From a31b0caab5639f75d84ca1eae477d41373087fad Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Fri, 29 Dec 2023 17:47:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BC=98=E5=8C=96/bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zj365/dc/activity/DeviceChoiceAct.kt | 8 + .../dc/activity/OneKeyBinderDeviceAct.kt | 3 + .../zj365/dc/activity/RecognizeResultAct.kt | 16 +- .../zj365/dc/adapter/BannerCustomAdapter.kt | 6 + .../dc/adapter/RecognizeResultAdapter.kt | 5 + .../dc/fragment/DynamicManagementFrag.kt | 54 ++----- .../com/zj365/dc/fragment/HealthHomeFrag.kt | 152 ++++++++++-------- .../com/zj365/dc/fragment/MessageFragment.kt | 2 +- .../java/com/zj365/dc/fragment/MineFrag.kt | 20 ++- app/src/main/res/layout/frag_health.xml | 1 + .../main/res/layout/item_recognize_result.xml | 1 + .../java/com/xty/base/h5/CloudJSBridge.kt | 8 + .../res/drawable/shape_r8_02c_stroke_1_5.xml | 2 +- common/src/main/res/mipmap-xhdpi/ic_logo.png | Bin 5356 -> 5711 bytes common/src/main/res/mipmap-xxhdpi/ic_logo.png | Bin 10711 -> 11123 bytes .../res/mipmap-xxhdpi/icon_about_logo.png | Bin 21207 -> 11999 bytes health/src/main/res/layout/frag_sleep_new.xml | 1 + .../java/com/zj365/mime/act/DevInfoAct.kt | 9 ++ .../main/java/com/zj365/mime/vm/BaseInfoVm.kt | 12 +- mine/src/main/res/layout/act_about.xml | 4 +- .../main/java/com/xty/network/ApiInterface.kt | 2 +- .../java/com/xty/network/model/BannerBean.kt | 5 +- .../xty/network/model/FoodRecoginzeInfo.kt | 1 + .../com/xty/network/model/HomeLayoutBean.kt | 3 +- 24 files changed, 184 insertions(+), 131 deletions(-) diff --git a/app/src/main/java/com/zj365/dc/activity/DeviceChoiceAct.kt b/app/src/main/java/com/zj365/dc/activity/DeviceChoiceAct.kt index 25e68e0..2165794 100644 --- a/app/src/main/java/com/zj365/dc/activity/DeviceChoiceAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/DeviceChoiceAct.kt @@ -9,12 +9,15 @@ import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.bracelet.checkBlueConnectPermission import com.xty.common.bracelet.getBluePermission +import com.xty.common.event.BindDevEvent import com.xty.network.model.DeviceBean import com.zj365.dc.R import com.zj365.dc.adapter.DeviceChoiceAdapter import com.zj365.dc.databinding.ActDeviceChoiceBinding import com.zj365.dc.vm.DeviceChoiceVm import com.zj365.mime.weight.FactorySettingDialog +import org.greenrobot.eventbus.Subscribe +import org.greenrobot.eventbus.ThreadMode /** * 选择手表型号 @@ -101,4 +104,9 @@ class DeviceChoiceAct : BaseVmAct() { super.onBackPressed() } } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun onBindDev(event : BindDevEvent){ + finish() + } } \ No newline at end of file diff --git a/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt b/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt index 0139149..6659857 100644 --- a/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt @@ -9,12 +9,14 @@ import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper import com.xty.base.act.BaseVmAct import com.xty.common.LogUtils import com.xty.common.arouter.ARouterUrl +import com.xty.common.event.BindDevEvent import com.xty.common.util.CommonToastUtils import com.xty.common.xqr_code.XQRCodeAct import com.xuexiang.xqrcode.XQRCode import com.zj365.dc.databinding.ActBinderDeviceOneKeyBinding import com.zj365.dc.model.ScanInfoBean import com.zj365.dc.vm.OneKeyBinderDeviceVm +import org.greenrobot.eventbus.EventBus @Route(path = ARouterUrl.DEVICE_ACTIVE) class OneKeyBinderDeviceAct : BaseVmAct() { @@ -22,6 +24,7 @@ class OneKeyBinderDeviceAct : BaseVmAct() { val binding by lazy { ActBinderDeviceOneKeyBinding.inflate(layoutInflater) } override fun liveObserver() { mViewModel.bindResult.observe(this){ + EventBus.getDefault().post(BindDevEvent()) CommonToastUtils.showToast("绑定成功") finish() } diff --git a/app/src/main/java/com/zj365/dc/activity/RecognizeResultAct.kt b/app/src/main/java/com/zj365/dc/activity/RecognizeResultAct.kt index d9e72fd..b8491f9 100644 --- a/app/src/main/java/com/zj365/dc/activity/RecognizeResultAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/RecognizeResultAct.kt @@ -95,13 +95,13 @@ class RecognizeResultAct : BaseVmAct() { var vit = bean.vit_a+ bean.vit_b1+ bean.vit_b2+bean.vit_c+bean.vit_e var calorieBean = ReportNewBean().apply { title = "热卡分析" - count = bean.df+bean.cho+vit - listNum.add(vit ) - listNum.add(bean.df) + count = bean.protein+bean.cho+bean.fat listNum.add(bean.cho) - listName.add("维生素") - listName.add("膳食纤维") + listNum.add(bean.protein) + listNum.add(bean.fat) listName.add("碳水化合") + listName.add("蛋白质") + listName.add("脂肪") unit = "g" isShow = true } @@ -117,11 +117,7 @@ class RecognizeResultAct : BaseVmAct() { binding.recycler.addItemDecoration(object : ItemDecoration(){ override fun getItemOffsets(outRect: Rect, itemPosition: Int, parent: RecyclerView) { super.getItemOffsets(outRect, itemPosition, parent) - if (itemPosition == 0){ - - }else{ - outRect.right = SizeUtils.dp2px(8.0f) - } + outRect.right = SizeUtils.dp2px(8.0f) } }) adapter.setOnItemClickListener{ adapter, view, position -> diff --git a/app/src/main/java/com/zj365/dc/adapter/BannerCustomAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/BannerCustomAdapter.kt index bf6e578..fc5e356 100644 --- a/app/src/main/java/com/zj365/dc/adapter/BannerCustomAdapter.kt +++ b/app/src/main/java/com/zj365/dc/adapter/BannerCustomAdapter.kt @@ -76,6 +76,12 @@ class BannerCustomAdapter(var context: Context) mVHMap.append(position, imageHolder) context?.let { imageHolder.imageView.setBigImage(it, data?.imgUrl) } } + + 20 ->{ + val imageHolder: ImageHolder = holder as ImageHolder + mVHMap.append(position, imageHolder) + context?.let { imageHolder.imageView.setBigImage(it, data?.imgUrl) } + } } } } diff --git a/app/src/main/java/com/zj365/dc/adapter/RecognizeResultAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/RecognizeResultAdapter.kt index a202b76..e639f6f 100644 --- a/app/src/main/java/com/zj365/dc/adapter/RecognizeResultAdapter.kt +++ b/app/src/main/java/com/zj365/dc/adapter/RecognizeResultAdapter.kt @@ -1,7 +1,10 @@ package com.zj365.dc.adapter +import android.widget.ImageView import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.tencent.qcloud.tuikit.timcommon.component.impl.GlideEngine import com.xty.base.adapter.BaseAdapter +import com.xty.common.setImage import com.xty.network.model.FoodRecoginzeInfo import com.xty.network.model.HomeLayoutBean import com.zj365.dc.R @@ -16,6 +19,8 @@ class RecognizeResultAdapter : BaseAdapter(R.layout.item_reco } + holder.getView(R.id.img_pic).setImage(context,item.img) + } } \ No newline at end of file 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 1284790..b19d52e 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -37,6 +37,7 @@ import com.xty.common.bracelet.checkBlueConnectPermission import com.xty.common.bracelet.getBluePermission import com.xty.common.bracelet.isGpsOpen import com.xty.common.event.AddSuccessEvent +import com.xty.common.event.BindDevEvent import com.xty.common.event.BlueToothConnectEvent import com.xty.common.event.ChangeFamilyEvent import com.xty.common.event.FamilyEvent @@ -171,8 +172,6 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } else { MMkvHelper.getLong(Const.USER_ID).toString() } - //家人信息绑定 - initFamilyAdapter() //点击事件 setOnClickListener() @@ -314,41 +313,6 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission mViewModel.getWarningMsg() } - /** - * 家人信息绑定 - */ - @SuppressLint("NotifyDataSetChanged") - private fun initFamilyAdapter() { - /*binding.mRecycle.layoutManager = - LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) - binding.mRecycle.adapter = mFamilyAdapter - mFamilyAdapter.setOnItemClickListener { adapter, view, position -> - if (position == mFamilyAdapter.data.size - 1) { - onEventObject(requireContext(), UmengEventId.Family) - RouteManager.goAct(ARouterUrl.BIND_FAMILY) - } else { - val bean = adapter.getItem(position) as FamilyBean - showIdInfo = if (bean.id == 0) { - "" - } else { - bean.userJointId.toString() - } - sex = bean.sex.toString() - binding.mHeader.mWearManager.visibility = - if (showIdInfo.isEmpty()) View.VISIBLE else View.GONE - setUserImage(if (showIdInfo.isEmpty()) "0" else showIdInfo, bean.avatarUrl, bean.sex.toString()) - binding.mHeader.mUserName.text = bean.fCall - mFamilyAdapter.position = position - mFamilyAdapter.notifyDataSetChanged() - mViewModel.getAllInfo(showIdInfo, true) - getXtInfo(showIdInfo) - get24HourReportInfo(showIdInfo) -// mViewModel.getDkInfo(false, showIdInfo) - updateWarningStatus() - } - }*/ - } - //点击事件 private fun setOnClickListener() { binding.mMsgLayout.setOnClickListener(onClickListener) @@ -1737,10 +1701,6 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission tenJob?.cancel() } - @Subscribe(threadMode = ThreadMode.MAIN) - fun LoginOrRegisterChange(event: LoginOrRegisterEvent){ - request() - } @Subscribe(threadMode = ThreadMode.MAIN) fun loginOutChange(event: LoginOutEvent){ @@ -1771,7 +1731,19 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } else { MMkvHelper.getLong(Const.USER_ID).toString() } + + getXtInfo(showIdInfo) + get24HourReportInfo(showIdInfo) request() + uploadWhatchData() } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun bindDevSuccess(event: BindDevEvent){ + getXtInfo(showIdInfo) + get24HourReportInfo(showIdInfo) + request() + uploadWhatchData() + } } \ No newline at end of file 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 69aea53..3920847 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -1,6 +1,5 @@ package com.zj365.dc.fragment -import android.R.attr.path import android.content.Intent import android.provider.Settings import android.view.View @@ -29,7 +28,6 @@ import com.xty.common.util.CommonUtils import com.xty.network.model.BannerBean import com.xty.network.model.FamilyBean import com.xty.network.model.HomeLayoutBean -import com.xty.network.model.MainBean import com.xty.network.model.ScienceBean import com.youth.banner.indicator.RoundLinesIndicator import com.youth.banner.listener.OnPageChangeListener @@ -45,6 +43,8 @@ import com.zj365.dc.vm.HomeVm import com.zj365.dc.weight.AgainSignDialog import com.zj365.health.weight.DialogTip import com.zj365.mime.weight.NoticeSettingDialog +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -149,6 +149,21 @@ HealthHomeFrag : BaseVmFrag() { bundle.putString("url", bannerBean.linkAddress) RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) } + 20 ->{ + val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID + + val api = WXAPIFactory.createWXAPI(ApplicationContext.context, appId) + + val req = WXLaunchMiniProgram.Req() + req.userName = bannerBean.wxId// 填小程序原始id + + // req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。 + + req.miniprogramType = + WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版 + + api.sendReq(req) + } } } @@ -177,6 +192,22 @@ HealthHomeFrag : BaseVmFrag() { bundle.putString("url", bannerBean.linkAddress) RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) } + + 20 ->{ + val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID + + val api = WXAPIFactory.createWXAPI(requireContext(), appId) + + val req = WXLaunchMiniProgram.Req() + req.userName = bannerBean.wxId // 填小程序原始id + + //req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。 + + req.miniprogramType = + WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版 + + api.sendReq(req) + } } } setOnClickListener() @@ -200,34 +231,12 @@ HealthHomeFrag : BaseVmFrag() { binding.mCom.rvLayout.adapter = layoutTopAdapter layoutTopAdapter.setOnItemClickListener { adapter, view, position -> - CommonToastUtils.showToast("敬请期待") - /*var contentData = adapter.getItem(position) as HomeLayoutBean.HomeChildBean + + var contentData = adapter.getItem(position) as HomeLayoutBean.HomeChildBean when(contentData.jumpType){ 1 ->{ - contentData.jumpUrl?.let { - when(contentData.jumpUrl){ - "AI_TONGUE" ->{ //AI 舌诊 - onEventObject(requireContext(), UmengEventId.HealthRisk) - bundle.clear() - bundle.putString("id", showIdInfo) - RouteManager.goAct(ARouterUrl.TONGUE_MAIN_ACTIVITY, bundle) - } - - "AI_TUMOR" ->{ //防癌 - bundle.clear() - bundle.putString("id", showIdInfo) - RouteManager.goAct(ARouterUrl.PRVENT_CANCER, bundle) - } - "MEALS"->{ //膳食管理 - - } - - else ->{ - - } - } - } + CommonToastUtils.showToast("敬请期待") } @@ -241,16 +250,16 @@ HealthHomeFrag : BaseVmFrag() { } - else ->{ + 3 ->{ contentData.jumpUrl?.let { val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID - val api = WXAPIFactory.createWXAPI(ApplicationContext.context, appId) + val api = WXAPIFactory.createWXAPI(requireContext(), appId) val req = WXLaunchMiniProgram.Req() - req.userName = "gh_d43f693ca31f" // 填小程序原始id + req.userName = contentData.wxId // 填小程序原始id - req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。 + // req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。 req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版 @@ -259,7 +268,11 @@ HealthHomeFrag : BaseVmFrag() { } } - }*/ + + 4 ->{ + CommonToastUtils.showToast("敬请期待") + } + } } @@ -299,6 +312,10 @@ HealthHomeFrag : BaseVmFrag() { } + "PSYCHOLOGY" ->{ + CommonToastUtils.showToast("敬请期待") + } + else ->{ CommonToastUtils.showToast("敬请期待") } @@ -317,16 +334,16 @@ HealthHomeFrag : BaseVmFrag() { } - else ->{ + 3 ->{ contentData.jumpUrl?.let { val appId = "wx032bacb749c0dcb0" // 填移动应用(App)的 AppId，非小程序的 AppID - val api = WXAPIFactory.createWXAPI(ApplicationContext.context, appId) + val api = WXAPIFactory.createWXAPI(requireContext(), appId) val req = WXLaunchMiniProgram.Req() - req.userName = "gh_d43f693ca31f" // 填小程序原始id + req.userName = contentData.wxId // 填小程序原始id - req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。 + //req.path = it ////拉起小程序页面的可带参路径，不填默认拉起小程序首页，对于小游戏，可以只传入 query 部分，来实现传参效果，如：传入 "?foo=bar"。 req.miniprogramType = WXLaunchMiniProgram.Req.MINIPTOGRAM_TYPE_RELEASE // 可选打开 开发版，体验版和正式版 @@ -335,6 +352,10 @@ HealthHomeFrag : BaseVmFrag() { } } + + 4 ->{ + CommonToastUtils.showToast("敬请期待") + } } } @@ -452,25 +473,6 @@ HealthHomeFrag : BaseVmFrag() { } private fun setOnClickListener() { - /*binding.mChildView.llAiConfectioner.setOnClickListener(onClickListener) - binding.mChildView.llAiSkinMeasurement.setOnClickListener(onClickListener) - binding.mChildView.llCancerScreening.setOnClickListener(onClickListener) - - binding.mChildView.llMentalTest.setOnClickListener(onClickListener) - binding.mChildView.llAiTongueDiagnosis.setOnClickListener(onClickListener) - binding.mChildView.llDietManagement.setOnClickListener(onClickListener)*/ - -/* - binding.mCom.llHealthRecords.setOnClickListener(onClickListener) - *//*binding.mChildHomeView.mRelInterDk.setOnClickListener(onClickListener) - binding.mChildHomeView.mRelInterBD.setOnClickListener(onClickListener) - binding.mChildHomeView.mRelInterFamily.setOnClickListener(onClickListener)*//* - binding.mCom.llHealthCode.setOnClickListener(onClickListener) - binding.mCom.llDailyBenefit.setOnClickListener(onClickListener) - binding.mCom.llVideoInterview.setOnClickListener(onClickListener) - *//*binding.mOrganView.llCompare.setOnClickListener(onClickListener) - binding.myManager.setOnClickListener(onClickListener) - binding.myHealthDa.setOnClickListener(onClickListener)*/ binding.tvMore.setOnClickListener { RouteManager.goAct(ARouterUrl.SCIENCE_LIST) @@ -516,16 +518,21 @@ HealthHomeFrag : BaseVmFrag() { } private fun request() { - mViewModel.getBanners(CommonUtils.getMyUserId(),1)//当期登录用户id + mainScope.launch { + mViewModel.getBanners(CommonUtils.getMyUserId(),1)//当期登录用户id + + delay(1000) + + mViewModel.getBanners(CommonUtils.getMyUserId(),2)//当期登录用户id + - // mViewModel.getMyFamilyList() + } mViewModel.getScinceList() mViewModel.getHomeLayout() - mViewModel.getBanners(CommonUtils.getMyUserId(),2)//当期登录用户id } @@ -540,17 +547,24 @@ HealthHomeFrag : BaseVmFrag() { if (null == it) { return@observe } + if (it[1].isNullOrEmpty()){ + binding.mBanner.visibility = View.GONE + }else{ + binding.mBanner.visibility = View.VISIBLE - mBannerAdapter.setDatas(it[1]) - mBannerAdapter.notifyDataSetChanged() - + mBannerAdapter.setDatas(it[1]) + } if(it[2].isNullOrEmpty()){ - binding.mBannerTwo.visibility = View.GONE + binding.mBannerCardTwo.visibility = View.GONE + }else{ - binding.mBannerTwo.visibility = View.VISIBLE + binding.mBannerCardTwo.visibility = View.VISIBLE mMiddleBannerAdapter.setDatas(it[2]) - mMiddleBannerAdapter.notifyDataSetChanged() + // mMiddleBannerAdapter.notifyDataSetChanged() } + + + } mViewModel.scinceLive.observe(this) { @@ -585,7 +599,13 @@ HealthHomeFrag : BaseVmFrag() { mViewModel.layoutLive.observe(this){ layoutTopAdapter.setNewInstance(it.data.top) - binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),it.data.middle.size/2) + if(it.data.middle.size <= 6){ + binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),3) + + }else{ + binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),4) + + } layoutContentAdapter.setNewInstance(it.data.middle) } } @@ -666,7 +686,7 @@ HealthHomeFrag : BaseVmFrag() { signDialog.dismiss() } @Subscribe(threadMode = ThreadMode.MAIN) - fun LoginOrRegisterChange(event: LoginOrRegisterEvent){ + fun loginOrRegisterChange(event: LoginOrRegisterEvent){ showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") { "" } else { diff --git a/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt b/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt index eb19e77..b8c127b 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt @@ -81,7 +81,7 @@ class MessageFragment : BaseFragList() { override fun setLayout()=binding.root @Subscribe(threadMode = ThreadMode.MAIN) - fun LoginOrRegisterChange(event: LoginOrRegisterEvent){ + fun loginOrRegisterChange(event: LoginOrRegisterEvent){ refresh() } 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 d01d66b..d510679 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -14,6 +14,7 @@ import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.bracelet.YCBBlueConnectHelper import com.xty.common.event.AddSuccessEvent +import com.xty.common.event.BindDevEvent import com.xty.common.event.LoginOrRegisterEvent import com.xty.common.event.LoginOutEvent import com.xty.common.event.MyInfoEvent @@ -25,6 +26,7 @@ import com.zj365.dc.BuildConfig import com.zj365.dc.activity.MainActivity import com.zj365.dc.databinding.FragMineBinding import com.zj365.health.act.HealthMainAct +import com.zj365.health.vm.ReportVm import com.zj365.health.weight.DialogTip import com.zj365.mime.act.DevInfoAct import com.zj365.mime.vm.SettingVm @@ -222,7 +224,16 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) }else { - CommonToastUtils.showToast("敬请期待") + + bundle.clear() + bundle.putString("id", showIdInfo) + bundle.putSerializable("index", ReportVm.ReportInfoType.Day) + bundle.putBoolean("isDemonstrate", isDemonstrate) + bundle.putInt("pageType", 0) + bundle.putString("titleName", "日报") +// RouteManager.goAct(ARouterUrl.HEALTH_REPORT, bundle)//老版（日周月年）报 + RouteManager.goAct(ARouterUrl.HEALTH_SKY_HOUR_REPORT, bundle) + // CommonToastUtils.showToast("敬请期待") } } binding.llStartBs.setOnClickListener { @@ -451,6 +462,13 @@ class MineFrag : BaseVmFrag(),EasyPermissions.PermissionCallbacks { mViewModel.getAllInfo(showIdInfo,false) mViewModel.getScore(1) } + + @Subscribe(threadMode = ThreadMode.MAIN) + fun bindDevSuccess(event:BindDevEvent){ + mViewModel.getMySetting() + mViewModel.getAllInfo(showIdInfo,false) + mViewModel.getScore(1) + } @Subscribe(threadMode = ThreadMode.MAIN) fun refreshUI(event: MyInfoEvent){ mViewModel.getMySetting() diff --git a/app/src/main/res/layout/frag_health.xml b/app/src/main/res/layout/frag_health.xml index d462fe1..d4b2cfe 100644 --- a/app/src/main/res/layout/frag_health.xml +++ b/app/src/main/res/layout/frag_health.xml @@ -110,6 +110,7 @@ app:banner_indicator_normal_color="@color/col_298D0" app:banner_indicator_selected_color="@color/col_8D0" app:banner_infinite_loop="true" + app:banner_loop_time="4000" /> diff --git a/app/src/main/res/layout/item_recognize_result.xml b/app/src/main/res/layout/item_recognize_result.xml index d12ffa3..05f589d 100644 --- a/app/src/main/res/layout/item_recognize_result.xml +++ b/app/src/main/res/layout/item_recognize_result.xml @@ -16,6 +16,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" app:is_circle="false" + android:scaleType="centerCrop" android:layout_margin="@dimen/dp_1" app:corner_radius="@dimen/dp_8"/> diff --git a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt index 058a753..17402ca 100644 --- a/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt +++ b/base/src/main/java/com/xty/base/h5/CloudJSBridge.kt @@ -56,6 +56,7 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) { } + @JavascriptInterface fun gotoScienceDetail(str: String?){ LogUtils.e("CloudJSBridge","gotoScienceDetail str") str?.let { @@ -64,4 +65,11 @@ open class CloudJSBridge(val context: Context, val listener: IJsBridge) { ToastUtils(context).showToast("敬请期待") } + @JavascriptInterface + fun watchRecharge(str: String?){ + str?.let { + + } + } + } \ No newline at end of file diff --git a/common/src/main/res/drawable/shape_r8_02c_stroke_1_5.xml b/common/src/main/res/drawable/shape_r8_02c_stroke_1_5.xml index 43dabbf..e5e9148 100644 --- a/common/src/main/res/drawable/shape_r8_02c_stroke_1_5.xml +++ b/common/src/main/res/drawable/shape_r8_02c_stroke_1_5.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xhdpi/ic_logo.png b/common/src/main/res/mipmap-xhdpi/ic_logo.png index 3146e71a0db0517d6ad6d4477fbe870b670023ec..63b253e26c65c0d1d0b497abd27efda21ad082e0 100644 GIT binary patch literal 5711 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 R{UgM9+UiiXYE|2i{{fN@rMLh9 literal 5356 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

