sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into build-addGateway-20240814

Browse Source
This commit is contained in:
魏少阳 2025-01-08 18:05:43 +08:00
commit a90a6a387a
15 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/app/build.gradle
View File

@ -304,6 +304,6 @@ dependencies {
implementation 'cn.jiguang.sdk.plugin:vivo:5.2.3' implementation 'cn.jiguang.sdk.plugin:vivo:5.2.3'
// Umeng统计 // Umeng统计
implementation 'com.umeng.umsdk:common:9.3.7' implementation 'com.umeng.umsdk:common:9.7.9'
implementation 'com.umeng.umsdk:asms:1.4.1' implementation 'com.umeng.umsdk:asms:1.8.5'
} }

14
android/app/src/main/AndroidManifest.xml
View File

@ -1,6 +1,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.example.star_lock"> package="com.skychip.lock">
<uses-permission <uses-permission
android:name="android.permission.BLUETOOTH_SCAN" android:name="android.permission.BLUETOOTH_SCAN"
@ -8,8 +8,6 @@
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" /> <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
<!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />-->
<!-- <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30" />-->
<!--允许访问网络，必选权限--> <!--允许访问网络，必选权限-->
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<!--允许获取精确位置，精准定位必选--> <!--允许获取精确位置，精准定位必选-->
@ -58,14 +56,8 @@
<uses-permission android:name="com.hihonor.permission.sec.SDK_LAUNCHER" /> <uses-permission android:name="com.hihonor.permission.sec.SDK_LAUNCHER" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<application <application
android:name="android.app.Application" android:name=".App"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:requestLegacyExternalStorage="true" android:requestLegacyExternalStorage="true"
@ -149,7 +141,7 @@
</intent-filter> </intent-filter>
</service> <!--兼容Q版本--> </service> <!--兼容Q版本-->
<activity <activity
android:name="com.skychip.lock.MainActivity" android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:exported="true" android:exported="true"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"

16
android/app/src/main/kotlin/com/skychip/lock/App.kt Executable file
View File

@ -0,0 +1,16 @@
package com.skychip.lock
import io.flutter.app.FlutterApplication
import android.util.Log
import com.umeng.commonsdk.UMConfigure;
class App : FlutterApplication() {
override fun onCreate() {
super.onCreate()
// UMConfigure.setLogEnabled(true);
//友盟预初始化
// UMConfigure.preInit(getApplicationContext(), "671244cf80464b33f6df9648", "Product");
Log.d("MyApplication", "Application has started")
}
}

6
ios/Runner/Info.plist
View File

@ -87,11 +87,11 @@
<key>NSFileProtectionKey</key> <key>NSFileProtectionKey</key>
<string>NSFileProtectionCompleteUntilFirstUserAuthentication</string> <string>NSFileProtectionCompleteUntilFirstUserAuthentication</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key> <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>应用在前台和后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationAlwaysUsageDescription</key> <key>NSLocationAlwaysUsageDescription</key>
<string>应用在后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>应用在前台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>应用请求麦克风用来通话</string> <string>应用请求麦克风用来通话</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>

6
ios/Runner/en.lproj/InfoPlist_sky.strings
View File

@ -11,8 +11,8 @@ NSBluetoothAlwaysUsageDescription="The app uses bluetooth to find, connect and t
NSBluetoothPeripheralUsageDescription="The app uses bluetooth to find, connect and transfer data between different devices"; NSBluetoothPeripheralUsageDescription="The app uses bluetooth to find, connect and transfer data between different devices";
NSCameraUsageDescription="The application requests the camera to take photos for avatar upload and face authentication"; NSCameraUsageDescription="The application requests the camera to take photos for avatar upload and face authentication";
NSContactsUsageDescription="Access the address book to send electronic keys to contacts in the address book"; NSContactsUsageDescription="Access the address book to send electronic keys to contacts in the address book";
NSLocationAlwaysAndWhenInUseUsageDescription="updated location information when applying in the front and backend"; NSLocationAlwaysAndWhenInUseUsageDescription="We need to access your location information in order to more accurately scan the Bluetooth lock device at your location.";
NSLocationAlwaysUsageDescription="updated location information when the app is in the background"; NSLocationAlwaysUsageDescription="We need to access your location information in order to more accurately scan the Bluetooth lock device at your location.";
NSLocationWhenInUseUsageDescription="updated location information when the app is in the foreground"; NSLocationWhenInUseUsageDescription="We need to access your location information in order to more accurately scan the Bluetooth lock device at your location.";
NSMicrophoneUsageDescription="request microphone for calls"; NSMicrophoneUsageDescription="request microphone for calls";
NSPhotoLibraryUsageDescription="request photo album for avatar upload"; NSPhotoLibraryUsageDescription="request photo album for avatar upload";

