中建365-二期开发-优化

app/src/main/java/com/zj365/dc/activity/MainActivity.kt

@@ -67,6 +67,7 @@ import com.zj365.mime.act.DevInfoAct
 import io.reactivex.functions.Consumer
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
+import me.leolin.shortcutbadger.ShortcutBadger
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -120,6 +121,7 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData>  {
 //                    isShowReadAllButton = true
                 imunreadCount = unreadCount.toInt()
                 setBadge(sysunreadCount + unreadCount.toInt())
+
 //                } else {
 //                    isShowReadAllButton = false
 //                    setBadge(unreadCount)
@@ -439,6 +441,7 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData>  {
         badegView?.let {
             var tv = it.findViewById<TextView>(R.id.mBadge)
             var carrdView = it.findViewById<CardView>(R.id.mCard)
+            ShortcutBadger.applyCount(applicationContext, num)
             if (num > 0) {
                 tv.visibility = View.VISIBLE
                 tv.text = if (num > 99) "99+" else "$num"

app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt

@@ -7,10 +7,13 @@ import com.xty.base.act.BaseVmAct
 import com.xty.base.vm.BaseVm
 import com.xty.common.Dateutils
 import com.xty.common.arouter.ARouterUrl
+import com.xty.common.event.MessageReadEvent
 import com.xty.common.util.ImageGetterUtils
 import com.xty.network.model.MessageBean
 import com.xty.network.model.MessageTypeDataBean
 import com.zj365.dc.databinding.ActMessageDetailNewBinding
+import me.leolin.shortcutbadger.ShortcutBadger
+import org.greenrobot.eventbus.EventBus
 
 @Route(path = ARouterUrl.MESSAGE_DETAIL_NEW)
 class MessageDetailNewAct: BaseVmAct<BaseVm>() {
@@ -28,6 +31,7 @@ class MessageDetailNewAct: BaseVmAct<BaseVm>() {
         super.initView()
         statusBar(binding.title.mView)
         binding.title.mTvTitle.text= "消息详情"
+        EventBus.getDefault().post(MessageReadEvent())
         binding.title.mIvBack.setOnClickListener {
             finish()
         }

app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt

@@ -15,6 +15,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.view.isVisible
 import androidx.lifecycle.MutableLiveData
 import cn.jpush.android.api.JPushInterface
+import com.hjq.toast.ToastUtils
 import com.tamsiree.rxkit.RxTimeTool
 import com.xty.base.fragment.BaseVmFrag
 import com.xty.base.utils.UserInfoDefin
@@ -467,10 +468,18 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
     // 刷新注册
     private fun refresh() {
         refresh.setRefresh(binding.mRefresh) {
-            isJob = false
+            if(!TextUtils.isEmpty(showIdInfo)){
+                isJob = false
+                request()
+            }else{
+                ToastUtils.show(R.string.again_login)
+            }
+
+
       //      getXtInfo(showIdInfo)
          //   get24HourReportInfo(showIdInfo)
-            request()
+
+       //     request()
      //       uploadWhatchData()
         }
     }
@@ -486,47 +495,43 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
         if(MMkvHelper.contains(Const.LATITUDE) && MMkvHelper.contains(Const.LONGITUDE)){
             mViewModel.getWeather()
         }else{
-            if (showIdInfo == ""){
 
-            }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(EasyPermissions.hasPermissions(requireContext(),  Manifest.permission.ACCESS_COARSE_LOCATION,
+                }
+            }else{
+                if (EasyPermissions.somePermissionDenied(requireActivity(),  Manifest.permission.ACCESS_COARSE_LOCATION,
                         Manifest.permission.ACCESS_FINE_LOCATION)){
-                    AmapInit.startLocation(requireContext()) {
+                    DialogTip(
-                        LogUtils.e("DynamicManagementFrag","${it.city}")
+                        requireContext(),
-                        MMkvHelper.put(Const.LONGITUDE,it.longitude)
+                        "中健365需要定位权限,需要打开设置页面么?"
-                        MMkvHelper.put(Const.LATITUDE,it.latitude)
+                    ) {
-                        MMkvHelper.put(Const.PROVINCE,it.province)
+                        JumpPermissionManagement.GoToSetting(requireActivity())
-                        MMkvHelper.put(Const.CITY,it.city)
+                    }.show()
-                        MMkvHelper.put(Const.DISTRICT,it.district)
-                        mViewModel.getWeather()
-
-                    }
                 }else{
-                    if (EasyPermissions.somePermissionDenied(requireActivity(),  Manifest.permission.ACCESS_COARSE_LOCATION,
+                    FactorySettingDialog(
-                            Manifest.permission.ACCESS_FINE_LOCATION)){
+                        requireContext(),
-                        DialogTip(
+                        "中健365需要定位权限，以便您获取天气信息"
-                            requireContext(),
+                    ) {
-                            "中健365需要定位权限,需要打开设置页面么?"
+                        EasyPermissions.requestPermissions(this,"获取天气信息需要申请定位权限",
-                        ) {
+                            0x00022,
-                            JumpPermissionManagement.GoToSetting(requireActivity())
+                            Manifest.permission.ACCESS_COARSE_LOCATION,  Manifest.permission.ACCESS_FINE_LOCATION);
-                        }.show()
+                    }.show()
-                    }else{
-                        FactorySettingDialog(
-                            requireContext(),
-                            "中健365需要定位权限，以便您获取天气信息"
-                        ) {
-                            EasyPermissions.requestPermissions(this,"获取天气信息需要申请定位权限",
-                                0x00022,
-                                Manifest.permission.ACCESS_COARSE_LOCATION,  Manifest.permission.ACCESS_FINE_LOCATION);
-                        }.show()
-                    }
-
-
                 }
 
+
             }
 
+
         }
 
 
@@ -753,7 +758,6 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
             functionList.addAll(it.data)
             if (showIdInfo ==MMkvHelper.getLong(Const.USER_ID).toString()) {
                 Const.functionListDate.value = functionList
-                startUpdateHealthInfoLive()
             }
 
 
@@ -826,6 +830,10 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
                         } else if (YCBBlueConnectHelper.getBleNowStatus() == YCBBlueConnectHelper.BLEConnectState.Connected) {
                             getConnectStatus()
                         }*/
+
+                        if(Const.watchType != -1 && !isDemonstrate){
+                            startUpdateHealthInfoLive()
+                        }
                     } else {
 
                     }
@@ -1238,7 +1246,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
 
     private var mDisposable: Disposable? = null
     fun startUpdateHealthInfoLive(){
-        LogUtils.e("DynamicManagementFrag","刷新数据 ${getHealthInfoJob} disposable:${mDisposable}")
+        LogUtils.e("DynamicManagementFrag","刷新数据 disposable:${mDisposable}")
 
         if(mDisposable == null){
             Observable.interval(1000 * 60,60*1000,TimeUnit.MILLISECONDS)

app/src/main/java/com/zj365/dc/fragment/MineFrag.kt

@@ -650,6 +650,7 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun bindDevSuccess(event:BindDevEvent){
         mViewModel.getUserDeviceInfo(showIdInfo)
+        mViewModel.getMySetting()
     }
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun refreshUI(event: MyInfoEvent){

base/src/main/java/com/xty/base/fragment/BaseVmFrag.kt

@@ -29,7 +29,7 @@ abstract class BaseVmFrag<T : BaseVm> : IBaseFrag() {
 
         mViewModel.nowData.observe(this) {
             loadingView.dismiss()
-//            ToastUtils.show(R.string.again_login)
+            ToastUtils.show(R.string.again_login)
 
             //RxActivityTool.finishAllActivity()
             MMkvHelper.clearUserInfo()

config.gradle

@@ -148,7 +148,7 @@ ext {
             jpush_vivo                   : 'cn.jiguang.sdk.plugin:vivo:4.7.0',
 //            jpush_honor                  : 'cn.jiguang.sdk.plugin:honor:4.7.0',
             //角标
-            shortcut_badger              : 'me.leolin:ShortcutBadger:1.1.4@aar',
+            shortcut_badger              : 'me.leolin:ShortcutBadger:1.1.22@aar',
 
             // 友盟统计SDK
             umsdk_common                 : 'com.umeng.umsdk:common:9.4.7',// 必选

health/src/main/res/layout/item_health_code_main.xml

@@ -16,9 +16,11 @@
             android:layout_width="@dimen/dp_20"
             android:layout_height="@dimen/dp_20"
             android:gravity="center"
-            android:text="12"
+            tools:text="1"
             android:layout_gravity="center"
             android:textColor="@color/col_02c"
+            android:textSize="@dimen/sp_10"
+            android:textStyle="bold"
             android:background="@drawable/shape_oval_02c" />
         <TextView
             android:id="@+id/tv_body_name"