;wZoZ0MO*u=%99al6X3Fy#B(6xY%g}K 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 N83{%4DpBL${{u&hKrR3P diff --git a/common/src/main/res/mipmap-xxhdpi/icon_about_logo.png b/common/src/main/res/mipmap-xxhdpi/icon_about_logo.png index 4dd0970db587952ad356cc2eea896fdc0c154e36..d3b47bc39570a8b0e452ec96274940cbf1f1e415 100644 GIT binary patch literal 11999 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 bn@{-L3dh_!@A2Ow0UtRjWyuQhj{*M$<=A3d literal 21207 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 XzyR6&bvK$+NoQ(gdA;7iE#dzF2~6ZO diff --git a/health/src/main/res/layout/frag_sleep_new.xml b/health/src/main/res/layout/frag_sleep_new.xml index afec625..7fbd6b9 100644 --- a/health/src/main/res/layout/frag_sleep_new.xml +++ b/health/src/main/res/layout/frag_sleep_new.xml @@ -114,6 +114,7 @@ diff --git a/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt b/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt index e2b683a..b88a351 100644 --- a/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt @@ -126,6 +126,15 @@ class DevInfoAct : BaseVmAct(),EasyPermissions.PermissionCallbacks { RouteManager.goAct(ARouterUrl.H5_ACT,bundle) } + binding.tvRecharge.setOnClickListener { + bundle.clear() + bundle.putString( + "web_site_url", + "${BuildConfig.h5url}pages/index/index?pageId=flowRecharge" + ) + RouteManager.goAct(ARouterUrl.H5_ACT, bundle) + } + } diff --git a/mine/src/main/java/com/zj365/mime/vm/BaseInfoVm.kt b/mine/src/main/java/com/zj365/mime/vm/BaseInfoVm.kt index d83ab54..bfee73e 100644 --- a/mine/src/main/java/com/zj365/mime/vm/BaseInfoVm.kt +++ b/mine/src/main/java/com/zj365/mime/vm/BaseInfoVm.kt @@ -62,14 +62,14 @@ class BaseInfoVm : BaseVm() { startHttp { withContext(Dispatchers.IO) { - var fileId = "" + var fileUrl = "" if (path.isNullOrEmpty()) { } else { val image = async { uploadImage(path) } val await = image.await() - fileId = await.fileId + fileUrl = await.url } val upload = async { uploadInfo( @@ -81,7 +81,7 @@ class BaseInfoVm : BaseVm() { urgent, urgentPhone, urgentRelation, - fileId, + fileUrl, province, city, district, @@ -118,7 +118,7 @@ class BaseInfoVm : BaseVm() { urgent: String, urgentPhone: String, urgentRelation: String, - fileId: String = "", + fileUrl: String = "", province: String, city: String, district: String, @@ -162,8 +162,8 @@ class BaseInfoVm : BaseVm() { json.put("birthday", birthDay) json.put("birthdayType", birthdayType) - if (!fileId.isNullOrEmpty()) { - json.put("avatarUrl", fileId) + if (!fileUrl.isNullOrEmpty()) { + json.put("avatarUrl", fileUrl) } val rb = retrofits.getRequestBody(json.toString()) return apiInterface().setUpdateUser(rb) diff --git a/mine/src/main/res/layout/act_about.xml b/mine/src/main/res/layout/act_about.xml index cf03e41..f2b6193 100644 --- a/mine/src/main/res/layout/act_about.xml +++ b/mine/src/main/res/layout/act_about.xml @@ -18,11 +18,13 @@ android:layout_margin="@dimen/dp_14" android:orientation="vertical"> -