diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@3x.png b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png new file mode 100644 index 0000000..b73b6f3 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@3x.png b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png new file mode 100644 index 0000000..b73b6f3 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json deleted file mode 100644 index eb57061..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "zhongdian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@3x.png b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png new file mode 100644 index 0000000..b73b6f3 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json deleted file mode 100644 index eb57061..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "zhongdian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png b/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png deleted file mode 100644 index 0a32aa3..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png +++ /dev/null Binary files differ diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@3x.png b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png new file mode 100644 index 0000000..b73b6f3 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json deleted file mode 100644 index eb57061..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "zhongdian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png b/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png deleted file mode 100644 index 0a32aa3..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Util/InspectionRealmManager.swift b/LaserMethane/Util/InspectionRealmManager.swift index 0442555..5e7c880 100644 --- a/LaserMethane/Util/InspectionRealmManager.swift +++ b/LaserMethane/Util/InspectionRealmManager.swift @@ -65,7 +65,7 @@ model.id = resultObject[0].inspectionId model.name = resultObject[0].name let routeJson = resultObject[0].routes -// print("路线: \(routeJson)") + print("路线: \(routeJson)") let routeModels = [RouteModel].deserialize(from: routeJson)! var tempRoutes = [RouteModel]() routeModels.forEach { it in diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@3x.png b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png new file mode 100644 index 0000000..b73b6f3 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json deleted file mode 100644 index eb57061..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "zhongdian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png b/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png deleted file mode 100644 index 0a32aa3..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Util/InspectionRealmManager.swift b/LaserMethane/Util/InspectionRealmManager.swift index 0442555..5e7c880 100644 --- a/LaserMethane/Util/InspectionRealmManager.swift +++ b/LaserMethane/Util/InspectionRealmManager.swift @@ -65,7 +65,7 @@ model.id = resultObject[0].inspectionId model.name = resultObject[0].name let routeJson = resultObject[0].routes -// print("路线: \(routeJson)") + print("路线: \(routeJson)") let routeModels = [RouteModel].deserialize(from: routeJson)! var tempRoutes = [RouteModel]() routeModels.forEach { it in diff --git a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib index 7cb10f4..1e69c75 100644 --- a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib +++ b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib @@ -1,6 +1,6 @@ - + @@ -22,11 +22,11 @@ - + - + - + @@ -87,7 +87,7 @@ - + - + - + diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@3x.png b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png new file mode 100644 index 0000000..b73b6f3 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json deleted file mode 100644 index eb57061..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "zhongdian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png b/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png deleted file mode 100644 index 0a32aa3..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Util/InspectionRealmManager.swift b/LaserMethane/Util/InspectionRealmManager.swift index 0442555..5e7c880 100644 --- a/LaserMethane/Util/InspectionRealmManager.swift +++ b/LaserMethane/Util/InspectionRealmManager.swift @@ -65,7 +65,7 @@ model.id = resultObject[0].inspectionId model.name = resultObject[0].name let routeJson = resultObject[0].routes -// print("路线: \(routeJson)") + print("路线: \(routeJson)") let routeModels = [RouteModel].deserialize(from: routeJson)! var tempRoutes = [RouteModel]() routeModels.forEach { it in diff --git a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib index 7cb10f4..1e69c75 100644 --- a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib +++ b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib @@ -1,6 +1,6 @@ - + @@ -22,11 +22,11 @@ - + - + - + @@ -87,7 +87,7 @@ - + - + - + diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 5b49a0a..9ff40d0 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -12,11 +12,6 @@ import UIKit class InspectMapViewController: UIViewController, TransferValueDelegate { - private var id: String? - private var mapView: MAMapView! - private var inspectView: UIView! - private let defaults = Defaults.shared - @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @IBOutlet var inspectUserLabel: UILabel! @@ -26,8 +21,10 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - private var startPointAnnotation: MAPointAnnotation! - private var endPointAnnotation: MAPointAnnotation! + private let defaults = Defaults.shared + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { @@ -38,28 +35,35 @@ navigationController?.navigationBar.barTintColor = .systemBlue let dict: [NSAttributedString.Key: Any] = [NSAttributedString.Key.foregroundColor: UIColor.white] navigationController?.navigationBar.titleTextAttributes = dict // title color - // 设置地图 - setUpMap() - // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: SCREEN_WIDTH - 16, height: 70)) - inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - // 在inspectView添加相应的控件 - addInspectSubview() - view.addSubview(inspectView) - // 添加按钮 - let buttonWidth = SCREEN_WIDTH * 0.8 - eventListButton.layer.cornerRadius = 8 - view.addSubview(eventListButton) - eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(SCREEN_HEIGHT * 0.8) - // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: 36)) - // x轴方向上居中 - make.centerX.equalToSuperview() + DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [self] in + // 设置地图 + setUpMap() + // 在地图图层上面View并设置阴影 + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: SCREEN_WIDTH - 16, height: 70)) + inspectView.backgroundColor = .white + LayerShadowHub.shared.setShadow( + view: inspectView, sColor: [211, 211, 211].transferUIColor(), + offset: CGSize(width: 0, height: 0), + alpha: 1.0, + radius: CGFloat(5.0) + ) + // 在inspectView添加相应的控件 + addInspectSubview() + view.addSubview(inspectView) + // 添加按钮 + let buttonWidth = SCREEN_WIDTH * 0.8 + eventListButton.layer.cornerRadius = 8 + view.addSubview(eventListButton) + eventListButton.snp.makeConstraints { (make) -> Void in + make.top.equalTo(SCREEN_HEIGHT * 0.8) + // 设置视图大小 + make.size.equalTo(CGSize(width: buttonWidth, height: 36)) + // x轴方向上居中 + make.centerX.equalToSuperview() + } + // 根据id查询巡检详情 + loadInspectDetail() } - // 根据id查询巡检详情 - loadInspectDetail() } func setUpMap() { @@ -136,9 +140,12 @@ func loadInspectDetail() { let baseURL = defaults.get(for: serverConfigKey)! let inspectionDetailURL = baseURL + Constant.inspectionDetail.rawValue - Alamofire.request(inspectionDetailURL, - method: .get, parameters: ["id": id!], - headers: ["token": defaults.get(for: tokenKey)!]).responseJSON { [self] response in + Alamofire.request( + inspectionDetailURL, + method: .get, + parameters: ["id": id!], + headers: ["token": defaults.get(for: tokenKey)!] + ).responseJSON { [self] response in switch response.result { case let .success(value): setInspectData(detailModel: InspectDetailModel(respJson: JSON(value)).data) @@ -154,25 +161,38 @@ inspectStartTimeLabel.text = detailModel.startTime inspectEndTimeLabel.text = detailModel.endTime // 绘制起点终点 - startPointAnnotation = MAPointAnnotation() - let startPointCoordinate = CLLocationCoordinate2D(latitude: CLLocationDegrees(detailModel.startLat!), longitude: CLLocationDegrees(detailModel.startLng!)) + let startPointAnnotation = MAPointAnnotation() + let startPointCoordinate = CLLocationCoordinate2D( + latitude: CLLocationDegrees(detailModel.startLat!), + longitude: CLLocationDegrees(detailModel.startLng!) + ) // 移动到巡检起始经纬度 mapView.centerCoordinate = startPointCoordinate startPointAnnotation.coordinate = startPointCoordinate + startPointAnnotation.title = "起点" + mapView.addAnnotation(startPointAnnotation) - endPointAnnotation = MAPointAnnotation() - let endPointCoordinate = CLLocationCoordinate2D(latitude: CLLocationDegrees(detailModel.endLat!), longitude: CLLocationDegrees(detailModel.endLng!)) + let endPointAnnotation = MAPointAnnotation() + let endPointCoordinate = CLLocationCoordinate2D( + latitude: CLLocationDegrees(detailModel.endLat!), + longitude: CLLocationDegrees(detailModel.endLng!) + ) endPointAnnotation.coordinate = endPointCoordinate - mapView.addAnnotations([startPointAnnotation!, endPointAnnotation!]) + endPointAnnotation.title = "终点" + mapView.addAnnotation(endPointAnnotation) // 绘制路线 var lineCoordinates: [CLLocationCoordinate2D] = [] for route in detailModel.routes! { - if route.lat == nil || route.lng == nil { - return - } - lineCoordinates.append(CLLocationCoordinate2D(latitude: CLLocationDegrees(route.lat), longitude: CLLocationDegrees(route.lng))) + lineCoordinates.append( + CLLocationCoordinate2D( + latitude: CLLocationDegrees(route.lat), + longitude: CLLocationDegrees(route.lng) + ) + ) } - mapView.add(MAPolyline(coordinates: &lineCoordinates, count: UInt(lineCoordinates.count))) + mapView.add( + MAPolyline(coordinates: &lineCoordinates, count: UInt(lineCoordinates.count)) + ) } @IBAction func toEventListViewController(_ sender: Any) { @@ -206,22 +226,23 @@ func mapView(_ mapView: MAMapView!, viewFor annotation: MAAnnotation!) -> MAAnnotationView! { if annotation.isKind(of: MAPointAnnotation.self) { let pointReuseIdentifier = "pointReuseIdentifier" - var annotationView: MAPinAnnotationView? = mapView.dequeueReusableAnnotationView(withIdentifier: pointReuseIdentifier) as! MAPinAnnotationView? + var annotationView = mapView.dequeueReusableAnnotationView( + withIdentifier: pointReuseIdentifier + ) as! MAPinAnnotationView? if annotationView == nil { annotationView = MAPinAnnotationView(annotation: annotation, reuseIdentifier: pointReuseIdentifier) } // 区分起点终点，分别设置图标 - if annotation.isEqual(startPointAnnotation) { - annotationView!.image = UIImage(named: "qidian") + if annotation.title == "起点" { + annotationView!.image = UIImage(named: "start") } - if annotation.isEqual(endPointAnnotation) { - annotationView!.image = UIImage(named: "zhongdian") + if annotation.title == "终点" { + annotationView!.image = UIImage(named: "end") } - annotationView!.imageView.frame = CGRect(x: 0, y: 0, width: 32, height: 32) + // 设置中心点偏移，使得标注底部中间点成为经纬度对应点 + annotationView!.centerOffset = CGPoint(x: 0, y: -18) annotationView!.animatesDrop = true annotationView!.isDraggable = false - // 设置中心点偏移，使得标注底部中间点成为经纬度对应点 - annotationView!.centerOffset = CGPoint(x: 0, y: -16) return annotationView! } return nil diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index acaf376..441705c 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/Contents.json b/LaserMethane/Assets.xcassets/end.imageset/Contents.json new file mode 100644 index 0000000..324b300 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "end.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "end@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "end@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/end.imageset/end.png b/LaserMethane/Assets.xcassets/end.imageset/end.png new file mode 100644 index 0000000..5f96468 --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@2x.png b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png new file mode 100644 index 0000000..5faef1c --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/end.imageset/end@3x.png b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png new file mode 100644 index 0000000..d48de0d --- /dev/null +++ b/LaserMethane/Assets.xcassets/end.imageset/end@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json deleted file mode 100644 index bd15710..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "qidian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png b/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png deleted file mode 100644 index 94290c6..0000000 --- a/LaserMethane/Assets.xcassets/qidian.imageset/qidian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/Contents.json b/LaserMethane/Assets.xcassets/start.imageset/Contents.json new file mode 100644 index 0000000..0523dd2 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "start.png", + "idiom" : "iphone", + "scale" : "1x" + }, + { + "filename" : "start@2x.png", + "idiom" : "iphone", + "scale" : "2x" + }, + { + "filename" : "start@3x.png", + "idiom" : "iphone", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/LaserMethane/Assets.xcassets/start.imageset/start.png b/LaserMethane/Assets.xcassets/start.imageset/start.png new file mode 100644 index 0000000..5281176 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@2x.png b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png new file mode 100644 index 0000000..1f8dbcc --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/start.imageset/start@3x.png b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png new file mode 100644 index 0000000..b73b6f3 --- /dev/null +++ b/LaserMethane/Assets.xcassets/start.imageset/start@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json deleted file mode 100644 index eb57061..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "images" : [ - { - "filename" : "zhongdian.png", - "idiom" : "iphone", - "scale" : "1x" - }, - { - "idiom" : "iphone", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png b/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png deleted file mode 100644 index 0a32aa3..0000000 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/zhongdian.png +++ /dev/null Binary files differ diff --git a/LaserMethane/Util/InspectionRealmManager.swift b/LaserMethane/Util/InspectionRealmManager.swift index 0442555..5e7c880 100644 --- a/LaserMethane/Util/InspectionRealmManager.swift +++ b/LaserMethane/Util/InspectionRealmManager.swift @@ -65,7 +65,7 @@ model.id = resultObject[0].inspectionId model.name = resultObject[0].name let routeJson = resultObject[0].routes -// print("路线: \(routeJson)") + print("路线: \(routeJson)") let routeModels = [RouteModel].deserialize(from: routeJson)! var tempRoutes = [RouteModel]() routeModels.forEach { it in diff --git a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib index 7cb10f4..1e69c75 100644 --- a/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib +++ b/LaserMethane/ViewController/Event/SingModeEventDetailViewController.xib @@ -1,6 +1,6 @@ - + @@ -22,11 +22,11 @@ - + - + - + @@ -87,7 +87,7 @@ - + - + - + diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 5b49a0a..9ff40d0 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -12,11 +12,6 @@ import UIKit class InspectMapViewController: UIViewController, TransferValueDelegate { - private var id: String? - private var mapView: MAMapView! - private var inspectView: UIView! - private let defaults = Defaults.shared - @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @IBOutlet var inspectUserLabel: UILabel! @@ -26,8 +21,10 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - private var startPointAnnotation: MAPointAnnotation! - private var endPointAnnotation: MAPointAnnotation! + private let defaults = Defaults.shared + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { @@ -38,28 +35,35 @@ navigationController?.navigationBar.barTintColor = .systemBlue let dict: [NSAttributedString.Key: Any] = [NSAttributedString.Key.foregroundColor: UIColor.white] navigationController?.navigationBar.titleTextAttributes = dict // title color - // 设置地图 - setUpMap() - // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: SCREEN_WIDTH - 16, height: 70)) - inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - // 在inspectView添加相应的控件 - addInspectSubview() - view.addSubview(inspectView) - // 添加按钮 - let buttonWidth = SCREEN_WIDTH * 0.8 - eventListButton.layer.cornerRadius = 8 - view.addSubview(eventListButton) - eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(SCREEN_HEIGHT * 0.8) - // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: 36)) - // x轴方向上居中 - make.centerX.equalToSuperview() + DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [self] in + // 设置地图 + setUpMap() + // 在地图图层上面View并设置阴影 + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: SCREEN_WIDTH - 16, height: 70)) + inspectView.backgroundColor = .white + LayerShadowHub.shared.setShadow( + view: inspectView, sColor: [211, 211, 211].transferUIColor(), + offset: CGSize(width: 0, height: 0), + alpha: 1.0, + radius: CGFloat(5.0) + ) + // 在inspectView添加相应的控件 + addInspectSubview() + view.addSubview(inspectView) + // 添加按钮 + let buttonWidth = SCREEN_WIDTH * 0.8 + eventListButton.layer.cornerRadius = 8 + view.addSubview(eventListButton) + eventListButton.snp.makeConstraints { (make) -> Void in + make.top.equalTo(SCREEN_HEIGHT * 0.8) + // 设置视图大小 + make.size.equalTo(CGSize(width: buttonWidth, height: 36)) + // x轴方向上居中 + make.centerX.equalToSuperview() + } + // 根据id查询巡检详情 + loadInspectDetail() } - // 根据id查询巡检详情 - loadInspectDetail() } func setUpMap() { @@ -136,9 +140,12 @@ func loadInspectDetail() { let baseURL = defaults.get(for: serverConfigKey)! let inspectionDetailURL = baseURL + Constant.inspectionDetail.rawValue - Alamofire.request(inspectionDetailURL, - method: .get, parameters: ["id": id!], - headers: ["token": defaults.get(for: tokenKey)!]).responseJSON { [self] response in + Alamofire.request( + inspectionDetailURL, + method: .get, + parameters: ["id": id!], + headers: ["token": defaults.get(for: tokenKey)!] + ).responseJSON { [self] response in switch response.result { case let .success(value): setInspectData(detailModel: InspectDetailModel(respJson: JSON(value)).data) @@ -154,25 +161,38 @@ inspectStartTimeLabel.text = detailModel.startTime inspectEndTimeLabel.text = detailModel.endTime // 绘制起点终点 - startPointAnnotation = MAPointAnnotation() - let startPointCoordinate = CLLocationCoordinate2D(latitude: CLLocationDegrees(detailModel.startLat!), longitude: CLLocationDegrees(detailModel.startLng!)) + let startPointAnnotation = MAPointAnnotation() + let startPointCoordinate = CLLocationCoordinate2D( + latitude: CLLocationDegrees(detailModel.startLat!), + longitude: CLLocationDegrees(detailModel.startLng!) + ) // 移动到巡检起始经纬度 mapView.centerCoordinate = startPointCoordinate startPointAnnotation.coordinate = startPointCoordinate + startPointAnnotation.title = "起点" + mapView.addAnnotation(startPointAnnotation) - endPointAnnotation = MAPointAnnotation() - let endPointCoordinate = CLLocationCoordinate2D(latitude: CLLocationDegrees(detailModel.endLat!), longitude: CLLocationDegrees(detailModel.endLng!)) + let endPointAnnotation = MAPointAnnotation() + let endPointCoordinate = CLLocationCoordinate2D( + latitude: CLLocationDegrees(detailModel.endLat!), + longitude: CLLocationDegrees(detailModel.endLng!) + ) endPointAnnotation.coordinate = endPointCoordinate - mapView.addAnnotations([startPointAnnotation!, endPointAnnotation!]) + endPointAnnotation.title = "终点" + mapView.addAnnotation(endPointAnnotation) // 绘制路线 var lineCoordinates: [CLLocationCoordinate2D] = [] for route in detailModel.routes! { - if route.lat == nil || route.lng == nil { - return - } - lineCoordinates.append(CLLocationCoordinate2D(latitude: CLLocationDegrees(route.lat), longitude: CLLocationDegrees(route.lng))) + lineCoordinates.append( + CLLocationCoordinate2D( + latitude: CLLocationDegrees(route.lat), + longitude: CLLocationDegrees(route.lng) + ) + ) } - mapView.add(MAPolyline(coordinates: &lineCoordinates, count: UInt(lineCoordinates.count))) + mapView.add( + MAPolyline(coordinates: &lineCoordinates, count: UInt(lineCoordinates.count)) + ) } @IBAction func toEventListViewController(_ sender: Any) { @@ -206,22 +226,23 @@ func mapView(_ mapView: MAMapView!, viewFor annotation: MAAnnotation!) -> MAAnnotationView! { if annotation.isKind(of: MAPointAnnotation.self) { let pointReuseIdentifier = "pointReuseIdentifier" - var annotationView: MAPinAnnotationView? = mapView.dequeueReusableAnnotationView(withIdentifier: pointReuseIdentifier) as! MAPinAnnotationView? + var annotationView = mapView.dequeueReusableAnnotationView( + withIdentifier: pointReuseIdentifier + ) as! MAPinAnnotationView? if annotationView == nil { annotationView = MAPinAnnotationView(annotation: annotation, reuseIdentifier: pointReuseIdentifier) } // 区分起点终点，分别设置图标 - if annotation.isEqual(startPointAnnotation) { - annotationView!.image = UIImage(named: "qidian") + if annotation.title == "起点" { + annotationView!.image = UIImage(named: "start") } - if annotation.isEqual(endPointAnnotation) { - annotationView!.image = UIImage(named: "zhongdian") + if annotation.title == "终点" { + annotationView!.image = UIImage(named: "end") } - annotationView!.imageView.frame = CGRect(x: 0, y: 0, width: 32, height: 32) + // 设置中心点偏移，使得标注底部中间点成为经纬度对应点 + annotationView!.centerOffset = CGPoint(x: 0, y: -18) annotationView!.animatesDrop = true annotationView!.isDraggable = false - // 设置中心点偏移，使得标注底部中间点成为经纬度对应点 - annotationView!.centerOffset = CGPoint(x: 0, y: -16) return annotationView! } return nil diff --git a/LaserMethane/ViewController/Inspect/SingModeInspectMapViewController.swift b/LaserMethane/ViewController/Inspect/SingModeInspectMapViewController.swift index 660de0f..f0ae3c5 100644 --- a/LaserMethane/ViewController/Inspect/SingModeInspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/SingModeInspectMapViewController.swift @@ -24,8 +24,6 @@ private var id: String? private var mapView: MAMapView! private var inspectView: UIView! - private var startPointAnnotation: MAPointAnnotation! - private var endPointAnnotation: MAPointAnnotation! private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { @@ -36,28 +34,36 @@ navigationController?.navigationBar.barTintColor = .systemBlue let dict: [NSAttributedString.Key: Any] = [NSAttributedString.Key.foregroundColor: UIColor.white] navigationController?.navigationBar.titleTextAttributes = dict // title color - // 设置地图 - setUpMap() - // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: SCREEN_WIDTH - 16, height: 70)) - inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - // 在inspectView添加相应的控件 - addInspectSubview() - view.addSubview(inspectView) - // 添加按钮 - let buttonWidth = SCREEN_WIDTH * 0.8 - eventListButton.layer.cornerRadius = 8 - view.addSubview(eventListButton) - eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(SCREEN_HEIGHT * 0.8) - // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: 36)) - // x轴方向上居中 - make.centerX.equalToSuperview() + DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) { [self] in + // 设置地图 + setUpMap() + // 在地图图层上面View并设置阴影 + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: SCREEN_WIDTH - 16, height: 70)) + inspectView.backgroundColor = .white + LayerShadowHub.shared.setShadow( + view: inspectView, + sColor: [211, 211, 211].transferUIColor(), + offset: CGSize(width: 0, height: 0), + alpha: 1.0, + radius: CGFloat(5.0) + ) + // 在inspectView添加相应的控件 + addInspectSubview() + view.addSubview(inspectView) + // 添加按钮 + let buttonWidth = SCREEN_WIDTH * 0.8 + eventListButton.layer.cornerRadius = 8 + view.addSubview(eventListButton) + eventListButton.snp.makeConstraints { (make) -> Void in + make.top.equalTo(SCREEN_HEIGHT * 0.8) + // 设置视图大小 + make.size.equalTo(CGSize(width: buttonWidth, height: 36)) + // x轴方向上居中 + make.centerX.equalToSuperview() + } + // 根据id查询巡检详情 + loadInspectDetail() } - // 根据id查询巡检详情 - loadInspectDetail() } func setUpMap() { @@ -146,25 +152,41 @@ inspectStartTimeLabel.text = detailModel.startTime inspectEndTimeLabel.text = detailModel.endTime // 绘制起点终点 - startPointAnnotation = MAPointAnnotation() - let startPointCoordinate = CLLocationCoordinate2D(latitude: CLLocationDegrees(detailModel.startLat!), longitude: CLLocationDegrees(detailModel.startLng!)) + let startPointAnnotation = MAPointAnnotation() + let startPointCoordinate = CLLocationCoordinate2D( + latitude: CLLocationDegrees(detailModel.startLat!), + longitude: CLLocationDegrees(detailModel.startLng!) + ) // 移动到巡检起始经纬度 mapView.centerCoordinate = startPointCoordinate startPointAnnotation.coordinate = startPointCoordinate + startPointAnnotation.title = "起点" + mapView.addAnnotation(startPointAnnotation) - endPointAnnotation = MAPointAnnotation() - let endPointCoordinate = CLLocationCoordinate2D(latitude: CLLocationDegrees(detailModel.endLat!), longitude: CLLocationDegrees(detailModel.endLng!)) + let endPointAnnotation = MAPointAnnotation() + let endPointCoordinate = CLLocationCoordinate2D( + latitude: CLLocationDegrees(detailModel.endLat!), + longitude: CLLocationDegrees(detailModel.endLng!) + ) endPointAnnotation.coordinate = endPointCoordinate - mapView.addAnnotations([startPointAnnotation!, endPointAnnotation!]) + endPointAnnotation.title = "终点" + mapView.addAnnotation(endPointAnnotation) // 绘制路线 var lineCoordinates: [CLLocationCoordinate2D] = [] for route in detailModel.routes! { if route.lat == nil || route.lng == nil { return } - lineCoordinates.append(CLLocationCoordinate2D(latitude: CLLocationDegrees(route.lat), longitude: CLLocationDegrees(route.lng))) + lineCoordinates.append( + CLLocationCoordinate2D( + latitude: CLLocationDegrees(route.lat), + longitude: CLLocationDegrees(route.lng) + ) + ) } - mapView.add(MAPolyline(coordinates: &lineCoordinates, count: UInt(lineCoordinates.count))) + mapView.add( + MAPolyline(coordinates: &lineCoordinates, count: UInt(lineCoordinates.count)) + ) } @IBAction func toEventListViewController(_ sender: Any) { @@ -198,22 +220,26 @@ func mapView(_ mapView: MAMapView!, viewFor annotation: MAAnnotation!) -> MAAnnotationView! { if annotation.isKind(of: MAPointAnnotation.self) { let pointReuseIdentifier = "pointReuseIdentifier" - var annotationView: MAPinAnnotationView? = mapView.dequeueReusableAnnotationView(withIdentifier: pointReuseIdentifier) as! MAPinAnnotationView? + var annotationView = mapView.dequeueReusableAnnotationView( + withIdentifier: pointReuseIdentifier + ) as! MAPinAnnotationView? if annotationView == nil { - annotationView = MAPinAnnotationView(annotation: annotation, reuseIdentifier: pointReuseIdentifier) + annotationView = MAPinAnnotationView( + annotation: annotation, + reuseIdentifier: pointReuseIdentifier + ) } // 区分起点终点，分别设置图标 - if annotation.isEqual(startPointAnnotation) { - annotationView!.image = UIImage(named: "qidian") + if annotation.title == "起点" { + annotationView!.image = UIImage(named: "start") } - if annotation.isEqual(endPointAnnotation) { - annotationView!.image = UIImage(named: "zhongdian") + if annotation.title == "终点" { + annotationView!.image = UIImage(named: "end") } - annotationView!.imageView.frame = CGRect(x: 0, y: 0, width: 32, height: 32) + //设置中心点偏移，使得标注底部中间点成为经纬度对应点 + annotationView!.centerOffset = CGPoint(x: 0, y: -18); annotationView!.animatesDrop = true annotationView!.isDraggable = false - // 设置中心点偏移，使得标注底部中间点成为经纬度对应点 - annotationView!.centerOffset = CGPoint(x: 0, y: -16) return annotationView! } return nil