From 27ef3cdbb35ec23fafcd329ce197f242990604a7 Mon Sep 17 00:00:00 2001
From: anfe <448468458@qq.com>
Date: Tue, 11 Jun 2024 15:48:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=20google=20=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E8=A2=AB=E6=8B=92=E9=97=AE=E9=A2=98=EF=BC=9A=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E5=B7=B2=E5=AE=89=E8=A3=85=E5=BA=94=E7=94=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E4=BF=AE=E5=A4=8D=E5=8D=8E=E4=B8=BA=E8=A2=AB?=
 =?UTF-8?q?=E6=8B=92=E9=97=AE=E9=A2=98=EF=BC=9A=E5=90=8C=E6=84=8F=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=89=8D=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml  | 226 ++++++++++++----------
 lib/login/login/starLock_login_logic.dart |   9 +-
 lib/tools/appFirstEnterHandle.dart        |  40 ++--
 3 files changed, 156 insertions(+), 119 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bd772d1b..93cfda8c 100755
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,115 +1,145 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="com.example.star_lock">
-  <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" />
-  <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.ACCESS_FINE_LOCATION"/>
-  <!--允许获取粗略位置，粗略定位必选-->
-  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-  <!--允许获取设备和运营商信息，用于问题排查和网络定位（无gps情况下的定位），若需网络定位功能则必选-->
-  <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-  <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"/>
-  <!--允许获取网络状态，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
-  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-  <!--允许获取wifi网络信息，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
-  <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-  <!--允许获取wifi状态改变，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
-  <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-  <!--允许写设备缓存，用于问题排查-->
-  <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-  <!--允许读设备日志，用于问题排查-->
-  <uses-permission android:name="android.permission.READ_LOGS" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.example.star_lock">
 
-  <!--相机-->
-  <uses-permission android:name="android.permission.CAMERA"/>
+    <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" />
+    <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.ACCESS_FINE_LOCATION" />
+    <!--允许获取粗略位置，粗略定位必选-->
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <!--允许获取设备和运营商信息，用于问题排查和网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
+    <!--允许获取网络状态，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <!--允许获取wifi网络信息，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <!--允许获取wifi状态改变，用于网络定位（无gps情况下的定位），若需网络定位功能则必选-->
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <!--允许写设备缓存，用于问题排查-->
+    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
+    <!--允许读设备日志，用于问题排查-->
+    <uses-permission android:name="android.permission.READ_LOGS" />
 
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <!--相机-->
+    <uses-permission android:name="android.permission.CAMERA" />
 
-  <!--允许麦克风权限，用于录音发送-->
-  <uses-permission android:name="android.permission.RECORD_AUDIO"/>
-  <uses-permission android:name="android.permission.WAKE_LOCK"/>
-  <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-  <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
-  <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-  <uses-permission android:name="android.permission.VIBRATE"/>
-  <uses-permission android:name="android.permission.REORDER_TASKS"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
 
-  <!-- 相册权限 34适配  -->
-  <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
+    <!--允许麦克风权限，用于录音发送-->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.REORDER_TASKS" />
 
+    <!-- 相册权限 34适配  -->
+    <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
 
-  <application android:usesCleartextTraffic="true" android:label="@string/app_name" android:name="android.app.Application" android:icon="@mipmap/ic_launcher">
-    <meta-data
-        android:name="flutterEmbedding"
-        android:value="2" />
-    <meta-data
-        android:name="com.google.firebase.messaging.default_notification_channel_id"
-        android:value="1"/> <!-- 将您的通知渠道ID替换为您的实际ID -->
-    <meta-data
+    <!-- 移除 QUERY_ALL_PACKAGES 权限 -->
+    <uses-permission
+        android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:node="remove" />
+
+    <application
+        android:name="android.app.Application"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:usesCleartextTraffic="true">
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_channel_id"
+            android:value="1" /> <!-- 将您的通知渠道ID替换为您的实际ID -->
+        <meta-data
             android:name="com.huawei.hms.client.appid"
