From 4176e8ed0fe216c54a4f798a4525778b6dbb58ca Mon Sep 17 00:00:00 2001
From: wlh <646507849@qq.com>
Date: Thu, 4 Jan 2024 09:24:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zj365/dc/activity/MainActivity.kt     |  4 +--
 .../dc/fragment/DynamicManagementFrag.kt      | 33 +++++++++++--------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt
index 3e31d13..22ef732 100644
--- a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt
+++ b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt
@@ -161,7 +161,7 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData>  {
         mViewModel.getIsDemonstate()
 
 
-        if(EasyPermissions.hasPermissions(this,  Manifest.permission.ACCESS_COARSE_LOCATION,
+       /* if(EasyPermissions.hasPermissions(this,  Manifest.permission.ACCESS_COARSE_LOCATION,
                 Manifest.permission.ACCESS_FINE_LOCATION)) {
             AmapInit.startLocation(this) {
                 LogUtils.e("DynamicManagementFrag","${it.city}")
@@ -177,7 +177,7 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData>  {
             EasyPermissions.requestPermissions(this,"申请定位权限",
                 0x00022,
                 Manifest.permission.ACCESS_COARSE_LOCATION,  Manifest.permission.ACCESS_FINE_LOCATION);
-        }
+        }*/
      //   mViewModel.getBindList(BaseDeviceBindListAct.DeviceType.BODYFAT.type)
     }
 
diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
index bb14c68..5d38b08 100644
--- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
+++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
@@ -583,23 +583,28 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
         if(MMkvHelper.contains(Const.LATITUDE) && MMkvHelper.contains(Const.LONGITUDE)){
             mViewModel.getWeather()
         }else{
-            if(EasyPermissions.hasPermissions(requireContext(),  Manifest.permission.ACCESS_COARSE_LOCATION,
-                    Manifest.permission.ACCESS_FINE_LOCATION)) {
-                AmapInit.startLocation(requireContext()) {
-                    LogUtils.e("DynamicManagementFrag","${it.city}")
-                    MMkvHelper.put(Const.LONGITUDE,it.longitude)
-                    MMkvHelper.put(Const.LATITUDE,it.latitude)
-                    MMkvHelper.put(Const.PROVINCE,it.province)
-                    MMkvHelper.put(Const.CITY,it.city)
-                    MMkvHelper.put(Const.DISTRICT,it.district)
-                    mViewModel.getWeather()
+            if (MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
 
-                }
             }else{
-                EasyPermissions.requestPermissions(this,"申请定位权限",
-                    0x00022,
-                    Manifest.permission.ACCESS_COARSE_LOCATION,  Manifest.permission.ACCESS_FINE_LOCATION);
+                if(EasyPermissions.hasPermissions(requireContext(),  Manifest.permission.ACCESS_COARSE_LOCATION,
+                        Manifest.permission.ACCESS_FINE_LOCATION)) {
+                    AmapInit.startLocation(requireContext()) {
+                        LogUtils.e("DynamicManagementFrag","${it.city}")
+                        MMkvHelper.put(Const.LONGITUDE,it.longitude)
+                        MMkvHelper.put(Const.LATITUDE,it.latitude)
+                        MMkvHelper.put(Const.PROVINCE,it.province)
+                        MMkvHelper.put(Const.CITY,it.city)
+                        MMkvHelper.put(Const.DISTRICT,it.district)
+                        mViewModel.getWeather()
+
+                    }
+                }else{
+                    EasyPermissions.requestPermissions(this,"获取天气信息需要申请定位权限",
+                        0x00022,
+                        Manifest.permission.ACCESS_COARSE_LOCATION,  Manifest.permission.ACCESS_FINE_LOCATION);
+                }
             }
+
         }