From fa3b7f5f91df527710d764ef8448efe4b91c5de2 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Fri, 8 Mar 2024 16:47:40 +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-=E5=A2=9E=E5=8A=A0=E5=9F=8B=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zj365/health/act/ComparePageDataAct.kt | 7 ++++++- health/src/main/java/com/zj365/health/act/FamilyAct.kt | 2 +- .../main/java/com/zj365/health/act/HealthMainAct.kt | 10 +++++----- .../main/java/com/zj365/health/act/HealthReportAct.kt | 4 ++-- .../com/zj365/health/act/HealthSkyHourReportAct.kt | 7 +++++++ .../java/com/zj365/health/act/PreventCancertAct.kt | 3 +++ .../health/act/familyhealth/AddFamilyGuardianAct.kt | 7 +++++++ .../zj365/health/act/familyhealth/FamilyHealthAct.kt | 7 +++++++ .../health/act/healthrecord/HealthRecordMainAct.kt | 5 ++++- .../act/tonguediagnosis/TongueDiagnosisMainActivity.kt | 3 +++ 10 files changed, 45 insertions(+), 10 deletions(-) diff --git a/health/src/main/java/com/zj365/health/act/ComparePageDataAct.kt b/health/src/main/java/com/zj365/health/act/ComparePageDataAct.kt index bf32c14..7cd596c 100644 --- a/health/src/main/java/com/zj365/health/act/ComparePageDataAct.kt +++ b/health/src/main/java/com/zj365/health/act/ComparePageDataAct.kt @@ -9,7 +9,9 @@ import com.androidkun.xtablayout.XTabLayout import com.xty.base.act.BaseVmAct import com.xty.base.vm.BaseVm import com.xty.base.vp2.VpAdapter +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl +import com.xty.common.onEventObject import com.xty.common.util.DeviceFunctionUtils import com.xty.network.model.DeviceFunctionBean import com.zj365.health.R @@ -80,7 +82,10 @@ class ComparePageDataAct : BaseVmAct() { listFragment.add(setArgumentFrag(BloodFatCompareDataFrag(),id)) } } - + onEventObject( + baseContext, + UmengEventId.COMPARSION + ) binding.mVp2.adapter = VpAdapter(listFragment, this) binding.mVp2.isUserInputEnabled = false binding.mVp2.offscreenPageLimit =1 diff --git a/health/src/main/java/com/zj365/health/act/FamilyAct.kt b/health/src/main/java/com/zj365/health/act/FamilyAct.kt index c03821d..0182a74 100644 --- a/health/src/main/java/com/zj365/health/act/FamilyAct.kt +++ b/health/src/main/java/com/zj365/health/act/FamilyAct.kt @@ -68,7 +68,7 @@ class FamilyAct : BaseListAct() { // } // } setRecycleRefresh(binding.mRecycle, binding.mRefresh) - onEventObject(baseContext, UmengEventId.MyFamily) + // onEventObject(baseContext, UmengEventId.MyFamily) //mViewModel.getFamilyRelationList() } diff --git a/health/src/main/java/com/zj365/health/act/HealthMainAct.kt b/health/src/main/java/com/zj365/health/act/HealthMainAct.kt index 1dca2ff..9cae879 100644 --- a/health/src/main/java/com/zj365/health/act/HealthMainAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthMainAct.kt @@ -93,6 +93,11 @@ class HealthMainAct : BaseVmAct() { binding.title.mTvTitle.text = resources.getString(R.string.health_sub_demonstrate) binding.mSubmit.setOnClickListener { finish() } } + + onEventObject( + baseContext, + UmengEventId.HEALTH_MONITORING + ) } override fun liveObserver() { @@ -208,11 +213,6 @@ class HealthMainAct : BaseVmAct() { override fun onPageSelected(position: Int) { super.onPageSelected(position) // binding.xTablayout.getTabAt(position)!!.select() - onEventObject( - baseContext, - UmengEventId.HealthMonitor, - "${functionList[position].name}监测详情页" - ) changeTitle(position) } }) diff --git a/health/src/main/java/com/zj365/health/act/HealthReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthReportAct.kt index 91bd6cb..694c868 100644 --- a/health/src/main/java/com/zj365/health/act/HealthReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthReportAct.kt @@ -142,11 +142,11 @@ class HealthReportAct : IBaseAct() { binding.mVp2.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { override fun onPageSelected(position: Int) { super.onPageSelected(position) - onEventObject( + /*onEventObject( baseContext, UmengEventId.HealthReport, "${reportArray[position]}报告详情页" - ) + )*/ positionPage = position binding.xTablayout.getTabAt(position)!!.select() } diff --git a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt index 1f605f7..fdd5b53 100644 --- a/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthSkyHourReportAct.kt @@ -30,10 +30,12 @@ import com.xty.common.Const import com.xty.common.MMkvHelper import com.xty.common.TimeSelect import com.xty.common.TimeUtils +import com.xty.common.UmengEventId import com.xty.common.WxUtils import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.IntegralEvent +import com.xty.common.onEventObject import com.xty.common.setImageUser import com.xty.common.util.CommonToastUtils import com.xty.common.util.CommonUtils @@ -240,6 +242,11 @@ class HealthSkyHourReportAct : BaseVmAct() { binding.title.mIvBack.setOnClickListener { finish() } + + onEventObject( + baseContext, + UmengEventId.HEALTH_DAILY + ) binding.title.mIvReight.apply { visibility = if (index.reportType == ReportVm.ReportInfoType.Hour.reportType) { View.GONE diff --git a/health/src/main/java/com/zj365/health/act/PreventCancertAct.kt b/health/src/main/java/com/zj365/health/act/PreventCancertAct.kt index 473a32d..47c0bf8 100644 --- a/health/src/main/java/com/zj365/health/act/PreventCancertAct.kt +++ b/health/src/main/java/com/zj365/health/act/PreventCancertAct.kt @@ -22,10 +22,12 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory import com.xty.base.act.BaseVmAct import com.xty.common.BuildConfig import com.xty.common.LogUtils +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.WxPayEvent import com.xty.common.getImageUrl +import com.xty.common.onEventObject import com.xty.common.setImage import com.xty.common.util.SpannableUtils import com.zj365.health.R @@ -183,6 +185,7 @@ class PreventCancertAct : BaseVmAct() { } tvZhifu.setOnClickListener { + onEventObject(baseContext, UmengEventId.CancerPay) //支付 if (tvZhifubao.isSelected) { //支付宝 diff --git a/health/src/main/java/com/zj365/health/act/familyhealth/AddFamilyGuardianAct.kt b/health/src/main/java/com/zj365/health/act/familyhealth/AddFamilyGuardianAct.kt index fa8c4be..1f8970e 100644 --- a/health/src/main/java/com/zj365/health/act/familyhealth/AddFamilyGuardianAct.kt +++ b/health/src/main/java/com/zj365/health/act/familyhealth/AddFamilyGuardianAct.kt @@ -6,8 +6,10 @@ import com.tamsiree.rxkit.RxRegTool import com.xty.base.act.BaseVmAct import com.xty.base.vm.BaseVm import com.xty.common.R +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.event.AddSuccessEvent +import com.xty.common.onEventObject import com.xty.common.util.CommonToastUtils import com.zj365.health.databinding.ActAddFamilyGuardianBinding import com.zj365.health.vm.AddFamilyGuardianVm @@ -61,6 +63,11 @@ class AddFamilyGuardianAct : BaseVmAct() { guardian = "0" } + onEventObject( + baseContext, + UmengEventId.BINDINGGUARDIAN + ) + mViewModel.addFamily(familyRelation!!,familyPhone!!,guardian) } diff --git a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt index ae22f0f..f790a7e 100644 --- a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt +++ b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthAct.kt @@ -5,9 +5,11 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.alibaba.android.arouter.facade.annotation.Route import com.blankj.utilcode.util.GsonUtils import com.xty.base.act.BaseListAct +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.AddSuccessEvent +import com.xty.common.onEventObject import com.xty.common.util.CommonUtils import com.xty.network.model.CancerGoodsBean import com.xty.network.model.FamilyHealthBean @@ -69,6 +71,11 @@ class FamilyHealthAct : BaseListAct() { binding.title.mIvBack.setOnClickListener { finish() } + + onEventObject( + baseContext, + UmengEventId.FAMILY + ) } override fun initAdapter() { diff --git a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt index 8616256..870ec2a 100644 --- a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt +++ b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordMainAct.kt @@ -121,7 +121,10 @@ class HealthRecordMainAct : BaseVmAct() { finish() } - + onEventObject( + baseContext, + UmengEventId.HEALTHRECORD + ) initTab() // initSurvey() diff --git a/health/src/main/java/com/zj365/health/act/tonguediagnosis/TongueDiagnosisMainActivity.kt b/health/src/main/java/com/zj365/health/act/tonguediagnosis/TongueDiagnosisMainActivity.kt index 7ac117f..a6a20c1 100644 --- a/health/src/main/java/com/zj365/health/act/tonguediagnosis/TongueDiagnosisMainActivity.kt +++ b/health/src/main/java/com/zj365/health/act/tonguediagnosis/TongueDiagnosisMainActivity.kt @@ -19,9 +19,11 @@ import com.tencent.mm.opensdk.openapi.WXAPIFactory import com.xty.base.act.BaseVmAct import com.xty.common.BuildConfig import com.xty.common.LogUtils +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.WxPayEvent +import com.xty.common.onEventObject import com.xty.common.setImage import com.xty.common.util.SpannableUtils import com.zj365.health.R @@ -127,6 +129,7 @@ class TongueDiagnosisMainActivity : BaseVmAct() { } tvZhifu.setOnClickListener { + onEventObject(baseContext, UmengEventId.TonguePay) //支付 if (tvZhifubao.isSelected) { //支付宝