From b1e3574ea61b961457c2eafc74128c0651996207 Mon Sep 17 00:00:00 2001
From: zhangmeng <494089941@qq.com>
Date: Thu, 5 Aug 2021 19:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=20=E6=9B=B4=E6=96=B0=20jpush=20appkey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 android/app/src/main/AndroidManifest.xml | 27 +++++++++++++++++++++++-
 lib/main.dart                            |  4 ++--
 lib/provider/app_provider.dart           |  5 +++--
 lib/provider/user_provider.dart          |  7 ++++--
 4 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 029697b..8f25c10 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -5,7 +5,8 @@
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
   <application android:name="io.flutter.app.FlutterApplication" android:label="小蜜蜂智慧社区管家端" android:icon="@mipmap/ic_launcher" android:usesCleartextTraffic="true">
-    <meta-data android:name="com.amap.api.v2.apikey" android:value="872b909f2ebc8150b809d692c4349f22"/>
+   <service android:name="com.amap.api.location.APSService"/>
+    <meta-data android:name="com.amap.api.v2.apikey" android:value="01b4902aa29bd50ae71ccc2c920ceb10"/>
     <activity android:name=".MainActivity" 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
@@ -30,4 +31,28 @@
              android:resource="@xml/network_security_config"/>
 
   </application>
+    <!--允许程序打开网络套接字-->
+<uses-permission android:name="android.permission.INTERNET" />  
+<!--允许程序设置内置sd卡的写权限-->
+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />    
+<!--允许程序获取网络状态-->
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 
+<!--允许程序访问WiFi网络信息-->
+<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> 
+<!--允许程序读写手机状态和身份-->
+<uses-permission android:name="android.permission.READ_PHONE_STATE" />     
+<!--允许程序访问CellID或WiFi热点来获取粗略的位置-->
+<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> 
+  <!-- 保存照片到相册 -->
+  <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+  <!-- 打开相册选取图片 -->
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <!--获取相机权限-->
+  <uses-permission android:name="android.permission.CAMERA" />
+  <!-- <activity android:name="com.apptreesoftware.barcodescan.BarcodeScannerActivity"/> -->
+  <!--获取网络-->
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-permission android:name="android.permission.BLUETOOTH"/>
+  <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
+  <uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION"/>
 </manifest>
diff --git a/lib/main.dart b/lib/main.dart
index 05a59ec..f87b768 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -55,13 +55,13 @@ void main() async {
     },
   );
   jpush.setup(
-    appKey: "99067fe33fa04aad88c3acac",
+    appKey: "028adb7b9eda661fefdf3072",
     channel: "developer-default",
     production: false,
     debug: true, // 设置是否打印 debug 日志
   );
   String? id = await JPush().getRegistrationID();
-  print(id);
+  print('jpush RegistrationID is $id');
   LoggerData.addData(id);
   runApp(MyApp());
 }
diff --git a/lib/provider/app_provider.dart b/lib/provider/app_provider.dart
index 1155195..132c4ae 100644
--- a/lib/provider/app_provider.dart
+++ b/lib/provider/app_provider.dart
@@ -8,6 +8,7 @@ import 'package:amap_flutter_location/amap_location_option.dart';
 
 // Project imports:
 import 'package:aku_community_manager/ui/home/application/applications_page.dart';
+import 'package:power_logger/power_logger.dart';
 
 enum WORKCLOCK {
   ///未上班打卡状态
@@ -51,6 +52,8 @@ class AppProvider extends ChangeNotifier {
     _flutterLocation = AMapFlutterLocation();
     _flutterLocation.onLocationChanged().listen((event) {
       _location = event;
+      LoggerData.addData(_location.toString());
+      print(_location.toString());
       if (_location != null) {
         stopLocation();
       }
@@ -65,8 +68,6 @@ class AppProvider extends ChangeNotifier {
     _flutterLocation.destroy();
   }
 
-  
-
   WORKCLOCK _clockStatus = WORKCLOCK.NOTIN;
   DateTime? _clockInTime;
   DateTime? _clockOutTime;
diff --git a/lib/provider/user_provider.dart b/lib/provider/user_provider.dart
index 7bd66a3..3c65e37 100644
--- a/lib/provider/user_provider.dart
+++ b/lib/provider/user_provider.dart
@@ -35,8 +35,10 @@ class UserProvider extends ChangeNotifier {
     await HiveStore.appBox!.put('login', true);
     _profileModel = await updateProfile();
     _infoModel = await updateUserInfo();
-    WebSocketUtil().setUser(infoModel!.id.toString());
-    WebSocketUtil().startWebSocket();
+    if (isLogin) {
+      WebSocketUtil().setUser(infoModel!.id.toString());
+      WebSocketUtil().startWebSocket();
+    }
     // await setCurrentHouse((_userDetailModel?.estateNames?.isEmpty ?? true)
     //     ? ''
     //     : _userDetailModel?.estateNames?.first);
@@ -68,6 +70,7 @@ class UserProvider extends ChangeNotifier {
     else {
       var userModel = UserInfoModel.fromJson(model.data);
       JPush().setAlias(userModel.id.toString());
+      print('jpush alias is ${userModel.id}');
       return userModel;
     }
   }