README.md

@@ -3,8 +3,7 @@
 ## 开发环境
 
 - flutter：3.19.6
-- OpenJdk 17
+
-- Xcode 16.3
 
 ## 目录说明
 
@@ -15,24 +14,16 @@
 - routes：路由
 - views：页面
 
+
 ## 多flavor配置
-
 - 配置文件在[flavorizr.yaml](flavorizr.yaml)
-
 > 增加flavor环境所需要的命令参考：[flavorizr.yaml](flavorizr.yaml)文件中的说明
 > 
 > 文档链接：https://pub.dev/packages/flutter_flavorizr
 > 
 > 注意该插件最好在mac环境下运行
->
-> 确保依赖、环境安装完成之后，执行`flutter pub run flutter_flavorizr`进行生成，注意这一步会覆盖原有的内容
-
-### 生成.jks文件，用于android的flavor签名
 
+- 项目运行
 ```shell
-keytool -genkeypair -v -keystore <文件昵称>.jks -alias <别名> \                        
+flutter run --flavor <flavor昵称>
-  -keyalg RSA -keysize 2048 -validity 10000 \                                            
-  -dname "CN=<通用名，通常是公司或产品名>, OU=<组织单位，如部门名称>, O=<组织/公司全名>, L=深圳, S=广东, C=CN" \
-  -storepass <密码> \                                                              
-  -keypass <密码>   
 ```

android/.gitignore

@@ -8,4 +8,6 @@ GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+key.properties
 **/*.keystore
+**/*.jks

android/app/build.gradle

@@ -30,12 +30,6 @@ def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
-// 获取签名密码
-def keystoreProperties = new Properties()
-def keystorePropertiesFile = rootProject.file('key.properties')
-if (keystorePropertiesFile.exists()) {
-    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-}
 
 // Android配置块
 android {
@@ -81,38 +75,16 @@ android {
         // 设置支持的ABI架构
         ndk {
             // abiFilters "arm64-v8a"
-            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86","x86_64"
-        }
-    }
-
-    // 👇 添加 signingConfigs
-    // 对应flavorizr.gradle中的 signingConfig 属性
-    signingConfigs {
-        debug {
-            // 使用默认 debug 签名（无需配置）
-        }
-        sky {
-            keyAlias keystoreProperties['sky.keyAlias']
-            keyPassword keystoreProperties['sky.keyPassword']
-            storeFile keystoreProperties['sky.storeFile'] ? file(keystoreProperties['sky.storeFile']) : null
-            storePassword keystoreProperties['sky.storePassword']
-        }
-
-        xhj {
-            keyAlias keystoreProperties['xhj.keyAlias']
-            keyPassword keystoreProperties['xhj.keyPassword']
-            storeFile keystoreProperties['xhj.storeFile'] ? file(keystoreProperties['sky.storeFile']) : null
-            storePassword keystoreProperties['xhj.storePassword']
         }
     }
 
     // 构建类型配置
     buildTypes {
-        debug {
+        // 发布版本配置
-            signingConfig signingConfigs.debug
-        }
         release {
-            // release 类型根据 flavor 使用不同签名
+            // 签名配置，使用调试密钥
+            signingConfig signingConfigs.debug
         }
     }
 }

android/app/flavorizr.gradle

