diff --git a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt index de2b82c..93f27bf 100644 --- a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt +++ b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt @@ -50,6 +50,7 @@ import com.xty.common.util.CommonToastUtils import com.xty.common.util.CommonUtils import com.xty.common.util.ViewScreenshotUtils import com.xty.network.model.InviteCustodyBean +import com.xty.network.utils.AppUtils import com.zj365.dc.BuildConfig import com.zj365.dc.R import com.zj365.dc.databinding.ActivityMainBinding @@ -149,7 +150,7 @@ class MainActivity : BaseVmAct(), Consumer { initVp2() initBottomNav() addNv() - mViewModel.getVersionNew() + mViewModel.getVersionNew(AppUtils.getVersionCode(this)) initUnreadCountReceiver() JPushInterface.setBadgeNumber(this, 0) @@ -400,6 +401,7 @@ class MainActivity : BaseVmAct(), Consumer { if (it.code != 0) { CommonToastUtils.showLoserToast("获取设备信息失败") } + Const.userDeviceLiveData.value =it.data when (it.data.bindStatus) { 0 -> { binding.mVp2.currentItem = 0 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 eaf2595..88cc4af 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 @@ -151,6 +151,13 @@ class CreateGoodsOrderAct : BaseVmAct() { @Subscribe(threadMode = ThreadMode.MAIN) fun paySuccess(event: ReChangeEvent){ + RouteManager.goAct(ARouterUrl.SHOP_ORDER_LIST_ACT) + Toast.makeText( + this@CreateGoodsOrderAct, + "支付成功", + Toast.LENGTH_SHORT + ) + .show() finish() } 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 2f614f3..28189cd 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -26,6 +26,7 @@ import com.xty.network.model.InviteCustodyBean import com.xty.network.model.SettingBean import com.xty.network.model.UserOtherInfo +import com.xty.network.utils.AppUtils import com.zj365.dc.BuildConfig import com.zj365.dc.activity.MainActivity import com.zj365.dc.databinding.FragMineBinding @@ -120,15 +121,6 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ Const.CHAT_IMAGE = it.user.avatarUrl } } - - binding.mNoNetwork.mRefreshBtn.isSelected = true - binding.mNoNetwork.mRefreshBtn.setOnClickListener { - mViewModel.getMySetting() - // mViewModel.getAllInfo(showIdInfo,false) - - mViewModel.searchInviteInfo() - } - binding.clInfo.setOnClickListener { if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) @@ -186,22 +178,20 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ return@setOnClickListener } - mViewModel.deviceInfo.value?.apply { - data.apply { - if (adorn.wearCount > 29 && adorn.activeWear > 14) { - onEventObject(requireContext(), UmengEventId.Health30Day) - bundle.clear() - bundle.putString("id", showIdInfo) - bundle.putInt("page", 1) - RouteManager.goAct(ARouterUrl.WARRING, bundle) - } else { - onEventObject( - requireContext(), - UmengEventId.Health30Day, - "佩戴未满30天或活跃天数未满15天。" - ) - CommonToastUtils.showToast("尊敬的用户您好，该功能需要佩戴30天且活跃佩戴15天查看，请坚持佩戴且每日同步数据！") - } + Const.userDeviceLiveData.value?.apply { + if (adorn.wearCount > 29 && adorn.activeWear > 14) { + onEventObject(requireContext(), UmengEventId.Health30Day) + bundle.clear() + bundle.putString("id", showIdInfo) + bundle.putInt("page", 1) + RouteManager.goAct(ARouterUrl.WARRING, bundle) + } else { + onEventObject( + requireContext(), + UmengEventId.Health30Day, + "佩戴未满30天或活跃天数未满15天。" + ) + CommonToastUtils.showToast("尊敬的用户您好，该功能需要佩戴30天且活跃佩戴15天查看，请坚持佩戴且每日同步数据！") } } @@ -434,6 +424,15 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ } } + binding.mllServerOrder.setOnClickListener { + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + RouteManager.goAct(ARouterUrl.ORDER_LIST) + //CommonToastUtils.showToast("敬请期待") + } + } + binding.llFamilyHealth.setOnClickListener { if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) @@ -470,7 +469,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) }else { - mViewModel.getVersionNew(BuildConfig.VERSION_CODE) + mViewModel.getVersionNew(AppUtils.getVersionCode(requireActivity())) } } @@ -496,7 +495,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ private fun refresh() { refresh.setRefresh(binding.mRefresh) { if (!TextUtils.isEmpty(showIdInfo)) { - mViewModel.getMySetting() + // mViewModel.getMySetting() mViewModel.getUserOtherInfo() // mViewModel.getAllInfo(showIdInfo, false) mViewModel.searchInviteInfo() @@ -510,23 +509,26 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ Const.mainLiveData.value?: mViewModel.getMySetting() - // mViewModel.getAllInfo(showIdInfo,false) + Const.userDeviceLiveData.value?:mViewModel.getUserDeviceInfo(showIdInfo) mViewModel.searchInviteInfo() - // mViewModel.getUserOtherInfo() + mViewModel.getUserOtherInfo() } } override fun observer() { - /* mViewModel.familyLive.observe(this) { - binding.mFamily.text = it.data.size.toString() - }*/ mViewModel.useOtherInfoLiveData.observe(this){ otherInfo = it.data binding.tvMemberValidity.text ="有效期至：${it.data.vip_end_time}" binding.mCoupon.text = "${it.data.coupons_count}" binding.mTvWallet.text = "${it.data.money}" binding.tvOrder.text = "${it.data.order_count}" + if(it.data.serviceOrderCount > 0){ + binding.mllServerOrder.visibility = View.VISIBLE + binding.mServerOrder.text = "${it.data.serviceOrderCount}" + }else{ + binding.mllServerOrder.visibility = View.GONE + } if(TextUtils.isEmpty(it.data.start_business)){ binding.llStartBs.visibility = View.GONE @@ -566,16 +568,9 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ } - - Const.mainLiveData.observe(this) { - if (null == it) { - return@observe - } - - - + mViewModel.deviceInfo.observe(this){ + Const.userDeviceLiveData.value = it.data } - //个人设置信息获取 mViewModel.settingLive.observe(this) { if (null == it.data) return@observe @@ -626,7 +621,6 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ } mViewModel.getMySetting() mViewModel.getUserDeviceInfo(showIdInfo) - // mViewModel.getAllInfo(showIdInfo,false) mViewModel.searchInviteInfo() mViewModel.getUserOtherInfo() } @@ -639,25 +633,18 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ @Subscribe(threadMode = ThreadMode.MAIN) fun addSuccess(event: AddSuccessEvent){ // mViewModel.getMySetting() - // mViewModel.getAllInfo(showIdInfo,false) mViewModel.getUserDeviceInfo(showIdInfo) -// mViewModel.getScore(1) - } @Subscribe(threadMode = ThreadMode.MAIN) fun bindDevSuccess(event:BindDevEvent){ - // mViewModel.getMySetting() - // mViewModel.getAllInfo(showIdInfo,false) mViewModel.getUserDeviceInfo(showIdInfo) -// mViewModel.getScore(1) } @Subscribe(threadMode = ThreadMode.MAIN) fun refreshUI(event: MyInfoEvent){ mViewModel.getMySetting() - // mViewModel.getAllInfo(showIdInfo,false) mViewModel.getUserDeviceInfo(showIdInfo) - mViewModel.searchInviteInfo() + // mViewModel.searchInviteInfo() mViewModel.getUserOtherInfo() } @@ -690,7 +677,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ fun refreshLogoutUI(){ user = null - binding.mIntegral.text = "0" + binding.mIntegral.text = "--" binding.mName.text = "" binding.mPhone.text = "" binding.mImage.setImageResource(defaultIcon[0]) @@ -698,6 +685,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ binding.mCoupon.text = "--" binding.mTvWallet.text = "--" binding.tvOrder.text = "--" + binding.mllServerOrder.visibility = View.GONE } override fun onPermissionsGranted(requestCode: Int, perms: MutableList) { diff --git a/app/src/main/java/com/zj365/dc/vm/MainVm.kt b/app/src/main/java/com/zj365/dc/vm/MainVm.kt index ab740ba..3ca50ea 100644 --- a/app/src/main/java/com/zj365/dc/vm/MainVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/MainVm.kt @@ -17,6 +17,7 @@ import com.xty.network.model.SettingBean import com.xty.network.model.UnReadMessageBean import com.xty.network.model.Update import com.xty.network.model.UserEquipmentInformationizationBean +import com.xty.network.utils.AppUtils import com.zj365.dc.BuildConfig import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async @@ -68,9 +69,9 @@ class MainVm : BaseVm() { response.getCodeStatus(saveSuccess, nowData) } } - fun getVersionNew() { + fun getVersionNew(versionCode:Int) { startHttp { - var response = apiInterface().getVersionNew(BuildConfig.VERSION_CODE) + var response = apiInterface().getVersionNew(versionCode) response.getCodeStatus(updateLive, nowData) } } diff --git a/app/src/main/res/layout/frag_mine.xml b/app/src/main/res/layout/frag_mine.xml index a9857a1..df2e17d 100644 --- a/app/src/main/res/layout/frag_mine.xml +++ b/app/src/main/res/layout/frag_mine.xml @@ -135,8 +135,6 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/dp_25" android:orientation="horizontal" - android:weightSum="3" - android:background="@color/white" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toBottomOf="@+id/cl_info"> @@ -249,13 +247,42 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_10" - android:text="我的订单" + android:text="商城订单" android:textColor="@color/col_7c7" android:textSize="@dimen/sp_12" tools:ignore="HardcodedText,UseCompatTextViewDrawableXml" /> + + + + + + + + diff --git a/common/src/main/java/com/xty/common/Const.kt b/common/src/main/java/com/xty/common/Const.kt index 7bc3eaf..2ae5938 100644 --- a/common/src/main/java/com/xty/common/Const.kt +++ b/common/src/main/java/com/xty/common/Const.kt @@ -4,7 +4,9 @@ import androidx.lifecycle.MutableLiveData import com.xty.network.model.DeviceFunctionBean import com.xty.network.model.MainBean import com.xty.network.model.MusicBean +import com.xty.network.model.RespBody import com.xty.network.model.SettingBean +import com.xty.network.model.UserEquipmentInformationizationBean import com.yucheng.ycbtsdk.bean.ScanDeviceBean class Const { @@ -73,6 +75,8 @@ class Const { val connectBlueDevice by lazy { ScanDeviceBean() } val functionListDate by lazy { MutableLiveData>() } + val userDeviceLiveData by lazy { MutableLiveData()} + var battery = ""//电量信息 var watchType = -1 diff --git a/config.gradle b/config.gradle index 17dbca7..b023353 100644 --- a/config.gradle +++ b/config.gradle @@ -23,7 +23,7 @@ ext { url = [ - releaseTime: String.valueOf(new Date().format("HHmmss")), + releaseTime: String.valueOf(new Date().format("ddHHmm")), //正式环境 /*debug_url : "https://app.zhongjian365.com/app/", release_url: "https://app.zhongjian365.com/app/", diff --git a/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt b/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt index cf9735e..6a0e9d1 100644 --- a/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt +++ b/health/src/main/java/com/zj365/health/act/ShopOrderListAct.kt @@ -21,6 +21,7 @@ import com.zj365.health.R import com.zj365.health.adapter.GoodsOrderAdapter import com.zj365.health.databinding.ActShopOrderListBinding import com.zj365.health.vm.ShopOrderVm +import com.zj365.health.weight.DialogTip import com.zj365.health.weight.DialogTipNew import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode @@ -131,9 +132,15 @@ class ShopOrderListAct : BaseListAct() { Manifest.permission.CALL_PHONE)){ startActivity(Intent(Intent.ACTION_CALL, Uri.parse("tel:4000063365"))) }else{ - EasyPermissions.requestPermissions(this,"", - 0x00011, - Manifest.permission.CALL_PHONE) + DialogTip( + this, + "中健365需要拨打电话权限，以便您联系客服功能" + ) { + EasyPermissions.requestPermissions(this,"", + 0x00011, + Manifest.permission.CALL_PHONE) + }.show() + } } } diff --git a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthRealTimeAct.kt b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthRealTimeAct.kt index 8957fa7..5fbfab0 100644 --- a/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthRealTimeAct.kt +++ b/health/src/main/java/com/zj365/health/act/familyhealth/FamilyHealthRealTimeAct.kt @@ -57,12 +57,11 @@ class FamilyHealthRealTimeAct : BaseVmAct() { measureBeanList.clear() var latLng = LatLng(it.data.gps.lat, it.data.gps.lng) locationPoint(R.mipmap.icon_location_market,latLng) - - measureBeanList.add(WatchCurrentTimeBean.MeasureBean(1,it.data.tiwen.time,it.data.tiwen.v)) measureBeanList.add(WatchCurrentTimeBean.MeasureBean(2,it.data.xinlv.time,it.data.xinlv.v)) + measureBeanList.add(WatchCurrentTimeBean.MeasureBean(4,it.data.xueyang.time,it.data.xueyang.v)) measureBeanList.add(WatchCurrentTimeBean.MeasureBean(3,it.data.xueya.time,it.data.xueya.v)) + measureBeanList.add(WatchCurrentTimeBean.MeasureBean(1,it.data.tiwen.time,it.data.tiwen.v)) - measureBeanList.add(WatchCurrentTimeBean.MeasureBean(4,it.data.xueyang.time,it.data.xueyang.v)) binding.tvTips.visibility = View.GONE mAdapter.setNewInstance(measureBeanList) diff --git a/health/src/main/java/com/zj365/health/adapter/QuestDetailAdapter.kt b/health/src/main/java/com/zj365/health/adapter/QuestDetailAdapter.kt index 288a880..4843c24 100644 --- a/health/src/main/java/com/zj365/health/adapter/QuestDetailAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/QuestDetailAdapter.kt @@ -14,7 +14,7 @@ import com.xty.network.model.QuestBean import com.xty.network.model.QuestDetailBean class QuestDetailAdapter:BaseAdapter(R.layout.item_quest_detail) { - val selPosition by lazy{ mutableMapOf("A" to 0,"B" to 1,"C" to 2,"D" to 3,"E" to 4,"F" to 5,"G" to 6)} + val selPosition by lazy{ mutableMapOf("A" to 0,"B" to 1,"C" to 2,"D" to 3,"E" to 4,"F" to 5,"G" to 6,"H" to 7)} override fun convert(holder: BaseViewHolder, item: QuestDetailBean.Answers) { holder.setText(R.id.mNum,"${holder.layoutPosition}") .setText(R.id.nQuestName,item.question) diff --git a/health/src/main/java/com/zj365/health/adapter/RiskAssessAdapter.kt b/health/src/main/java/com/zj365/health/adapter/RiskAssessAdapter.kt index 3ee591a..884db09 100644 --- a/health/src/main/java/com/zj365/health/adapter/RiskAssessAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/RiskAssessAdapter.kt @@ -8,27 +8,40 @@ import com.zj365.health.R class RiskAssessAdapter : BaseAdapter(R.layout.item_risk_assess) { val col by lazy { mapOf( - "零风险" to R.color.col_41c_14, - "低风险" to R.color.col_dbf, - "中风险" to R.color.col_8db, - "高风险" to R.color.col_0db, - "很高风险" to R.color.col_1db, + "零风险" to R.drawable.shape_low_round, + "低风险" to R.drawable.shape_low_round, + "中风险" to R.drawable.shape_middle_round, + "高风险" to R.drawable.shape_high_round, + "很高风险" to R.drawable.shape_super_high_round, ) } + + private val textCol by lazy { + mapOf( + "零风险" to R.color.col_9Bd, + "低风险" to R.color.col_9Bd, + "中风险" to R.color.col_96D, + "高风险" to R.color.col_481, + "很高风险" to R.color.col_2621, + ) + } + val mipmaps by lazy { arrayOf( R.mipmap.ic_quest_1, + R.mipmap.ic_quest_4, R.mipmap.ic_quest_2, - R.mipmap.ic_quest_3, - R.mipmap.ic_quest_4 + R.mipmap.ic_quest_3 + ) } val title by lazy { arrayOf( "高血压风险评估报告", + "糖尿病风险评估报告", "冠心病风险评估报告", - "脑卒中风险评估报告", - "糖尿病风险评估报告" + "脑卒中风险评估报告" + ) } @@ -37,7 +50,8 @@ class RiskAssessAdapter : BaseAdapter(R.layout.item_risk_assess) { holder.setText(R.id.mTitle, title[holder.layoutPosition]) holder.setText(R.id.mStatus, item) - holder.setBackgroundColor(R.id.mStatus, ContextCompat.getColor(context, col[item]!!)) + holder.setBackgroundResource(R.id.mStatus, col[item]!!) + holder.setTextColor(R.id.mStatus,ContextCompat.getColor(context, textCol[item]!!)) holder.setImageResource(R.id.mImage, mipmaps[holder.layoutPosition]) } } \ No newline at end of file diff --git a/health/src/main/res/layout/item_family_health_real_time.xml b/health/src/main/res/layout/item_family_health_real_time.xml index 9e6a6d2..3dca883 100644 --- a/health/src/main/res/layout/item_family_health_real_time.xml +++ b/health/src/main/res/layout/item_family_health_real_time.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:gravity="center_vertical" - android:layout_height="@dimen/dp_62"> + android:layout_height="@dimen/dp_64"> () { statusBar(binding.title.mView) binding.title.mIvBack.setOnClickListener { finish() } binding.title.mTvTitle.text = getString(R.string.about) + try { + val buildConfigClass = + classLoader.loadClass("com.zj365.mime.BuildConfig") + val releaseTimeField: Field = buildConfigClass.getDeclaredField("releaseTime") + val releaseTime = releaseTimeField.get(null) as String + LogUtils.e(TAG,"releaseTime${releaseTime}") + binding.mVersion.text="版本号: V${AppUtils.getPackageVersionName(this)}(${releaseTime})" + } catch (e: Exception) { + e.printStackTrace() + } - binding.mVersion.text="版本号: V${packageManager.getPackageInfo(this.packageName,0).versionName}(${BuildConfig.releaseTime})" binding.tvUserPrivate.setOnClickListener { bundle.clear() diff --git a/network/src/main/java/com/xty/network/model/UserOtherInfo.kt b/network/src/main/java/com/xty/network/model/UserOtherInfo.kt index 1e91f57..f6322ac 100644 --- a/network/src/main/java/com/xty/network/model/UserOtherInfo.kt +++ b/network/src/main/java/com/xty/network/model/UserOtherInfo.kt @@ -7,4 +7,5 @@ data class UserOtherInfo( var start_business:String, var operation_guide:String, var coupons_count:Int, + var serviceOrderCount:Int, var placard:String)