Merge：merge develop into build-addGateway-20240814

.gitlab-ci.yml

@@ -0,0 +1,175 @@
+stages:
+  - test
+  - generate_tag_or_version
+  - build-artifacts
+  - release-artifacts
+  - notification
+
+variables:
+  LC_ALL: "en_US.UTF-8"
+  LANG: "en_US.UTF-8"
+
+
+.build_rule:
+  tags:
+    - macos
+    - flutter
+  rules:
+    - if: $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_COMMIT_BRANCH == "release"
+    - if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/
+    - if: $CI_COMMIT_BRANCH == "canary_release"
+    - if: $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$/
+
+.generate_tag_rule:
+  tags:
+    - macos
+    - flutter
+  rules:
+    - if: $CI_COMMIT_BRANCH == "master"
+
+.generate_next_version_rule:
+  tags:
+    - macos
+    - flutter
+  rules:
+    - if: $CI_COMMIT_BRANCH == "develop"
+    - if: $CI_COMMIT_BRANCH == "release"
+    - if: $CI_COMMIT_BRANCH == "canary_release"
+    - if: $CI_COMMIT_BRANCH =~ /feat_[a-zA-Z]+/
+
+.print_env:
+  stage: test
+  extends: .build_rule
+  before_script:
+    - java --version
+    - printenv | while IFS='=' read -r key value; do echo "$key=$value"; done
+  after_script:
+    - echo "finished"
+
+.setup_fastlane_android:
+  extends: .build_rule
+  before_script:
+    - ls -li
+    - export NEXT_VERSION="$(cat app_new.version)"
+    - flutter pub get
+    - bundle install --gemfile android/Gemfile --quiet
+  cache:
+    paths:
+      - app_new.version
+
+.setup_fastlane_ios:
+  extends: .build_rule
+  before_script:
+    - ls -li
+    - export NEXT_VERSION="$(cat app_new.version)"
+    - flutter pub get
+    - bundle install --gemfile ios/Gemfile --quiet
+  cache:
+    paths:
+      - app_new.version
+
+test_lint_check:
+  stage: test
+  extends: .print_env
+  script:
+    - echo "run lint check or per-test here"
+  tags:
+    - macos
+    - flutter
+
+generate_git_tag:
+  stage: generate_tag_or_version
+  extends: .generate_tag_rule
+  before_script:
+    - project_url=$(echo $CI_PROJECT_URL | sed 's/http:\/\///')
+    - echo "project_url:$project_url"
+    - git remote set-url origin http://gitlab-ci-token:${GITLAB_ACCESS_TOKEN}@$project_url.git
+  script:
+    - bash tag_generator.sh generate_tag
+
+generate_next_version:
+  stage: generate_tag_or_version
+  extends: .generate_next_version_rule
+  script:
+    - bash tag_generator.sh generate_version
+  cache:
+    paths:
+      - app_new.version
+
+build_android:
+  stage: build-artifacts
+  extends: .setup_fastlane_android
+  script: bash android/build.sh
+  artifacts:
+    paths:
+      - build/app/outputs/flutter-apk/
+
+build_ios:
+  stage: build-artifacts
+  extends: .setup_fastlane_ios
+  script:
+    - bash ios/build.sh
+  artifacts:
+    paths:
+      - build/app/outputs/flutter-ipa
+
+create-release:
+  stage: release-artifacts
+  extends: .build_rule
+  dependencies:
+    - build_android
+    - build_ios
+  needs:
+    - job: build_android
+      artifacts: true
+    - job: build_ios
+      artifacts: true
+  rules:
+    - if: $CI_COMMIT_TAG
+  before_script:
+    - echo "start create release"
+    - bash release_description_generator.sh
+    - export RELEASE_DESCRIPTION="$(cat changelog.md)"
+    - echo "${RELEASE_DESCRIPTION}"
+  script:
+    - export StarLock_VERSION=${CI_COMMIT_TAG#*-}
+    - echo "Uploading StarLock-${StarLock_VERSION} packages to
+      ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/StarLock-${StarLock_VERSION}-*"
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-xhj-release-${CI_COMMIT_TAG}.apk
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-xhj-release-${CI_COMMIT_TAG}.apk"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-xhj-release-${CI_COMMIT_TAG}.aab
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-xhj-release-${CI_COMMIT_TAG}.aab"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-sky-release-${CI_COMMIT_TAG}.apk
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.apk"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-apk/starlock-sky-release-${CI_COMMIT_TAG}.aab
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.aab"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/starlock-xhj-release-${CI_COMMIT_TAG}.ipa
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-xhj-release-${CI_COMMIT_TAG}.ipa"'
+    - 'curl -i --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file build/app/outputs/flutter-ipa/starlock-sky-release-${CI_COMMIT_TAG}.ipa
+      "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${StarLock_VERSION}/starlock-sky-release-${CI_COMMIT_TAG}.ipa"'
+  release:
+    name: '$CI_COMMIT_TAG'
+    description: '$(cat changelog.md)'
+    tag_name: '$CI_COMMIT_TAG'
+    ref: '$CI_COMMIT_TAG'
+    assets:
+      links:
+        - name: 'xhj apk binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.apk'
+          link_type: 'package'
+        - name: 'xhj bundle binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.aab'
+          link_type: 'package'
+        - name: 'sky apk binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.apk'
+          link_type: 'package'
+        - name: 'sky bundle binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.aab'
+          link_type: 'package'
+        - name: 'xhj ipa binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-xhj-release-${CI_COMMIT_TAG}.ipa'
+          link_type: 'package'
+        - name: 'sky ipa binary package'
+          url: '${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/StarLock/${CI_COMMIT_TAG}/starlock-sky-release-${CI_COMMIT_TAG}.ipa'
+          link_type: 'package'

android/Gemfile

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

android/Gemfile.lock

@@ -0,0 +1,221 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.979.0)
+    aws-sdk-core (3.209.1)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.9)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.94.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.166.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    excon (0.109.0)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.3.1)
+    fastlane (2.222.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-pgyer (0.2.9)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.45.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.29.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.7)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.9.1)
+      base64
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    nanaimo (0.3.0)
+    naturally (2.2.1)
+    nkf (0.2.0)
+    optparse (0.5.0)
+    os (1.1.4)
+    plist (3.7.1)
+    public_suffix (5.1.1)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.3.7)
+    rouge (2.0.7)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.5)
+    signet (0.18.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    uber (0.1.0)
+    unf (0.2.0)
+    unicode-display_width (2.6.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.25.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (>= 3.3.2, < 4.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fastlane
+  fastlane-plugin-pgyer
+
+BUNDLED WITH
+   1.17.2

android/app/and_res_guard.gradle

@@ -0,0 +1,13 @@
+apply plugin: 'AndResGuard'
+
+andResGuard {
+    whiteList = [
+            "R.xml.jpush*",
+            "R.drawable.jpush*",
+            "R.layout.jpush*",
+            "R.layout.push*",
+            "R.string.jg*",
+            "R.style.MyDialogStyle",
+            "R.style.JPushTheme"
+    ]
+}

android/app/build.gradle

@@ -26,36 +26,37 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 apply plugin: 'com.android.application'
-apply plugin: 'android-junk-code'
+//apply plugin: 'android-junk-code'
 apply plugin: 'com.huawei.agconnect'
+apply from: 'and_res_guard.gradle'
 
-androidJunkCode {
+//androidJunkCode {
-    variantConfig {
+//    variantConfig {
-        release {
+//        release {
-            //注意：这里的release是变体名称，如果没有设置productFlavors就是buildType名称，如果有设置productFlavors就是flavor+buildType，例如（freeRelease、proRelease）
+//            //注意：这里的release是变体名称，如果没有设置productFlavors就是buildType名称，如果有设置productFlavors就是flavor+buildType，例如（freeRelease、proRelease）
-            packageBase = "cn.hx.plugin.ui"  //生成java类根包名
+//            packageBase = "cn.hx.plugin.ui"  //生成java类根包名
-            packageCount = 30 //生成包数量
+//            packageCount = 30 //生成包数量
-            activityCountPerPackage = 3 //每个包下生成Activity类数量
+//            activityCountPerPackage = 3 //每个包下生成Activity类数量
-            excludeActivityJavaFile = false
+//            excludeActivityJavaFile = false
-            //是否排除生成Activity的Java文件,默认false(layout和写入AndroidManifest.xml还会执行)，主要用于处理类似神策全埋点编译过慢问题
+//            //是否排除生成Activity的Java文件,默认false(layout和写入AndroidManifest.xml还会执行)，主要用于处理类似神策全埋点编译过慢问题
-            otherCountPerPackage = 50  //每个包下生成其它类的数量
+//            otherCountPerPackage = 50  //每个包下生成其它类的数量
-            methodCountPerClass = 20  //每个类下生成方法数量
+//            methodCountPerClass = 20  //每个类下生成方法数量
-            resPrefix = "junk_"  //生成的layout、drawable、string等资源名前缀
+//            resPrefix = "junk_"  //生成的layout、drawable、string等资源名前缀
-            drawableCount = 300  //生成drawable资源数量
+//            drawableCount = 300  //生成drawable资源数量
-            stringCount = 300  //生成string数量
+//            stringCount = 300  //生成string数量
-        }
+//        }
-    }
+//    }
-}
+//}
 
 android {
     signingConfigs {
         // 这里“debug”不是一个自定义变量，而是一个特定的关键词，凡是使用--debug模式，都会引用到这里
         // 目前看来，debug模式没办法在buildTypes里面按flavors指定编译签名，所有口味的debug模式只能用同一个签名
         debug {
-             storeFile file("starlock.keystore")
+            storeFile file("starlock.keystore")
-             storePassword '123456'
+            storePassword '123456'
-             keyAlias = 'starlock'
+            keyAlias = 'starlock'
-             keyPassword '123456'
+            keyPassword '123456'
 //            storeFile file("xhj.jks")
 //            storePassword 'xhj8872'
 //            keyAlias = 'upload'
@@ -107,6 +108,19 @@ android {
             signingConfig signingConfigs.sky
             resValue "string", "app_name", "锁通通"
             manifestPlaceholders.JPUSH_PKGNAME = "com.skychip.lock"
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-sky.pro'
+        }
+        sky_pre {
+            dimension "flavor-type"
+            applicationId "com.skychip.lock.pre"
+            signingConfig signingConfigs.sky
+            resValue "string", "app_name", "锁通通-P"
+        }
+        sky_dev {
+            dimension "flavor-type"
+            applicationId "com.skychip.lock.dev"
+            signingConfig signingConfigs.sky
+            resValue "string", "app_name", "锁通通-D"
         }
         xhj {
             dimension "flavor-type"
@@ -114,6 +128,19 @@ android {
             signingConfig signingConfigs.xhj
             resValue "string", "app_name", "星星锁"
             manifestPlaceholders.JPUSH_PKGNAME = "com.xhjcn.lock"
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules-xhj.pro'
+        }
+        xhj_pre {
+            dimension "flavor-type"
+            applicationId "com.xhjcn.lock.pre"
+            signingConfig signingConfigs.xhj
+            resValue "string", "app_name", "星星锁-P"
+        }
+        xhj_dev {
+            dimension "flavor-type"
+            applicationId "com.xhjcn.lock.dev"
+            signingConfig signingConfigs.xhj
+            resValue "string", "app_name", "星星锁-D"
         }
     }
 
@@ -122,7 +149,7 @@ android {
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
-    lintOptions{
+    lintOptions {
         checkReleaseBuilds false
         abortOnError false
     }
@@ -146,9 +173,10 @@ android {
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 25
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
+        proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
 
         // 为减少体积，使用不同架构分包发布编译选项 flutter build apk --split-per-abi
         // 所以需要禁用ndk在同一个个包中包含多个架构
@@ -167,7 +195,7 @@ android {
                 JPUSH_PKGNAME : "这里不重要，在口味配置",
                 //JPush 上注册的包名对应的 Appkey.
                 // JPUSH_APPKEY : "7ff37d174c1a568a89e98dad",//--skyAppKey
-                JPUSH_APPKEY : "251fc8074820d122b6de58d2",//--鑫泓佳AppKey
+                JPUSH_APPKEY  : "251fc8074820d122b6de58d2",//--鑫泓佳AppKey
                 JPUSH_CHANNEL : "flutter_channel",
 
                 //若不集成厂商通道，可直接跳过以下配置
@@ -175,14 +203,14 @@ android {
                 // XIAOMI_APPID : "MI-2882303761520287291",
                 // XIAOMI_APPKEY : "MI-5352028744291",
                 //以下均为鑫泓佳的配置
-                XIAOMI_APPID : "MI-2882303761520314939",
+                XIAOMI_APPID  : "MI-2882303761520314939",
                 XIAOMI_APPKEY : "MI-5312031456939",
-                OPPO_APPKEY : "OP-47f668c9943248118502aa58d066393b",
+                OPPO_APPKEY   : "OP-47f668c9943248118502aa58d066393b",
-                OPPO_APPID : "OP-31726001",
+                OPPO_APPID    : "OP-31726001",
-                OPPO_APPSECRET : "OP-05723986bba64183a71530b496922450",
+                OPPO_APPSECRET: "OP-05723986bba64183a71530b496922450",
-                VIVO_APPKEY : "75fe8e570425b714e08d0390b14797cb",
+                VIVO_APPKEY   : "75fe8e570425b714e08d0390b14797cb",
-                VIVO_APPID : "105752244",
+                VIVO_APPID    : "105752244",
-                HONOR_APPID : "104458196", 
+                HONOR_APPID   : "104458196",
         ]
         splits {
             abi {
@@ -214,8 +242,8 @@ android {
             // 高德地图导致release编译模式下应用闪退，根据：[高德地图在Debug模式下运行正常但是打Release包时则闪退解决办法](https://blog.csdn.net/weixin_39370093/article/details/109631210)
             // 为release模式设置混淆可以解决地图闪退问题
             // 真实的解决办法
-            minifyEnabled false
+            minifyEnabled true
-            shrinkResources false
+            shrinkResources true
             productFlavors.local.signingConfig signingConfigs.debug
             productFlavors.dev.signingConfig signingConfigs.debug
             productFlavors.pre.signingConfig signingConfigs.debug
@@ -223,6 +251,12 @@ android {
             productFlavors.xhj.signingConfig signingConfigs.xhj
         }
     }
+
+    applicationVariants.all { variant ->
+        variant.outputs.all {
+            outputFileName = "app-starlock-${variant.buildType.name}-${variant.flavorName}-${defaultConfig.versionName}.apk"
+        }
+    }
 }
 
 flutter {
@@ -231,8 +265,9 @@ flutter {
 
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation('com.amap.api:location:5.6.0')
+//    implementation('com.amap.api:location:5.6.0')
-    implementation('com.amap.api:3dmap:8.1.0')
+//    implementation('com.amap.api:3dmap:8.1.0')
+    implementation('com.amap.api:3dmap-location-search:latest.integration')
 
     implementation 'cn.jiguang.sdk:jpush:5.2.3'
     // 接入华为厂商
@@ -244,13 +279,13 @@ dependencies {
     //接入OPPO厂商
     implementation 'cn.jiguang.sdk.plugin:oppo:5.2.3'
     //引入 libs 中的 aar，如果项目中有此依赖不需要重复引用
-    implementation fileTree(include: ['*.jar','*.aar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
     //OPPO 3.1.0 aar 及其以上版本需要添加以下依赖
     implementation 'com.google.code.gson:gson:2.6.2'
     implementation 'commons-codec:commons-codec:1.6'
     implementation 'androidx.annotation:annotation:1.1.0'
     // 接入荣耀厂商
-    implementation 'cn.jiguang.sdk.plugin:honor:5.2.3' 
+    implementation 'cn.jiguang.sdk.plugin:honor:5.2.3'
     //需要单独引入荣耀厂商 aar ，请下载官网 SDK 包并把 jpush-android-xxx-release/third-push/honor/libs 下的 aar 文件单独拷贝一份到应用 module/libs 下
     // implementation(name: 'HiPushSDK-7.0.61.303', ext: 'aar')
     //接入 VIVO 厂商

android/app/proguard-dictionary-symbol

@@ -0,0 +1,650 @@
+ʻ
+ʼ
+ʽ
+ʾ
+ʿ
+ˆ
+ˈ
+ˉ
+ˊ
+ˋ
+ˎ
+ˏ
+ˑ
+י
+ـ
+ٴ
+ᐧ
+ᴵ
+ᵎ
+ᵔ
+ᵢ
+ⁱ
+ﹳ
+ﹶ
+ﾞ
+ﾞﾞ
+ᐧᐧ
+ᴵᴵ
+ʻʻ
+ʽʽ
+ʼʼ
+ʿʿ
+ʾʾ
+ــ
+ˆˆ
+ˉˉ
+ˈˈ
+ˋˋ
+ˊˊ
+ˏˏ
+ˎˎ
+ˑˑ
+ᵔᵔ
+יי
+ᵎᵎ
+ᵢᵢ
+ⁱⁱ
+ﹳﹳ
+ٴٴ
+ﹶﹶ
+ʻʼ
+ʻʽ
+ʻʾ
+ʻʿ
+ʻˆ
+ʻˈ
+ʻˉ
+ʻˊ
+ʻˋ
+ʻˎ
+ʻˏ
+ʻˑ
+ʻי
+ʻـ
+ʻٴ
+ʻᐧ
+ʻᴵ
+ʻᵎ
+ʻᵔ
+ʻᵢ
+ʻⁱ
+ʻﹳ
+ʻﹶ
+ʻﾞ
+ʼʻ
+ʼʽ
+ʼʾ
+ʼʿ
+ʼˆ
+ʼˈ
+ʼˉ
+ʼˊ
+ʼˋ
+ʼˎ
+ʼˏ
+ʼˑ
+ʼי
+ʼـ
+ʼٴ
+ʼᐧ
+ʼᴵ
+ʼᵎ
+ʼᵔ
+ʼᵢ
+ʼⁱ
+ʼﹳ
+ʼﹶ
+ʼﾞ
+ʽʻ
+ʽʼ
+ʽʾ
+ʽʿ
+ʽˆ
+ʽˈ
+ʽˉ
+ʽˊ
+ʽˋ
+ʽˎ
+ʽˏ
+ʽˑ
+ʽי
+ʽـ
+ʽٴ
+ʽᐧ
+ʽᴵ
+ʽᵎ
+ʽᵔ
+ʽᵢ
+ʽⁱ
+ʽﹳ
+ʽﹶ
+ʽﾞ
+ʾʻ
+ʾʼ
+ʾʽ
+ʾʿ
+ʾˆ
+ʾˈ
+ʾˉ
+ʾˊ
+ʾˋ
+ʾˎ
+ʾˏ
+ʾˑ
+ʾי
+ʾـ
+ʾٴ
+ʾᐧ
+ʾᴵ
+ʾᵎ
+ʾᵔ
+ʾᵢ
+ʾⁱ
+ʾﹳ
+ʾﹶ
+ʾﾞ
+ʿʻ
+ʿʼ
+ʿʽ
+ʿʾ
+ʿˆ
+ʿˈ
+ʿˉ
+ʿˊ
+ʿˋ
+ʿˎ
+ʿˏ
+ʿˑ
+ʿי
+ʿـ
+ʿٴ
+ʿᐧ
+ʿᴵ
+ʿᵎ
+ʿᵔ
+ʿᵢ
+ʿⁱ
+ʿﹳ
+ʿﹶ
+ʿﾞ
+ˆʻ
+ˆʼ
+ˆʽ
+ˆʾ
+ˆʿ
+ˆˈ
+ˆˉ
+ˆˊ
+ˆˋ
+ˆˎ
+ˆˏ
+ˆˑ
+ˆי
+ˆـ
+ˆٴ
+ˆᐧ
+ˆᴵ
+ˆᵎ
+ˆᵔ
+ˆᵢ
+ˆⁱ
+ˆﹳ
+ˆﹶ
+ˆﾞ
+ˈʻ
+ˈʼ
+ˈʽ
+ˈʾ
+ˈʿ
+ˈˆ
+ˈˉ
+ˈˊ
+ˈˋ
+ˈˎ
+ˈˏ
+ˈˑ
+ˈי
+ˈـ
+ˈٴ
+ˈᐧ
+ˈᴵ
+ˈᵎ
+ˈᵔ
+ˈᵢ
+ˈⁱ
+ˈﹳ
+ˈﹶ
+ˈﾞ
+ˉʻ
+ˉʼ
+ˉʽ
+ˉʾ
+ˉʿ
+ˉˆ
+ˉˈ
+ˉˊ
+ˉˋ
+ˉˎ
+ˉˏ
+ˉˑ
+ˉי
+ˉـ
+ˉٴ
+ˉᐧ
+ˉᴵ
+ˉᵎ
+ˉᵔ
+ˉᵢ
+ˉⁱ
+ˉﹳ
+ˉﹶ
+ˉﾞ
+ˊʻ
+ˊʼ
+ˊʽ
+ˊʾ
+ˊʿ
+ˊˆ
+ˊˈ
+ˊˉ
+ˊˋ
+ˊˎ
+ˊˏ
+ˊˑ
+ˊי
+ˊـ
+ˊٴ
+ˊᐧ
+ˊᴵ
+ˊᵎ
+ˊᵔ
+ˊᵢ
+ˊⁱ
+ˊﹳ
+ˊﹶ
+ˊﾞ
+ˋʻ
+ˋʼ
+ˋʽ
+ˋʾ
+ˋʿ
+ˋˆ
+ˋˈ
+ˋˉ
+ˋˊ
+ˋˎ
+ˋˏ
+ˋˑ
+ˋי
+ˋـ
+ˋٴ
+ˋᐧ
+ˋᴵ
+ˋᵎ
+ˋᵔ
+ˋᵢ
+ˋⁱ
+ˋﹳ
+ˋﹶ
+ˋﾞ
+ˎʻ
+ˎʼ
+ˎʽ
+ˎʾ
+ˎʿ
+ˎˆ
+ˎˈ
+ˎˉ
+ˎˊ
+ˎˋ
+ˎˏ
+ˎˑ
+ˎי
+ˎـ
+ˎٴ
+ˎᐧ
+ˎᴵ
+ˎᵎ
+ˎᵔ
+ˎᵢ
+ˎⁱ
+ˎﹳ
+ˎﹶ
+ˎﾞ
+ˏʻ
+ˏʼ
+ˏʽ
+ˏʾ
+ˏʿ
+ˏˆ
+ˏˈ
+ˏˉ
+ˏˊ
+ˏˋ
+ˏˎ
+ˏˑ
+ˏי
+ˏـ
+ˏٴ
+ˏᐧ
+ˏᴵ
+ˏᵎ
+ˏᵔ
+ˏᵢ
+ˏⁱ
+ˏﹳ
+ˏﹶ
+ˏﾞ
+ˑʻ
+ˑʼ
+ˑʽ
+ˑʾ
+ˑʿ
+ˑˆ
+ˑˈ
+ˑˉ
+ˑˊ
+ˑˋ
+ˑˎ
+ˑˏ
+ˑי
+ˑـ
+ˑٴ
+ˑᐧ
+ˑᴵ
+ˑᵎ
+ˑᵔ
+ˑᵢ
+ˑⁱ
+ˑﹳ
+ˑﹶ
+ˑﾞ
+יʻ
+יʼ
+יʽ
+יʾ
+יʿ
+יˆ
+יˈ
+יˉ
+יˊ
+יˋ
+יˎ
+יˏ
+יˑ
+יـ
+יٴ
+יᐧ
+יᴵ
+יᵎ
+יᵔ
+יᵢ
+יⁱ
+יﹳ
+יﹶ
+יﾞ
+ـʻ
+ـʼ
+ـʽ
+ـʾ
+ـʿ
+ـˆ
+ـˈ
+ـˉ
+ـˊ
+ـˋ
+ـˎ
+ـˏ
+ـˑ
+ـי
+ـٴ
+ـᐧ
+ـᴵ
+ـᵎ
+ـᵔ
+ـᵢ
+ـⁱ
+ـﹳ
+ـﹶ
+ـﾞ
+ٴʻ
+ٴʼ
+ٴʽ
+ٴʾ
+ٴʿ
+ٴˆ
+ٴˈ
+ٴˉ
+ٴˊ
+ٴˋ
+ٴˎ
+ٴˏ
+ٴˑ
+ٴי
+ٴـ
+ٴᐧ
+ٴᴵ
+ٴᵎ
+ٴᵔ
+ٴᵢ
+ٴⁱ
+ٴﹳ
+ٴﹶ
+ٴﾞ
+ᐧʻ
+ᐧʼ
+ᐧʽ
+ᐧʾ
+ᐧʿ
+ᐧˆ
+ᐧˈ
+ᐧˉ
+ᐧˊ
+ᐧˋ
+ᐧˎ
+ᐧˏ
+ᐧˑ
+ᐧי
+ᐧـ
+ᐧٴ
+ᐧᴵ
+ᐧᵎ
+ᐧᵔ
+ᐧᵢ
+ᐧⁱ
+ᐧﹳ
+ᐧﹶ
+ᐧﾞ
+ᴵʻ
+ᴵʼ
+ᴵʽ
+ᴵʾ
+ᴵʿ
+ᴵˆ
+ᴵˈ
+ᴵˉ
+ᴵˊ
+ᴵˋ
+ᴵˎ
+ᴵˏ
+ᴵˑ
+ᴵי
+ᴵـ
+ᴵٴ
+ᴵᐧ
+ᴵᵎ
+ᴵᵔ
+ᴵᵢ
+ᴵⁱ
+ᴵﹳ
+ᴵﹶ
+ᴵﾞ
+ᵎʻ
+ᵎʼ
+ᵎʽ
+ᵎʾ
+ᵎʿ
+ᵎˆ
+ᵎˈ
+ᵎˉ
+ᵎˊ
+ᵎˋ
+ᵎˎ
+ᵎˏ
+ᵎˑ
+ᵎי
+ᵎـ
+ᵎٴ
+ᵎᐧ
+ᵎᴵ
+ᵎᵔ
+ᵎᵢ
+ᵎⁱ
+ᵎﹳ
+ᵎﹶ
+ᵎﾞ
+ᵔʻ
+ᵔʼ
+ᵔʽ
+ᵔʾ
+ᵔʿ
+ᵔˆ
+ᵔˈ
+ᵔˉ
+ᵔˊ
+ᵔˋ
+ᵔˎ
+ᵔˏ
+ᵔˑ
+ᵔי
+ᵔـ
+ᵔٴ
+ᵔᐧ
+ᵔᴵ
+ᵔᵎ
+ᵔᵢ
+ᵔⁱ
+ᵔﹳ
+ᵔﹶ
+ᵔﾞ
+ᵢʻ
+ᵢʼ
+ᵢʽ
+ᵢʾ
+ᵢʿ
+ᵢˆ
+ᵢˈ
+ᵢˉ
+ᵢˊ
+ᵢˋ
+ᵢˎ
+ᵢˏ
+ᵢˑ
+ᵢי
+ᵢـ
+ᵢٴ
+ᵢᐧ
+ᵢᴵ
+ᵢᵎ
+ᵢᵔ
+ᵢⁱ
+ᵢﹳ
+ᵢﹶ
+ᵢﾞ
+ⁱʻ
+ⁱʼ
+ⁱʽ
+ⁱʾ
+ⁱʿ
+ⁱˆ
+ⁱˈ
+ⁱˉ
+ⁱˊ
+ⁱˋ
+ⁱˎ
+ⁱˏ
+ⁱˑ
+ⁱי
+ⁱـ
+ⁱٴ
+ⁱᐧ
+ⁱᴵ
+ⁱᵎ
+ⁱᵔ
+ⁱᵢ
+ⁱﹳ
+ⁱﹶ
+ⁱﾞ
+ﹳʻ
+ﹳʼ
+ﹳʽ
+ﹳʾ
+ﹳʿ
+ﹳˆ
+ﹳˈ
+ﹳˉ
+ﹳˊ
+ﹳˋ
+ﹳˎ
+ﹳˏ
+ﹳˑ
+ﹳי
+ﹳـ
+ﹳٴ
+ﹳᐧ
+ﹳᴵ
+ﹳᵎ
+ﹳᵔ
+ﹳᵢ
+ﹳⁱ
+ﹳﹶ
+ﹳﾞ
+ﹶʻ
+ﹶʼ
+ﹶʽ
+ﹶʾ
+ﹶʿ
+ﹶˆ
+ﹶˈ
+ﹶˉ
+ﹶˊ
+ﹶˋ
+ﹶˎ
+ﹶˏ
+ﹶˑ
+ﹶי
+ﹶـ
+ﹶٴ
+ﹶᐧ
+ﹶᴵ
+ﹶᵎ
+ﹶᵔ
+ﹶᵢ
+ﹶⁱ
+ﹶﹳ
+ﹶﾞ
+ﾞʻ
+ﾞʼ
+ﾞʽ
+ﾞʾ
+ﾞʿ
+ﾞˆ
+ﾞˈ
+ﾞˉ
+ﾞˊ
+ﾞˋ
+ﾞˎ
+ﾞˏ
+ﾞˑ
+ﾞי
+ﾞـ
+ﾞٴ
+ﾞᐧ
+ﾞᴵ
+ﾞᵎ
+ﾞᵔ
+ﾞᵢ
+ﾞⁱ
+ﾞﹳ
+ﾞﹶ

android/app/proguard-rules-sky.pro

@@ -0,0 +1,134 @@
+-obfuscationdictionary ./proguard-dictionary-1il
+-classobfuscationdictionary ./proguard-dictionary-1il
+-packageobfuscationdictionary ./proguard-dictionary-1il
+
+#Flutter Wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }
+
+-keepattributes Signature
+-keepattributes InnerClasses,EnclosingMethod
+-keepattributes *Annotation*
+-keepattributes SourceFile,LineNumberTable
+
+-dontwarn com.hwangjr.rxbus.**
+-keep class com.hwangjr.rxbus.** { *; }
+-keepattributes *Annotation*
+
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+
+-dontwarn com.jcraft.jzlib.**
+-keep class com.jcraft.jzlib.**  { *;}
+
+-dontwarn sun.misc.**
+-keep class sun.misc.** { *;}
+
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *;}
+
+-dontwarn io.reactivex.**
+-keep class io.reactivex.** { *;}
+
+-dontwarn sun.security.**
+-keep class sun.security.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.** { *;}
+
+-keep public class android.net.http.SslError
+-keep public class android.webkit.WebViewClient
+
+-dontwarn android.webkit.WebView
+-dontwarn android.net.http.SslError
+-dontwarn android.webkit.WebViewClient
+
+-dontwarn android.support.**
+
+-dontwarn org.apache.**
+-keep class org.apache.** { *;}
+
+-dontwarn okhttp3.**
+-keep class okhttp3.** { *;}
+-keep interface okhttp3.** { *; }
+
+-dontwarn okio.**
+-keep class okio.** { *;}
+
+-keep class **JNI* {*;}
+
+-keep class com.lib.flutter_blue_plus.* { *; }
+
+-ignorewarnings
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keep class com.huawei.hianalytics.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}
+
+
+-keep public class * extends android.app.Service
+-keep class com.heytap.msp.** { *;}
+
+-dontwarn com.vivo.push.**
+-keep class com.vivo.push.**{*; }
+-keep class com.vivo.vms.**{*; }
+
+
+-dontoptimize
+-dontpreverify
+-dontwarn cn.jpush.**
+-keep class cn.jpush.** { *; }
+-keep class * extends cn.jpush.android.service.JPushMessageService { *; }
+-dontwarn cn.jiguang.**
+-keep class cn.jiguang.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.gson.** {*;}
+-keep class com.google.protobuf.** {*;}
+
+-keep class com.amap.api.maps.** { *; }
+-keep class com.autonavi.** { *; }
+-keep class com.amap.api.trace.** {*; }
+
+-keep class com.amap.api.location.** {*; }
+-keep class com.amap.api.fence.** { *; }
+-keep class com.loc.** { *; }
+-keep class com.amap.flutter.location.** { *; }
+-keep class com.autonavi.aps.amapapi.model.** { *; }
+
+-keep class com.amap.api.services.** { *; }
+
+-keep class com.amap.api.maps2d.** { *; }
+-keep class com.amap.api.mapcore2d.** { *; }
+
+-keep class com.amap.api.navi.** { *; }
+
+
+-keep class com.alipay.deviceid.** { *; }
+-keep class net.security.device.api.** {*;}
+-keep class org.json.** { *;}
+-keep class com.alibaba.fastjson.** {*;}
+-keep class com.alibaba.sdk.android.oss.** { *; }
+
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
+
+-keepclassmembers,allowobfuscation class * {
+@com.alibaba.fastjson.annotation.JSONField <fields>;
+}
+
+-keep class com.tencent.mm.sdk.** { *; }
+-keep class com.tencent.mm.opensdk.** { *; }
+
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}

android/app/proguard-rules-xhj.pro

@@ -0,0 +1,134 @@
+-obfuscationdictionary ./proguard-dictionary-symbol
+-classobfuscationdictionary ./proguard-dictionary-symbol
+-packageobfuscationdictionary ./proguard-dictionary-symbol
+
+#Flutter Wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }
+
+-keepattributes Signature
+-keepattributes InnerClasses,EnclosingMethod
+-keepattributes *Annotation*
+-keepattributes SourceFile,LineNumberTable
+
+-dontwarn com.hwangjr.rxbus.**
+-keep class com.hwangjr.rxbus.** { *; }
+-keepattributes *Annotation*
+
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+
+-dontwarn com.jcraft.jzlib.**
+-keep class com.jcraft.jzlib.**  { *;}
+
+-dontwarn sun.misc.**
+-keep class sun.misc.** { *;}
+
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *;}
+
+-dontwarn io.reactivex.**
+-keep class io.reactivex.** { *;}
+
+-dontwarn sun.security.**
+-keep class sun.security.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.** { *;}
+
+-keep public class android.net.http.SslError
+-keep public class android.webkit.WebViewClient
+
+-dontwarn android.webkit.WebView
+-dontwarn android.net.http.SslError
+-dontwarn android.webkit.WebViewClient
+
+-dontwarn android.support.**
+
+-dontwarn org.apache.**
+-keep class org.apache.** { *;}
+
+-dontwarn okhttp3.**
+-keep class okhttp3.** { *;}
+-keep interface okhttp3.** { *; }
+
+-dontwarn okio.**
+-keep class okio.** { *;}
+
+-keep class **JNI* {*;}
+
+-keep class com.lib.flutter_blue_plus.* { *; }
+
+-ignorewarnings
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keep class com.huawei.hianalytics.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}
+
+
+-keep public class * extends android.app.Service
+-keep class com.heytap.msp.** { *;}
+
+-dontwarn com.vivo.push.**
+-keep class com.vivo.push.**{*; }
+-keep class com.vivo.vms.**{*; }
+
+
+-dontoptimize
+-dontpreverify
+-dontwarn cn.jpush.**
+-keep class cn.jpush.** { *; }
+-keep class * extends cn.jpush.android.service.JPushMessageService { *; }
+-dontwarn cn.jiguang.**
+-keep class cn.jiguang.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.gson.** {*;}
+-keep class com.google.protobuf.** {*;}
+
+-keep class com.amap.api.maps.** { *; }
+-keep class com.autonavi.** { *; }
+-keep class com.amap.api.trace.** {*; }
+
+-keep class com.amap.api.location.** {*; }
+-keep class com.amap.api.fence.** { *; }
+-keep class com.loc.** { *; }
+-keep class com.amap.flutter.location.** { *; }
+-keep class com.autonavi.aps.amapapi.model.** { *; }
+
+-keep class com.amap.api.services.** { *; }
+
+-keep class com.amap.api.maps2d.** { *; }
+-keep class com.amap.api.mapcore2d.** { *; }
+
+-keep class com.amap.api.navi.** { *; }
+
+
+-keep class com.alipay.deviceid.** { *; }
+-keep class net.security.device.api.** {*;}
+-keep class org.json.** { *;}
+-keep class com.alibaba.fastjson.** {*;}
+-keep class com.alibaba.sdk.android.oss.** { *; }
+
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
+
+-keepclassmembers,allowobfuscation class * {
+@com.alibaba.fastjson.annotation.JSONField <fields>;
+}
+
+-keep class com.tencent.mm.sdk.** { *; }
+-keep class com.tencent.mm.opensdk.** { *; }
+
+-dontwarn com.tencent.bugly.**
+-keep public class com.tencent.bugly.**{*;}

android/app/proguard-rules.pro

@@ -0,0 +1,131 @@
+-obfuscationdictionary ./proguard-dictionary-chinese
+-classobfuscationdictionary ./proguard-dictionary-chinese
+-packageobfuscationdictionary ./proguard-dictionary-chinese
+
+#Flutter Wrapper
+-keep class io.flutter.app.** { *; }
+-keep class io.flutter.plugin.**  { *; }
+-keep class io.flutter.util.**  { *; }
+-keep class io.flutter.view.**  { *; }
+-keep class io.flutter.**  { *; }
+-keep class io.flutter.plugins.**  { *; }
+
+-keepattributes Signature
+-keepattributes InnerClasses,EnclosingMethod
+-keepattributes *Annotation*
+-keepattributes SourceFile,LineNumberTable
+
+-dontwarn com.hwangjr.rxbus.**
+-keep class com.hwangjr.rxbus.** { *; }
+-keepattributes *Annotation*
+
+# Retain generic type information for use by reflection by converters and adapters.
+-keepattributes Signature
+# Retain declared checked exceptions for use by a Proxy instance.
+-keepattributes Exceptions
+
+-dontwarn com.jcraft.jzlib.**
+-keep class com.jcraft.jzlib.**  { *;}
+
+-dontwarn sun.misc.**
+-keep class sun.misc.** { *;}
+
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *;}
+
+-dontwarn io.reactivex.**
+-keep class io.reactivex.** { *;}
+
+-dontwarn sun.security.**
+-keep class sun.security.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.** { *;}
+
+-keep public class android.net.http.SslError
+-keep public class android.webkit.WebViewClient
+
+-dontwarn android.webkit.WebView
+-dontwarn android.net.http.SslError
+-dontwarn android.webkit.WebViewClient
+
+-dontwarn android.support.**
+
+-dontwarn org.apache.**
+-keep class org.apache.** { *;}
+
+-dontwarn okhttp3.**
+-keep class okhttp3.** { *;}
+-keep interface okhttp3.** { *; }
+
+-dontwarn okio.**
+-keep class okio.** { *;}
+
+-keep class **JNI* {*;}
+
+-keep class com.lib.flutter_blue_plus.* { *; }
+
+-ignorewarnings
+-keepattributes *Annotation*
+-keepattributes Exceptions
+-keepattributes InnerClasses
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keep class com.huawei.hianalytics.**{*;}
+-keep class com.huawei.updatesdk.**{*;}
+-keep class com.huawei.hms.**{*;}
+
+
+-keep public class * extends android.app.Service
+-keep class com.heytap.msp.** { *;}
+
+-dontwarn com.vivo.push.**
+-keep class com.vivo.push.**{*; }
+-keep class com.vivo.vms.**{*; }
+
+
+-dontoptimize
+-dontpreverify
+-dontwarn cn.jpush.**
+-keep class cn.jpush.** { *; }
+-keep class * extends cn.jpush.android.service.JPushMessageService { *; }
+-dontwarn cn.jiguang.**
+-keep class cn.jiguang.** { *; }
+
+-dontwarn com.google.**
+-keep class com.google.gson.** {*;}
+-keep class com.google.protobuf.** {*;}
+
+-keep class com.amap.api.maps.** { *; }
+-keep class com.autonavi.** { *; }
+-keep class com.amap.api.trace.** {*; }
+
+-keep class com.amap.api.location.** {*; }
+-keep class com.amap.api.fence.** { *; }
+-keep class com.loc.** { *; }
+-keep class com.amap.flutter.location.** { *; }
+-keep class com.autonavi.aps.amapapi.model.** { *; }
+
+-keep class com.amap.api.services.** { *; }
+
+-keep class com.amap.api.maps2d.** { *; }
+-keep class com.amap.api.mapcore2d.** { *; }
+
+-keep class com.amap.api.navi.** { *; }
+
+
+-keep class com.alipay.deviceid.** { *; }
+-keep class net.security.device.api.** {*;}
+-keep class org.json.** { *;}
+-keep class com.alibaba.fastjson.** {*;}
+-keep class com.alibaba.sdk.android.oss.** { *; }
+
+-dontwarn okio.**
+-dontwarn org.apache.commons.codec.binary.**
+
+-keepclassmembers,allowobfuscation class * {
+@com.alibaba.fastjson.annotation.JSONField <fields>;
+}
+
+-keep class com.tencent.mm.sdk.** { *; }
+-keep class com.tencent.mm.opensdk.** { *; }

android/app/src/main/AndroidManifest.xml

@@ -56,8 +56,6 @@
         android:name="android.permission.QUERY_ALL_PACKAGES"
         tools:node="remove" />
 
-    <uses-permission android:name="com.hihonor.permission.sec.SDK_LAUNCHER" />
-
     <application
         android:name="android.app.Application"
         android:icon="@mipmap/ic_launcher"
@@ -99,29 +97,9 @@
             android:name="OPPO_APPSECRET"
             android:value="OP-05723986bba64183a71530b496922450" />
 
-
-        <meta-data
-            android:name="com.huawei.hms.client.appid"
-            android:value="110798531" />
-        <meta-data
-            android:name="com.huawei.hms.client.cpid"
-            android:value="1406555529261648640" />
-        <meta-data
-            android:name="OPPO_APPKEY"
-            android:value="OP-47f668c9943248118502aa58d066393b" />
-
-        <meta-data
-            android:name="OPPO_APPID"
-            android:value="OP-31726001" />
-
-        <meta-data
-            android:name="OPPO_APPSECRET"
-            android:value="OP-05723986bba64183a71530b496922450" />
-
-
         <service
-            android:name="com.huawei.hms.push.HmsMessageService"
+                android:name="com.huawei.hms.push.HmsMessageService"
-            android:exported="true">
+                android:exported="true">
             <intent-filter>
                 <action android:name="com.huawei.push.action.MESSAGING_EVENT" />
             </intent-filter>
@@ -129,8 +107,8 @@
 
 
         <receiver
-            android:name="com.huawei.hms.support.api.push.PushReceiver"
+                android:name="com.huawei.hms.support.api.push.PushReceiver"
-            android:exported="true">
+                android:exported="true">
             <intent-filter>
                 <action android:name="com.huawei.android.push.intent.REGISTRATION" />
                 <action android:name="com.huawei.android.push.intent.RECEIVE" />

android/app/src/sky/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"30086000752967166",
+		"product_id":"388421841222116270",
+		"client_id":"1406555529261648640",
+		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
+		"project_id":"388421841222116270",
+		"app_id":"110798531",
+		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"package_name":"com.skychip.lock"
+	},
+	"oauth_client":{
+		"client_id":"110798531",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"110798531",
+		"package_name":"com.skychip.lock"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.skychip.lock",
+			"client":{
+				"app_id":"110798531"
+			},
+			"app_info":{
+				"package_name":"com.skychip.lock",
+				"app_id":"110798531"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"110798531"
+			}
+		}
+	]
+}

android/app/src/sky_dev/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"30086000752967166",
+		"product_id":"388421841222116270",
+		"client_id":"1406555529261648640",
+		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
+		"project_id":"388421841222116270",
+		"app_id":"110798531",
+		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"package_name":"com.skychip.lock.dev"
+	},
+	"oauth_client":{
+		"client_id":"110798531",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"110798531",
+		"package_name":"com.skychip.lock.dev"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.skychip.lock.dev",
+			"client":{
+				"app_id":"110798531"
+			},
+			"app_info":{
+				"package_name":"com.skychip.lock.dev",
+				"app_id":"110798531"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"110798531"
+			}
+		}
+	]
+}

android/app/src/sky_pre/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"30086000752967166",
+		"product_id":"388421841222116270",
+		"client_id":"1406555529261648640",
+		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
+		"project_id":"388421841222116270",
+		"app_id":"110798531",
+		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"package_name":"com.skychip.lock.pre"
+	},
+	"oauth_client":{
+		"client_id":"110798531",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"110798531",
+		"package_name":"com.skychip.lock.pre"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.skychip.lock.pre",
+			"client":{
+				"app_id":"110798531"
+			},
+			"app_info":{
+				"package_name":"com.skychip.lock.pre",
+				"app_id":"110798531"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"110798531"
+			}
+		}
+	]
+}

android/app/src/xhj_dev/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"30086000752967166",
+		"product_id":"388421841222116270",
+		"client_id":"1406555529261648640",
+		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
+		"project_id":"388421841222116270",
+		"app_id":"110798531",
+		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"package_name":"com.xhjcn.lock.dev"
+	},
+	"oauth_client":{
+		"client_id":"110798531",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"110798531",
+		"package_name":"com.xhjcn.lock.dev"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.xhjcn.lock.dev",
+			"client":{
+				"app_id":"110798531"
+			},
+			"app_info":{
+				"package_name":"com.xhjcn.lock.dev",
+				"app_id":"110798531"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"110798531"
+			}
+		}
+	]
+}