6
ios/Runner/en.lproj/InfoPlist_xhj.strings
View File

@ -11,8 +11,8 @@ NSBluetoothAlwaysUsageDescription="The app uses bluetooth to find, connect and t
NSBluetoothPeripheralUsageDescription="The app uses bluetooth to find, connect and transfer data between different devices"; NSBluetoothPeripheralUsageDescription="The app uses bluetooth to find, connect and transfer data between different devices";
NSCameraUsageDescription="The application requests the camera to take photos for avatar upload and face authentication"; NSCameraUsageDescription="The application requests the camera to take photos for avatar upload and face authentication";
NSContactsUsageDescription="Access the address book to send electronic keys to contacts in the address book"; NSContactsUsageDescription="Access the address book to send electronic keys to contacts in the address book";
NSLocationAlwaysAndWhenInUseUsageDescription="updated location information when applying in the front and backend"; NSLocationAlwaysAndWhenInUseUsageDescription="We need to access your location information in order to more accurately scan the Bluetooth lock device at your location.";
NSLocationAlwaysUsageDescription="updated location information when the app is in the background"; NSLocationAlwaysUsageDescription="We need to access your location information in order to more accurately scan the Bluetooth lock device at your location.";
NSLocationWhenInUseUsageDescription="updated location information when the app is in the foreground"; NSLocationWhenInUseUsageDescription="We need to access your location information in order to more accurately scan the Bluetooth lock device at your location.";
NSMicrophoneUsageDescription="request microphone for calls"; NSMicrophoneUsageDescription="request microphone for calls";
NSPhotoLibraryUsageDescription="request photo album for avatar upload"; NSPhotoLibraryUsageDescription="request photo album for avatar upload";

6
ios/Runner/info_dev.plist
View File

@ -87,11 +87,11 @@
<key>NSFileProtectionKey</key> <key>NSFileProtectionKey</key>
<string>NSFileProtectionCompleteUntilFirstUserAuthentication</string> <string>NSFileProtectionCompleteUntilFirstUserAuthentication</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key> <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>应用在前台和后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationAlwaysUsageDescription</key> <key>NSLocationAlwaysUsageDescription</key>
<string>应用在后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>应用在前台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>应用请求麦克风用来通话</string> <string>应用请求麦克风用来通话</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>

6
ios/Runner/info_pre.plist
View File

@ -85,11 +85,11 @@
<key>NSContactsUsageDescription</key> <key>NSContactsUsageDescription</key>
<string>Reason we need access to the contact list</string> <string>Reason we need access to the contact list</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key> <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>应用在前台和后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationAlwaysUsageDescription</key> <key>NSLocationAlwaysUsageDescription</key>
<string>应用在后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>应用在前台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>应用请求麦克风用来通话</string> <string>应用请求麦克风用来通话</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>

6
ios/Runner/info_sky.plist
View File

@ -85,11 +85,11 @@
<key>NSContactsUsageDescription</key> <key>NSContactsUsageDescription</key>
<string>Reason we need access to the contact list</string> <string>Reason we need access to the contact list</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key> <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>应用在前台和后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationAlwaysUsageDescription</key> <key>NSLocationAlwaysUsageDescription</key>
<string>应用在后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>应用在前台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>应用请求麦克风用来通话</string> <string>应用请求麦克风用来通话</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>

6
ios/Runner/info_xhj.plist
View File