@@ -2,17 +2,27 @@ android {
     flavorDimensions += "flavor-type"
 
     productFlavors {
-
+        dev {
+            dimension "flavor-type"
+            applicationId "com.starlock.work.dev"
+            signingConfig signingConfigs.pre
+            resValue "string", "app_name", "星锁-dev"
+        }
+        pre {
+            dimension "flavor-type"
+            applicationId "com.starlock.work.pre"
+            signingConfig signingConfigs.pre
+            resValue "string", "app_name", "星锁"
+        }
         sky {
             dimension "flavor-type"
-            applicationId "top.skychip.work"
+            applicationId "com.skychip.work"
             signingConfig signingConfigs.sky
             resValue "string", "app_name", "星勤-sky"
         }
-
         xhj {
             dimension "flavor-type"
-            applicationId "ltd.xhjcn.work"
+            applicationId "com.xhjcn.work"
             signingConfig signingConfigs.xhj
             resValue "string", "app_name", "星勤-xhj"
         }

android/app/src/main/AndroidManifest.xml

@@ -1,62 +1,19 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-android:enableOnBackInvokedCallback="true"
+  <application android:label="@string/app_name" android:name="${applicationName}" android:icon="@mipmap/ic_launcher">
-    xmlns:tools="http://schemas.android.com/tools">
+    <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
-
-
-
-    <!--允许访问网络，必选权限-->
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- 写权限 -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <!-- 读权限 -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <!--  系统通知  -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    
-    <!-- 蓝牙相关权限 -->
-    <!-- Android 12以下需要的蓝牙权限 -->
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    
-    <!-- Android 12及以上需要的蓝牙权限 -->
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" 
-        android:usesPermissionFlags="neverForLocation" />
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
-    
-    <!-- 位置权限（Android 12以下蓝牙扫描需要） -->
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
-    <application
-        android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name">
-        <activity
-            android:name=".MainActivity"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-            android:exported="true"
-            android:hardwareAccelerated="true"
-            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
-            android:windowSoftInputMode="adjustResize">
       <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
-            <meta-data
+      <meta-data android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme"/>
-                android:name="io.flutter.embedding.android.NormalTheme"
-                android:resource="@style/NormalTheme" />
       <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+        <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER" />
+        <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
     <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-        <meta-data
+    <meta-data android:name="flutterEmbedding" android:value="2"/>
-            android:name="flutterEmbedding"
-            android:value="2" />
   </application>
   <!-- Required to query activities that can process text, see:
          https://developer.android.com/training/package-visibility?hl=en and
@@ -65,8 +22,8 @@ android:enableOnBackInvokedCallback="true"
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
   <queries>
     <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT" />
+      <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain" />
+      <data android:mimeType="text/plain"/>
     </intent>
   </queries>
 </manifest>

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-8.5-all.zip
+distributionUrl=https://mirrors.cloud.tencent.com/gradle/gradle-7.4-all.zip

android/key.properties

@@ -1,10 +0,0 @@
-# sky ????
-sky.storePassword=RHFn9LJcWHFxKmt
-sky.keyPassword=RHFn9LJcWHFxKmt
-sky.keyAlias=sky
-sky.storeFile=sky-release-key.jks
-# xhj ????
-xhj.storePassword=qoQGNcPCD0wtrV8
-xhj.keyPassword=qoQGNcPCD0wtrV8
-xhj.keyAlias=xhj
-xhj.storeFile=xhj-release-key.jks

flavorizr.yaml

@@ -1,25 +1,92 @@
+# 用于编译出不同的APPID
+
+# 生成：意思是将本文件定义的配置，生成对应的代码，或者原生的配置、构建过程、文件资源等
+# 风味用法：dart run flutter_flavorizr -p <processor_1>,<processor_2>
+
+# 以下行为都是覆盖，所以如果不是很清楚自己在做什么，请不要随意运行，以免覆盖有用的文件
+# 安卓图标：dart run flutter_flavorizr -p android:icons
+# 安卓构建参数集配置：dart run flutter_flavorizr -p android:androidManifest
+# 安卓构建目标配置：dart run flutter_flavorizr -p android:buildGradle
+# 用法-生成iOS图标：dart run flutter_flavorizr -p ios:icons
+
+# Scheme 定义了构建目标、测试、运行、调试和分析应用程序的方式。它是Xcode中一个关键的组件，用于配置不同的构建设置和运行环境。
+# 可以有针对不同目的的多个Schemes，例如一个用于调试的Scheme、一个用于发布的Scheme，以及用于不同测试环境的Scheme。
+# 用法 ：dart run flutter_flavorizr -p ios:schema
+
+# XCConfig文件是Xcode配置文件，用于外部化和管理项目的构建设置。通过使用这些文件，可以更容易地管理和共享构建配置。
+# 可以为不同的构建环境（如Debug和Release）或不同的应用flavor配置多个XCConfig文件。
+# 用法：dart run flutter_flavorizr -p ios:xcconfig
+
+# Build Target定义了一个构建过程，它描述了如何编译和链接构建应用程序的源代码。每个Target可以有不同的配置和目的（例如，一个应用程序Target、一个单元测试Target）。
+# 可能包括应用程序本身的Target、测试Target、用于不同flavor的Target，或者针对不同平台（如iOS和macOS）的Target。
+# 用法：dart run flutter_flavorizr -p ios:buildTargets
+
+# Plist文件用于存储应用程序的配置信息，如应用版本号、显示名称等。它是一个XML文件，Xcode在构建应用程序时会读取它
+# 每个Target通常有自己的Info.plist文件，还可能有其他Plist文件来管理不同的配置和设置。
+# 用法：dart run flutter_flavorizr -p ios:plist
+
+# LaunchScreen（启动屏幕）是应用启动时显示的界面，通常包含应用的Logo和名称。它在应用加载期间显示，提供更好的用户体验。
+# 可以针对不同的设备和屏幕尺寸配置多个LaunchScreen，或者为不同的版本或flavor提供不同的启动屏幕。
+# 用法：dart run flutter_flavorizr -p ios:launchScreen
+
+
+# 项目运行说明：添加不同风味后，不能再使用flutter默认的运行方式`flutter run`，而是需要指定运行的风味
+# flutter run --flavor <flavor> -t lib/main_<flavor>.dart
+# 注意，这里有 入口文件(main_<flavor>.dart) 和 口味(<flavor>) 两个参数
+# 其中入口文件在代码中指定运行时的差异，例如 页面上的名称、颜色、API请求的域名等
+# 而 口味 指定 构建差异，例如 APPID、Logo、应用名称等
+# 下面是4个运行示例：
+# flutter run --flavor dev -t lib/main_dev.dart
+# flutter run --flavor pre -t lib/main_pre.dart
+# flutter run --flavor sky -t lib/main_sky_full.dart
+# flutter run --flavor xhj -t lib/main_xhj_full.dart
+
+# 下面是安卓发布编译命令
+# flutter build apk --split-per-abi --release --flavor sky -t lib/main_sky_full.dart
+# flutter build apk --release --flavor sky -t lib/main_sky_full.dart
+
 app:
   android:
     flavorDimensions: "flavor-type"
 flavors:
+  dev:
+    app:
+      name: "星勤-dev"
+      icon: "assets/logo/dev.png"
+    android:
+      applicationId: "com.starlock.work.dev"
+      customConfig:
+        signingConfig: signingConfigs.pre
+    ios:
+      bundleId: "com.starlock.work.dev"
+  pre:
+    app:
+      name: "星勤-pre"
+      icon: "assets/logo/pre.png"
+    android:
+      applicationId: "com.starlock.work.pre"
+      customConfig:
+        signingConfig: signingConfigs.pre
+    ios:
+      bundleId: "com.starlock.work.pre"
   sky:
     app:
       name: "星勤-sky"
       icon: "assets/logo/sky.png"
     android:
-      applicationId: "top.skychip.work"
+      applicationId: "com.skychip.work"
       customConfig:
         signingConfig: signingConfigs.sky
     ios:
-      bundleId: "top.skychip.work"
+      bundleId: "com.skychip.work"
   xhj:
     app:
       name: "星勤-xhj"
       icon: "assets/logo/xhj.png"
     android:
-      applicationId: "ltd.xhjcn.work"
+      applicationId: "com.xhjcn.work"
       customConfig:
         signingConfig: signingConfigs.xhj
     ios:
-      bundleId: "ltd.xhjcn.work"
+      bundleId: "com.xhjcn.work"
 ide: idea

ios/Flutter/skyDebug.xcconfig

@@ -1,4 +1,4 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug-sky.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
 
 ASSET_PREFIX=sky

ios/Flutter/skyProfile.xcconfig

@@ -1,4 +1,4 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile-sky.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
 
 ASSET_PREFIX=sky

ios/Flutter/skyRelease.xcconfig

@@ -1,4 +1,4 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release-sky.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
 
 ASSET_PREFIX=sky

ios/Flutter/xhjDebug.xcconfig

@@ -1,4 +1,4 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug-xhj.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
 
 ASSET_PREFIX=xhj

ios/Flutter/xhjProfile.xcconfig

@@ -1,4 +1,4 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile-xhj.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
 
 ASSET_PREFIX=xhj

ios/Flutter/xhjRelease.xcconfig

@@ -1,4 +1,4 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release-xhj.xcconfig"
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
 
 ASSET_PREFIX=xhj

ios/Podfile

@@ -5,12 +5,9 @@
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
 
 project 'Runner', {
-  'Debug-sky' => :debug,
+  'Debug' => :debug,
-  'Profile-sky' => :release,
+  'Profile' => :release,
-  'Release-sky' => :release,
+  'Release' => :release,
-  'Debug-xhj' => :debug,
-  'Profile-xhj' => :release,
-  'Release-xhj' => :release,
 }
 
 def flutter_root
@@ -43,30 +40,5 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
-     target.build_configurations.each do |config|
-          # You can remove unused permissions here
-          # for more information: https://github.com/Baseflow/flutter-permission-handler/blob/main/permission_handler_apple/ios/Classes/PermissionHandlerEnums.h
-          # e.g. when you don't need camera permission, just add 'PERMISSION_CAMERA=0'
-          config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
-            '$(inherited)',
-
-          ## dart: PermissionGroup.camera
-          'PERMISSION_CAMERA=1',
-
-          ## dart: PermissionGroup.photos
-          'PERMISSION_PHOTOS=1',
-
-          ## dart: PermissionGroup.bluetooth
-          'PERMISSION_BLUETOOTH=1',
-
-          ## dart: PermissionGroup.MICROPHONE
-          'PERMISSION_MICROPHONE=1',
-
-          ## dart: PermissionGroup.location
-          'PERMISSION_LOCATION=1',
-          'PERMISSION_LOCATION_WHENINUSE=0',
-          ]
-
-        end
   end
 end

ios/Podfile.lock

@@ -1,42 +1,29 @@
 PODS:
   - Flutter (1.0.0)
-  - flutter_blue_plus_darwin (0.0.2):
-    - Flutter
-    - FlutterMacOS
   - permission_handler_apple (9.3.0):
     - Flutter
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - starcloud (0.0.1):
-    - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
-  - flutter_blue_plus_darwin (from `.symlinks/plugins/flutter_blue_plus_darwin/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - starcloud (from `.symlinks/plugins/starcloud/ios`)
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
-  flutter_blue_plus_darwin:
-    :path: ".symlinks/plugins/flutter_blue_plus_darwin/darwin"
   permission_handler_apple:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  starcloud:
-    :path: ".symlinks/plugins/starcloud/ios"
 
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
-  flutter_blue_plus_darwin: 20a08bfeaa0f7804d524858d3d8744bcc1b6dbc3
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
-  starcloud: 0d2034397e2a0d81b8c187b99bd2de7371ea5b2d
 
-PODFILE CHECKSUM: 41883e5e56033ab6e4e0f607734d753c5bb7c460
+PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796
 
 COCOAPODS: 1.16.2

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

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