android/app/src/xhj_pre/agconnect-services.json

@@ -0,0 +1,96 @@
+{
+	"agcgw":{
+		"backurl":"connect-drcn.hispace.hicloud.com",
+		"url":"connect-drcn.dbankcloud.cn",
+		"websocketbackurl":"connect-ws-drcn.hispace.dbankcloud.com",
+		"websocketurl":"connect-ws-drcn.hispace.dbankcloud.cn"
+	},
+	"agcgw_all":{
+		"CN":"connect-drcn.dbankcloud.cn",
+		"CN_back":"connect-drcn.hispace.hicloud.com",
+		"DE":"connect-dre.dbankcloud.cn",
+		"DE_back":"connect-dre.hispace.hicloud.com",
+		"RU":"connect-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-drru.hispace.dbankcloud.cn",
+		"SG":"connect-dra.dbankcloud.cn",
+		"SG_back":"connect-dra.hispace.hicloud.com"
+	},
+	"websocketgw_all":{
+		"CN":"connect-ws-drcn.hispace.dbankcloud.cn",
+		"CN_back":"connect-ws-drcn.hispace.dbankcloud.com",
+		"DE":"connect-ws-dre.hispace.dbankcloud.cn",
+		"DE_back":"connect-ws-dre.hispace.dbankcloud.com",
+		"RU":"connect-ws-drru.hispace.dbankcloud.ru",
+		"RU_back":"connect-ws-drru.hispace.dbankcloud.cn",
+		"SG":"connect-ws-dra.hispace.dbankcloud.cn",
+		"SG_back":"connect-ws-dra.hispace.dbankcloud.com"
+	},
+	"client":{
+		"cp_id":"30086000752967166",
+		"product_id":"388421841222116270",
+		"client_id":"1406555529261648640",
+		"client_secret":"843E8191B02B692239726CF0ED990E1EC2B31928F825AA012B932A128FD2C516",
+		"project_id":"388421841222116270",
+		"app_id":"110798531",
+		"api_key":"DQEDAALnPCtuCgoYOyZfsIDa9/YZZhQ+buDGpypeurXhQUGMajWcVyYLQgXXqV3x2HbI6oyG+Wm2Gf+1hPs6j+wA3B6ylYAXG4aAQA==",
+		"package_name":"com.xhjcn.lock.pre"
+	},
+	"oauth_client":{
+		"client_id":"110798531",
+		"client_type":1
+	},
+	"app_info":{
+		"app_id":"110798531",
+		"package_name":"com.xhjcn.lock.pre"
+	},
+	"service":{
+		"analytics":{
+			"collector_url":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"collector_url_ru":"datacollector-drru.dt.dbankcloud.ru,datacollector-drru.dt.hicloud.com",
+			"collector_url_sg":"datacollector-dra.dt.hicloud.com,datacollector-dra.dt.dbankcloud.cn",
+			"collector_url_de":"datacollector-dre.dt.hicloud.com,datacollector-dre.dt.dbankcloud.cn",
+			"collector_url_cn":"datacollector-drcn.dt.hicloud.com,datacollector-drcn.dt.dbankcloud.cn",
+			"resource_id":"p1",
+			"channel_id":""
+		},
+		"edukit":{
+			"edu_url":"edukit.cloud.huawei.com.cn",
+			"dh_url":"edukit.cloud.huawei.com.cn"
+		},
+		"search":{
+			"url":"https://search-drcn.cloud.huawei.com"
+		},
+		"cloudstorage":{
+			"storage_url_sg_back":"https://agc-storage-dra.cloud.huawei.asia",
+			"storage_url_ru_back":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_ru":"https://agc-storage-drru.cloud.huawei.ru",
+			"storage_url_de_back":"https://agc-storage-dre.cloud.huawei.eu",
+			"storage_url_de":"https://ops-dre.agcstorage.link",
+			"storage_url":"https://agc-storage-drcn.platform.dbankcloud.cn",
+			"storage_url_sg":"https://ops-dra.agcstorage.link",
+			"storage_url_cn_back":"https://agc-storage-drcn.cloud.huawei.com.cn",
+			"storage_url_cn":"https://agc-storage-drcn.platform.dbankcloud.cn"
+		},
+		"ml":{
+			"mlservice_url":"ml-api-drcn.ai.dbankcloud.com,ml-api-drcn.ai.dbankcloud.cn"
+		}
+	},
+	"region":"CN",
+	"configuration_version":"3.0",
+	"appInfos":[
+		{
+			"package_name":"com.xhjcn.lock.pre",
+			"client":{
+				"app_id":"110798531"
+			},
+			"app_info":{
+				"package_name":"com.xhjcn.lock.pre",
+				"app_id":"110798531"
+			},
+			"oauth_client":{
+				"client_type":1,
+				"client_id":"110798531"
+			}
+		}
+	]
+}

