diff --git a/android/app/build.gradle b/android/app/build.gradle index cd368efc..68d0a18d 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,7 +106,7 @@ android { dimension "flavor-type" applicationId "com.skychip.lock" signingConfig signingConfigs.sky - resValue "string", "app_name", "锁通通" + resValue "string", "app_name", "斯凯智能" manifestPlaceholders.JPUSH_PKGNAME = "com.skychip.lock" proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-sky.pro' } diff --git a/android/app/src/sky/res/mipmap-hdpi/ic_launcher.png b/android/app/src/sky/res/mipmap-hdpi/ic_launcher.png old mode 100755 new mode 100644 index 4587c19d..ff87e975 Binary files a/android/app/src/sky/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/sky/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/sky/res/mipmap-mdpi/ic_launcher.png b/android/app/src/sky/res/mipmap-mdpi/ic_launcher.png old mode 100755 new mode 100644 index 32e709f3..39700e6b Binary files a/android/app/src/sky/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/sky/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/sky/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/sky/res/mipmap-xhdpi/ic_launcher.png old mode 100755 new mode 100644 index bdd7f056..7c5e4f93 Binary files a/android/app/src/sky/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/sky/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/sky/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/sky/res/mipmap-xxhdpi/ic_launcher.png old mode 100755 new mode 100644 index 1598749d..5bd49494 Binary files a/android/app/src/sky/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/sky/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/sky/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/sky/res/mipmap-xxxhdpi/ic_launcher.png old mode 100755 new mode 100644 index 644b4d33..d4853f4f Binary files a/android/app/src/sky/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/sky/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/ios/Flutter/skyDebug.xcconfig b/ios/Flutter/skyDebug.xcconfig index b2f11914..4148f08e 100755 --- a/ios/Flutter/skyDebug.xcconfig +++ b/ios/Flutter/skyDebug.xcconfig @@ -2,5 +2,5 @@ FLUTTER_TARGET=lib/main_sky_full.dart ASSET_PREFIX=sky -BUNDLE_NAME=锁通通 -BUNDLE_DISPLAY_NAME=锁通通 +BUNDLE_NAME=斯凯智能 +BUNDLE_DISPLAY_NAME=斯凯智能 diff --git a/ios/Flutter/skyProfile.xcconfig b/ios/Flutter/skyProfile.xcconfig index b2f11914..4148f08e 100755 --- a/ios/Flutter/skyProfile.xcconfig +++ b/ios/Flutter/skyProfile.xcconfig @@ -2,5 +2,5 @@ FLUTTER_TARGET=lib/main_sky_full.dart ASSET_PREFIX=sky -BUNDLE_NAME=锁通通 -BUNDLE_DISPLAY_NAME=锁通通 +BUNDLE_NAME=斯凯智能 +BUNDLE_DISPLAY_NAME=斯凯智能 diff --git a/ios/Flutter/skyRelease.xcconfig b/ios/Flutter/skyRelease.xcconfig index b2f11914..4148f08e 100755 --- a/ios/Flutter/skyRelease.xcconfig +++ b/ios/Flutter/skyRelease.xcconfig @@ -2,5 +2,5 @@ FLUTTER_TARGET=lib/main_sky_full.dart ASSET_PREFIX=sky -BUNDLE_NAME=锁通通 -BUNDLE_DISPLAY_NAME=锁通通 +BUNDLE_NAME=斯凯智能 +BUNDLE_DISPLAY_NAME=斯凯智能 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 40f5428d..022a6c01 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -361,4 +361,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 317f9473a5705c6fe4d79d95e81676f248048fdc -COCOAPODS: 1.15.2 +COCOAPODS: 1.14.3 diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Contents.json index d36b1fab..88147747 100755 --- a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Contents.json @@ -1,122 +1,117 @@ { "images" : [ { - "size" : "20x20", + "filename" : "icon-20@2x.png", "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "icon-20@3x.png", "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "20x20" }, { - "size" : "29x29", "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "icon-29@2x.png", "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "icon-29@3x.png", "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "29x29" }, { - "size" : "40x40", + "filename" : "icon-40@2x.png", "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "icon-40@3x.png", "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "40x40" }, { - "size" : "60x60", + "filename" : "icon-60@2x.png", "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "60x60" }, { - "size" : "60x60", + "filename" : "icon-60@3x.png", "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" + "scale" : "3x", + "size" : "60x60" }, { - "size" : "20x20", "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "20x20" }, { - "size" : "20x20", + "filename" : "icon-20@2x 1.png", "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "20x20" }, { - "size" : "29x29", "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "29x29" }, { - "size" : "29x29", + "filename" : "icon-29@2x 1.png", "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "29x29" }, { - "size" : "40x40", "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "40x40" }, { - "size" : "40x40", + "filename" : "icon-40@2x 1.png", "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "40x40" }, { - "size" : "76x76", "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "76x76" }, { - "size" : "76x76", + "filename" : "icon-76@2x.png", "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "76x76" }, { - "size" : "83.5x83.5", + "filename" : "icon-83.5@2x.png", "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" + "scale" : "2x", + "size" : "83.5x83.5" }, { - "size" : "1024x1024", + "filename" : "icon-1024.png", "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" + "scale" : "1x", + "size" : "1024x1024" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } } diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-1024x1024@1x.png deleted file mode 100755 index dd761bc4..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-1024x1024@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@1x.png deleted file mode 100755 index 4e8c801a..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@2x.png deleted file mode 100755 index 20f2a164..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@3x.png deleted file mode 100755 index 509306f6..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@1x.png deleted file mode 100755 index 8d943d4f..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@2x.png deleted file mode 100755 index b8e0da8c..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@3x.png deleted file mode 100755 index ce5b6941..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@1x.png deleted file mode 100755 index 20f2a164..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@2x.png deleted file mode 100755 index 24ad8c57..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@3x.png deleted file mode 100755 index e3683ba4..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-60x60@2x.png deleted file mode 100755 index e3683ba4..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-60x60@3x.png deleted file mode 100755 index ae954ac4..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-76x76@1x.png deleted file mode 100755 index 1b2aa99e..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-76x76@2x.png deleted file mode 100755 index 5825af16..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-83.5x83.5@2x.png deleted file mode 100755 index 6939522e..00000000 Binary files a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-1024.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-1024.png new file mode 100644 index 00000000..1401d392 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-1024.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@2x 1.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@2x 1.png new file mode 100644 index 00000000..0d4ef0b0 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@2x 1.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@2x.png new file mode 100644 index 00000000..0d4ef0b0 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@3x.png new file mode 100644 index 00000000..f0f13c16 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@2x 1.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@2x 1.png new file mode 100644 index 00000000..cb4f2492 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@2x 1.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@2x.png new file mode 100644 index 00000000..cb4f2492 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@3x.png new file mode 100644 index 00000000..a00ca13b Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@2x 1.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@2x 1.png new file mode 100644 index 00000000..28ac8631 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@2x 1.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@2x.png new file mode 100644 index 00000000..28ac8631 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@3x.png new file mode 100644 index 00000000..3a98d3fc Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-60@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-60@2x.png new file mode 100644 index 00000000..3a98d3fc Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-60@3x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-60@3x.png new file mode 100644 index 00000000..838f2c38 Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-76@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-76@2x.png new file mode 100644 index 00000000..57f361aa Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-83.5@2x.png b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-83.5@2x.png new file mode 100644 index 00000000..2baa4fcb Binary files /dev/null and b/ios/Runner/Assets.xcassets/skyAppIcon.appiconset/icon-83.5@2x.png differ diff --git a/ios/Runner/launchImage_sky.png b/ios/Runner/launchImage_sky.png index b323652c..3e0336a8 100644 Binary files a/ios/Runner/launchImage_sky.png and b/ios/Runner/launchImage_sky.png differ