-            android:value="110798531"/>
-    <meta-data
+            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" />
+            android:value="1406555529261648640" />
+        <meta-data
+            android:name="OPPO_APPKEY"
+            android:value="OP-47f668c9943248118502aa58d066393b" />
 
-     <meta-data android:name="OPPO_APPID"
+        <meta-data
+            android:name="OPPO_APPID"
             android:value="OP-31726001" />
 
-     <meta-data android:name="OPPO_APPSECRET"
+        <meta-data
+            android:name="OPPO_APPSECRET"
             android:value="OP-05723986bba64183a71530b496922450" />
-    <!-- 配置定位Service -->
-    <service android:name="com.amap.api.location.APSService"/>
-    		 <!-- since JPushv3.6.8 ，oppov2.1.0 oppo 核心功能-->
-          <service android:name="cn.jpush.android.service.PluginOppoPushService"
-             android:permission="com.coloros.mcs.permission.SEND_MCS_MESSAGE"
-             android:exported="true">
-             <intent-filter>
-                 <action android:name="com.coloros.mcs.action.RECEIVE_MCS_MESSAGE" />
-             </intent-filter>
-         </service>
+        <!-- 配置定位Service -->
+        <service android:name="com.amap.api.location.APSService" />
+        <!-- since JPushv3.6.8 ，oppov2.1.0 oppo 核心功能-->
+        <service
+            android:name="cn.jpush.android.service.PluginOppoPushService"
+            android:exported="true"
+            android:permission="com.coloros.mcs.permission.SEND_MCS_MESSAGE">
+            <intent-filter>
+                <action android:name="com.coloros.mcs.action.RECEIVE_MCS_MESSAGE" />
+            </intent-filter>
+        </service>
 
-         <!-- since JPushv3.6.8 ，oppov2.1.0 oppo 核心功能-->
-         <service
-             android:name="com.heytap.msp.push.service.DataMessageCallbackService"
-             android:permission="com.heytap.mcs.permission.SEND_PUSH_MESSAGE"
-             android:exported="true">
- 
-             <intent-filter>
-                 <action android:name="com.heytap.mcs.action.RECEIVE_MCS_MESSAGE"/>
- 
-                 <action android:name="com.heytap.msp.push.RECEIVE_MCS_MESSAGE"/>
-             </intent-filter>
-         </service> <!--兼容Q版本-->
-    <activity android:name="com.skychip.lock.MainActivity" android:exported="true" android:screenOrientation="portrait" 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">
-      <!-- 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 android:name="io.flutter.embedding.android.NormalTheme" android:resource="@style/NormalTheme"/>
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN"/>
-        <category android:name="android.intent.category.LAUNCHER"/>
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="skysmartlock" />
-      </intent-filter>
+        <!-- since JPushv3.6.8 ，oppov2.1.0 oppo 核心功能-->
+        <service
+            android:name="com.heytap.msp.push.service.DataMessageCallbackService"
+            android:exported="true"
+            android:permission="com.heytap.mcs.permission.SEND_PUSH_MESSAGE">
 
-    </activity>
-  </application>
+            <intent-filter>
+                <action android:name="com.heytap.mcs.action.RECEIVE_MCS_MESSAGE" />
+
+                <action android:name="com.heytap.msp.push.RECEIVE_MCS_MESSAGE" />
+            </intent-filter>
+        </service> <!--兼容Q版本-->
+        <activity
+            android:name="com.skychip.lock.MainActivity"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:exported="true"
+            android:hardwareAccelerated="true"
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"
+            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
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme" />
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="skysmartlock" />
+            </intent-filter>
+
+        </activity>
+    </application>
 
 
 </manifest>
diff --git a/lib/login/login/starLock_login_logic.dart b/lib/login/login/starLock_login_logic.dart
index 64b869e0..f91a8646 100755
--- a/lib/login/login/starLock_login_logic.dart
+++ b/lib/login/login/starLock_login_logic.dart
@@ -102,15 +102,14 @@ class StarLockLoginLogic extends BaseGetXController {
     super.onClose();
   }
 