android/build.gradle

@@ -21,7 +21,8 @@ buildscript {
         // hms，若不集成华为厂商通道，可直接跳过
         classpath 'com.huawei.agconnect:agcp:1.6.0.300'
         // 垃圾代码生成器
-        classpath "com.github.qq549631030:android-junk-code:1.3.3"
+//        classpath "com.github.qq549631030:android-junk-code:1.3.3"
+        classpath'com.tencent.mm:AndResGuard-gradle-plugin:1.2.21'
     }
 
 }

android/build.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+echo "Build Params Info:Build Dir:$CI_PROJECT_DIR,Build Tag:$CI_COMMIT_TAG,Build Branch:$CI_COMMIT_BRANCH,Build BUILD_REVISION:$CI_RUNNER_REVISION"
+
+export ENV_BUILD_TAG=${CI_COMMIT_TAG}
+export ENV_BUILD_BRANCH=${CI_COMMIT_BRANCH}
+export ENV_BUILD_WORKSPACE=${CI_PROJECT_DIR}
+echo "GITLAB_WORKSPACE: ${CI_PROJECT_DIR}"
+cd ${CI_PROJECT_DIR}/android
+echo "ENV_BUILD_TAG:${ENV_BUILD_TAG},ENV_BUILD_BRANCH:${ENV_BUILD_BRANCH}"
+regex='^v[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z]+\.[0-9]+)?$'
+if [[ "${ENV_BUILD_BRANCH}" == "canary_release" ]]; then
+    echo "===build canary_release: ${NEXT_VERSION}"
+    export ENV_BUILD_TAG=${NEXT_VERSION}
+    bundle exec fastlane release flavor:xhj --verbose
+    bundle exec fastlane release flavor:sky --verbose
+elif [[ $ENV_BUILD_TAG =~ $regex ]]; then
+    echo "===build release===$ENV_BUILD_TAG"
+    bundle exec fastlane release flavor:xhj --verbose
+    bundle exec fastlane release flavor:sky --verbose
+elif [[ "${ENV_BUILD_BRANCH}" == "develop" ]]; then
+    echo "===build dev===${NEXT_VERSION}"
+    bundle exec fastlane beta flavor:xhj env:dev --verbose
+    bundle exec fastlane beta flavor:sky env:dev --verbose
+elif [[ "${ENV_BUILD_BRANCH}" == "release" ]] || [[ "${ENV_BUILD_BRANCH}" == "feat_devops" ]] ; then
+    echo "===build pre===${NEXT_VERSION}"
+    bundle exec fastlane beta flavor:xhj env:pre --verbose
+    bundle exec fastlane beta flavor:sky env:pre --verbose
+fi
+exit 0

