中建365-版本上线问题处理

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)
     }
 

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,
+            if (MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
-                    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,"申请定位权限",
+                if(EasyPermissions.hasPermissions(requireContext(),  Manifest.permission.ACCESS_COARSE_LOCATION,
-                    0x00022,
+                        Manifest.permission.ACCESS_FINE_LOCATION)) {
-                    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);
+                }
             }
+
         }