-  @override
-  void onReady() {
-    super.onReady();
-
+  //刷新设备信息
+  void flushedDeviceInfo(){
     XSConstantMacro().getDeviceInfoData().then((Map<String, dynamic> data) {
       state.deviceInfoMap.value = data;
-    }).catchError((error) {
+    }).catchError((dynamic error) {
       // 适当处理错误
       AppLog.log('获取设备信息时出错: $error');
     });
   }
+
 }
diff --git a/lib/tools/appFirstEnterHandle.dart b/lib/tools/appFirstEnterHandle.dart
index 6976af6b..bdc10af1 100755
--- a/lib/tools/appFirstEnterHandle.dart
+++ b/lib/tools/appFirstEnterHandle.dart
@@ -10,6 +10,7 @@ import 'package:star_lock/app_settings/app_settings.dart';
 import 'package:star_lock/common/XSConstantMacro/XSConstantMacro.dart';
 import 'package:star_lock/flavors.dart';
 import 'package:star_lock/login/login/app_get_version.dart';
+import 'package:star_lock/login/login/starLock_login_logic.dart';
 import 'package:star_lock/main.dart';
 import 'package:star_lock/network/api_repository.dart';
 import 'package:star_lock/tools/customer_tool.dart';
@@ -30,6 +31,9 @@ class AppFirstEnterHandle {
         }
         getAppInfo();
         await privacySDKInitialization();
+        if (Get.isRegistered<StarLockLoginLogic>()) {
+          Get.find<StarLockLoginLogic>().flushedDeviceInfo();
+        }
         break;
       case isAgreePosition: // 位置权限
         if (getFlag != isAgreePosition) {
@@ -87,10 +91,11 @@ class AppFirstEnterHandle {
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
                   // 处理用户协议点击事件
-                  Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                    "url": XSConstantMacro.userAgreementURL,
-                    "title": '用户协议'.tr
-                  });
+                  Get.toNamed(Routers.webviewShowPage,
+                      arguments: <String, String>{
+                        "url": XSConstantMacro.userAgreementURL,
+                        "title": '用户协议'.tr
+                      });
                 },
             ),
             TextSpan(text: '和'.tr),
@@ -101,10 +106,11 @@ class AppFirstEnterHandle {
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
                   // 处理隐私政策点击事件
-                  Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                    "url": XSConstantMacro.privacyPolicyURL,
-                    "title": '隐私政策'.tr
-                  });
+                  Get.toNamed(Routers.webviewShowPage,
+                      arguments: <String, String>{
+                        "url": XSConstantMacro.privacyPolicyURL,
+                        "title": '隐私政策'.tr
+                      });
                 },
             ),
             TextSpan(
@@ -154,10 +160,11 @@ class AppFirstEnterHandle {
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
                   // 处理用户协议点击事件
-                  Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                    "url": XSConstantMacro.userAgreementURL,
-                    "title": '用户协议'.tr
-                  });
+                  Get.toNamed(Routers.webviewShowPage,
+                      arguments: <String, String>{
+                        "url": XSConstantMacro.userAgreementURL,
+                        "title": '用户协议'.tr
+                      });
                 },
             ),
             TextSpan(text: '和'.tr),
@@ -169,10 +176,11 @@ class AppFirstEnterHandle {
               recognizer: TapGestureRecognizer()
                 ..onTap = () {
                   // 处理隐私政策点击事件
-                  Get.toNamed(Routers.webviewShowPage, arguments: <String, String>{
-                    "url": XSConstantMacro.privacyPolicyURL,
-                    "title": '隐私政策'.tr
-                  });
+                  Get.toNamed(Routers.webviewShowPage,
+                      arguments: <String, String>{
+                        "url": XSConstantMacro.privacyPolicyURL,
+                        "title": '隐私政策'.tr
+                      });
                 },
             ),
             TextSpan(