android/fastlane/Appfile

@@ -0,0 +1,2 @@
+json_key_file("") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("") # e.g. com.krausefx.app

android/fastlane/Fastfile

@@ -0,0 +1,125 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+#     https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+#     https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+$env_key_project_root = 'ENV_BUILD_WORKSPACE'
+$env_current_branch = 'ENV_BUILD_BRANCH'
+$env_current_tag = 'ENV_BUILD_TAG'
+$env_next_version = 'NEXT_VERSION'
+
+$path_dir_build = File.join(ENV[$env_key_project_root],'')
+$current_branch = ENV[$env_current_branch]
+$current_tag = ENV[$env_current_tag]
+$next_version = ENV[$env_next_version]
+
+$path_apk_output_dir = File.join($path_dir_build, 'build/app/outputs/flutter-apk')
+$path_bundle_output_dir = File.join($path_dir_build, 'build/app/outputs/bundle')
+
+
+def print_header header
+    UI.message "~~~~~~~~~~~~~~~~~~~~~~"
+    UI.message '📍 ' + header.to_s
+    UI.message "~~~~~~~~~~~~~~~~~~~~~~"
+end
+
+def print_log(content)
+    UI.message '📠 ' + content.to_s
+end
+
+platform :android do
+  before_all do
+    print_header '🏁 Before All'
+    print_log $current_branch
+    print_log $current_tag
+    print_log $path_file_preview_apk_default
+    print_log $path_file_release_apk_default
+    print_log $path_file_preview_apk_copy
+    print_log $path_file_release_apk_copy
+    Dir.chdir "../.." do
+        sh('pwd')
+    end
+  end
+
+  desc "Submit a new Beta Build to Pgy Beta"
+  lane :beta do |options|
+    flavor = options[:flavor]
+    env = options[:env]
+    UI.user_error!("flavor is required") unless flavor
+    UI.user_error!("env is required") unless env
+    print_log "build #{flavor} on #{env}"
+    build_number = Time.now.strftime("%Y%m%d%H")
+    print_log "BuildNo #{build_number}"
+    build_version = $next_version
+    print_log "build_version #{build_version}"
+    commit_hash = last_git_commit
+    short_hash = commit_hash[:abbreviated_commit_hash]
+    print_log "last_git_commit_short_hash #{short_hash}"
+    Dir.chdir "../.." do
+       sh("flutter", "build", "apk", "--no-tree-shake-icons", "--release", "--flavor", "#{flavor}_#{env}", "-t", "lib/main_#{flavor}_#{env}.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
+    end
+    old_file_path = File.join($path_apk_output_dir, "app-#{flavor}_#{env}-release.apk")
+    new_file_path = File.join($path_apk_output_dir, "starlock-#{flavor}-preview-#{build_version}.apk")
+    File.rename(old_file_path, new_file_path)
+    logs = changelog_from_git_commits(
+      pretty: '- %s (%cn)',
+      commits_count: 5,
+      merge_commit_filtering: 'exclude_merges'
+    )
+    upload_file_to_pgy(directory:$path_apk_output_dir,file_extension:".apk",logs:logs)
+  end
+
+  desc "Build & upload a new version to Gitlab Release"
+  lane :release do |options|
+    flavor = options[:flavor]
+    UI.user_error!("flavor is required") unless flavor
+    print_log "build flavor for: #{flavor}"
+    build_number = Time.now.strftime("%Y%m%d%H")
+    print_log "BuildNo #{build_number}"
+    build_version = $current_tag.match(/^v(\d+\.\d+\.\d+)/).captures[0]
+    print_log "buildVersion #{build_version}"
+    commit_hash = last_git_commit
+    short_hash = commit_hash[:abbreviated_commit_hash]
+    print_log "last_git_commit_short_hash #{short_hash}"
+    Dir.chdir "../.." do
+        sh("flutter", "build", "apk", "--no-tree-shake-icons", "--release", "--flavor", "#{flavor}", "-t", "lib/main_#{flavor}_lite.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
+    end
+    old_apk_file_path = File.join($path_apk_output_dir, "app-#{flavor}-release.apk")
+    new_apk_file_path = File.join($path_apk_output_dir, "starlock-#{flavor}-release-"+$current_tag+".apk")
+    File.rename(old_apk_file_path, new_apk_file_path)
+    Dir.chdir "../.." do
+        sh("flutter", "build", "appbundle", "--no-tree-shake-icons", "--release", "--flavor", "#{flavor}", "-t", "lib/main_#{flavor}_lite.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")
+    end
+    old_bundle_file_path = File.join($path_bundle_output_dir , "/#{flavor}Release/app-#{flavor}-release.aab")
+    new_bundle_file_path = File.join($path_bundle_output_dir , "/#{flavor}Release/starlock-#{flavor}-release-"+$current_tag+".aab")
+    File.rename(old_bundle_file_path, new_bundle_file_path)
+    sh('cp',new_bundle_file_path,$path_apk_output_dir)
+  end
+
+  lane :upload_file_to_pgy do |options|
+    directory = options[:directory]
+    file_extension = options[:file_extension]
+    logs = options[:logs]
+    UI.user_error!("Directory path is required") unless directory
+    UI.user_error!("File extension is required") unless file_extension
+    # 使用Dir.glob来查找目录下的所有.apk和.ipa文件
+    Dir.glob("#{directory}/*#{file_extension}").each do |file|
+      # 打印文件名称
+      puts "start upload file: #{file}"
+      pgyer(api_key: ENV['PGY_API_KEY'],apk:file,update_description: logs)
+      File.delete(file)
+    end
+  end
+end

android/fastlane/Pluginfile

@@ -0,0 +1,5 @@
+# Autogenerated by fastlane
+#
+# Ensure this file is checked in to source control!
+
+gem 'fastlane-plugin-pgyer'

android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
+android.enableJetifier=false
+android.enableR8 = true

ios/.gitignore

@@ -7,6 +7,7 @@
 **/*sync/
 .sconsign.dblite
 .tags*
+.DS_Store
 **/.vagrant/
 **/DerivedData/
 Icon?

ios/Flutter/localDebug.xcconfig

@@ -0,0 +1,6 @@
+#include "Generated.xcconfig"
+
+FLUTTER_TARGET=lib/main_local.dart
+ASSET_PREFIX=local
+BUNDLE_NAME=星锁-local
+BUNDLE_DISPLAY_NAME=星锁-local

ios/Flutter/skyDevRelease.xcconfig

@@ -0,0 +1,6 @@
+#include "Generated.xcconfig"
+
+FLUTTER_TARGET=lib/main_sky_dev.dart
+ASSET_PREFIX=sky
+BUNDLE_NAME=锁通通-D
+BUNDLE_DISPLAY_NAME=锁通通-D

ios/Flutter/skyPreviewRelease.xcconfig

@@ -0,0 +1,6 @@
+#include "Generated.xcconfig"
+
+FLUTTER_TARGET=lib/main_sky_pre.dart
+ASSET_PREFIX=sky
+BUNDLE_NAME=锁通通-P
+BUNDLE_DISPLAY_NAME=锁通通-P

ios/Flutter/skyRelease.xcconfig

@@ -1,6 +1,6 @@
 #include "Generated.xcconfig"
 
-FLUTTER_TARGET=lib/main_sky_full.dart
+FLUTTER_TARGET=lib/main_sky_lite.dart
 ASSET_PREFIX=sky
 BUNDLE_NAME=锁通通
 BUNDLE_DISPLAY_NAME=锁通通

ios/Flutter/xhjDevRelease.xcconfig

@@ -0,0 +1,6 @@
+#include "Generated.xcconfig"
+
+FLUTTER_TARGET=lib/main_xhj_dev.dart
+ASSET_PREFIX=xhj
+BUNDLE_NAME=星星锁-D
+BUNDLE_DISPLAY_NAME=星星锁-D

ios/Flutter/xhjPreviewRelease.xcconfig

@@ -0,0 +1,6 @@
+#include "Generated.xcconfig"
+
+FLUTTER_TARGET=lib/main_xhj_pre.dart
+ASSET_PREFIX=xhj
+BUNDLE_NAME=星星锁-P
+BUNDLE_DISPLAY_NAME=星星锁-P

ios/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "fastlane"
+gem 'cocoapods', '1.14.3'
+gem 'public_suffix', '~> 4.0'
+plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
+eval_gemfile(plugins_path) if File.exist?(plugins_path)

ios/Gemfile.lock

@@ -0,0 +1,288 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    CFPropertyList (3.0.7)
+      base64
+      nkf
+      rexml
+    activesupport (6.1.7.8)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    algoliasearch (1.27.5)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    artifactory (3.0.17)
+    atomos (0.1.3)
+    aws-eventstream (1.3.0)
+    aws-partitions (1.979.0)
+    aws-sdk-core (3.209.1)
+      aws-eventstream (~> 1, >= 1.3.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.9)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.94.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.166.0)
+      aws-sdk-core (~> 3, >= 3.207.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.10.0)
+      aws-eventstream (~> 1, >= 1.0.2)
+    babosa (1.0.4)
+    base64 (0.2.0)
+    claide (1.1.0)
+    cocoapods (1.14.3)
+      addressable (~> 2.8)
+      claide (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.14.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
+      cocoapods-plugins (>= 1.0.0, < 2.0)
+      cocoapods-search (>= 1.0.0, < 2.0)
+      cocoapods-trunk (>= 1.6.0, < 2.0)
+      cocoapods-try (>= 1.1.0, < 2.0)
+      colored2 (~> 3.1)
+      escape (~> 0.0.4)
+      fourflusher (>= 2.3.0, < 3.0)
+      gh_inspector (~> 1.0)
+      molinillo (~> 0.8.0)
+      nap (~> 1.0)
+      ruby-macho (>= 2.3.0, < 3.0)
+      xcodeproj (>= 1.23.0, < 2.0)
+    cocoapods-core (1.14.3)
+      activesupport (>= 5.0, < 8)
+      addressable (~> 2.8)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
+      fuzzy_match (~> 2.0.4)
+      nap (~> 1.0)
+      netrc (~> 0.11)
+      public_suffix (~> 4.0)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.5)
+    cocoapods-downloader (2.1)
+    cocoapods-plugins (1.0.0)
+      nap
+    cocoapods-search (1.0.1)
+    cocoapods-trunk (1.6.0)
+      nap (>= 0.8, < 2.0)
+      netrc (~> 0.11)
+    cocoapods-try (1.2.0)
+    colored (1.2)
+    colored2 (3.1.2)
+    commander (4.6.0)
+      highline (~> 2.0.0)
+    concurrent-ruby (1.3.4)
+    declarative (0.0.20)
+    digest-crc (0.6.5)
+      rake (>= 12.0.0, < 14.0.0)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
+    dotenv (2.8.1)
+    emoji_regex (3.2.3)
+    escape (0.0.4)
+    ethon (0.16.0)
+      ffi (>= 1.15.0)
+    excon (0.109.0)
+    faraday (1.10.4)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-cookie_jar (0.0.7)
+      faraday (>= 0.8.0)
+      http-cookie (~> 1.0.0)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.4)
+      multipart-post (~> 2)
+    faraday-net_http (1.0.2)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    faraday_middleware (1.2.1)
+      faraday (~> 1.0)
+    fastimage (2.3.1)
+    fastlane (2.222.0)
+      CFPropertyList (>= 2.3, < 4.0.0)
+      addressable (>= 2.8, < 3.0.0)
+      artifactory (~> 3.0)
+      aws-sdk-s3 (~> 1.0)
+      babosa (>= 1.0.3, < 2.0.0)
+      bundler (>= 1.12.0, < 3.0.0)
+      colored (~> 1.2)
+      commander (~> 4.6)
+      dotenv (>= 2.1.1, < 3.0.0)
+      emoji_regex (>= 0.1, < 4.0)
+      excon (>= 0.71.0, < 1.0.0)
+      faraday (~> 1.0)
+      faraday-cookie_jar (~> 0.0.6)
+      faraday_middleware (~> 1.0)
+      fastimage (>= 2.1.0, < 3.0.0)
+      gh_inspector (>= 1.1.2, < 2.0.0)
+      google-apis-androidpublisher_v3 (~> 0.3)
+      google-apis-playcustomapp_v1 (~> 0.1)
+      google-cloud-env (>= 1.6.0, < 2.0.0)
+      google-cloud-storage (~> 1.31)
+      highline (~> 2.0)
+      http-cookie (~> 1.0.5)
+      json (< 3.0.0)
+      jwt (>= 2.1.0, < 3)
+      mini_magick (>= 4.9.4, < 5.0.0)
+      multipart-post (>= 2.0.0, < 3.0.0)
+      naturally (~> 2.2)
+      optparse (>= 0.1.1, < 1.0.0)
+      plist (>= 3.1.0, < 4.0.0)
+      rubyzip (>= 2.0.0, < 3.0.0)
+      security (= 0.1.5)
+      simctl (~> 1.6.3)
+      terminal-notifier (>= 2.0.0, < 3.0.0)
+      terminal-table (~> 3)
+      tty-screen (>= 0.6.3, < 1.0.0)
+      tty-spinner (>= 0.8.0, < 1.0.0)
+      word_wrap (~> 1.0.0)
+      xcodeproj (>= 1.13.0, < 2.0.0)
+      xcpretty (~> 0.3.0)
+      xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
+    fastlane-plugin-pgyer (0.2.9)
+    ffi (1.17.0)
+    fourflusher (2.3.1)
+    fuzzy_match (2.0.4)
+    gh_inspector (1.1.3)
+    google-apis-androidpublisher_v3 (0.54.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-core (0.11.3)
+      addressable (~> 2.5, >= 2.5.1)
+      googleauth (>= 0.16.2, < 2.a)
+      httpclient (>= 2.8.1, < 3.a)
+      mini_mime (~> 1.0)
+      representable (~> 3.0)
+      retriable (>= 2.0, < 4.a)
+      rexml
+    google-apis-iamcredentials_v1 (0.17.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-playcustomapp_v1 (0.13.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-apis-storage_v1 (0.29.0)
+      google-apis-core (>= 0.11.0, < 2.a)
+    google-cloud-core (1.6.1)
+      google-cloud-env (>= 1.0, < 3.a)
+      google-cloud-errors (~> 1.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
+    google-cloud-storage (1.45.0)
+      addressable (~> 2.8)
+      digest-crc (~> 0.4)
+      google-apis-iamcredentials_v1 (~> 0.1)
+      google-apis-storage_v1 (~> 0.29.0)
+      google-cloud-core (~> 1.6)
+      googleauth (>= 0.16.2, < 2.a)
+      mini_mime (~> 1.0)
+    googleauth (1.8.1)
+      faraday (>= 0.17.3, < 3.a)
+      jwt (>= 1.4, < 3.0)
+      multi_json (~> 1.11)
+      os (>= 0.9, < 2.0)
+      signet (>= 0.16, < 2.a)
+    highline (2.0.3)
+    http-cookie (1.0.7)
+      domain_name (~> 0.5)
+    httpclient (2.8.3)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    jmespath (1.6.2)
+    json (2.7.2)
+    jwt (2.9.1)
+      base64
+    mini_magick (4.13.2)
+    mini_mime (1.1.5)
+    minitest (5.25.1)
+    molinillo (0.8.0)
+    multi_json (1.15.0)
+    multipart-post (2.4.1)
+    nanaimo (0.3.0)
+    nap (1.1.0)
+    naturally (2.2.1)
+    netrc (0.11.0)
+    nkf (0.2.0)
+    optparse (0.5.0)
+    os (1.1.4)
+    plist (3.7.1)
+    public_suffix (4.0.7)
+    rake (13.2.1)
+    representable (3.2.0)
+      declarative (< 0.1.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
+      uber (< 0.2.0)
+    retriable (3.1.2)
+    rexml (3.3.7)
+    rouge (2.0.7)
+    ruby-macho (2.5.1)
+    ruby2_keywords (0.0.5)
+    rubyzip (2.3.2)
+    security (0.1.5)
+    signet (0.18.0)
+      addressable (~> 2.8)
+      faraday (>= 0.17.5, < 3.a)
+      jwt (>= 1.5, < 3.0)
+      multi_json (~> 1.10)
+    simctl (1.6.10)
+      CFPropertyList
+      naturally
+    terminal-notifier (2.0.0)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    trailblazer-option (0.1.2)
+    tty-cursor (0.7.1)
+    tty-screen (0.8.2)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
+    typhoeus (1.4.1)
+      ethon (>= 0.9.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uber (0.1.0)
+    unf (0.2.0)
+    unicode-display_width (2.6.0)
+    word_wrap (1.0.0)
+    xcodeproj (1.25.0)
+      CFPropertyList (>= 2.3.3, < 4.0)
+      atomos (~> 0.1.3)
+      claide (>= 1.0.2, < 2.0)
+      colored2 (~> 3.1)
+      nanaimo (~> 0.3.0)
+      rexml (>= 3.3.2, < 4.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.1)
+      xcpretty (~> 0.2, >= 0.0.7)
+    zeitwerk (2.6.18)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods (= 1.14.3)
+  fastlane
+  fastlane-plugin-pgyer
+  public_suffix (~> 4.0)
+
+BUNDLED WITH
+   1.17.2

ios/Podfile.lock

@@ -80,8 +80,8 @@ PODS:
   - Flutter (1.0.0)
   - flutter_blue_plus (0.0.1):
     - Flutter
-  - flutter_bugly_plugin (0.0.1):
+  - flutter_bugly (0.0.1):
-    - Bugly
+    - Bugly (= 2.6.1)
     - Flutter
   - flutter_local_notifications (0.0.1):
     - Flutter
@@ -173,7 +173,7 @@ DEPENDENCIES:
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
   - Flutter (from `Flutter`)
   - flutter_blue_plus (from `.symlinks/plugins/flutter_blue_plus/ios`)
-  - flutter_bugly_plugin (from `.symlinks/plugins/flutter_bugly_plugin/ios`)
+  - flutter_bugly (from `.symlinks/plugins/flutter_bugly/ios`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
   - flutter_native_contact_picker (from `.symlinks/plugins/flutter_native_contact_picker/ios`)
   - flutter_pcm_sound (from `.symlinks/plugins/flutter_pcm_sound/ios`)
@@ -252,8 +252,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_blue_plus:
     :path: ".symlinks/plugins/flutter_blue_plus/ios"
-  flutter_bugly_plugin:
+  flutter_bugly:
-    :path: ".symlinks/plugins/flutter_bugly_plugin/ios"
+    :path: ".symlinks/plugins/flutter_bugly/ios"
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
   flutter_native_contact_picker:
@@ -326,7 +326,7 @@ SPEC CHECKSUMS:
   file_picker: ce3938a0df3cc1ef404671531facef740d03f920
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96
-  flutter_bugly_plugin: d2db6d6641938269fa538575126e8ff530ee02c7
+  flutter_bugly: bf35df32a9c5d50b8aacdd35bd8ddc5b55150dae
   flutter_local_notifications: 4cde75091f6327eb8517fa068a0a5950212d2086
   flutter_native_contact_picker: bd430ba0fbf82768bb50c2c52a69a65759a8f907
   flutter_pcm_sound: de0572ca4f99091cc2abfcc31601b8a4ddd33c0e

ios/Runner.xcodeproj/xcshareddata/xcschemes/dev.xcscheme

@@ -24,7 +24,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release-dev"
+      buildConfiguration = "Debug-local"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

ios/Runner.xcodeproj/xcshareddata/xcschemes/local.xcscheme

@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Release-dev"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug-local"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release-dev"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "97C146ED1CF9000F007C117D"
+            BuildableName = "Runner.app"
+            BlueprintName = "Runner"
+            ReferencedContainer = "container:Runner.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Release-dev">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release-dev"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>PreviewsEnabled</key>
-	<false/>
-</dict>
-</plist>

ios/Runner/AppDelegate.m

@@ -19,20 +19,6 @@
 - (BOOL)application:(UIApplication *)application
     didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
     
-//    //【注册通知】通知回调代理（可选）
-//      JPUSHRegisterEntity * entity = [[JPUSHRegisterEntity alloc] init];
-//    entity.types = JPAuthorizationOptionAlert|JPAuthorizationOptionBadge|JPAuthorizationOptionSound|JPAuthorizationOptionProvidesAppNotificationSettings;
-//    [JPUSHService registerForRemoteNotificationConfig:entity delegate:self];
-//
-//    //【初始化sdk】
-//    // notice: 2.1.5 版本的 SDK 新增的注册方法，改成可上报 IDFA，如果没有使用 IDFA 直接传 nil
-//    [JPUSHService setupWithOption:launchOptions appKey:@"7ff37d174c1a568a89e98dad"
-//                          channel:@"flutter_channel"
-//                 apsForProduction:NO
-//            advertisingIdentifier:nil];
-
-//    [self initCloudPush];
-//    [CloudPushSDK sendNotificationAck:launchOptions];
     XSFlutterManager *VC = [[XSFlutterManager alloc] init];
     self.window.rootViewController = VC;
     [self.window makeKeyAndVisible];
@@ -50,16 +36,6 @@
 }
 
 
-- (void)initCloudPush {
-    // SDK初始化
-    [CloudPushSDK asyncInit:@"334068745" appSecret:@"bee9c200835e4951a85dc8709c319560" callback:^(CloudPushCallbackResult *res) {
-        if (res.success) {
-            NSLog(@"Push SDK init success, deviceId: %@.", [CloudPushSDK getDeviceId]);
-        } else {
-            NSLog(@"Push SDK init failed, error: %@", res.error);
-        }
-    }];
-}
 
 /**
  *    注册苹果推送，获取deviceToken用于推送
@@ -85,13 +61,7 @@
  *  苹果推送注册成功回调，将苹果返回的deviceToken上传到CloudPush服务器
  */
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-//    [CloudPushSDK registerDevice:deviceToken withCallback:^(CloudPushCallbackResult *res) {
+
-//        if (res.success) {
-//            NSLog(@"Register deviceToken success.");
-//        } else {
-//            NSLog(@"Register deviceToken failed, error: %@", res.error);
-//        }
-//    }];
     //sdk注册DeviceToken
     [JPUSHService registerDeviceToken:deviceToken];
 
@@ -124,28 +94,6 @@
     NSLog(@"Receive message title: %@, content: %@.", title, body);
 }
 
-/*
- *  App处于启动状态时，通知打开回调
- */
-//- (void)application:(UIApplication*)application didReceiveRemoteNotification:(NSDictionary*)userInfo {
-//    NSLog(@"Receive one notification.");
-     // 取得APNS通知内容
-//     NSDictionary *aps = [userInfo valueForKey:@"aps"];
-//     // 内容
-//     NSString *content = [aps valueForKey:@"alert"];
-//     // badge数量
-//     NSInteger badge = [[aps valueForKey:@"badge"] integerValue];
-//     // 播放声音
-//     NSString *sound = [aps valueForKey:@"sound"];
-//     // 取得Extras字段内容
-//     NSString *Extras = [userInfo valueForKey:@"Extras"]; //服务端中Extras字段，key是自己定义的
-//     NSLog(@"content = [%@], badge = [%ld], sound = [%@], Extras = [%@]", content, (long)badge, sound, Extras);
-//     // iOS badge 清0
-//     application.applicationIconBadgeNumber = 0;
-//     // 通知打开回执上报
-//     // [CloudPushSDK handleReceiveRemoteNotification:userInfo];(Deprecated from v1.8.1)
-//     [CloudPushSDK sendNotificationAck:userInfo];
-//}
 
 
 

ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md

@@ -1,5 +0,0 @@
-# Launch Screen Assets
-
-You can customize the launch screen with your own desired assets by replacing the image files in this directory.
-
-You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images.

ios/Runner/Assets.xcassets/localAppIcon.appiconset/Contents.json

@@ -0,0 +1,122 @@
+{
+  "images" : [
+    {
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-20x20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-40x40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-60x60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-App-60x60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "filename" : "Icon-App-20x20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "filename" : "Icon-App-40x40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "Icon-App-76x76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-76x76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "Icon-App-1024x1024@1x.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/Runner/Assets.xcassets/localLaunchImage.imageset/Contents.json

@@ -1,14 +1,17 @@
 {
   "images" : [
     {
+      "filename" : "LaunchImage.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
+      "filename" : "LaunchImage@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
+      "filename" : "LaunchImage@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

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
   }
 }