diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 100644 --- a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate +++ b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 3f16aee..0926e4b 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -11,13 +11,11 @@ import SwiftyJSON import UIKit -let VIEW_WIDTH = UIScreen.main.bounds.size.width -let VIEW_HEIGHT = UIScreen.main.bounds.size.height - class InspectMapViewController: UIViewController, TransferValueDelegate, MAMapViewDelegate { - var id: String? - var mapView: MAMapView! - var inspectView: UIView! + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! + private let keychain = Keychain() @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @@ -28,9 +26,9 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - var startPointAnnotation: MAPointAnnotation! - var endPointAnnotation: MAPointAnnotation! - var valueDelegate: TransferIdDelegate! + private var startPointAnnotation: MAPointAnnotation! + private var endPointAnnotation: MAPointAnnotation! + private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -43,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + 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 = VIEW_WIDTH * 0.8 + let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(VIEW_HEIGHT * 0.8) + make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -65,7 +63,6 @@ } func loadInspectDetail() { - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let inspectionDetailURL = baseURL! + Constant.inspectionDetail.rawValue Alamofire.request(inspectionDetailURL, @@ -204,24 +201,22 @@ view.addSubview(mapView) // 添加放大缩小按钮 // 放大 - let buttonWidth = CGFloat(36) - let buttonHeight = CGFloat(36) expandButton.layer.cornerRadius = 5 view.addSubview(expandButton) expandButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 view.addSubview(minusButton) minusButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3 + buttonHeight + 2) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 3f16aee..0926e4b 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -11,13 +11,11 @@ import SwiftyJSON import UIKit -let VIEW_WIDTH = UIScreen.main.bounds.size.width -let VIEW_HEIGHT = UIScreen.main.bounds.size.height - class InspectMapViewController: UIViewController, TransferValueDelegate, MAMapViewDelegate { - var id: String? - var mapView: MAMapView! - var inspectView: UIView! + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! + private let keychain = Keychain() @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @@ -28,9 +26,9 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - var startPointAnnotation: MAPointAnnotation! - var endPointAnnotation: MAPointAnnotation! - var valueDelegate: TransferIdDelegate! + private var startPointAnnotation: MAPointAnnotation! + private var endPointAnnotation: MAPointAnnotation! + private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -43,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + 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 = VIEW_WIDTH * 0.8 + let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(VIEW_HEIGHT * 0.8) + make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -65,7 +63,6 @@ } func loadInspectDetail() { - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let inspectionDetailURL = baseURL! + Constant.inspectionDetail.rawValue Alamofire.request(inspectionDetailURL, @@ -204,24 +201,22 @@ view.addSubview(mapView) // 添加放大缩小按钮 // 放大 - let buttonWidth = CGFloat(36) - let buttonHeight = CGFloat(36) expandButton.layer.cornerRadius = 5 view.addSubview(expandButton) expandButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 view.addSubview(minusButton) minusButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3 + buttonHeight + 2) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } diff --git a/LaserMethane/ViewController/Inspect/InspectViewController.swift b/LaserMethane/ViewController/Inspect/InspectViewController.swift index 625fe05..bf9fac7 100644 --- a/LaserMethane/ViewController/Inspect/InspectViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectViewController.swift @@ -17,15 +17,15 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var inspectTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [RowsModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [RowsModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? var valueDelegate: TransferValueDelegate! @@ -38,8 +38,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 3f16aee..0926e4b 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -11,13 +11,11 @@ import SwiftyJSON import UIKit -let VIEW_WIDTH = UIScreen.main.bounds.size.width -let VIEW_HEIGHT = UIScreen.main.bounds.size.height - class InspectMapViewController: UIViewController, TransferValueDelegate, MAMapViewDelegate { - var id: String? - var mapView: MAMapView! - var inspectView: UIView! + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! + private let keychain = Keychain() @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @@ -28,9 +26,9 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - var startPointAnnotation: MAPointAnnotation! - var endPointAnnotation: MAPointAnnotation! - var valueDelegate: TransferIdDelegate! + private var startPointAnnotation: MAPointAnnotation! + private var endPointAnnotation: MAPointAnnotation! + private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -43,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + 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 = VIEW_WIDTH * 0.8 + let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(VIEW_HEIGHT * 0.8) + make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -65,7 +63,6 @@ } func loadInspectDetail() { - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let inspectionDetailURL = baseURL! + Constant.inspectionDetail.rawValue Alamofire.request(inspectionDetailURL, @@ -204,24 +201,22 @@ view.addSubview(mapView) // 添加放大缩小按钮 // 放大 - let buttonWidth = CGFloat(36) - let buttonHeight = CGFloat(36) expandButton.layer.cornerRadius = 5 view.addSubview(expandButton) expandButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 view.addSubview(minusButton) minusButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3 + buttonHeight + 2) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } diff --git a/LaserMethane/ViewController/Inspect/InspectViewController.swift b/LaserMethane/ViewController/Inspect/InspectViewController.swift index 625fe05..bf9fac7 100644 --- a/LaserMethane/ViewController/Inspect/InspectViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectViewController.swift @@ -17,15 +17,15 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var inspectTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [RowsModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [RowsModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? var valueDelegate: TransferValueDelegate! @@ -38,8 +38,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Login/LoginViewController.swift b/LaserMethane/ViewController/Login/LoginViewController.swift index a91d110..d9edc12 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.swift +++ b/LaserMethane/ViewController/Login/LoginViewController.swift @@ -22,7 +22,7 @@ passwordView.delegate = self // rgb 色值为（21，101，227）那么给UIColor设置里面要除以255，设置16进制颜色也同理 - loginButton.backgroundColor = UIColor(red: 21 / 255, green: 101 / 255, blue: 227 / 255, alpha: 1.0) + loginButton.backgroundColor = [21, 101, 227].transferUIColor() loginButton.layer.cornerRadius = 18 // 设置圆角 // 设置默认账号密码 userNameView.text = keychain[Constant.UserName.rawValue] ?? "" @@ -53,29 +53,29 @@ let configModel = BaseConfigModel(respJson: JSON(value)) // 将密码经由RSA和publicKey加密 guard let pwdWithKey = try? password?.encryptByRSA(publicKey: (configModel.data?.publicKey)!) - else { + else { return } // 登录 let loginURL = baseURL! + Constant.login.rawValue Alamofire.request(loginURL, method: .post, parameters: ["username": userName!, "password": pwdWithKey]) - .responseJSON { response in - switch response.result { - case let .success(value): - let loginModel = LoginResultModel(respJson: JSON(value)) - if loginModel.code == 200 { - // 将token存起来 - keychain[Constant.Token.rawValue] = loginModel.data!.token - // 跳转主页 - startMainMenuView() - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") + .responseJSON { response in + switch response.result { + case let .success(value): + let loginModel = LoginResultModel(respJson: JSON(value)) + if loginModel.code == 200 { + // 将token存起来 + keychain[Constant.Token.rawValue] = loginModel.data!.token + // 跳转主页 + startMainMenuView() + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") } + } case .failure: AlertHub.shared.showWaringAlert(controller: self, message: "检验失败，无法登陆") } @@ -132,7 +132,7 @@ } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 3f16aee..0926e4b 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -11,13 +11,11 @@ import SwiftyJSON import UIKit -let VIEW_WIDTH = UIScreen.main.bounds.size.width -let VIEW_HEIGHT = UIScreen.main.bounds.size.height - class InspectMapViewController: UIViewController, TransferValueDelegate, MAMapViewDelegate { - var id: String? - var mapView: MAMapView! - var inspectView: UIView! + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! + private let keychain = Keychain() @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @@ -28,9 +26,9 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - var startPointAnnotation: MAPointAnnotation! - var endPointAnnotation: MAPointAnnotation! - var valueDelegate: TransferIdDelegate! + private var startPointAnnotation: MAPointAnnotation! + private var endPointAnnotation: MAPointAnnotation! + private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -43,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + 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 = VIEW_WIDTH * 0.8 + let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(VIEW_HEIGHT * 0.8) + make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -65,7 +63,6 @@ } func loadInspectDetail() { - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let inspectionDetailURL = baseURL! + Constant.inspectionDetail.rawValue Alamofire.request(inspectionDetailURL, @@ -204,24 +201,22 @@ view.addSubview(mapView) // 添加放大缩小按钮 // 放大 - let buttonWidth = CGFloat(36) - let buttonHeight = CGFloat(36) expandButton.layer.cornerRadius = 5 view.addSubview(expandButton) expandButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 view.addSubview(minusButton) minusButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3 + buttonHeight + 2) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } diff --git a/LaserMethane/ViewController/Inspect/InspectViewController.swift b/LaserMethane/ViewController/Inspect/InspectViewController.swift index 625fe05..bf9fac7 100644 --- a/LaserMethane/ViewController/Inspect/InspectViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectViewController.swift @@ -17,15 +17,15 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var inspectTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [RowsModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [RowsModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? var valueDelegate: TransferValueDelegate! @@ -38,8 +38,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Login/LoginViewController.swift b/LaserMethane/ViewController/Login/LoginViewController.swift index a91d110..d9edc12 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.swift +++ b/LaserMethane/ViewController/Login/LoginViewController.swift @@ -22,7 +22,7 @@ passwordView.delegate = self // rgb 色值为（21，101，227）那么给UIColor设置里面要除以255，设置16进制颜色也同理 - loginButton.backgroundColor = UIColor(red: 21 / 255, green: 101 / 255, blue: 227 / 255, alpha: 1.0) + loginButton.backgroundColor = [21, 101, 227].transferUIColor() loginButton.layer.cornerRadius = 18 // 设置圆角 // 设置默认账号密码 userNameView.text = keychain[Constant.UserName.rawValue] ?? "" @@ -53,29 +53,29 @@ let configModel = BaseConfigModel(respJson: JSON(value)) // 将密码经由RSA和publicKey加密 guard let pwdWithKey = try? password?.encryptByRSA(publicKey: (configModel.data?.publicKey)!) - else { + else { return } // 登录 let loginURL = baseURL! + Constant.login.rawValue Alamofire.request(loginURL, method: .post, parameters: ["username": userName!, "password": pwdWithKey]) - .responseJSON { response in - switch response.result { - case let .success(value): - let loginModel = LoginResultModel(respJson: JSON(value)) - if loginModel.code == 200 { - // 将token存起来 - keychain[Constant.Token.rawValue] = loginModel.data!.token - // 跳转主页 - startMainMenuView() - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") + .responseJSON { response in + switch response.result { + case let .success(value): + let loginModel = LoginResultModel(respJson: JSON(value)) + if loginModel.code == 200 { + // 将token存起来 + keychain[Constant.Token.rawValue] = loginModel.data!.token + // 跳转主页 + startMainMenuView() + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") } + } case .failure: AlertHub.shared.showWaringAlert(controller: self, message: "检验失败，无法登陆") } @@ -132,7 +132,7 @@ } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) diff --git a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift index af8599a..4c9daf5 100644 --- a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift +++ b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift @@ -58,15 +58,15 @@ } func reloadUserInfo() { - let alertController = UIAlertController(title: "提示", message: "确定要退出吗？", preferredStyle: .alert) - let confirmAction = UIAlertAction(title: "确定", style: .default, handler: { [self] _ in + let alertController = UIAlertController(title: "温馨提示", message: "获取用户信息失败，是否重试？", preferredStyle: .alert) + let confirmAction = UIAlertAction(title: "是", style: .default, handler: { [self] _ in // 获取用户信息 obtainUserInfo() }) - let cancelAction = UIAlertAction(title: "取消", style: .default, handler: { [self] _ in + let cancelAction = UIAlertAction(title: "否", style: .default, handler: { [self] _ in dismiss(animated: true, completion: nil) }) - cancelAction.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + cancelAction.setValue(UIColor.red, forKey: "titleTextColor") alertController.addAction(cancelAction) alertController.addAction(confirmAction) present(alertController, animated: true, completion: nil) @@ -114,10 +114,10 @@ } func initViewBackground() { - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: logSearchView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: logSearchView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: settingsView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: settingsView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 3f16aee..0926e4b 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -11,13 +11,11 @@ import SwiftyJSON import UIKit -let VIEW_WIDTH = UIScreen.main.bounds.size.width -let VIEW_HEIGHT = UIScreen.main.bounds.size.height - class InspectMapViewController: UIViewController, TransferValueDelegate, MAMapViewDelegate { - var id: String? - var mapView: MAMapView! - var inspectView: UIView! + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! + private let keychain = Keychain() @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @@ -28,9 +26,9 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - var startPointAnnotation: MAPointAnnotation! - var endPointAnnotation: MAPointAnnotation! - var valueDelegate: TransferIdDelegate! + private var startPointAnnotation: MAPointAnnotation! + private var endPointAnnotation: MAPointAnnotation! + private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -43,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + 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 = VIEW_WIDTH * 0.8 + let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(VIEW_HEIGHT * 0.8) + make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -65,7 +63,6 @@ } func loadInspectDetail() { - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let inspectionDetailURL = baseURL! + Constant.inspectionDetail.rawValue Alamofire.request(inspectionDetailURL, @@ -204,24 +201,22 @@ view.addSubview(mapView) // 添加放大缩小按钮 // 放大 - let buttonWidth = CGFloat(36) - let buttonHeight = CGFloat(36) expandButton.layer.cornerRadius = 5 view.addSubview(expandButton) expandButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 view.addSubview(minusButton) minusButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3 + buttonHeight + 2) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } diff --git a/LaserMethane/ViewController/Inspect/InspectViewController.swift b/LaserMethane/ViewController/Inspect/InspectViewController.swift index 625fe05..bf9fac7 100644 --- a/LaserMethane/ViewController/Inspect/InspectViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectViewController.swift @@ -17,15 +17,15 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var inspectTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [RowsModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [RowsModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? var valueDelegate: TransferValueDelegate! @@ -38,8 +38,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Login/LoginViewController.swift b/LaserMethane/ViewController/Login/LoginViewController.swift index a91d110..d9edc12 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.swift +++ b/LaserMethane/ViewController/Login/LoginViewController.swift @@ -22,7 +22,7 @@ passwordView.delegate = self // rgb 色值为（21，101，227）那么给UIColor设置里面要除以255，设置16进制颜色也同理 - loginButton.backgroundColor = UIColor(red: 21 / 255, green: 101 / 255, blue: 227 / 255, alpha: 1.0) + loginButton.backgroundColor = [21, 101, 227].transferUIColor() loginButton.layer.cornerRadius = 18 // 设置圆角 // 设置默认账号密码 userNameView.text = keychain[Constant.UserName.rawValue] ?? "" @@ -53,29 +53,29 @@ let configModel = BaseConfigModel(respJson: JSON(value)) // 将密码经由RSA和publicKey加密 guard let pwdWithKey = try? password?.encryptByRSA(publicKey: (configModel.data?.publicKey)!) - else { + else { return } // 登录 let loginURL = baseURL! + Constant.login.rawValue Alamofire.request(loginURL, method: .post, parameters: ["username": userName!, "password": pwdWithKey]) - .responseJSON { response in - switch response.result { - case let .success(value): - let loginModel = LoginResultModel(respJson: JSON(value)) - if loginModel.code == 200 { - // 将token存起来 - keychain[Constant.Token.rawValue] = loginModel.data!.token - // 跳转主页 - startMainMenuView() - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") + .responseJSON { response in + switch response.result { + case let .success(value): + let loginModel = LoginResultModel(respJson: JSON(value)) + if loginModel.code == 200 { + // 将token存起来 + keychain[Constant.Token.rawValue] = loginModel.data!.token + // 跳转主页 + startMainMenuView() + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") } + } case .failure: AlertHub.shared.showWaringAlert(controller: self, message: "检验失败，无法登陆") } @@ -132,7 +132,7 @@ } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) diff --git a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift index af8599a..4c9daf5 100644 --- a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift +++ b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift @@ -58,15 +58,15 @@ } func reloadUserInfo() { - let alertController = UIAlertController(title: "提示", message: "确定要退出吗？", preferredStyle: .alert) - let confirmAction = UIAlertAction(title: "确定", style: .default, handler: { [self] _ in + let alertController = UIAlertController(title: "温馨提示", message: "获取用户信息失败，是否重试？", preferredStyle: .alert) + let confirmAction = UIAlertAction(title: "是", style: .default, handler: { [self] _ in // 获取用户信息 obtainUserInfo() }) - let cancelAction = UIAlertAction(title: "取消", style: .default, handler: { [self] _ in + let cancelAction = UIAlertAction(title: "否", style: .default, handler: { [self] _ in dismiss(animated: true, completion: nil) }) - cancelAction.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + cancelAction.setValue(UIColor.red, forKey: "titleTextColor") alertController.addAction(cancelAction) alertController.addAction(confirmAction) present(alertController, animated: true, completion: nil) @@ -114,10 +114,10 @@ } func initViewBackground() { - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: logSearchView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: logSearchView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: settingsView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: settingsView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Map/MapViewController.swift b/LaserMethane/ViewController/Map/MapViewController.swift index c53e6fa..79a83c4 100644 --- a/LaserMethane/ViewController/Map/MapViewController.swift +++ b/LaserMethane/ViewController/Map/MapViewController.swift @@ -14,15 +14,6 @@ import Toast_Swift import UIKit -let SCREEN_WIDTH = UIScreen.main.bounds.size.width -let SCREEN_HEIGHT = UIScreen.main.bounds.size.height -let BUTTON_WIDTH = CGFloat(36) -let BUTTON_HEIGHT = CGFloat(36) -let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 -let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 -let viewWidth = (SCREEN_WIDTH - 40) / 3 -let viewHeight = (SCREEN_WIDTH - 40) / 3 - class MapViewController: UIViewController, MAMapViewDelegate { private let manager = CLLocationManager() private var locationManager = AMapLocationManager() @@ -47,10 +38,10 @@ @IBOutlet var maxValueLabel: UILabel! private var valueDelegate: TransferValueDelegate! - private var keychain: Keychain! + private var keychain = Keychain() private var userModel: UserInfoModel! private var baseURL: String! - private var centralManager: CBCentralManager! + private var centralManager = CBCentralManager() // 扫描到的设备的集合 private var scanDevices = [CBPeripheral]() private var writeCharacteristic: CBCharacteristic! @@ -77,14 +68,12 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // 初始化基本数据 - keychain = Keychain() baseURL = keychain[Constant.ServerConfig.rawValue] let userJson = keychain[Constant.UserJson.rawValue]! let data = userJson.data(using: String.Encoding.utf8, allowLossyConversion: false) ?? Data() userModel = UserInfoModel(respJson: JSON(data)) timeFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" // 蓝牙相关 - centralManager = CBCentralManager() centralManager.delegate = self // 新建巡检弹窗 creatNewInspection() @@ -93,7 +82,7 @@ setUpMap() // 在地图图层上面View topTagView = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 55)) - topTagView.backgroundColor = UIColor(red: 214 / 255, green: 238 / 255, blue: 254 / 255, alpha: 1.0) + topTagView.backgroundColor = [214, 238, 254].transferUIColor() addTopTagSubview() addLeftSubview() addBottomSubview() @@ -122,7 +111,7 @@ expandButton.snp.makeConstraints { (make) -> Void in make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - BUTTON_HEIGHT) / 3) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 @@ -130,7 +119,7 @@ minusButton.snp.makeConstraints { (make) -> Void in make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } @@ -205,28 +194,28 @@ // 提交参数: ["startLat": 39.915913628472225, "id": "162925125712000", "date": "2021-08-18", "startTime": "2021-08-18 09:47:37", "endLng": 116.26874240451389, "startLng": 116.26874240451389, "routes": "[{\"lat\":39.915913628472225,\"lng\":116.26874240451389}]", "user": "王晓颖", "name": "测试iOS", "endTime": "2021-08-18 09:47:56", "endLat": 39.915913628472225] print("提交参数: \(param)") Alamofire.request(addInspectionURL, method: .post, parameters: param, headers: ["token": keychain[Constant.Token.rawValue]!]) - .responseJSON(completionHandler: { response in - switch response.result { - case let .success(value): - let actionModel = ActionResultModel(respJson: JSON(value)) - if actionModel.code == 200 { - let alertController = UIAlertController(title: "提示", message: "巡检记录保存成功", preferredStyle: .alert) - let okAction = UIAlertAction(title: "知道了", style: .default, handler: { _ in - navigationController?.popViewController(animated: true) - }) - alertController.addAction(okAction) - present(alertController, animated: true, completion: nil) - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + .responseJSON(completionHandler: { response in + switch response.result { + case let .success(value): + let actionModel = ActionResultModel(respJson: JSON(value)) + if actionModel.code == 200 { + let alertController = UIAlertController(title: "提示", message: "巡检记录保存成功", preferredStyle: .alert) + let okAction = UIAlertAction(title: "知道了", style: .default, handler: { _ in + navigationController?.popViewController(animated: true) + }) + alertController.addAction(okAction) + present(alertController, animated: true, completion: nil) + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") } - }) + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + } + }) } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) @@ -296,26 +285,26 @@ } func addBottomSubview() { - LayerShadowHub.shared.setShadow(view: currentView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: currentView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(currentView) currentView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.left.equalTo(10) } - LayerShadowHub.shared.setShadow(view: settingView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: settingView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(settingView) settingView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.centerX.equalToSuperview() } - LayerShadowHub.shared.setShadow(view: maxView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(maxView) maxView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.right.equalTo(-10) } @@ -326,7 +315,7 @@ view.addSubview(addEventButton) addEventButton.snp.makeConstraints { (make) -> Void in make.top.equalTo(SCREEN_HEIGHT * 0.8) - make.size.equalTo(CGSize(width: buttonWidth, height: 36)) + make.size.equalTo(CGSize(width: buttonWidth, height: BUTTON_HEIGHT)) make.centerX.equalToSuperview() } } @@ -358,8 +347,8 @@ // 构造巡检初始参数 model = NewInspectionModel(id: inspectionId, name: inspectNameLabel.text!, startTime: inspectTimeLabel.text!, - endTime: "", date: dateFormatter.string(from: Date(timeIntervalSince1970: timeInterval)), - startLng: 0.0, startLat: 0.0, endLng: 0.0, endLat: 0.0, routes: "", user: (userModel.data?.name!)!) + endTime: "", date: dateFormatter.string(from: Date(timeIntervalSince1970: timeInterval)), + startLng: 0.0, startLat: 0.0, endLng: 0.0, endLat: 0.0, routes: "", user: (userModel.data?.name!)!) // 显示定位蓝点 mapView.showsUserLocation = true mapView.userTrackingMode = .follow @@ -376,7 +365,7 @@ navigationController?.popViewController(animated: true) } // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) @@ -395,21 +384,21 @@ let inspectButton = UIAlertAction(title: "报警事件", style: .default, handler: { [self] _ in // 实现代理的方法，传值 valueDelegate.transfer(controller: self, - dic: ["isWarning": true, - "inspectionId": inspectionId!, - "inspectionName": inspectNameLabel.text!, - "longitude": Double(lng)!, - "latitude": Double(lat)!]) + dic: ["isWarning": true, + "inspectionId": inspectionId!, + "inspectionName": inspectNameLabel.text!, + "longitude": Double(lng)!, + "latitude": Double(lat)!]) navigationController?.pushViewController(newEventViewController, animated: true) }) let eventLogButton = UIAlertAction(title: "自定义事件", style: .default, handler: { [self] _ in // 实现代理的方法，传值 valueDelegate.transfer(controller: self, - dic: ["isWarning": false, - "inspectionId": inspectionId!, - "inspectionName": inspectNameLabel.text!, - "longitude": Double(lng)!, - "latitude": Double(lat)!]) + dic: ["isWarning": false, + "inspectionId": inspectionId!, + "inspectionName": inspectNameLabel.text!, + "longitude": Double(lng)!, + "latitude": Double(lat)!]) navigationController?.pushViewController(newEventViewController, animated: true) }) selectController.addAction(inspectButton) @@ -590,7 +579,7 @@ // 51, 51, 50, 48, 50, 49, 48, 49, 48, 48, 48, 51, 13, 10, 170, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 13, 10 // 只解析前14位，后14位是测量值 var deviceCodeData = Data() - for i in 0...13 { + for i in 0 ... 13 { deviceCodeData.append(data[i]) } deviceStatusLabel.text = "设备编号: \(NSString(data: deviceCodeData, encoding: String.Encoding.utf8.rawValue)! as String)" @@ -663,21 +652,21 @@ "description": "自动报警记录", "user": model.user] print("提交参数: \(param)") Alamofire.request(addEventURL, method: .post, parameters: param, headers: ["token": keychain[Constant.Token.rawValue]!]) - .responseJSON(completionHandler: { [self] response in - switch response.result { - case let .success(value): - let actionModel = ActionResultModel(respJson: JSON(value)) - if actionModel.code == 200 { - view.makeToast("保存成功") - isGeneratingTask = false - alarmCount = 0 - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + .responseJSON(completionHandler: { [self] response in + switch response.result { + case let .success(value): + let actionModel = ActionResultModel(respJson: JSON(value)) + if actionModel.code == 200 { + view.makeToast("保存成功") + isGeneratingTask = false + alarmCount = 0 + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") } - }) + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + } + }) } } diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 3f16aee..0926e4b 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -11,13 +11,11 @@ import SwiftyJSON import UIKit -let VIEW_WIDTH = UIScreen.main.bounds.size.width -let VIEW_HEIGHT = UIScreen.main.bounds.size.height - class InspectMapViewController: UIViewController, TransferValueDelegate, MAMapViewDelegate { - var id: String? - var mapView: MAMapView! - var inspectView: UIView! + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! + private let keychain = Keychain() @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @@ -28,9 +26,9 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - var startPointAnnotation: MAPointAnnotation! - var endPointAnnotation: MAPointAnnotation! - var valueDelegate: TransferIdDelegate! + private var startPointAnnotation: MAPointAnnotation! + private var endPointAnnotation: MAPointAnnotation! + private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -43,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + 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 = VIEW_WIDTH * 0.8 + let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(VIEW_HEIGHT * 0.8) + make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -65,7 +63,6 @@ } func loadInspectDetail() { - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let inspectionDetailURL = baseURL! + Constant.inspectionDetail.rawValue Alamofire.request(inspectionDetailURL, @@ -204,24 +201,22 @@ view.addSubview(mapView) // 添加放大缩小按钮 // 放大 - let buttonWidth = CGFloat(36) - let buttonHeight = CGFloat(36) expandButton.layer.cornerRadius = 5 view.addSubview(expandButton) expandButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 view.addSubview(minusButton) minusButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3 + buttonHeight + 2) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } diff --git a/LaserMethane/ViewController/Inspect/InspectViewController.swift b/LaserMethane/ViewController/Inspect/InspectViewController.swift index 625fe05..bf9fac7 100644 --- a/LaserMethane/ViewController/Inspect/InspectViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectViewController.swift @@ -17,15 +17,15 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var inspectTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [RowsModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [RowsModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? var valueDelegate: TransferValueDelegate! @@ -38,8 +38,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Login/LoginViewController.swift b/LaserMethane/ViewController/Login/LoginViewController.swift index a91d110..d9edc12 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.swift +++ b/LaserMethane/ViewController/Login/LoginViewController.swift @@ -22,7 +22,7 @@ passwordView.delegate = self // rgb 色值为（21，101，227）那么给UIColor设置里面要除以255，设置16进制颜色也同理 - loginButton.backgroundColor = UIColor(red: 21 / 255, green: 101 / 255, blue: 227 / 255, alpha: 1.0) + loginButton.backgroundColor = [21, 101, 227].transferUIColor() loginButton.layer.cornerRadius = 18 // 设置圆角 // 设置默认账号密码 userNameView.text = keychain[Constant.UserName.rawValue] ?? "" @@ -53,29 +53,29 @@ let configModel = BaseConfigModel(respJson: JSON(value)) // 将密码经由RSA和publicKey加密 guard let pwdWithKey = try? password?.encryptByRSA(publicKey: (configModel.data?.publicKey)!) - else { + else { return } // 登录 let loginURL = baseURL! + Constant.login.rawValue Alamofire.request(loginURL, method: .post, parameters: ["username": userName!, "password": pwdWithKey]) - .responseJSON { response in - switch response.result { - case let .success(value): - let loginModel = LoginResultModel(respJson: JSON(value)) - if loginModel.code == 200 { - // 将token存起来 - keychain[Constant.Token.rawValue] = loginModel.data!.token - // 跳转主页 - startMainMenuView() - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") + .responseJSON { response in + switch response.result { + case let .success(value): + let loginModel = LoginResultModel(respJson: JSON(value)) + if loginModel.code == 200 { + // 将token存起来 + keychain[Constant.Token.rawValue] = loginModel.data!.token + // 跳转主页 + startMainMenuView() + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") } + } case .failure: AlertHub.shared.showWaringAlert(controller: self, message: "检验失败，无法登陆") } @@ -132,7 +132,7 @@ } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) diff --git a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift index af8599a..4c9daf5 100644 --- a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift +++ b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift @@ -58,15 +58,15 @@ } func reloadUserInfo() { - let alertController = UIAlertController(title: "提示", message: "确定要退出吗？", preferredStyle: .alert) - let confirmAction = UIAlertAction(title: "确定", style: .default, handler: { [self] _ in + let alertController = UIAlertController(title: "温馨提示", message: "获取用户信息失败，是否重试？", preferredStyle: .alert) + let confirmAction = UIAlertAction(title: "是", style: .default, handler: { [self] _ in // 获取用户信息 obtainUserInfo() }) - let cancelAction = UIAlertAction(title: "取消", style: .default, handler: { [self] _ in + let cancelAction = UIAlertAction(title: "否", style: .default, handler: { [self] _ in dismiss(animated: true, completion: nil) }) - cancelAction.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + cancelAction.setValue(UIColor.red, forKey: "titleTextColor") alertController.addAction(cancelAction) alertController.addAction(confirmAction) present(alertController, animated: true, completion: nil) @@ -114,10 +114,10 @@ } func initViewBackground() { - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: logSearchView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: logSearchView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: settingsView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: settingsView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Map/MapViewController.swift b/LaserMethane/ViewController/Map/MapViewController.swift index c53e6fa..79a83c4 100644 --- a/LaserMethane/ViewController/Map/MapViewController.swift +++ b/LaserMethane/ViewController/Map/MapViewController.swift @@ -14,15 +14,6 @@ import Toast_Swift import UIKit -let SCREEN_WIDTH = UIScreen.main.bounds.size.width -let SCREEN_HEIGHT = UIScreen.main.bounds.size.height -let BUTTON_WIDTH = CGFloat(36) -let BUTTON_HEIGHT = CGFloat(36) -let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 -let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 -let viewWidth = (SCREEN_WIDTH - 40) / 3 -let viewHeight = (SCREEN_WIDTH - 40) / 3 - class MapViewController: UIViewController, MAMapViewDelegate { private let manager = CLLocationManager() private var locationManager = AMapLocationManager() @@ -47,10 +38,10 @@ @IBOutlet var maxValueLabel: UILabel! private var valueDelegate: TransferValueDelegate! - private var keychain: Keychain! + private var keychain = Keychain() private var userModel: UserInfoModel! private var baseURL: String! - private var centralManager: CBCentralManager! + private var centralManager = CBCentralManager() // 扫描到的设备的集合 private var scanDevices = [CBPeripheral]() private var writeCharacteristic: CBCharacteristic! @@ -77,14 +68,12 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // 初始化基本数据 - keychain = Keychain() baseURL = keychain[Constant.ServerConfig.rawValue] let userJson = keychain[Constant.UserJson.rawValue]! let data = userJson.data(using: String.Encoding.utf8, allowLossyConversion: false) ?? Data() userModel = UserInfoModel(respJson: JSON(data)) timeFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" // 蓝牙相关 - centralManager = CBCentralManager() centralManager.delegate = self // 新建巡检弹窗 creatNewInspection() @@ -93,7 +82,7 @@ setUpMap() // 在地图图层上面View topTagView = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 55)) - topTagView.backgroundColor = UIColor(red: 214 / 255, green: 238 / 255, blue: 254 / 255, alpha: 1.0) + topTagView.backgroundColor = [214, 238, 254].transferUIColor() addTopTagSubview() addLeftSubview() addBottomSubview() @@ -122,7 +111,7 @@ expandButton.snp.makeConstraints { (make) -> Void in make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - BUTTON_HEIGHT) / 3) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 @@ -130,7 +119,7 @@ minusButton.snp.makeConstraints { (make) -> Void in make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } @@ -205,28 +194,28 @@ // 提交参数: ["startLat": 39.915913628472225, "id": "162925125712000", "date": "2021-08-18", "startTime": "2021-08-18 09:47:37", "endLng": 116.26874240451389, "startLng": 116.26874240451389, "routes": "[{\"lat\":39.915913628472225,\"lng\":116.26874240451389}]", "user": "王晓颖", "name": "测试iOS", "endTime": "2021-08-18 09:47:56", "endLat": 39.915913628472225] print("提交参数: \(param)") Alamofire.request(addInspectionURL, method: .post, parameters: param, headers: ["token": keychain[Constant.Token.rawValue]!]) - .responseJSON(completionHandler: { response in - switch response.result { - case let .success(value): - let actionModel = ActionResultModel(respJson: JSON(value)) - if actionModel.code == 200 { - let alertController = UIAlertController(title: "提示", message: "巡检记录保存成功", preferredStyle: .alert) - let okAction = UIAlertAction(title: "知道了", style: .default, handler: { _ in - navigationController?.popViewController(animated: true) - }) - alertController.addAction(okAction) - present(alertController, animated: true, completion: nil) - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + .responseJSON(completionHandler: { response in + switch response.result { + case let .success(value): + let actionModel = ActionResultModel(respJson: JSON(value)) + if actionModel.code == 200 { + let alertController = UIAlertController(title: "提示", message: "巡检记录保存成功", preferredStyle: .alert) + let okAction = UIAlertAction(title: "知道了", style: .default, handler: { _ in + navigationController?.popViewController(animated: true) + }) + alertController.addAction(okAction) + present(alertController, animated: true, completion: nil) + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") } - }) + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + } + }) } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) @@ -296,26 +285,26 @@ } func addBottomSubview() { - LayerShadowHub.shared.setShadow(view: currentView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: currentView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(currentView) currentView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.left.equalTo(10) } - LayerShadowHub.shared.setShadow(view: settingView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: settingView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(settingView) settingView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.centerX.equalToSuperview() } - LayerShadowHub.shared.setShadow(view: maxView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(maxView) maxView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.right.equalTo(-10) } @@ -326,7 +315,7 @@ view.addSubview(addEventButton) addEventButton.snp.makeConstraints { (make) -> Void in make.top.equalTo(SCREEN_HEIGHT * 0.8) - make.size.equalTo(CGSize(width: buttonWidth, height: 36)) + make.size.equalTo(CGSize(width: buttonWidth, height: BUTTON_HEIGHT)) make.centerX.equalToSuperview() } } @@ -358,8 +347,8 @@ // 构造巡检初始参数 model = NewInspectionModel(id: inspectionId, name: inspectNameLabel.text!, startTime: inspectTimeLabel.text!, - endTime: "", date: dateFormatter.string(from: Date(timeIntervalSince1970: timeInterval)), - startLng: 0.0, startLat: 0.0, endLng: 0.0, endLat: 0.0, routes: "", user: (userModel.data?.name!)!) + endTime: "", date: dateFormatter.string(from: Date(timeIntervalSince1970: timeInterval)), + startLng: 0.0, startLat: 0.0, endLng: 0.0, endLat: 0.0, routes: "", user: (userModel.data?.name!)!) // 显示定位蓝点 mapView.showsUserLocation = true mapView.userTrackingMode = .follow @@ -376,7 +365,7 @@ navigationController?.popViewController(animated: true) } // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) @@ -395,21 +384,21 @@ let inspectButton = UIAlertAction(title: "报警事件", style: .default, handler: { [self] _ in // 实现代理的方法，传值 valueDelegate.transfer(controller: self, - dic: ["isWarning": true, - "inspectionId": inspectionId!, - "inspectionName": inspectNameLabel.text!, - "longitude": Double(lng)!, - "latitude": Double(lat)!]) + dic: ["isWarning": true, + "inspectionId": inspectionId!, + "inspectionName": inspectNameLabel.text!, + "longitude": Double(lng)!, + "latitude": Double(lat)!]) navigationController?.pushViewController(newEventViewController, animated: true) }) let eventLogButton = UIAlertAction(title: "自定义事件", style: .default, handler: { [self] _ in // 实现代理的方法，传值 valueDelegate.transfer(controller: self, - dic: ["isWarning": false, - "inspectionId": inspectionId!, - "inspectionName": inspectNameLabel.text!, - "longitude": Double(lng)!, - "latitude": Double(lat)!]) + dic: ["isWarning": false, + "inspectionId": inspectionId!, + "inspectionName": inspectNameLabel.text!, + "longitude": Double(lng)!, + "latitude": Double(lat)!]) navigationController?.pushViewController(newEventViewController, animated: true) }) selectController.addAction(inspectButton) @@ -590,7 +579,7 @@ // 51, 51, 50, 48, 50, 49, 48, 49, 48, 48, 48, 51, 13, 10, 170, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 13, 10 // 只解析前14位，后14位是测量值 var deviceCodeData = Data() - for i in 0...13 { + for i in 0 ... 13 { deviceCodeData.append(data[i]) } deviceStatusLabel.text = "设备编号: \(NSString(data: deviceCodeData, encoding: String.Encoding.utf8.rawValue)! as String)" @@ -663,21 +652,21 @@ "description": "自动报警记录", "user": model.user] print("提交参数: \(param)") Alamofire.request(addEventURL, method: .post, parameters: param, headers: ["token": keychain[Constant.Token.rawValue]!]) - .responseJSON(completionHandler: { [self] response in - switch response.result { - case let .success(value): - let actionModel = ActionResultModel(respJson: JSON(value)) - if actionModel.code == 200 { - view.makeToast("保存成功") - isGeneratingTask = false - alarmCount = 0 - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + .responseJSON(completionHandler: { [self] response in + switch response.result { + case let .success(value): + let actionModel = ActionResultModel(respJson: JSON(value)) + if actionModel.code == 200 { + view.makeToast("保存成功") + isGeneratingTask = false + alarmCount = 0 + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") } - }) + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + } + }) } } diff --git a/LaserMethane/ViewController/Map/NewEventViewController.swift b/LaserMethane/ViewController/Map/NewEventViewController.swift index 4692e45..5fb076e 100644 --- a/LaserMethane/ViewController/Map/NewEventViewController.swift +++ b/LaserMethane/ViewController/Map/NewEventViewController.swift @@ -33,6 +33,7 @@ @IBOutlet var saveEventButton: UIButton! private let keychain = Keychain() + private let dateformatter = DateFormatter() private var imageUrlArray = [URL]() // 完整的图片url private var imageArray = [String]() // 上传图片成功后服务器返回的图片数组 private var userModel: UserInfoModel! @@ -67,13 +68,13 @@ } func setupLayerView() { - rootView.backgroundColor = UIColor(red: 238 / 255, green: 238 / 255, blue: 238 / 255, alpha: 1.0) - LayerShadowHub.shared.setShadow(view: firstView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: thirdView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + rootView.backgroundColor = [238, 238, 238].transferUIColor() + LayerShadowHub.shared.setShadow(view: firstView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: thirdView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) if isWarning! { title = "报警事件记录" secondView.isHidden = false - LayerShadowHub.shared.setShadow(view: secondView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: secondView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } else { title = "自定义事件记录" secondView.isHidden = true @@ -87,7 +88,7 @@ func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { let length = string.lengthOfBytes(using: .utf8) - for loopIndex in 0.. String { - let dateformatter = DateFormatter() dateformatter.dateFormat = "YYYY-MM-dd HH:mm:ss" // 自定义时间格式 // GMT时间 转字符串，直接是系统当前时间 return dateformatter.string(from: Date()) @@ -226,7 +226,6 @@ func uploadImage(image: UIImage, quality: CGFloat) { index += 1 - let dateformatter = DateFormatter() dateformatter.dateFormat = "yyyyMMddHHmmss" let imageName = "IMG_CMP_\(dateformatter.string(from: Date()))_\(index).jpeg" @@ -237,7 +236,7 @@ LoadingHub.shared.showLoading(text: "图片上传中...") Alamofire.upload(multipartFormData: { formData in formData.append(imageData, withName: "file", fileName: imageName, mimeType: "image/jpeg") - }, usingThreshold: UInt64(), to: uploadURL, method: .post, headers: ["token": keychain[Constant.Token.rawValue]!]) { [self] result in + }, usingThreshold: UInt64(), to: uploadURL, method: .post, headers: ["token": keychain[Constant.Token.rawValue]!]) { [self] result in switch result { case let .success(upload, _, _): upload.responseJSON(completionHandler: { value in @@ -275,11 +274,11 @@ let cell: ImageCollectionViewDelCell! = imageCollectionView.dequeueReusableCell(withReuseIdentifier: "collectionViewDelCell", for: indexPath) as? ImageCollectionViewDelCell let row = (indexPath as NSIndexPath).row KF.url(imageUrlArray[row]) - .loadDiskFileSynchronously() - .placeholder(UIImage(named: "load_imag_error.png")) - .cacheMemoryOnly() - .fade(duration: 0.25) - .set(to: cell.imageView) + .loadDiskFileSynchronously() + .placeholder(UIImage(named: "load_imag_error.png")) + .cacheMemoryOnly() + .fade(duration: 0.25) + .set(to: cell.imageView) // 传递点击按钮的位置 cell.delButton.tag = row cell.delButton.addTarget(self, action: #selector(delImageAction), for: .touchUpInside) diff --git a/LaserMethane.xcodeproj/project.pbxproj b/LaserMethane.xcodeproj/project.pbxproj index 5530d95..23f2198 100644 --- a/LaserMethane.xcodeproj/project.pbxproj +++ b/LaserMethane.xcodeproj/project.pbxproj @@ -1643,7 +1643,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; @@ -1671,7 +1671,7 @@ "$(inherited)", "$(SDKROOT)/usr/lib/swift", ); - MARKETING_VERSION = v2.0.0.0; + MARKETING_VERSION = 2.0.0; PRODUCT_BUNDLE_IDENTIFIER = com.casic.birmm.inspect.LaserMethane; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LaserMethane/LaserMethane-Bridging-Header.h"; diff --git a/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate b/LaserMethane.xcworkspace/xcuserdata/a203.xcuserdatad/UserInterfaceState.xcuserstate index 7af5918..602ac89 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/AppIcon.appiconset/Contents.json b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json index 9221b9b..ddbd949 100644 --- a/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,91 +1,55 @@ { "images" : [ { + "filename" : "logo-40@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "20x20" }, { + "filename" : "logo-60@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "20x20" }, { + "filename" : "logo-58@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "29x29" }, { + "filename" : "logo-87@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "29x29" }, { + "filename" : "logo-80@2x.png.png", "idiom" : "iphone", "scale" : "2x", "size" : "40x40" }, { + "filename" : "logo-120@3x.png.png", "idiom" : "iphone", "scale" : "3x", "size" : "40x40" }, { + "filename" : "logo-120@2x.png", "idiom" : "iphone", "scale" : "2x", "size" : "60x60" }, { + "filename" : "logo-180@3x.png", "idiom" : "iphone", "scale" : "3x", "size" : "60x60" }, { - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { + "filename" : "logo-1024@1x.png", "idiom" : "ios-marketing", "scale" : "1x", "size" : "1024x1024" diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png new file mode 100644 index 0000000..695dfc9 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-1024@1x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png new file mode 100644 index 0000000..2c047ff --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-120@3x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png new file mode 100644 index 0000000..7a6d08c --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-180@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png new file mode 100644 index 0000000..6765fb5 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-40@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png new file mode 100644 index 0000000..6b02710 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-58@2x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png new file mode 100644 index 0000000..f7be9f8 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-60@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png new file mode 100644 index 0000000..9522479 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-80@2x.png.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png new file mode 100644 index 0000000..8ac08d0 --- /dev/null +++ b/LaserMethane/Assets.xcassets/AppIcon.appiconset/logo-87@3x.png Binary files differ diff --git a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json index 4ecbf19..f34a8e2 100644 --- a/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/guide1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "guide1.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json index 408c69b..3be9607 100644 --- a/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/ic_login_bg.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "ic_login_bg.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json index 59e5600..916ea1f 100644 --- a/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/load_imag_error.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "load_imag_error.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/log.imageset/Contents.json b/LaserMethane/Assets.xcassets/log.imageset/Contents.json index 43e5255..d07e89e 100644 --- a/LaserMethane/Assets.xcassets/log.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/log.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "log.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json index 776497f..2ae7813 100644 --- a/LaserMethane/Assets.xcassets/psw.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/psw.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "psw.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json index aa709c0..bd15710 100644 --- a/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/qidian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "qidian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting-1.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json index 55b5095..42e4669 100644 --- a/LaserMethane/Assets.xcassets/setting.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/setting.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "setting.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/user.imageset/Contents.json b/LaserMethane/Assets.xcassets/user.imageset/Contents.json index 21d8882..2206c02 100644 --- a/LaserMethane/Assets.xcassets/user.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/user.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "user.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json index 054991b..27d4806 100644 --- a/LaserMethane/Assets.xcassets/warning.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/warning.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "warning.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json index 8650480..a520d75 100644 --- a/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/xunjian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "xunjian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json index a7de13d..eb57061 100644 --- a/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json +++ b/LaserMethane/Assets.xcassets/zhongdian.imageset/Contents.json @@ -2,15 +2,15 @@ "images" : [ { "filename" : "zhongdian.png", - "idiom" : "universal", + "idiom" : "iphone", "scale" : "1x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "2x" }, { - "idiom" : "universal", + "idiom" : "iphone", "scale" : "3x" } ], diff --git a/LaserMethane/Extension/Array.swift b/LaserMethane/Extension/Array.swift index a9af8f1..92e1e51 100644 --- a/LaserMethane/Extension/Array.swift +++ b/LaserMethane/Extension/Array.swift @@ -23,4 +23,14 @@ } return builder } + + func transferUIColor() -> UIColor { + if count == 0 { + return .systemBlue + } + let red = self[0] as! Int + let green = self[1] as! Int + let blue = self[2] as! Int + return UIColor(red: CGFloat(red) / 255.0, green: CGFloat(green) / 255.0, blue: CGFloat(blue) / 255.0, alpha: CGFloat(1.0)) + } } diff --git a/LaserMethane/Info.plist b/LaserMethane/Info.plist index e8fff56..12acd6a 100644 --- a/LaserMethane/Info.plist +++ b/LaserMethane/Info.plist @@ -2,10 +2,12 @@ + CFBundleAllowMixedLocalizations + CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 航小科智巡宝 + 智巡宝 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -20,22 +22,20 @@ $(MARKETING_VERSION) CFBundleVersion 1 - NSLocationWhenInUseUsageDescription - 使用应用期间允许访问位置信息 - NSLocationAlwaysAndWhenInUseUsageDescription - 始终允许应用访问位置信息 NSBluetoothAlwaysUsageDescription 允许应用使用蓝牙功能 - CFBundleAllowMixedLocalizations - - NSPhotoLibraryUsageDescription - 允许应用使用相册 - NSPhotoLibraryAddUsageDescription - 允许保存图片至相册 NSCameraUsageDescription 允许应用使用相机 + NSLocationAlwaysAndWhenInUseUsageDescription + 始终允许应用访问位置信息 + NSLocationWhenInUseUsageDescription + 使用应用期间允许访问位置信息 NSMicrophoneUsageDescription 允许应用使用麦克风 + NSPhotoLibraryAddUsageDescription + 允许保存图片至相册 + NSPhotoLibraryUsageDescription + 允许应用使用相册 UIApplicationSceneManifest UIApplicationSupportsMultipleScenes diff --git a/LaserMethane/Util/Constant.swift b/LaserMethane/Util/Constant.swift index 7dafef3..a50b95f 100644 --- a/LaserMethane/Util/Constant.swift +++ b/LaserMethane/Util/Constant.swift @@ -7,6 +7,15 @@ import Foundation +let SCREEN_WIDTH = UIScreen.main.bounds.size.width // 设备屏幕宽 +let SCREEN_HEIGHT = UIScreen.main.bounds.size.height // 设备屏幕高 +let BUTTON_WIDTH = CGFloat(36) // 按钮宽 +let BUTTON_HEIGHT = CGFloat(36) // 按钮高 +let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 +let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 +let DEVICE_DATA_VIEW_WIDTH = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View宽 +let DEVICE_DATA_VIEW_HEIGHT = (SCREEN_WIDTH - 40) / 3 // 蓝牙设备数据显示View高 + public enum Constant: String { // 用户相关的key值 case UserName = "userName" diff --git a/LaserMethane/ViewController/Event/EventDetailViewController.swift b/LaserMethane/ViewController/Event/EventDetailViewController.swift index 78500f9..e73b726 100644 --- a/LaserMethane/ViewController/Event/EventDetailViewController.swift +++ b/LaserMethane/ViewController/Event/EventDetailViewController.swift @@ -20,12 +20,12 @@ @IBOutlet var dataLabel: UILabel! @IBOutlet var imageCollectionView: UICollectionView! - var createTime: String? - var desc: String? - var maxValue: Int? - var images: String? + private var createTime: String? + private var desc: String? + private var maxValue: Int? + private var images: String? // 图片九宫格数据集 - var imageUrlArray: [URL] = [] + private var imageUrlArray: [URL] = [] override func viewDidLoad() { super.viewDidLoad() @@ -77,15 +77,12 @@ images = dic["images"] as? String } - func transfer(controller: UIViewController, offset: Int, array: NSArray) { - } - func initViewBackground() { - LayerShadowHub.shared.setShadow(view: messageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: messageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: maxValueView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxValueView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: imageView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: imageView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Event/EventViewController.swift b/LaserMethane/ViewController/Event/EventViewController.swift index 2439c66..40e41f6 100644 --- a/LaserMethane/ViewController/Event/EventViewController.swift +++ b/LaserMethane/ViewController/Event/EventViewController.swift @@ -17,17 +17,16 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var eventTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [EventRowModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? - - var valueDelegate: TransferValueDelegate! + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [EventRowModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -38,8 +37,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Guide/GuideViewController.swift b/LaserMethane/ViewController/Guide/GuideViewController.swift index 4ae017f..4c7f100 100644 --- a/LaserMethane/ViewController/Guide/GuideViewController.swift +++ b/LaserMethane/ViewController/Guide/GuideViewController.swift @@ -10,14 +10,13 @@ class GuideViewController: UIViewController { @IBOutlet var skipButton: UIButton! - var timer: Timer? - var keychain: Keychain! - var countSeconds = 3 + private var timer: Timer? + private var keychain = Keychain() + private var countSeconds = 3 override func viewDidLoad() { super.viewDidLoad() timer = Timer.scheduledTimer(timeInterval: 1, target: self, selector: #selector(countDownTimer), userInfo: nil, repeats: true) - keychain = Keychain() // 设置默认ip keychain[Constant.ServerConfig.rawValue] = "http://111.198.10.15:12204" } diff --git a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift index 6f464ca..bb92ed1 100644 --- a/LaserMethane/ViewController/Inspect/EventTaskViewController.swift +++ b/LaserMethane/ViewController/Inspect/EventTaskViewController.swift @@ -13,9 +13,10 @@ class EventTaskViewController: UIViewController, TransferIdDelegate { @IBOutlet var taskTableView: UITableView! - var id: String? - var rowsArray = [ListModel]() - var valueDelegate: TransferValueDelegate! + private let keychain = Keychain() + private var id: String? + private var rowsArray = [ListModel]() + private var valueDelegate: TransferValueDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -23,7 +24,6 @@ taskTableView.dataSource = self taskTableView.delegate = self // 查询事件列表 - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let eventListURL = baseURL! + Constant.searchByInspect.rawValue Alamofire.request(eventListURL, diff --git a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift index 3f16aee..0926e4b 100644 --- a/LaserMethane/ViewController/Inspect/InspectMapViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectMapViewController.swift @@ -11,13 +11,11 @@ import SwiftyJSON import UIKit -let VIEW_WIDTH = UIScreen.main.bounds.size.width -let VIEW_HEIGHT = UIScreen.main.bounds.size.height - class InspectMapViewController: UIViewController, TransferValueDelegate, MAMapViewDelegate { - var id: String? - var mapView: MAMapView! - var inspectView: UIView! + private var id: String? + private var mapView: MAMapView! + private var inspectView: UIView! + private let keychain = Keychain() @IBOutlet var inspectNameLabel: UILabel! @IBOutlet var inspectStartTimeLabel: UILabel! @@ -28,9 +26,9 @@ @IBOutlet var minusButton: UIButton! @IBOutlet var eventListButton: UIButton! - var startPointAnnotation: MAPointAnnotation! - var endPointAnnotation: MAPointAnnotation! - var valueDelegate: TransferIdDelegate! + private var startPointAnnotation: MAPointAnnotation! + private var endPointAnnotation: MAPointAnnotation! + private var valueDelegate: TransferIdDelegate! override func viewDidLoad() { super.viewDidLoad() @@ -43,18 +41,18 @@ // 设置地图 setUpMap() // 在地图图层上面View并设置阴影 - inspectView = UIView(frame: CGRect(x: 8, y: 8, width: VIEW_WIDTH - 16, height: 70)) + inspectView = UIView(frame: CGRect(x: 8, y: 8, width: DEVICE_DATA_VIEW_WIDTH - 16, height: 70)) inspectView.backgroundColor = .white - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + 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 = VIEW_WIDTH * 0.8 + let buttonWidth = DEVICE_DATA_VIEW_WIDTH * 0.8 eventListButton.layer.cornerRadius = 8 view.addSubview(eventListButton) eventListButton.snp.makeConstraints { (make) -> Void in - make.top.equalTo(VIEW_HEIGHT * 0.8) + make.top.equalTo(DEVICE_DATA_VIEW_HEIGHT * 0.8) // 设置视图大小 make.size.equalTo(CGSize(width: buttonWidth, height: 36)) // x轴方向上居中 @@ -65,7 +63,6 @@ } func loadInspectDetail() { - let keychain = Keychain() let baseURL = keychain[Constant.ServerConfig.rawValue] let inspectionDetailURL = baseURL! + Constant.inspectionDetail.rawValue Alamofire.request(inspectionDetailURL, @@ -204,24 +201,22 @@ view.addSubview(mapView) // 添加放大缩小按钮 // 放大 - let buttonWidth = CGFloat(36) - let buttonHeight = CGFloat(36) expandButton.layer.cornerRadius = 5 view.addSubview(expandButton) expandButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 view.addSubview(minusButton) minusButton.snp.makeConstraints { (make) -> Void in // 设置视图大小 - make.size.equalTo(CGSize(width: buttonWidth, height: buttonHeight)) + make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - buttonHeight) / 3 + buttonHeight + 2) + make.top.equalTo((DEVICE_DATA_VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } diff --git a/LaserMethane/ViewController/Inspect/InspectViewController.swift b/LaserMethane/ViewController/Inspect/InspectViewController.swift index 625fe05..bf9fac7 100644 --- a/LaserMethane/ViewController/Inspect/InspectViewController.swift +++ b/LaserMethane/ViewController/Inspect/InspectViewController.swift @@ -17,15 +17,15 @@ @IBOutlet var keywordsView: UITextField! @IBOutlet var inspectTableView: UITableView! - var keychain: Keychain! - var baseURL: String? - var rowsArray: [RowsModel] = [] - var dformatter: DateFormatter! - var pageOffSet: Int = 1 - var isUpdate: Bool = false - var startDate: String? - var endDate: String? - var keyWords: String? + private var keychain = Keychain() + private var baseURL: String? + private var rowsArray: [RowsModel] = [] + private var dformatter = DateFormatter() + private var pageOffSet: Int = 1 + private var isUpdate: Bool = false + private var startDate: String? + private var endDate: String? + private var keyWords: String? var valueDelegate: TransferValueDelegate! @@ -38,8 +38,6 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // Do any additional setup after loading the view. - keychain = Keychain() - dformatter = DateFormatter() setupTableView() // 默认加载数据 loadData(keywords: "", startTime: "", endTime: "", offset: 1) diff --git a/LaserMethane/ViewController/Login/LoginViewController.swift b/LaserMethane/ViewController/Login/LoginViewController.swift index a91d110..d9edc12 100644 --- a/LaserMethane/ViewController/Login/LoginViewController.swift +++ b/LaserMethane/ViewController/Login/LoginViewController.swift @@ -22,7 +22,7 @@ passwordView.delegate = self // rgb 色值为（21，101，227）那么给UIColor设置里面要除以255，设置16进制颜色也同理 - loginButton.backgroundColor = UIColor(red: 21 / 255, green: 101 / 255, blue: 227 / 255, alpha: 1.0) + loginButton.backgroundColor = [21, 101, 227].transferUIColor() loginButton.layer.cornerRadius = 18 // 设置圆角 // 设置默认账号密码 userNameView.text = keychain[Constant.UserName.rawValue] ?? "" @@ -53,29 +53,29 @@ let configModel = BaseConfigModel(respJson: JSON(value)) // 将密码经由RSA和publicKey加密 guard let pwdWithKey = try? password?.encryptByRSA(publicKey: (configModel.data?.publicKey)!) - else { + else { return } // 登录 let loginURL = baseURL! + Constant.login.rawValue Alamofire.request(loginURL, method: .post, parameters: ["username": userName!, "password": pwdWithKey]) - .responseJSON { response in - switch response.result { - case let .success(value): - let loginModel = LoginResultModel(respJson: JSON(value)) - if loginModel.code == 200 { - // 将token存起来 - keychain[Constant.Token.rawValue] = loginModel.data!.token - // 跳转主页 - startMainMenuView() - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") + .responseJSON { response in + switch response.result { + case let .success(value): + let loginModel = LoginResultModel(respJson: JSON(value)) + if loginModel.code == 200 { + // 将token存起来 + keychain[Constant.Token.rawValue] = loginModel.data!.token + // 跳转主页 + startMainMenuView() + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "密码错误，无法登陆") } + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "未知异常，无法登陆") } + } case .failure: AlertHub.shared.showWaringAlert(controller: self, message: "检验失败，无法登陆") } @@ -132,7 +132,7 @@ } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) diff --git a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift index af8599a..4c9daf5 100644 --- a/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift +++ b/LaserMethane/ViewController/MainMenu/MainMenuViewController.swift @@ -58,15 +58,15 @@ } func reloadUserInfo() { - let alertController = UIAlertController(title: "提示", message: "确定要退出吗？", preferredStyle: .alert) - let confirmAction = UIAlertAction(title: "确定", style: .default, handler: { [self] _ in + let alertController = UIAlertController(title: "温馨提示", message: "获取用户信息失败，是否重试？", preferredStyle: .alert) + let confirmAction = UIAlertAction(title: "是", style: .default, handler: { [self] _ in // 获取用户信息 obtainUserInfo() }) - let cancelAction = UIAlertAction(title: "取消", style: .default, handler: { [self] _ in + let cancelAction = UIAlertAction(title: "否", style: .default, handler: { [self] _ in dismiss(animated: true, completion: nil) }) - cancelAction.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + cancelAction.setValue(UIColor.red, forKey: "titleTextColor") alertController.addAction(cancelAction) alertController.addAction(confirmAction) present(alertController, animated: true, completion: nil) @@ -114,10 +114,10 @@ } func initViewBackground() { - LayerShadowHub.shared.setShadow(view: inspectView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: inspectView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: logSearchView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: logSearchView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: settingsView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: settingsView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } } diff --git a/LaserMethane/ViewController/Map/MapViewController.swift b/LaserMethane/ViewController/Map/MapViewController.swift index c53e6fa..79a83c4 100644 --- a/LaserMethane/ViewController/Map/MapViewController.swift +++ b/LaserMethane/ViewController/Map/MapViewController.swift @@ -14,15 +14,6 @@ import Toast_Swift import UIKit -let SCREEN_WIDTH = UIScreen.main.bounds.size.width -let SCREEN_HEIGHT = UIScreen.main.bounds.size.height -let BUTTON_WIDTH = CGFloat(36) -let BUTTON_HEIGHT = CGFloat(36) -let ASK_DEV_CODE_COMMAND: [UInt8] = [0x01, 0x0D, 0x0A] // 查询设备编号指令 -let OPEN_TRANSFER_COMMAND: [UInt8] = [0x02, 0x0D, 0x0A] // 开启数据发送命令 -let viewWidth = (SCREEN_WIDTH - 40) / 3 -let viewHeight = (SCREEN_WIDTH - 40) / 3 - class MapViewController: UIViewController, MAMapViewDelegate { private let manager = CLLocationManager() private var locationManager = AMapLocationManager() @@ -47,10 +38,10 @@ @IBOutlet var maxValueLabel: UILabel! private var valueDelegate: TransferValueDelegate! - private var keychain: Keychain! + private var keychain = Keychain() private var userModel: UserInfoModel! private var baseURL: String! - private var centralManager: CBCentralManager! + private var centralManager = CBCentralManager() // 扫描到的设备的集合 private var scanDevices = [CBPeripheral]() private var writeCharacteristic: CBCharacteristic! @@ -77,14 +68,12 @@ navigationController?.navigationBar.titleTextAttributes = dict navigationController?.navigationBar.tintColor = .white // 初始化基本数据 - keychain = Keychain() baseURL = keychain[Constant.ServerConfig.rawValue] let userJson = keychain[Constant.UserJson.rawValue]! let data = userJson.data(using: String.Encoding.utf8, allowLossyConversion: false) ?? Data() userModel = UserInfoModel(respJson: JSON(data)) timeFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" // 蓝牙相关 - centralManager = CBCentralManager() centralManager.delegate = self // 新建巡检弹窗 creatNewInspection() @@ -93,7 +82,7 @@ setUpMap() // 在地图图层上面View topTagView = UIView(frame: CGRect(x: 0, y: 0, width: SCREEN_WIDTH, height: 55)) - topTagView.backgroundColor = UIColor(red: 214 / 255, green: 238 / 255, blue: 254 / 255, alpha: 1.0) + topTagView.backgroundColor = [214, 238, 254].transferUIColor() addTopTagSubview() addLeftSubview() addBottomSubview() @@ -122,7 +111,7 @@ expandButton.snp.makeConstraints { (make) -> Void in make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - BUTTON_HEIGHT) / 3) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3) } // 缩小 minusButton.layer.cornerRadius = 5 @@ -130,7 +119,7 @@ minusButton.snp.makeConstraints { (make) -> Void in make.size.equalTo(CGSize(width: BUTTON_WIDTH, height: BUTTON_HEIGHT)) make.right.equalTo(-5) - make.top.equalTo((VIEW_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) + make.top.equalTo((SCREEN_HEIGHT - BUTTON_HEIGHT) / 3 + BUTTON_HEIGHT + 2) } } @@ -205,28 +194,28 @@ // 提交参数: ["startLat": 39.915913628472225, "id": "162925125712000", "date": "2021-08-18", "startTime": "2021-08-18 09:47:37", "endLng": 116.26874240451389, "startLng": 116.26874240451389, "routes": "[{\"lat\":39.915913628472225,\"lng\":116.26874240451389}]", "user": "王晓颖", "name": "测试iOS", "endTime": "2021-08-18 09:47:56", "endLat": 39.915913628472225] print("提交参数: \(param)") Alamofire.request(addInspectionURL, method: .post, parameters: param, headers: ["token": keychain[Constant.Token.rawValue]!]) - .responseJSON(completionHandler: { response in - switch response.result { - case let .success(value): - let actionModel = ActionResultModel(respJson: JSON(value)) - if actionModel.code == 200 { - let alertController = UIAlertController(title: "提示", message: "巡检记录保存成功", preferredStyle: .alert) - let okAction = UIAlertAction(title: "知道了", style: .default, handler: { _ in - navigationController?.popViewController(animated: true) - }) - alertController.addAction(okAction) - present(alertController, animated: true, completion: nil) - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + .responseJSON(completionHandler: { response in + switch response.result { + case let .success(value): + let actionModel = ActionResultModel(respJson: JSON(value)) + if actionModel.code == 200 { + let alertController = UIAlertController(title: "提示", message: "巡检记录保存成功", preferredStyle: .alert) + let okAction = UIAlertAction(title: "知道了", style: .default, handler: { _ in + navigationController?.popViewController(animated: true) + }) + alertController.addAction(okAction) + present(alertController, animated: true, completion: nil) + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") } - }) + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + } + }) } let actionCancel = UIAlertAction(title: "取消", style: .cancel, handler: nil) // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) @@ -296,26 +285,26 @@ } func addBottomSubview() { - LayerShadowHub.shared.setShadow(view: currentView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: currentView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(currentView) currentView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.left.equalTo(10) } - LayerShadowHub.shared.setShadow(view: settingView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: settingView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(settingView) settingView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.centerX.equalToSuperview() } - LayerShadowHub.shared.setShadow(view: maxView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: maxView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) view.addSubview(maxView) maxView.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: viewWidth, height: viewHeight)) + make.size.equalTo(CGSize(width: DEVICE_DATA_VIEW_WIDTH, height: DEVICE_DATA_VIEW_HEIGHT)) make.bottom.equalTo(-(SCREEN_HEIGHT * 0.1 + 20)) make.right.equalTo(-10) } @@ -326,7 +315,7 @@ view.addSubview(addEventButton) addEventButton.snp.makeConstraints { (make) -> Void in make.top.equalTo(SCREEN_HEIGHT * 0.8) - make.size.equalTo(CGSize(width: buttonWidth, height: 36)) + make.size.equalTo(CGSize(width: buttonWidth, height: BUTTON_HEIGHT)) make.centerX.equalToSuperview() } } @@ -358,8 +347,8 @@ // 构造巡检初始参数 model = NewInspectionModel(id: inspectionId, name: inspectNameLabel.text!, startTime: inspectTimeLabel.text!, - endTime: "", date: dateFormatter.string(from: Date(timeIntervalSince1970: timeInterval)), - startLng: 0.0, startLat: 0.0, endLng: 0.0, endLat: 0.0, routes: "", user: (userModel.data?.name!)!) + endTime: "", date: dateFormatter.string(from: Date(timeIntervalSince1970: timeInterval)), + startLng: 0.0, startLat: 0.0, endLng: 0.0, endLat: 0.0, routes: "", user: (userModel.data?.name!)!) // 显示定位蓝点 mapView.showsUserLocation = true mapView.userTrackingMode = .follow @@ -376,7 +365,7 @@ navigationController?.popViewController(animated: true) } // 设置取消按钮颜色为红色 - actionCancel.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + actionCancel.setValue(UIColor.red, forKey: "titleTextColor") msgAlertCtr.addAction(actionOK) msgAlertCtr.addAction(actionCancel) present(msgAlertCtr, animated: true, completion: nil) @@ -395,21 +384,21 @@ let inspectButton = UIAlertAction(title: "报警事件", style: .default, handler: { [self] _ in // 实现代理的方法，传值 valueDelegate.transfer(controller: self, - dic: ["isWarning": true, - "inspectionId": inspectionId!, - "inspectionName": inspectNameLabel.text!, - "longitude": Double(lng)!, - "latitude": Double(lat)!]) + dic: ["isWarning": true, + "inspectionId": inspectionId!, + "inspectionName": inspectNameLabel.text!, + "longitude": Double(lng)!, + "latitude": Double(lat)!]) navigationController?.pushViewController(newEventViewController, animated: true) }) let eventLogButton = UIAlertAction(title: "自定义事件", style: .default, handler: { [self] _ in // 实现代理的方法，传值 valueDelegate.transfer(controller: self, - dic: ["isWarning": false, - "inspectionId": inspectionId!, - "inspectionName": inspectNameLabel.text!, - "longitude": Double(lng)!, - "latitude": Double(lat)!]) + dic: ["isWarning": false, + "inspectionId": inspectionId!, + "inspectionName": inspectNameLabel.text!, + "longitude": Double(lng)!, + "latitude": Double(lat)!]) navigationController?.pushViewController(newEventViewController, animated: true) }) selectController.addAction(inspectButton) @@ -590,7 +579,7 @@ // 51, 51, 50, 48, 50, 49, 48, 49, 48, 48, 48, 51, 13, 10, 170, 0, 0, 0, 0, 0, 0, 100, 0, 0, 0, 0, 13, 10 // 只解析前14位，后14位是测量值 var deviceCodeData = Data() - for i in 0...13 { + for i in 0 ... 13 { deviceCodeData.append(data[i]) } deviceStatusLabel.text = "设备编号: \(NSString(data: deviceCodeData, encoding: String.Encoding.utf8.rawValue)! as String)" @@ -663,21 +652,21 @@ "description": "自动报警记录", "user": model.user] print("提交参数: \(param)") Alamofire.request(addEventURL, method: .post, parameters: param, headers: ["token": keychain[Constant.Token.rawValue]!]) - .responseJSON(completionHandler: { [self] response in - switch response.result { - case let .success(value): - let actionModel = ActionResultModel(respJson: JSON(value)) - if actionModel.code == 200 { - view.makeToast("保存成功") - isGeneratingTask = false - alarmCount = 0 - } else { - AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") - } - case .failure: - AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + .responseJSON(completionHandler: { [self] response in + switch response.result { + case let .success(value): + let actionModel = ActionResultModel(respJson: JSON(value)) + if actionModel.code == 200 { + view.makeToast("保存成功") + isGeneratingTask = false + alarmCount = 0 + } else { + AlertHub.shared.showWaringAlert(controller: self, message: "服务器异常") } - }) + case .failure: + AlertHub.shared.showWaringAlert(controller: self, message: "网络异常，提交失败") + } + }) } } diff --git a/LaserMethane/ViewController/Map/NewEventViewController.swift b/LaserMethane/ViewController/Map/NewEventViewController.swift index 4692e45..5fb076e 100644 --- a/LaserMethane/ViewController/Map/NewEventViewController.swift +++ b/LaserMethane/ViewController/Map/NewEventViewController.swift @@ -33,6 +33,7 @@ @IBOutlet var saveEventButton: UIButton! private let keychain = Keychain() + private let dateformatter = DateFormatter() private var imageUrlArray = [URL]() // 完整的图片url private var imageArray = [String]() // 上传图片成功后服务器返回的图片数组 private var userModel: UserInfoModel! @@ -67,13 +68,13 @@ } func setupLayerView() { - rootView.backgroundColor = UIColor(red: 238 / 255, green: 238 / 255, blue: 238 / 255, alpha: 1.0) - LayerShadowHub.shared.setShadow(view: firstView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) - LayerShadowHub.shared.setShadow(view: thirdView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + rootView.backgroundColor = [238, 238, 238].transferUIColor() + LayerShadowHub.shared.setShadow(view: firstView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: thirdView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) if isWarning! { title = "报警事件记录" secondView.isHidden = false - LayerShadowHub.shared.setShadow(view: secondView, sColor: UIColor(red: 211 / 255, green: 211 / 255, blue: 211 / 255, alpha: 1.0), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) + LayerShadowHub.shared.setShadow(view: secondView, sColor: [211, 211, 211].transferUIColor(), offset: CGSize(width: 0, height: 0), alpha: 1.0, radius: CGFloat(5.0)) } else { title = "自定义事件记录" secondView.isHidden = true @@ -87,7 +88,7 @@ func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool { let length = string.lengthOfBytes(using: .utf8) - for loopIndex in 0.. String { - let dateformatter = DateFormatter() dateformatter.dateFormat = "YYYY-MM-dd HH:mm:ss" // 自定义时间格式 // GMT时间 转字符串，直接是系统当前时间 return dateformatter.string(from: Date()) @@ -226,7 +226,6 @@ func uploadImage(image: UIImage, quality: CGFloat) { index += 1 - let dateformatter = DateFormatter() dateformatter.dateFormat = "yyyyMMddHHmmss" let imageName = "IMG_CMP_\(dateformatter.string(from: Date()))_\(index).jpeg" @@ -237,7 +236,7 @@ LoadingHub.shared.showLoading(text: "图片上传中...") Alamofire.upload(multipartFormData: { formData in formData.append(imageData, withName: "file", fileName: imageName, mimeType: "image/jpeg") - }, usingThreshold: UInt64(), to: uploadURL, method: .post, headers: ["token": keychain[Constant.Token.rawValue]!]) { [self] result in + }, usingThreshold: UInt64(), to: uploadURL, method: .post, headers: ["token": keychain[Constant.Token.rawValue]!]) { [self] result in switch result { case let .success(upload, _, _): upload.responseJSON(completionHandler: { value in @@ -275,11 +274,11 @@ let cell: ImageCollectionViewDelCell! = imageCollectionView.dequeueReusableCell(withReuseIdentifier: "collectionViewDelCell", for: indexPath) as? ImageCollectionViewDelCell let row = (indexPath as NSIndexPath).row KF.url(imageUrlArray[row]) - .loadDiskFileSynchronously() - .placeholder(UIImage(named: "load_imag_error.png")) - .cacheMemoryOnly() - .fade(duration: 0.25) - .set(to: cell.imageView) + .loadDiskFileSynchronously() + .placeholder(UIImage(named: "load_imag_error.png")) + .cacheMemoryOnly() + .fade(duration: 0.25) + .set(to: cell.imageView) // 传递点击按钮的位置 cell.delButton.tag = row cell.delButton.addTarget(self, action: #selector(delImageAction), for: .touchUpInside) diff --git a/LaserMethane/ViewController/Settings/SettingViewController.swift b/LaserMethane/ViewController/Settings/SettingViewController.swift index 6bb7d34..ebeb3ae 100644 --- a/LaserMethane/ViewController/Settings/SettingViewController.swift +++ b/LaserMethane/ViewController/Settings/SettingViewController.swift @@ -62,7 +62,7 @@ button.addTarget(self, action: #selector(loginOutAction), for: .touchUpInside) footerView.addSubview(button) button.snp.makeConstraints { (make) -> Void in - make.size.equalTo(CGSize(width: 320, height: 36)) + make.size.equalTo(CGSize(width: 320, height: BUTTON_HEIGHT)) make.centerX.equalToSuperview() make.top.equalTo(footerView.frame.height * 0.6) } @@ -72,7 +72,7 @@ @objc func loginOutAction(_ sender: UIButton) { let alertController = UIAlertController(title: "提示", message: "确定要退出吗？", preferredStyle: .alert) let cancelAction = UIAlertAction(title: "取消", style: .default, handler: nil) - cancelAction.setValue(UIColor(red: 255 / 255, green: 0 / 255, blue: 0 / 255, alpha: 1), forKey: "titleTextColor") + cancelAction.setValue(UIColor.red, forKey: "titleTextColor") let confirmAction = UIAlertAction(title: "确定", style: .default, handler: { [self] _ in // 执行退出登录操作 let loginOutURL = keychain[Constant.ServerConfig.rawValue]! + Constant.loginOut.rawValue