From c8e33e9cebe3382d86081d41005138f69a9fcf8c Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Fri, 15 Mar 2024 14:14:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?= =?UTF-8?q?=E5=BC=80=E5=8F=91-bug=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 3 + .../zj365/dc/activity/MessageDetailNewAct.kt | 13 +++ .../com/zj365/dc/activity/WarningMsgAct.kt | 9 +- .../zj365/dc/adapter/WarningMessageAdapter.kt | 2 +- .../dc/fragment/DynamicManagementFrag.kt | 20 ++-- .../com/zj365/dc/fragment/HealthHomeFrag.kt | 33 +++++-- .../java/com/zj365/dc/fragment/MineFrag.kt | 90 ++++++++++++++---- .../res/layout/frag_dynamic_management.xml | 6 +- app/src/main/res/layout/frag_mine.xml | 66 +++++++------ .../main/res/layout/item_warning_message.xml | 48 ++++------ .../icon_health_internet_thing.png | Bin 0 -> 5171 bytes .../res/mipmap-xxhdpi/icon_magic_test.png | Bin 0 -> 2454 bytes .../res/mipmap-xxhdpi/icon_mine_start_bs.png | Bin 2458 -> 4071 bytes base/src/main/java/com/xty/base/vm/BaseVm.kt | 21 ++-- .../src/main/java/com/xty/common/app/MyApp.kt | 35 +++++++ .../main/res/layout/act_warning_message.xml | 11 +-- .../com/xty/network/model/UserOtherInfo.kt | 2 + 17 files changed, 237 insertions(+), 122 deletions(-) create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_health_internet_thing.png create mode 100644 app/src/main/res/mipmap-xxhdpi/icon_magic_test.png diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 05d648d..5a50715 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -156,6 +156,9 @@ android:launchMode="singleTop" android:screenOrientation="portrait" /> + () { var msgBean : MessageTypeDataBean.MessageTypeBean? = null + var warningBean:MessageBean.SysMsg ? = null + override fun liveObserver() { } @@ -52,7 +54,18 @@ class MessageDetailNewAct: BaseVmAct() { } + }else if(it.containsKey("WarnningBean")){ + warningBean=it.getSerializable("WarnningBean") as MessageBean.SysMsg + warningBean?.let { + binding.tvMsgTitle.text = it.notifyTitle + binding.tvMsgTime.text = Dateutils.formatTime(it.notifyCreateTime,Dateutils.YYYY_MM_DD_HH_MM) + binding.tvMsgContent.text = Html.fromHtml(it.notifyContent,ImageGetterUtils.MyImageGetter(this,binding.tvMsgContent),null) + + } + }else{ + } + } onEventObject( diff --git a/app/src/main/java/com/zj365/dc/activity/WarningMsgAct.kt b/app/src/main/java/com/zj365/dc/activity/WarningMsgAct.kt index 7d40695..f2829fb 100644 --- a/app/src/main/java/com/zj365/dc/activity/WarningMsgAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/WarningMsgAct.kt @@ -46,7 +46,6 @@ class WarningMsgAct : BaseListAct() { override fun initAdapter() { binding.mRecycle.layoutManager = LinearLayoutManager(this) binding.mRecycle.adapter = adapter - binding.mRecycle.addItemDecoration(RecycleItem(this, 30)) adapter.addChildClickViewIds(R.id.mContentView) adapter.setOnItemChildClickListener { adapter, view, position -> var bean = adapter.getItem(position) @@ -59,8 +58,8 @@ class WarningMsgAct : BaseListAct() { clickPosition = position } else { bundle.clear() - bundle.putSerializable("bean", data) - RouteManager.goAct(ARouterUrl.MESSAGE_DETAIL, bundle) + bundle.putSerializable("WarnningBean", data) + RouteManager.goAct(ARouterUrl.MESSAGE_DETAIL_NEW, bundle) } } } @@ -73,8 +72,8 @@ class WarningMsgAct : BaseListAct() { (adapter.data[clickPosition]).notifyStatus = 1 adapter.notifyItemChanged(clickPosition) bundle.clear() - bundle.putSerializable("bean", clickBean) - RouteManager.goAct(ARouterUrl.MESSAGE_DETAIL, bundle) + bundle.putSerializable("WarnningBean", clickBean) + RouteManager.goAct(ARouterUrl.MESSAGE_DETAIL_NEW, bundle) } mViewModel.warningMsgLive.observe(this) { it?.let { diff --git a/app/src/main/java/com/zj365/dc/adapter/WarningMessageAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/WarningMessageAdapter.kt index 6bcb0fa..ad66823 100644 --- a/app/src/main/java/com/zj365/dc/adapter/WarningMessageAdapter.kt +++ b/app/src/main/java/com/zj365/dc/adapter/WarningMessageAdapter.kt @@ -31,7 +31,7 @@ class WarningMessageAdapter():BaseAdapter(R.layout.item_warn } draw.mutate() draw.setBounds(0,0,draw.minimumWidth,draw.minimumHeight) - tv.setCompoundDrawables(draw,null,null,null) + tv.setCompoundDrawables(null,null,draw,null) } } 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 7916826..8523705 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -65,6 +65,7 @@ import com.zj365.dc.databinding.FragDynamicManagementBinding import com.zj365.dc.vm.DynamicManagementVm import com.zj365.health.vm.ReportVm import com.zj365.health.weight.DialogTip +import com.zj365.health.weight.DialogTipNew import com.zj365.mime.weight.FactorySettingDialog import com.zj365.mime.weight.NoticeSettingDialog import io.reactivex.Observable @@ -249,8 +250,8 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission //点击事件 private fun setOnClickListener() { - binding.mMsgLayout.setOnClickListener(onClickListener) - binding.mMsg.setOnClickListener(onClickListener) + /* binding.mMsgLayout.setOnClickListener(onClickListener) + binding.mMsg.setOnClickListener(onClickListener)*/ binding.mHeader.mCard.setOnClickListener(onClickListener) binding.mHeader.mBtnBind.setOnClickListener(onClickListener) binding.mGriddingList.mSub.setOnClickListener(onClickListener) @@ -264,13 +265,14 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission binding.mHealthReport.llHebdomadReport.setOnClickListener(onClickListener) binding.mHealthReport.llThirtyDaysReport.setOnClickListener(onClickListener) binding.mHeader.mHealthRecords.setOnClickListener(onClickListener) + binding.mHeader.tvWarningNum.setOnClickListener(onClickListener) } //点击事件响应 private var onClickListener = View.OnClickListener { when (it.id) { //消息 - R.id.mMsg, R.id.mMsgLayout -> { + R.id.tv_warning_num/*, R.id.mMsgLayout*/ -> { RouteManager.goAct(ARouterUrl.WARNING_MSG) } //健康档案 @@ -518,12 +520,12 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission }else{ if (EasyPermissions.somePermissionDenied(requireActivity(), Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION)){ - DialogTip( + /*DialogTip( requireContext(), "中健365需要定位权限,需要打开设置页面么?" ) { JumpPermissionManagement.GoToSetting(requireActivity()) - }.show() + }.show()*/ }else{ FactorySettingDialog( requireContext(), @@ -739,7 +741,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission override fun observer() { //预警消息 - mViewModel.warningMsgLive.observe(this) { + /* mViewModel.warningMsgLive.observe(this) { updateBadgeNum(it.data.noReadNum) val systemMessage = it.data.systemMessage if (systemMessage !=null && systemMessage.isNotEmpty()) { @@ -748,7 +750,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } else { updateWarningInfo(null) } - } + }*/ mViewModel.weatherLiveDate.observe(this){ if(it.data == null){ @@ -1477,7 +1479,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } private fun updateBadgeNum(num: Int) { - if (num > 0) { + /*if (num > 0) { val badgeText = if (num > 99) "99+" else "$num" binding.mBadge.text = badgeText binding.mBadge.post { @@ -1496,7 +1498,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission binding.mBadgeCard.visibility = View.VISIBLE } else { binding.mBadgeCard.visibility = View.GONE - } + }*/ } private fun updateWarningInfo(sysMsg: MessageBean.SysMsg?) { diff --git a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt index 87c2832..6d89c3a 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -287,11 +287,17 @@ HealthHomeFrag : BaseVmFrag() { } }else{ - contentData.jumpUrl?.let { - bundle.clear() - bundle.putString("title", contentData.name) - bundle.putString("url", contentData.jumpUrl) - RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + contentData.jumpUrl?.let { + bundle.clear() + bundle.putString( + "web_site_url", + "${it}" + ) + RouteManager.goAct(ARouterUrl.H5_ACT, bundle) + } } } @@ -408,11 +414,18 @@ HealthHomeFrag : BaseVmFrag() { } 2->{ - contentData.jumpUrl?.let { - bundle.clear() - bundle.putString("title", contentData.name) - bundle.putString("url", contentData.jumpUrl) - RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) + + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + contentData.jumpUrl?.let { + bundle.clear() + bundle.putString( + "web_site_url", + "${it}" + ) + RouteManager.goAct(ARouterUrl.H5_ACT, bundle) + } } } diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index 97bf0b7..130e240 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -108,23 +108,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ //刷新注册 refresh() - Const.mainLiveData.value?.let { - user = it.user - binding.mName.text = it.user.name - binding.mPhone.text = "${it.user.phone}" -// binding.mDk.text = it.clock.toString() -// binding.mLevel.text = it.grade - if (it.user.avatarUrl.isNullOrEmpty()) { - binding.mImage.setImageResource(defaultIcon[if (it.user.sex - 1 < 0) 0 else it.user.sex - 1]) - } else { - binding.mImage.setImageUser( - requireContext(), - it.user.avatarUrl, - it.user.sex.toString() - ) - Const.CHAT_IMAGE = it.user.avatarUrl - } - } + binding.clInfo.setOnClickListener { if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) @@ -222,7 +206,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ bundle.clear() bundle.putString( "web_site_url", - "${it.start_business}" + "${it.vip_server}" ) RouteManager.goAct(ARouterUrl.H5_ACT, bundle) }else{ @@ -412,6 +396,46 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ } } + binding.llMagicTest.setOnClickListener { + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + otherInfo?.let { + if (!TextUtils.isEmpty(it.magic_mirror)){ + bundle.clear() + bundle.putString( + "web_site_url", + "${it.magic_mirror}" + ) + RouteManager.goAct(ARouterUrl.H5_ACT, bundle) + }else{ + CommonToastUtils.showToast("敬请期待") + + } + } + } + } + + binding.llInternetThing.setOnClickListener { + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + otherInfo?.let { + if (!TextUtils.isEmpty(it.miot)){ + bundle.clear() + bundle.putString( + "web_site_url", + "${it.miot}" + ) + RouteManager.goAct(ARouterUrl.H5_ACT, bundle) + }else{ + CommonToastUtils.showToast("敬请期待") + + } + } + } + } + binding.llOperationGuide.setOnClickListener { if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) @@ -542,6 +566,24 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ Const.userDeviceLiveData.value?:mViewModel.getUserDeviceInfo(showIdInfo) mViewModel.searchInviteInfo() mViewModel.getUserOtherInfo() + + Const.mainLiveData.value?.let { + user = it.user + binding.mName.text = it.user.name + binding.mPhone.text = "${it.user.phone}" +// binding.mDk.text = it.clock.toString() +// binding.mLevel.text = it.grade + if (it.user.avatarUrl.isNullOrEmpty()) { + binding.mImage.setImageResource(defaultIcon[if (it.user.sex - 1 < 0) 0 else it.user.sex - 1]) + } else { + binding.mImage.setImageUser( + requireContext(), + it.user.avatarUrl, + it.user.sex.toString() + ) + Const.CHAT_IMAGE = it.user.avatarUrl + } + } } if(isLogin){ @@ -564,6 +606,18 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ binding.mllServerOrder.visibility = View.GONE } + if(TextUtils.isEmpty(it.data.magic_mirror)){ + binding.llMagicTest.visibility = View.GONE + }else{ + binding.llMagicTest.visibility = View.VISIBLE + } + + if(TextUtils.isEmpty(it.data.miot)){ + binding.llInternetThing.visibility = View.GONE + }else{ + binding.llInternetThing.visibility = View.VISIBLE + } + if(TextUtils.isEmpty(it.data.start_business)){ binding.llStartBs.visibility = View.GONE }else{ diff --git a/app/src/main/res/layout/frag_dynamic_management.xml b/app/src/main/res/layout/frag_dynamic_management.xml index 7a5870c..40cb5b8 100644 --- a/app/src/main/res/layout/frag_dynamic_management.xml +++ b/app/src/main/res/layout/frag_dynamic_management.xml @@ -16,7 +16,7 @@ android:orientation="horizontal" android:visibility="gone" /> - @@ -30,7 +30,7 @@ android:visibility="gone" android:orientation="horizontal"> - + <!– 我的家人列表 –> - + --> + - + + - - + @@ -802,6 +802,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_24" + android:weightSum="4" android:orientation="horizontal"> + + + + - - - - - + tools:text="eeeeeee" + android:layout_centerVertical="true" + android:textColor="@color/col_313" + android:textSize="@dimen/sp_15" /> - - - + android:textColor="@color/col_7c7" + tools:text="eeeeee" + android:textSize="@dimen/sp_13" /> + - - + android:maxLines="1" + android:textColor="@color/col_7c7" + android:textSize="@dimen/sp_13" /> - + diff --git a/app/src/main/res/mipmap-xxhdpi/icon_health_internet_thing.png b/app/src/main/res/mipmap-xxhdpi/icon_health_internet_thing.png new file mode 100644 index 0000000000000000000000000000000000000000..4561dc3b4ebfd799005325e9b7453a3f56875b1e GIT binary patch literal 5171 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/icon_magic_test.png b/app/src/main/res/mipmap-xxhdpi/icon_magic_test.png new file mode 100644 index 0000000000000000000000000000000000000000..655e488735d85f9caeb72d59f83733a4162cb59c GIT binary patch literal 2454 zcmV;H32F9;P)Px;P)S5VRCr$PoPUf|)fLCT=e+l3W`7`M|3E3NwzL>vEl`2fE-3N>v?V=Y8Y zV>A%06?T@bRR3vM|7oHm?9MJoXiL$g8Vik48>JLsf5Ac&g=&E|{@D5>EyjpHfMsUh zynE`K*#(4o^W*Isc1Ye!_OHF?+;cwfd(XRb?|qNp_0`>`1LJEE6!zM6$^M1{1ToT> zfFaDi*DTpSj{$k<4BZ>AVot9GFdrgSAQDggm+njh=u-f%D8g?LZvLor7r8CG1J~Ua zVy*6vAl#0z#&uz?c9u$>QtFfCh_)rXfaf8&&aW}cTL6My1XczgpD2}_f#|P~d*M4j zIBEN$PPGZJje(^q@6hY(oWVik2ofnT;_}`{z<{z+)3BiB-;T~j2-u#@_2GvJZEeb_ z?Zx2w;!T>uFN9EG*oA7iSP4u8xeJk&ryM)o z-#(pD;owrq8HlVt=6v%z?qJa4AQ;&;1P}q$LCDE7-6HxDMDIT}{2u__UDKG=P8j;t zFw+5oU;rv*)+5}UM{%7$W0F6Ca@1)<2h8+4N~gt` z-~2XVV0{&tyq$=DlvP=-OVR{dVMSt3ID^|Xna$LD0LFg)mOIF_O3AmdsKt&k=cV<; z?-s)E0O&az5J5zq6LrOHgubr%Tpiqt(`TIPi7i)Pom#l+LB|KgKi1XIr-5gPX)#oV z%}1CZN?w$j&{E93cPO_ugt)Ksw*Vf>TUcwWpiUOD#s8V@nC}!Ijoev zaAb__WKW*FtL~+GI$OSn2y(yztwtpFrlXgg>uNX@*bAcB&La;% zKnK#+W}@Es-$~aNA#LT4ENFld=_OWU^I!8e?A}<5DzgSk=}42~vjw&Gp`^LL>NFp7FAg^ z2BocorGYyaQ4+utMw%W?HZ{LpQlOR6c>ktvaLRlDkQF8UOdKURK;!IRD*XlshXG1J zDqtxo-;E)==1K^HSupgO8HE)yJkR$zYH%aYY#4~W^ zO|$a6``}#O6Ca!p&LshtX1?Nla4reBH1iebgL6s1rJ1idADl}9F3o(!`QTgnQym)XaVY?6)};w9y65wH^?kCUN& ztgQ4*C~5=I_>#OhH6C+t+1;Y!AnX9)U0AphEVn|_Cl=hQ%#~CYya~Zd)flsPYFpB;B06jN0fz|ffL6OZA(M8Y1lVdP3cfK1@t*34X^A?NGLP)J>0bB z^;}%_{;o!)l)WchJ1XUk88~~7!cxanBsL>Q0`^&!5SiLxBD%IHb!3(Hrc%jp-a~`k zTSLsBzXM>>i(Zp78R zw&W#1M)#1oq(e3P(H=Qc4g-BsNf#qn+y}awxD1Oxay~FRrqK%c|pK z5b63ekzc((+L*Z~KB#oL2Mbzu73FJJ$JHF57r=a7!IM};IUH_OR&ZHpALxn~rJ}3; zRZ3jWZSAA57(=P0^EZ~NRX8=4a5m_}@Fwx%lR0duJ(YP-TEk2|o&5sncacW?{ z%+gbLCmT7R!miz3Wav4#>)H-5eaCTL#RO6~U>R54h=yg(d|jbw?NARZX_5x z+3a%m*eB{1&?OtHUI$pI{>rMjN=@2}xO{LfDf-}ia4reBH1iebgL6s1rJ1idADl}9 zF3o(!`QTgWBHh_;};ooMKsHNfY01QdQUv6g2o=tPxVwpmSqSc zXn+&ujf8`ntF_aK=Y^@M=&idl#B*7=%xsp+ZmTA=B)fmq(=m^Uo&(b)AD+W4%$~$L zuE_cc!mTf#`yx_*e2%8jDFLG)^EFoMysxre7IG*gND1}>v=-Uh$2iRMDWeBR0U1q4T{Q=|?Byxmx>_{Vd01F;GITH5&0cK1Q Uj?%F1h5!Hn07*qoM6N<$g2fZHT>t<8 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xxhdpi/icon_mine_start_bs.png b/app/src/main/res/mipmap-xxhdpi/icon_mine_start_bs.png index 4b88a28013c1b197bcd3c937498d97a7756c0e80..2fc99c6b151870820dbf40d2c55c444ff8c72076 100644 GIT binary patch literal 4071 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 Z{|9(Ce-~y0L9qY;002ovPDHLkV1g>^xcC47 literal 2458 zcmV;L31#+)P)Px;R7pfZRCr$Poqvp!M;XVz&&<2;?j2n9I7p+CVj*ae+9q04`Ek2<(n8U;rlz4W zF>3u0Err_yV`5_|SJK#2E9`E$Hf@NO7!9EkYiqF*V1L{N{87{pkXE4zXe*6{_9(~Q z?)%PTW*5rs-R`lsJMZmX`o90(%rnn?-e=~WndduugzQ13=@^h)iu-&O&?`l`|fa?M|*8%VbKuKcv=Wg4Y z-+I&FC9B@T+?fco^TOcR|&Ce@{rATS8x`&Df2zbE_cdP)B@(QYVFnb?ql5S`R z3%VJ~qbM8;6+s~8UY7#5qjlw(u~eo3;=`KCsm~L+g^C& z2}~;!Tc+&bix@03?_V5#Ui3)Y9Bn$W0}xqfnG@;QWx9D!V2VuqBtSDu%#V7$dJDjD z0z3;@21$Ug0x%7LD1s&kQ0l0Pbk3ddFs*cAsUrNY2&9fga2Bi{R?>P3i&wv9x+5d( z?cUrX0`4k+)&pD|G=d-)ZBDo&ZPE|pktx!N#{gb6G8*_n6^VA4biNW>A`@Q+q75ZJ zf^ijzc2;7e(lW+jQabT#0^eTb0OOQ$cqwk`JXon?#>!=4*9k?tK)7 zn*yorlpp5F$8Hcp-9x~9hW-*>Zbs1C4srl>6+m{8lY}goPXJ_H-j2!cvEB{2Af8od zyXesoc@jY2vOW5e^svg6xzS@`%+$xB-9hXg%m$PO;Z-+w}Y-4!%0tmcTt*# z&>N9@9C#S=NpC!)0D?C7?797{Xam}#FAnYOMVR?5ib%&F0^z$5!p=kVpV9<0RHgL6 z!y_sjeE*OM<`(&#^jv7olgrV;lnh7v0%i9>BBTgz@RBVGJTi^2^cixN9JUJnHOn|vqE^RTul3DJTkR| z%x@9s2%!2HVh+HwM@ag{+HtexbzU>Sk`MwGSw_wpdZ{*)m=JD$!=YGUNdudr=ZY3|%7)&X^F8`TT z)1p%92$6|zK+s-?fpNJ#Qo8H;!`tkGs=b7yF|Uu32S|u{Wz*D`19}OjK7ylJg;386 z2`*Q)`0x26``m44?fgx-iXs#51Bs@Zhtt?RE0osLk5Xq;B&t=!rJvNM3$Q4ltKri;f;?T2k0&BGvmJCFEz&y6W%c*O{?60)dXI7sXW#nG2P)+9Ky}Rgvgd z%dayxe?%yEFMtnK)l^{zWF*yld6=nq0=BifZZI9*s=}+ihG`-@NhcL}2_n&dlpp5t zAH%ZN)(55qIJu`)xbyC^QJ0R-6@ZS+nKeYF0hrAHQ@FXfu>%lw5{K!F2}-@JBGGx}{IgPt zRz;ku`s~#hOiO|tcLztJcV0MhDq3R6RN^+a<#Tlz;uq=J7Rbr1a9cZ{83wd)F(MP& z25H?@wXD(@OzmAm5a=I>s9;#yCcu_@J3fE`bqecFRbnJTw1s|^I zywxa7eGnS5i3hTK1n3taoMQb^0=@-CqZeeVv^fZ(Zqgqc7c-Ppcam*?4ug)qeO3L| z+Az#Q-}3ikv|p@XNintySykd0OSOv^qa0U(Na)Ev{~JiPKAym=)v3u^--l`N&G|5W zm<9Sdx-Y#&*2fq$#Fh8Lw}m5%Bqk&bVMZQYA(9RzAM_&=el z1}rV4{R!od?56}X=r{H&UK6UHsB1(;nb65UWZs!w)LCE>h4mJC;&RI0*{NnfRqO#BlE=_Y)- zqwiAQV`m~rjp{Jj)||TJw(f|iE zKb#^)3WQ&|;WNJkbros<%cnQ@ZEV0OV07*qoM6N<$f}!V;1^@s6 diff --git a/base/src/main/java/com/xty/base/vm/BaseVm.kt b/base/src/main/java/com/xty/base/vm/BaseVm.kt index 0e2d9e9..0f9bba5 100644 --- a/base/src/main/java/com/xty/base/vm/BaseVm.kt +++ b/base/src/main/java/com/xty/base/vm/BaseVm.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.hjq.toast.ToastUtils import com.xty.common.LogUtils +import com.xty.common.app.MyApp import com.xty.common.util.CommonUtils import com.xty.network.ApiInterface import com.xty.network.MyRetrofit @@ -38,23 +39,29 @@ open class BaseVm(var loading: Dialog?) : ViewModel() { } when (throwable) { - is ConnectException -> ToastUtils.show("网络异常") + is ConnectException -> if(MyApp.activityCount> 0) ToastUtils.show("网络异常") is HttpException -> { var exception = throwable when ((exception as HttpException).code()) { - 500 -> ToastUtils.show("服务器繁忙，请稍后重试") - 502 -> ToastUtils.show("当前网络状态不佳，请稍后重试") - 504 -> ToastUtils.show("请求超时，请检查网络") - else -> ToastUtils.show("连接异常错误码:${(exception as HttpException).code()}") + 500 -> if(MyApp.activityCount> 0) ToastUtils.show("服务器繁忙，请稍后重试") + 502 -> if(MyApp.activityCount> 0) ToastUtils.show("当前网络状态不佳，请稍后重试") + 504 -> if(MyApp.activityCount> 0) ToastUtils.show("请求超时，请检查网络") + else -> if(MyApp.activityCount> 0) ToastUtils.show("连接异常错误码:${(exception as HttpException).code()}") } return@CoroutineExceptionHandler } is SocketTimeoutException -> { - ToastUtils.show("连接超时") + if(MyApp.activityCount> 0){ + ToastUtils.show("连接超时") + } + return@CoroutineExceptionHandler } is UnknownHostException -> { - ToastUtils.show("当前网络状态不佳，请再试一次") + if(MyApp.activityCount> 0){ + ToastUtils.show("当前网络状态不佳，请再试一次") + } + return@CoroutineExceptionHandler } } diff --git a/common/src/main/java/com/xty/common/app/MyApp.kt b/common/src/main/java/com/xty/common/app/MyApp.kt index 56dd3c1..0db5ae7 100644 --- a/common/src/main/java/com/xty/common/app/MyApp.kt +++ b/common/src/main/java/com/xty/common/app/MyApp.kt @@ -1,6 +1,7 @@ package com.xty.common.app import android.annotation.SuppressLint +import android.app.Activity import android.app.ActivityManager import android.app.Application import android.bluetooth.BluetoothAdapter @@ -9,6 +10,7 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.Build +import android.os.Bundle import android.util.Log import cat.ereza.customactivityoncrash.CustomActivityOnCrash import cat.ereza.customactivityoncrash.config.CaocConfig @@ -47,8 +49,11 @@ class MyApp : Application() { private lateinit var blueToothReceiver: BluetoothMonitorReceiver + + companion object { var instance: MyApp? = null + var activityCount = 0 private fun getInstance(app: MyApp) { instance = app } @@ -107,6 +112,36 @@ class MyApp : Application() { MMkvHelper.put(Const.VERSION_NAME, AppUtils.getPackageVersionName(this)) MMkvHelper.put(Const.VERSION_CODES, AppUtils.getVersionCode(this)) + + registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks{ + override fun onActivityCreated(p0: Activity, p1: Bundle?) { + + } + + override fun onActivityStarted(p0: Activity) { + LogUtils.e("APP","前台呀") + activityCount++ + } + + override fun onActivityResumed(p0: Activity) { + } + + override fun onActivityPaused(p0: Activity) { + } + + override fun onActivityStopped(p0: Activity) { + LogUtils.e("APP","后台") + activityCount-- + LogUtils.e("APP","后台${activityCount}") + + } + + override fun onActivitySaveInstanceState(p0: Activity, p1: Bundle) { + } + + override fun onActivityDestroyed(p0: Activity) { + } + }) } // private fun forceStopApp(){ diff --git a/mine/src/main/res/layout/act_warning_message.xml b/mine/src/main/res/layout/act_warning_message.xml index 9652508..37cecb5 100644 --- a/mine/src/main/res/layout/act_warning_message.xml +++ b/mine/src/main/res/layout/act_warning_message.xml @@ -2,8 +2,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> + />