@ -87,11 +87,11 @@
<key>NSFileProtectionKey</key> <key>NSFileProtectionKey</key>
<string>NSFileProtectionCompleteUntilFirstUserAuthentication</string> <string>NSFileProtectionCompleteUntilFirstUserAuthentication</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key> <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>应用在前台和后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationAlwaysUsageDescription</key> <key>NSLocationAlwaysUsageDescription</key>
<string>应用在后台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>应用在前台的时候可以搜到更新的位置信息</string> <string>我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备</string>
<key>NSMicrophoneUsageDescription</key> <key>NSMicrophoneUsageDescription</key>
<string>应用请求麦克风用来通话</string> <string>应用请求麦克风用来通话</string>
<key>NSPhotoLibraryUsageDescription</key> <key>NSPhotoLibraryUsageDescription</key>

6
ios/Runner/zh-Hans.lproj/InfoPlist.strings
View File

@ -11,8 +11,8 @@ NSBluetoothAlwaysUsageDescription="该应用程序使用蓝牙在不同设备之
NSBluetoothPeripheralUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据"; NSBluetoothPeripheralUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据";
NSCameraUsageDescription="应用请求相机，以便于拍摄照片，用于头像上传及人脸认证"; NSCameraUsageDescription="应用请求相机，以便于拍摄照片，用于头像上传及人脸认证";
NSContactsUsageDescription="应用访问通讯录，用于给通讯录中的联系人发送电子钥匙"; NSContactsUsageDescription="应用访问通讯录，用于给通讯录中的联系人发送电子钥匙";
NSLocationAlwaysAndWhenInUseUsageDescription="应用在前台和后台的时候可以搜到更新的位置信息"; NSLocationAlwaysAndWhenInUseUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSLocationAlwaysUsageDescription="应用在后台的时候可以搜到更新的位置信息"; NSLocationAlwaysUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSLocationWhenInUseUsageDescription="应用在前台的时候可以搜到更新的位置信息"; NSLocationWhenInUseUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSMicrophoneUsageDescription="应用请求麦克风用来通话"; NSMicrophoneUsageDescription="应用请求麦克风用来通话";
NSPhotoLibraryUsageDescription="应用请求相册用于头像上传"; NSPhotoLibraryUsageDescription="应用请求相册用于头像上传";

6
ios/Runner/zh-Hans.lproj/InfoPlist_sky.strings
View File

@ -11,8 +11,8 @@ NSBluetoothAlwaysUsageDescription="该应用程序使用蓝牙在不同设备之
NSBluetoothPeripheralUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据"; NSBluetoothPeripheralUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据";
NSCameraUsageDescription="应用请求相机，以便于拍摄照片，用于头像上传及人脸认证"; NSCameraUsageDescription="应用请求相机，以便于拍摄照片，用于头像上传及人脸认证";
NSContactsUsageDescription="应用访问通讯录，用于给通讯录中的联系人发送电子钥匙"; NSContactsUsageDescription="应用访问通讯录，用于给通讯录中的联系人发送电子钥匙";
NSLocationAlwaysAndWhenInUseUsageDescription="应用在前台和后台的时候可以搜到更新的位置信息"; NSLocationAlwaysAndWhenInUseUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSLocationAlwaysUsageDescription="应用在后台的时候可以搜到更新的位置信息"; NSLocationAlwaysUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSLocationWhenInUseUsageDescription="应用在前台的时候可以搜到更新的位置信息"; NSLocationWhenInUseUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSMicrophoneUsageDescription="应用请求麦克风用来通话"; NSMicrophoneUsageDescription="应用请求麦克风用来通话";
NSPhotoLibraryUsageDescription="应用请求相册用于头像上传"; NSPhotoLibraryUsageDescription="应用请求相册用于头像上传";

6
ios/Runner/zh-Hans.lproj/InfoPlist_xhj.strings
View File

