diff --git a/app/src/main/java/com/zj365/dc/activity/HealthScienceAct.kt b/app/src/main/java/com/zj365/dc/activity/HealthScienceAct.kt index eec0163..a83fa88 100644 --- a/app/src/main/java/com/zj365/dc/activity/HealthScienceAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/HealthScienceAct.kt @@ -36,7 +36,7 @@ class HealthScienceAct : BaseListAct (){ bundle.clear() var bean = adapter.getItem(position) as ScienceBean bundle.putSerializable("bean", bean) - onEventObject(this, UmengEventId.HealthScience, "${bean.name}") + // onEventObject(this, UmengEventId.HealthScience, "${bean.name}") RouteManager.goAct(ARouterUrl.SCIENCE_DETAIL, bundle) } diff --git a/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt b/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt index ebd7837..4f83d38 100644 --- a/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/MessageDetailNewAct.kt @@ -6,8 +6,10 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.xty.base.act.BaseVmAct import com.xty.base.vm.BaseVm import com.xty.common.Dateutils +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.event.MessageReadEvent +import com.xty.common.onEventObject import com.xty.common.util.ImageGetterUtils import com.xty.network.model.MessageBean import com.xty.network.model.MessageTypeDataBean @@ -53,5 +55,10 @@ class MessageDetailNewAct: BaseVmAct() { } } + onEventObject( + baseContext, + UmengEventId.MESSAGEDETAIL + ) + } } \ No newline at end of file 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 f6bbbc2..7d40695 100644 --- a/app/src/main/java/com/zj365/dc/activity/WarningMsgAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/WarningMsgAct.kt @@ -40,7 +40,7 @@ class WarningMsgAct : BaseListAct() { binding.title.mIvBack.setOnClickListener { finish() } - onEventObject(baseContext, UmengEventId.WarningMsg, "打开预警消息列表") + // onEventObject(baseContext, UmengEventId.WarningMsg, "打开预警消息列表") } override fun initAdapter() { diff --git a/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt b/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt index b902ded..acb59b5 100644 --- a/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/shop/CreateGoodsOrderAct.kt @@ -13,10 +13,12 @@ import com.xty.network.model.ChooseAddressBean import com.xty.base.model.ChooseCouponBean import com.xty.base.model.CreateOrderBean import com.xty.base.utils.PayUtils +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.ReChangeEvent import com.xty.common.event.WxPayEvent +import com.xty.common.onEventObject import com.xty.common.setImage import com.xty.common.util.NumUtils import com.zj365.dc.BuildConfig @@ -90,6 +92,7 @@ class CreateGoodsOrderAct : BaseVmAct() { binding.title.mIvBack.setOnClickListener { finish() } + onEventObject(baseContext, UmengEventId.CREATE_ORDER) bean = intent.getParcelableExtra("bean") onClickedListener() @@ -140,6 +143,7 @@ class CreateGoodsOrderAct : BaseVmAct() { binding.tvDiscounts.setOnClickListener { if(hasCoup == 1){ + onEventObject(baseContext, UmengEventId.COUPON) bundle.clear() bundle.putString( "web_site_url", diff --git a/app/src/main/java/com/zj365/dc/activity/shop/ShopCategoryActivity.kt b/app/src/main/java/com/zj365/dc/activity/shop/ShopCategoryActivity.kt index ac28c2f..90763e1 100644 --- a/app/src/main/java/com/zj365/dc/activity/shop/ShopCategoryActivity.kt +++ b/app/src/main/java/com/zj365/dc/activity/shop/ShopCategoryActivity.kt @@ -14,8 +14,10 @@ import com.xty.base.act.BaseListAct import com.xty.base.act.BaseVmAct import com.xty.common.Const import com.xty.common.R +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager +import com.xty.common.onEventObject import com.xty.common.util.CommonToastUtils import com.xty.network.model.GoodsRecordsBean import com.xty.network.model.ShopCategoryBean @@ -66,6 +68,7 @@ class ShopCategoryActivity : BaseVmAct() { } bean.isChecked = true categoryId = bean.id + onEventObject(baseContext, UmengEventId.GOODS_CATEGORY,"id:${bean.id}") mViewModel.getGoodsList(goodsName,categoryId,0,page) mChildCategoryAdapter.notifyDataSetChanged() } @@ -84,6 +87,7 @@ class ShopCategoryActivity : BaseVmAct() { mGoodsAdapter.setOnItemClickListener { adapter, view, position -> var bean = adapter.data[position] as GoodsRecordsBean.GoodsBean + onEventObject(baseContext, UmengEventId.GOODS_DETAIL,"id:${bean.id}") bundle.clear() bundle.putString( "web_site_url", @@ -137,6 +141,7 @@ class ShopCategoryActivity : BaseVmAct() { } bean.isChecked = true parentId = bean.id + onEventObject(baseContext, UmengEventId.GOODS_CATEGORY,"id:${bean.id}") mViewModel.getGoodsCategory(bean.id) mCategoryAdapter.notifyDataSetChanged() } 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 74dde93..7916826 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -186,7 +186,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission binding.mGriddingList.mGridView.setOnItemClickListener { _, _, position, _ -> val index = mHealthAdapter.getItem(position).type val functionType = mHealthAdapter.getItem(position).functionType - onEventObject(requireContext(), UmengEventId.HealthMonitor, mHealthAdapter.getItem(position).buttonName) + // onEventObject(requireContext(), UmengEventId.HealthMonitor, mHealthAdapter.getItem(position).buttonName) when (functionType) { //（ ）0.心率、1.血氧、2.呼吸率、3.体温、4.步数、5.睡眠、6.血压、7.血糖、8.心电、9.尿酸、10.血脂。 //（U32）0.心率、1.血氧、2.呼吸率、3.体温、 、4.睡眠、5.血压、6.血糖、7.尿酸、8.心电,9血脂 @@ -283,6 +283,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //评估 R.id.mCard -> { + onEventObject(requireContext(), UmengEventId.Health24HourReport) bundle.clear() bundle.putSerializable("index", ReportVm.ReportInfoType.Hour) bundle.putString("id", showIdInfo) @@ -297,6 +298,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //健康监测 R.id.mSub -> { + onEventObject(requireContext(), UmengEventId.TODAYDATADETAIL) goPage(0,"") } //健康对比 @@ -335,7 +337,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //日报 R.id.mDailyReports -> { - onEventObject(requireContext(), UmengEventId.HealthReport, "动态管理") + onEventObject(requireContext(), UmengEventId.DAILYPAPER) bundle.clear() bundle.putString("id", showIdInfo) bundle.putSerializable("index", ReportVm.ReportInfoType.Day) @@ -348,7 +350,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //周报 R.id.mWeeklyReports -> { - onEventObject(requireContext(), UmengEventId.HealthReport, "动态管理") + onEventObject(requireContext(), UmengEventId.WEEKLYPAPER) bundle.clear() bundle.putString("id", showIdInfo) bundle.putSerializable("index", ReportVm.ReportInfoType.Week) @@ -360,7 +362,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //月报 R.id.mMonthlyReports -> { - onEventObject(requireContext(), UmengEventId.HealthReport, "动态管理") + onEventObject(requireContext(), UmengEventId.MONTHLY) bundle.clear() bundle.putString("id", showIdInfo) bundle.putSerializable("index", ReportVm.ReportInfoType.Month) @@ -372,7 +374,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //年报 R.id.mAnnualReports -> { - onEventObject(requireContext(), UmengEventId.HealthReport, "动态管理") + onEventObject(requireContext(), UmengEventId.ANNUALREPORT) bundle.clear() bundle.putString("id", showIdInfo) bundle.putSerializable("index", ReportVm.ReportInfoType.Year) @@ -384,6 +386,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //24小时健康评估 R.id.llSkyHourReport -> { + onEventObject(requireContext(), UmengEventId.HOURSFOR24) bundle.clear() bundle.putSerializable("index", ReportVm.ReportInfoType.Hour) bundle.putString("id", showIdInfo) @@ -395,6 +398,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //近7天健康评估 R.id.llHebdomadReport -> { + onEventObject(requireContext(), UmengEventId.HEALTHFOR7DAY) bundle.clear() bundle.putSerializable("index", ReportVm.ReportInfoType.Week) bundle.putString("id", showIdInfo) @@ -407,6 +411,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } //近30天健康评估 R.id.llThirtyDaysReport -> { + onEventObject(requireContext(), UmengEventId.HEALTHFOR30DAY) bundle.clear() bundle.putSerializable("index", ReportVm.ReportInfoType.Week) bundle.putString("id", showIdInfo) 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 a2bd350..45a27d9 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -116,7 +116,7 @@ HealthHomeFrag : BaseVmFrag() { onEventObject( requireContext(), UmengEventId.Banner, - "type:${bannerBean.bannerType}; 标题:${bannerBean.title}" + "url:${bannerBean.linkAddress}" ) when (bannerBean.bannerType) { 1 -> {//图片 @@ -172,7 +172,7 @@ HealthHomeFrag : BaseVmFrag() { onEventObject( requireContext(), UmengEventId.Banner, - "type:${bannerBean.bannerType}; 标题:${bannerBean.title}" + "url:${bannerBean.linkAddress}" ) when (bannerBean.bannerType) { 1 -> {//图片 @@ -234,7 +234,6 @@ HealthHomeFrag : BaseVmFrag() { bundle.clear() var bean = adapter.getItem(position) as ScienceBean bundle.putSerializable("bean", bean) - onEventObject(requireContext(), UmengEventId.HealthScience, "${bean.name}") RouteManager.goAct(ARouterUrl.SCIENCE_DETAIL, bundle) } @@ -245,6 +244,11 @@ HealthHomeFrag : BaseVmFrag() { var contentData = adapter.getItem(position) as HomeLayoutBean.HomeChildBean + onEventObject( + requireContext(), + UmengEventId.FUNCTION, + "id:${contentData.id}" + ) when(contentData.jumpType){ 1 ->{ @@ -333,6 +337,11 @@ HealthHomeFrag : BaseVmFrag() { layoutContentAdapter.setOnItemClickListener { adapter, view, position -> var contentData = adapter.getItem(position) as HomeLayoutBean.HomeChildBean + onEventObject( + requireContext(), + UmengEventId.FUNCTION, + "id:${contentData.id}" + ) when(contentData.jumpType){ 1 ->{ contentData.jumpUrl?.let { 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 b6f2921..97bf0b7 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -206,6 +206,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) }else { + onEventObject(requireContext(), UmengEventId.HealthRisk) bundle.clear() bundle.putString("id", showIdInfo) RouteManager.goAct(ARouterUrl.SUBMIT_REPORTMain, bundle) @@ -310,6 +311,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ }else { otherInfo?.let { if (!TextUtils.isEmpty(it.start_business)){ + onEventObject(requireContext(), UmengEventId.StartBus) bundle.clear() bundle.putString( "web_site_url", @@ -390,6 +392,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) }else { + onEventObject(requireContext(), UmengEventId.EnterpriseData) RouteManager.goAct(ARouterUrl.ENTERPRISE_INFO) // CommonToastUtils.showToast("敬请期待") } @@ -415,6 +418,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ }else { otherInfo?.let { if (!TextUtils.isEmpty(it.operation_guide)){ + onEventObject(requireContext(), UmengEventId.OperGuide) bundle.clear() bundle.putString("title", "操作手册") bundle.putBoolean("isAgree", false) diff --git a/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt b/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt index 517bde4..eeceb80 100644 --- a/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt +++ b/app/src/main/java/com/zj365/dc/fragment/ShopFragment.kt @@ -16,8 +16,10 @@ import com.tamsiree.rxkit.RxKeyboardTool import com.xty.base.fragment.BaseFragList import com.xty.base.fragment.BaseVmFrag import com.xty.base.vm.BaseVm +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager +import com.xty.common.onEventObject import com.xty.common.util.CommonToastUtils import com.xty.common.weight.ExpandStaggeredManager import com.xty.network.model.GoodsRecordsBean @@ -48,6 +50,7 @@ class ShopFragment: BaseFragList() { mCategoryAdapter.setOnItemClickListener { adapter, view, position -> var bean = adapter.data[position] as ShopCategoryBean + onEventObject(requireContext(), UmengEventId.GOODS_CATEGORY,"id:${bean.id}") bundle.clear() bundle.putLong("id",bean.id) bundle.putParcelableArrayList("categoryList",adapter.data as ArrayList) @@ -58,6 +61,7 @@ class ShopFragment: BaseFragList() { mGoodsAdapter.setOnItemClickListener { adapter, view, position -> var bean = adapter.data[position] as GoodsRecordsBean.GoodsBean + onEventObject(requireContext(), UmengEventId.GOODS_DETAIL,"id:${bean.id}") bundle.clear() bundle.putString( "web_site_url", diff --git a/base/src/main/java/com/xty/base/dialog/DialogActivities.kt b/base/src/main/java/com/xty/base/dialog/DialogActivities.kt index d2b51b9..2dbee14 100644 --- a/base/src/main/java/com/xty/base/dialog/DialogActivities.kt +++ b/base/src/main/java/com/xty/base/dialog/DialogActivities.kt @@ -10,8 +10,10 @@ import com.bumptech.glide.request.transition.Transition import com.xty.base.databinding.DialogActivitiesBinding import com.xty.common.R import com.xty.common.SizeUtil +import com.xty.common.UmengEventId import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager +import com.xty.common.onEventObject import com.xty.common.setBigImage import com.xty.common.setImage import com.xty.common.setImageUser @@ -48,6 +50,7 @@ class DialogActivities (context:Context,var bannerBean: BannerBean?): BaseDialog bundle.putString("title", bean.title) bundle.putString("url", it) RouteManager.goAct(ARouterUrl.WEB_ACT, bundle) + onEventObject(context, UmengEventId.DIALOG) } } diff --git a/common/src/main/java/com/xty/common/UMengUtils.kt b/common/src/main/java/com/xty/common/UMengUtils.kt index e84b4de..f462d7e 100644 --- a/common/src/main/java/com/xty/common/UMengUtils.kt +++ b/common/src/main/java/com/xty/common/UMengUtils.kt @@ -21,38 +21,128 @@ fun onEventObject(context: Context, event:UmengEventId, params: String = ""){ } enum class UmengEventId(val eventId: String) { + /**/ + DIALOG("clickPop-upWindow"), + /*金刚区*/ + FUNCTION("clikcFunction"), /**健康方案**/ - HealthProgrammes("Android_Healthprogrammes"), + FAMILY("clickFamily"), /**佩戴管理**/ WearManager("Android_WearManager"), /**操作指南**/ - OperGuide("Android_Operationguide"), - /**健康监测**/ - HealthMonitor("Android_Healthmonitoring"), - /**健康科普**/ - HealthScience("Android_Healthsciencepopularization"), - /**健康报告**/ - HealthReport("Android_Healthreport"), + OperGuide("clickOperationGuide"), /**24小时报告**/ - Health24HourReport("Android_24Hour"), - /**健康榜单**/ - HealthRank("Android_Healthlist"), - /**健康管家**/ - HealthAdmin("Android_HealthHousekeeper"), + Health24HourReport("click24HoursDetails"), + /**绑定监护人**/ + BINDINGGUARDIAN("clickBindingGuardian"), /**风险评估**/ - HealthRisk("Android_riskassessment"), - /**家人**/ - Family("Android_family"), - /**健康打卡**/ - HealthDk("Android_Healthpunch"), + HealthRisk("showRisk"), /**轮播图**/ - Banner("Android_banner"), - /**预警消息**/ - WarningMsg("Android_WarningMsg"), - /**30天预警**/ - Health30Day("Android_30day"), - /**我的家人**/ - MyFamily("Android_Myfamily"), + Banner("clickBanner"), + /** + * 今日数据详情 + */ + TODAYDATADETAIL("clickTodayDataDetails"), + /** + * 日报 + */ + DAILYPAPER("clickDailyPaper"), + /** + * 周报 + */ + WEEKLYPAPER("clickWeeklyPaper"), + /** + * 月报 + */ + MONTHLY("clickMonthly"), + /** + * 年报 + */ + ANNUALREPORT("clickAnnualReport"), + /** + * 24小时 + */ + HOURSFOR24("click24Hours"), + /** + * 7天 + */ + HEALTHFOR7DAY("click7Day"), + /** + * 30天 + */ + HEALTHFOR30DAY("click30Day"), + /** + * 消息详情 + */ + MESSAGEDETAIL("clickMsgDetails"), + /** + * 商品详情 + */ + GOODS_DETAIL("clickProductDetails"), + /** + *商品分类 + */ + GOODS_CATEGORY("clickProductType"), + /** + * 创建订单 + */ + CREATE_ORDER("creatOrder"), + /** + * 优惠券 + */ + COUPON("clickCoupon"), + /** + * 个人信息编辑 + */ + SAVE_USERINFO("saveUserinfo"), + /** + * 健康档案 + */ + HEALTHRECORD("showHealthRecord"), + + /** + * 健康监测 + */ + HEALTH_MONITORING("showHealthMonitoring"), + + /** + * 健康日报 + */ + + HEALTH_DAILY("showHealthDaily"), + /** + * 数据对比 + */ + + COMPARSION("showDataComparison"), + /** + *疾病预警 + */ + + Health30Day("showDiseaseWarning"), + /** + * 企业资料 + */ + EnterpriseData("clickEnterpriseData"), + /** + * 2999创业 + */ + + StartBus("click2999"), + + /** + *穿戴解绑 + */ + Unbind("clickUnbind"), + /** + * 舌诊支付 + */ + TonguePay("clickTonguePay"), + /** + * 防癌支付 + */ + CancerPay("clickCancerPay") + } diff --git a/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt b/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt index 68e9a3e..8993199 100644 --- a/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt +++ b/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt @@ -81,7 +81,7 @@ class ARouterUrl { const val QUEST_DETAIL = "/health/com/zj365/health/act/QuestDetailAct" // const val FRIEND_WATCH = "/health/com/zj365/health/act/FriendWatchAct" const val COMPARE_DATA_ACT = "/health/com/zj365/health/act/CompareAct" - const val COMPARE_PAGE_DATA_ACT = "/health/com/zj365/health/act/ComparePageAct" + const val COMPARE_PAGE_DATA_ACT = "/health/com/zj365/health/act/ComparePageDataAct" // const val BLOOD_STUDY_NEED_KNOW = "/health/com/zj365/health/act/BloodStudyNeedKnowAct" const val XINLV_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/XinLvExceptionAct" const val URIC_ACID_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/UricAcidExceptionAct" @@ -95,7 +95,7 @@ class ARouterUrl { const val BODY_INFO_SHOW_OR_ADD = "/health/com/zj365/health/act/BodyInfoShowOrAddAct" /*AI防癌*/ - const val PRVENT_CANCER = "/health/com/zj365/health/act/PreventCanceltAct" + const val PRVENT_CANCER = "/health/com/zj365/health/act/PreventCancertAct" const val DUIHUAN = "/health/com/zj365/health/act/DuihuanmaAct" const val PAY_SUCCESS = "/health/com/zj365/health/act/PaySuccessAct" const val AGREE = "/health/com/zj365/health/act/AGREE" diff --git a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt b/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt index c91d8bc..41e79bc 100644 --- a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt @@ -28,12 +28,14 @@ import com.xty.common.LogUtils import com.xty.common.MMkvHelper import com.xty.common.TimeSelect import com.xty.common.TimeUtils +import com.xty.common.UmengEventId import com.xty.common.aMapUtils.AmapInit import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.bracelet.getBluePermission import com.xty.common.bracelet.isGpsOpen import com.xty.common.event.MyInfoEvent +import com.xty.common.onEventObject import com.xty.common.picture.PictureUtils import com.xty.common.setImage import com.xty.common.setImageUser @@ -449,6 +451,10 @@ class BaseInfoChangeAct : BaseVmAct() , EasyPermissions.PermissionCa CommonToastUtils.showToast("请输入关系") return } + onEventObject( + baseContext, + UmengEventId.SAVE_USERINFO + ) mViewModel.submit( paht, 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 9bae99d..db7f112 100644 --- a/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/DevInfoAct.kt @@ -16,6 +16,7 @@ import com.xty.common.Const import com.xty.common.LogUtils import com.xty.common.MMkvHelper import com.xty.common.MyLinkedMovementMethod +import com.xty.common.UmengEventId import com.xty.common.aMapUtils.AmapInit import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager @@ -24,6 +25,7 @@ import com.xty.common.event.BlueToothConnectEvent import com.xty.common.event.MyInfoEvent import com.xty.common.event.ReChangeEvent import com.xty.common.event.UnBinderEvent +import com.xty.common.onEventObject import com.xty.common.setImage import com.xty.common.util.PermissionUtils import com.xty.network.MyRetrofit @@ -59,6 +61,7 @@ class DevInfoAct : BaseVmAct() , EasyPermissions.PermissionCallbacks var devInfo: UserEquipmentInformationizationBean? = null private val unBindDialog by lazy { FactorySettingDialog(this, getString(R.string.dialog_un_bind)) { + onEventObject(baseContext, UmengEventId.Unbind) //确认解除绑定 mViewModel.unBind() } diff --git a/mine/src/main/java/com/zj365/mime/act/MessageDetailAct.kt b/mine/src/main/java/com/zj365/mime/act/MessageDetailAct.kt index b81e8bf..b980dc6 100644 --- a/mine/src/main/java/com/zj365/mime/act/MessageDetailAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/MessageDetailAct.kt @@ -31,7 +31,7 @@ class MessageDetailAct: IBaseAct() { } binding.mMsg.text=content - onEventObject(baseContext, UmengEventId.WarningMsg, "查看预警消息详情$content") + // onEventObject(baseContext, UmengEventId.WarningMsg, "查看预警消息详情$content") } override fun initView() {