@ -11,8 +11,8 @@ NSBluetoothAlwaysUsageDescription="该应用程序使用蓝牙在不同设备之
NSBluetoothPeripheralUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据"; NSBluetoothPeripheralUsageDescription="该应用程序使用蓝牙在不同设备之间查找、连接和传输数据";
NSCameraUsageDescription="应用请求相机，以便于拍摄照片，用于头像上传及人脸认证"; NSCameraUsageDescription="应用请求相机，以便于拍摄照片，用于头像上传及人脸认证";
NSContactsUsageDescription="应用访问通讯录，用于给通讯录中的联系人发送电子钥匙"; NSContactsUsageDescription="应用访问通讯录，用于给通讯录中的联系人发送电子钥匙";
NSLocationAlwaysAndWhenInUseUsageDescription="应用在前台和后台的时候可以搜到更新的位置信息"; NSLocationAlwaysAndWhenInUseUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSLocationAlwaysUsageDescription="应用在后台的时候可以搜到更新的位置信息"; NSLocationAlwaysUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSLocationWhenInUseUsageDescription="应用在前台的时候可以搜到更新的位置信息"; NSLocationWhenInUseUsageDescription="我们需要访问您的位置信息，以便更加精准的扫描到所在位置的蓝牙锁设备";
NSMicrophoneUsageDescription="应用请求麦克风用来通话"; NSMicrophoneUsageDescription="应用请求麦克风用来通话";
NSPhotoLibraryUsageDescription="应用请求相册用于头像上传"; NSPhotoLibraryUsageDescription="应用请求相册用于头像上传";

21
lib/tools/appFirstEnterHandle.dart
View File

@ -23,9 +23,12 @@ class AppFirstEnterHandle {
switch (flagStr) { switch (flagStr) {
case isAgreePrivacy: // 隐私协议 case isAgreePrivacy: // 隐私协议
if (getFlag != isAgreePrivacy) { if (getFlag != isAgreePrivacy) {
await showPrivacyAgreementAlert(); final bool? isAgree = await showPrivacyAgreementAlert();
if (isAgree ?? false) {
await privacySDKInitialization();
}
} }
await privacySDKInitialization();
if (Get.isRegistered<StarLockLoginLogic>()) { if (Get.isRegistered<StarLockLoginLogic>()) {
Get.find<StarLockLoginLogic>().flushedDeviceInfo(); Get.find<StarLockLoginLogic>().flushedDeviceInfo();
} }
@ -51,8 +54,8 @@ class AppFirstEnterHandle {
} }
//隐私协议弹窗 //隐私协议弹窗
Future<void> showPrivacyAgreementAlert() async { Future<bool?> showPrivacyAgreementAlert() async {
await showCupertinoDialog( return await showCupertinoDialog(
context: Get.context!, context: Get.context!,
builder: (BuildContext context) { builder: (BuildContext context) {
return PopScope( return PopScope(
@ -103,7 +106,8 @@ class AppFirstEnterHandle {
}, },
), ),
TextSpan( TextSpan(
text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'.tr text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'
.tr
.tr), .tr),
], ],
), ),
@ -123,7 +127,7 @@ class AppFirstEnterHandle {
), ),
onPressed: () { onPressed: () {
Storage.setString(isAgreePrivacy, isAgreePrivacy); Storage.setString(isAgreePrivacy, isAgreePrivacy);
Navigator.of(context).pop(); Navigator.of(context).pop(true);
getAppFirstEnter(isShowUpdateVersion); getAppFirstEnter(isShowUpdateVersion);
}, },
), ),
@ -173,7 +177,8 @@ class AppFirstEnterHandle {
}, },
), ),
TextSpan( TextSpan(
text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'.tr text: '的全部内容。点击“同意”即表示您同意并接受全部条款。若选择不同意，将无法使用我们的产品和服务，并会退出应用。'
.tr
.tr), .tr),
], ],
), ),
@ -193,7 +198,7 @@ class AppFirstEnterHandle {
), ),
onPressed: () { onPressed: () {
Storage.setString(isAgreePrivacy, isAgreePrivacy); Storage.setString(isAgreePrivacy, isAgreePrivacy);
Navigator.of(context).pop(); Navigator.of(context).pop(true);
getAppFirstEnter(isShowUpdateVersion); getAppFirstEnter(isShowUpdateVersion);
}, },
), ),

2
pubspec.yaml
View File

@ -249,7 +249,7 @@ dependencies:
flutter_bugly: ^1.0.2 flutter_bugly: ^1.0.2
open_filex: ^4.4.0 open_filex: ^4.4.0
umeng_common_sdk: 1.2.7 umeng_common_sdk: 1.2.8
dependency_overrides: dependency_overrides:
#强制设置google_maps_flutter_ios 为 2.5.2 #强制设置google_maps_flutter_ios 为 2.5.2