diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1215eb1..37a09cd 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -130,6 +130,10 @@ android:launchMode="singleTop" android:screenOrientation="portrait" /> + + + diff --git a/app/src/main/java/com/zj365/dc/activity/LoginAct.kt b/app/src/main/java/com/zj365/dc/activity/LoginAct.kt index 03efb2e..fff069f 100644 --- a/app/src/main/java/com/zj365/dc/activity/LoginAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/LoginAct.kt @@ -197,6 +197,7 @@ class LoginAct : BaseVmAct() { */ fun initTab() { + binding.tabTitle.removeAllTabs() tabName.forEach { var tab = binding.tabTitle.newTab() tab.text = it diff --git a/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt b/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt new file mode 100644 index 0000000..8e2a7a4 --- /dev/null +++ b/app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt @@ -0,0 +1,99 @@ +package com.zj365.dc.activity + +import android.content.Intent +import android.view.View +import com.alibaba.android.arouter.facade.annotation.Route +import com.google.gson.Gson +import com.tencent.qcloud.tuikit.tuichat.util.PermissionHelper +import com.xty.base.act.BaseVmAct +import com.xty.base.vm.BaseVm +import com.xty.common.LogUtils +import com.xty.common.arouter.ARouterUrl +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 + +@Route(path = ARouterUrl.DEVICE_ACTIVE) +class OneKeyBinderDeviceAct : BaseVmAct() { + + val binding by lazy { ActBinderDeviceOneKeyBinding.inflate(layoutInflater) } + override fun liveObserver() { + + } + + override fun initView() { + super.initView() + statusBar(binding.title.mView) + binding.title.mTvTitle.text ="一键绑定" + binding.title.mIvBack.setOnClickListener { + finish() + } + binding.tvScan.setOnClickListener { + startScan() + } + binding.tvBackHome.setOnClickListener { + + } + } + + override fun initData() { + super.initData() + } + + private fun startScan() { + PermissionHelper.requestPermission(PermissionHelper.PERMISSION_CAMERA, object : + PermissionHelper.PermissionCallback { + override fun onGranted() { +// XQRCode.startScan(this@DeviceActiveAct, QRCODE_AGREEMENT) + XQRCodeAct.start( + this@OneKeyBinderDeviceAct, + XQRCodeAct.QRCODE_AGREEMENT, + com.zj365.health.R.style.XQRCodeTheme_Custom + ) + } + + override fun onDenied() { + } + + }) + } + + override fun setLayout() = binding.root + + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + if (resultCode === RESULT_OK) { + when (requestCode) { + XQRCodeAct.QRCODE_AGREEMENT -> { + when (data!!.getIntExtra(XQRCode.RESULT_TYPE, 0)) { + XQRCode.RESULT_SUCCESS -> { + try { + val result = data.extras!!.getString(XQRCode.RESULT_DATA) + LogUtils.d("扫描结果:$result") + binding.tvErrorMsg.visibility = View.GONE + if (!result.isNullOrEmpty()) { + val gson = Gson() + var scanInfoBean = gson.fromJson(result, ScanInfoBean::class.java) + } else { + binding.tvErrorMsg.visibility = View.VISIBLE + binding.tvScan.text = "继续绑定" + } + } catch (e: Exception) { + binding.tvErrorMsg.visibility = View.VISIBLE + binding.tvScan.text = "继续绑定" + } + } + + XQRCode.RESULT_FAILED -> { + binding.tvErrorMsg.visibility = View.VISIBLE + binding.tvScan.text = "继续绑定" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt b/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt index bf8dcfe..6907764 100644 --- a/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt +++ b/app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt @@ -99,9 +99,9 @@ class HealthMonitoringAdapter( val buttonContent = healthMonitoringListBean.buttonContent setStrSpan( buttonContent, - 18, + 14, ContextCompat.getColor( - context, R.color.col_464 + context, R.color.col_313 ), Typeface.BOLD, 0, @@ -118,9 +118,9 @@ class HealthMonitoringAdapter( val buttonContent = healthMonitoringListBean.buttonContent setStrSpan( buttonContent + context.getString(units[healthMonitoringListBean.type]), - 18, + 14, ContextCompat.getColor( - context, R.color.col_464 + context, R.color.col_313 ), Typeface.BOLD, 0, 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 c4cdbd6..f357bc9 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -35,6 +35,7 @@ import com.xty.common.bracelet.checkBlueConnectPermission import com.xty.common.bracelet.getBluePermission import com.xty.common.bracelet.isGpsOpen import com.xty.common.event.BlueToothConnectEvent +import com.xty.common.event.ChangeFamilyEvent import com.xty.common.event.FamilyEvent import com.xty.common.event.Health24HourStatusEvent import com.xty.common.event.MyInfoEvent @@ -87,7 +88,7 @@ class DynamicManagementFrag : BaseVmFrag() { override fun setViewModel() = DynamicManagementVm() //家人列表适配器 - private val mFamilyAdapter by lazy { FamilyAdapter() } +// private val mFamilyAdapter by lazy { FamilyAdapter() } private val dialogInfoUn by lazy { DialogTip(requireContext(), "请完善基本信息") { @@ -301,7 +302,7 @@ class DynamicManagementFrag : BaseVmFrag() { */ @SuppressLint("NotifyDataSetChanged") private fun initFamilyAdapter() { - binding.mRecycle.layoutManager = + /*binding.mRecycle.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.HORIZONTAL, false) binding.mRecycle.adapter = mFamilyAdapter mFamilyAdapter.setOnItemClickListener { adapter, view, position -> @@ -328,7 +329,7 @@ class DynamicManagementFrag : BaseVmFrag() { // mViewModel.getDkInfo(false, showIdInfo) updateWarningStatus() } - } + }*/ } //点击事件 @@ -596,10 +597,11 @@ class DynamicManagementFrag : BaseVmFrag() { mViewModel.getAllInfo(showIdInfo, false) // mViewModel.getDkInfo(false, showIdInfo) // 如果显示的是家人Tab则不刷新用户信息，防止头像错乱 - if (mFamilyAdapter.position < 1) { + /*if (mFamilyAdapter.position < 1) { mViewModel.getMySetting() } - mViewModel.getMyFamilyList() + mViewModel.getMyFamilyList()*/ + mViewModel.getMySetting() mViewModel.getTips() mViewModel.getRank(2) } @@ -825,7 +827,7 @@ class DynamicManagementFrag : BaseVmFrag() { binding.mHeader.mWatchType.visibility = View.VISIBLE binding.mHeader.mWearInfo.visibility = View.VISIBLE } - if (mFamilyAdapter.position != -1) { + /*if (mFamilyAdapter.position != -1) { if (mFamilyAdapter.getItem(mFamilyAdapter.position).userJointId != bean.user.id.toInt()) { if (mFamilyAdapter.position == 0 && bean.user.id.toString() == CommonUtils.getMyUserId()) {//如果是自己加载用户头像并保存用户信息 } else { @@ -833,7 +835,7 @@ class DynamicManagementFrag : BaseVmFrag() { return@observe } } - } + }*/ if (showIdInfo.isNotEmpty()) { //自己 //// binding.mChildView.mGuide2.visibility = View.VISIBLE @@ -956,7 +958,7 @@ class DynamicManagementFrag : BaseVmFrag() { return@observe } - if (mFamilyAdapter.position != -1) { + /*if (mFamilyAdapter.position != -1) { if (mFamilyAdapter.getItem(mFamilyAdapter.position).userJointId != it.data.user?.id) { if (mFamilyAdapter.position == 0 && it.data.user?.id.toString() == CommonUtils.getMyUserId()) {//如果是自己，啥也不做 @@ -965,7 +967,7 @@ class DynamicManagementFrag : BaseVmFrag() { return@observe } } - } + }*/ reportBean = it.data @@ -974,7 +976,7 @@ class DynamicManagementFrag : BaseVmFrag() { binding.mHeader.mBtnBind.visibility = View.GONE binding.mHeader.mLayoutResult.visibility = View.VISIBLE } else { //没有绑定手表 - if (mFamilyAdapter.position == 0 && it.data.user?.id.toString() == CommonUtils.getMyUserId()) { //是自己，显示绑定手表 + if (/*mFamilyAdapter.position == 0 &&*/ it.data.user?.id.toString() == CommonUtils.getMyUserId()) { //是自己，显示绑定手表 binding.mHeader.mBtnBind.visibility = View.VISIBLE binding.mHeader.mLayoutResult.visibility = View.GONE } else { //不是自己隐藏数据 @@ -1021,10 +1023,10 @@ class DynamicManagementFrag : BaseVmFrag() { // 激活过才能开启定是我任务 //Log.e("worker", "定时任务开启") - if (mFamilyAdapter.data.isNotEmpty() && mFamilyAdapter.data.size > 0) { + /*if (mFamilyAdapter.data.isNotEmpty() && mFamilyAdapter.data.size > 0) { mFamilyAdapter.data[0].avatarUrl = if (settingBean.user.avatarUrl.isEmpty()) "" else settingBean.user.avatarUrl - } + }*/ //设置用户头像 setUserImage(settingBean.user.id, settingBean.user.avatarUrl, settingBean.user.sex.toString()) @@ -1163,7 +1165,7 @@ class DynamicManagementFrag : BaseVmFrag() { } //我家人信息 - mViewModel.familyLive.observe(this) { + /* mViewModel.familyLive.observe(this) { it.data.add(0, FamilyBean().apply { this.fCall = "我" }) @@ -1197,7 +1199,7 @@ class DynamicManagementFrag : BaseVmFrag() { mFamilyAdapter.position = selectPosition mFamilyAdapter.setNewInstance(it.data) - } + }*/ //手表信息组装上传 mViewModel.allDataInfo.observe(this) { @@ -1591,13 +1593,13 @@ class DynamicManagementFrag : BaseVmFrag() { } private fun updateWarningInfo(sysMsg: MessageBean.SysMsg?) { - if (sysMsg == null || mFamilyAdapter.position > 0) { //如果不是自己，不显示预警消息 + /* if (sysMsg == null || mFamilyAdapter.position > 0) { //如果不是自己，不显示预警消息 binding.mHeader.llWarning.visibility = View.GONE return } else if (mFamilyAdapter.position == 0 || mFamilyAdapter.position == -1) { binding.mHeader.llWarning.visibility = View.VISIBLE - } - notifyStatus = sysMsg.notifyStatus + }*/ + notifyStatus = sysMsg?.notifyStatus if (notifyStatus == 0) { //未读 显示预警消息 binding.mHeader.llWarning.visibility = View.VISIBLE @@ -1606,7 +1608,7 @@ class DynamicManagementFrag : BaseVmFrag() { binding.mHeader.llWarning.visibility = View.GONE } binding.mHeader.tvWarning.isSelected = true - binding.mHeader.tvWarning.text = sysMsg.notifyContent + binding.mHeader.tvWarning.text = sysMsg?.notifyContent } /** @@ -1641,7 +1643,7 @@ class DynamicManagementFrag : BaseVmFrag() { } private fun updateWarningStatus() { - val position = mFamilyAdapter.position + /*val position = mFamilyAdapter.position if (position == 0 || position == -1) { if (notifyStatus == 0) { //未读 @@ -1652,7 +1654,7 @@ class DynamicManagementFrag : BaseVmFrag() { } } else { binding.mHeader.llWarning.visibility = View.GONE - } + }*/ } /** @@ -1814,6 +1816,15 @@ class DynamicManagementFrag : BaseVmFrag() { mViewModel.getAllInfo(showIdInfo, false) } + @Subscribe(threadMode = ThreadMode.MAIN) + fun updateHealthInfo(event:ChangeFamilyEvent){ + + mViewModel.getAllInfo(event.showUserId, false) + getXtInfo(event.showUserId) + get24HourReportInfo(event.showUserId) + updateWarningStatus() + } + override fun onDestroy() { super.onDestroy() tenJob?.cancel() 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 12ceff5..5df36ef 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -35,6 +35,7 @@ import com.xty.common.bracelet.getBluePermission import com.xty.common.bracelet.isGpsOpen import com.xty.common.event.AgainSignEvent import com.xty.common.event.BlueToothConnectEvent +import com.xty.common.event.ChangeFamilyEvent import com.xty.common.event.FamilyEvent import com.xty.common.event.Health24HourStatusEvent import com.xty.common.event.MyInfoEvent @@ -73,6 +74,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.json.JSONArray @@ -704,80 +706,7 @@ HealthHomeFrag : BaseVmFrag() { // } } -/** - * 设置设备信息*/ - - /* private fun setBindDeviceInfo(deviceInfo: MainBean.DeviceTotal?) { - deviceInfo?.let { - if (it.sphygmomanometer > 0) { - binding.mChildHomeView.tvXueyaNum.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_02c - ) - ) - } else { - binding.mChildHomeView.tvXueyaNum.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_c7c - ) - ) - } - binding.mChildHomeView.tvXueyaNum.text = "已绑定" + it.sphygmomanometer + "台" - if (it.bloodGlucose > 0) { - binding.mChildHomeView.tvXuetangNum.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_02c - ) - ) - } else { - binding.mChildHomeView.tvXuetangNum.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_c7c - ) - ) - } - binding.mChildHomeView.tvXuetangNum.text = "已绑定" + it.bloodGlucose + "台" - if (it.bodyFatScale > 0) { - binding.mChildHomeView.tvBodyFatNum.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_02c - ) - ) - } else { - binding.mChildHomeView.tvBodyFatNum.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_c7c - ) - ) - } - binding.mChildHomeView.tvBodyFatNum.text = "已绑定${it.bodyFatScale}台" - } - binding.mChildHomeView.llXueya.setOnClickListener { - //已绑定血压列表 - bundle.clear() - bundle.putString("userId", showIdInfo) - RouteManager.goAct(ARouterUrl.XUEYAJI_BIND_LIST, bundle) - } - binding.mChildHomeView.llXuetang.setOnClickListener { - //已绑定血糖列表 - bundle.clear() - bundle.putString("userId", showIdInfo) - RouteManager.goAct(ARouterUrl.XUETANGYI_BIND_LIST, bundle) - } - //体脂秤跳转页面 - binding.mChildHomeView.llBodyFat.setOnClickListener { - bundle.clear() - bundle.putString("userId", showIdInfo) - RouteManager.goAct(ARouterUrl.BODY_FAT_BIND_LIST, bundle) - } - }*/ // 刷新注册 private fun refresh() { @@ -789,7 +718,7 @@ HealthHomeFrag : BaseVmFrag() { private fun request() { mViewModel.getBanners(CommonUtils.getMyUserId())//当期登录用户id - mViewModel.getAllInfo(showIdInfo, false) + // mViewModel.getAllInfo(showIdInfo, false) // mViewModel.getDkInfo(false, showIdInfo) // 如果显示的是家人Tab则不刷新用户信息，防止头像错乱 if (mFamilyAdapter.position < 1) { @@ -814,16 +743,6 @@ HealthHomeFrag : BaseVmFrag() { mainScope.launch { LogUtils.d("getDeviceInfo isOk:$isok;;; value=$value") if (isok) {//获取到设备信息，设备准备就绪上传手表数据 -// binding.mCom.visibility = View.GONE -// binding.mEle.visibility = View.VISIBLE -// binding.mEle.text = value - /*setDeviceInfo( - DeviceInfoBean( - true, - YCBBlueConnectHelper.BLEConnectState.Connected, - value - ) - )*/ mViewModel.settingLive.value?.let { MyWorkManger.setMyWork( @@ -834,7 +753,6 @@ HealthHomeFrag : BaseVmFrag() { } else {//如果获取手表信息失败，断开连接以后让用户手动连接 YCBBlueConnectHelper.disconnect() -// initBlueToothStatu() } } } @@ -844,95 +762,12 @@ HealthHomeFrag : BaseVmFrag() { } } - private fun blueTooth(): Boolean { - -// CommonUtils.getBlueToothMac()?.let { -// if (!it.isNullOrEmpty()) { -// return true -// } -// } - return CommonUtils.isBlueTooth(MMkvHelper.getInt(Const.Watch_Device_Type)) - } - - -/** - * 是否绑定了设备*/ - - - private fun isBind(): Boolean { -// Const.mainLiveData?.value?.let { -// if (!it.user.bluetooth.isNullOrEmpty()) { -// return true -// } -// } -// return false - return true - } - - /* private fun setTips(datas: List) { -// val datas: List = listOf( -// "《赋得古原草送别》", -// "离离原上草，一岁一枯荣。", -// "野火烧不尽，春风吹又生。", -// "远芳侵古道，晴翠接荒城。", -// "又送王孙去，萋萋满别情。" -// ) - val marqueeFactory: SimpleMF = SimpleMF(context) - marqueeFactory.data = datas - binding.mCom.simpleMarqueeView.setMarqueeFactory(marqueeFactory) - binding.mCom.simpleMarqueeView.setDrawable( - getDrawable(R.mipmap.ic_tips_new), - null, - null, - null - ) - if (binding.mCom.simpleMarqueeView.isFlipping) { - binding.mCom.simpleMarqueeView.stopFlipping() - } -// binding.mCom.simpleMarqueeView.flipInterval = 3 * 1000//轮播间隔时间 - binding.mCom.simpleMarqueeView.startFlipping() - }*/ - - /* private fun updateBadgeNum(num: Int) { - if (num > 0) { - var badgeText = if (num > 99) "99+" else "$num" - binding.mBadge.text = badgeText - binding.mBadge.post { - val layoutParams = binding.mBadge.layoutParams as ViewGroup.LayoutParams - val text = binding.mBadge.text.toString() - binding.mBadgeCard.radius = binding.mBadge.height / 2f - var textWidth = binding.mBadge.paint.measureText(text) - if (binding.mBadge.height >= textWidth) { //等宽高的圆形 - layoutParams.width = binding.mBadge.height - - } else { //宽高不等 将宽度两边加10 - layoutParams.width = textWidth.toInt() + 20 - } - binding.mBadge.layoutParams = layoutParams - } - binding.mBadgeCard.visibility = View.VISIBLE - } else { - binding.mBadgeCard.visibility = View.GONE - } - }*/ override fun onResume() { super.onResume() - mViewModel.getWarningMsg() } override fun observer() { - //预警消息 - mViewModel.warningMsgLive.observe(this) { - /* updateBadgeNum(it.data.noReadNum) - val systemMessage = it.data.systemMessage - if (systemMessage != null && systemMessage.isNotEmpty()) { - val sysMsg = systemMessage[0] - updateWarningInfo(sysMsg) - } else { - updateWarningInfo(null) - }*/ - } //首页轮播图 mViewModel.bannerLive.observe(this) { @@ -1019,34 +854,6 @@ HealthHomeFrag : BaseVmFrag() { } - //手表数据上传 - mViewModel.uploadMultiple.observe(this) { - CommonToastUtils.showSucceedToast(R.string.upload_data_success) - LogUtils.d("all data upload success ") - get24HourReportInfo(showIdInfo)//数据上传成功后获取24小时日报 - getXtInfo(showIdInfo)//数据上传成功后获取血糖信息 - YCBManager.deleteHistory(YCBOrder.DELETE_ALL) //删除 数据 - mainScope.launch { - delay(500) - mViewModel.getAllInfo(showIdInfo, false) - } - } - //睡眠上传 - mViewModel.uploadSleep.observe(this) { - //睡眠上传成功 清除睡眠数据 - LogUtils.d("sleep upload success ") - YCBManager.deleteHistory(YCBOrder.SLEEP_HISTORY) - //clearSleep() - } - - //步数上传 - mViewModel.uploadStep.observe(this) { - //步数上传成功 - //YCBManager.deleteHistory(YCBOrder.STEP_HISTORY) - LogUtils.d("step upload success ") - mViewModel.getDkInfo(false, showIdInfo) - } - //小贴士 mViewModel.tipsLive.observe(this) { LogUtils.d("TipsData:${it.data.size}") @@ -1054,32 +861,8 @@ HealthHomeFrag : BaseVmFrag() { it.data.forEach { tipsBean -> list.add("${tipsBean.title}${tipsBean.content}") } - // setTips(list) } - //步数信息 - /* mViewModel.dkInfo.observe(this) { - mHealthAdapter.dkBean = it.data - mHealthAdapter.notifyDataSetChanged() - }*/ - - //排名信息 -/* mViewModel.rankLive.observe(this) { - val content = getString( - R.string.rank_num, - if (it.data.userRank == 0) "-" else "${it.data.userRank}" - ) - binding.mChildHomeView.tvBdContent.text = setStrSpan( - content, - 15, - getColor(R.color.col_25C), - Typeface.BOLD, - content.length - 1 - (it.data.userRank).toString().length, - content.length - 1 - ) - - }*/ - //个人设置信息获取 mViewModel.settingLive.observe(this) { if (null == it.data) return@observe @@ -1107,193 +890,18 @@ HealthHomeFrag : BaseVmFrag() { if (settingBean.user.avatarUrl.isNullOrEmpty()) "" else settingBean.user.avatarUrl } - //设置用户头像 - /* setUserImage( - settingBean.user.id, - settingBean.user.avatarUrl, - settingBean.user.sex.toString() - )*/ - - /*if (settingBean.user.bluetooth.isNullOrEmpty()) { //没有mac地址表示未绑定 -// binding.mContent.visibility = View.VISIBLE - binding.mCom.mLayoutResult.visibility = View.GONE - binding.mCom.mBtnBind.visibility = View.VISIBLE - setDeviceInfo(DeviceInfoBean(false)) -// if (!(activity as MainActivity).isDialogShow) { -// dialogBind.show() -// } - } else { - MyRetrofit.get().BLUETOOTH_MAC = settingBean.user.bluetooth - binding.mCom.mLayoutResult.visibility = View.VISIBLE - binding.mCom.mBtnBind.visibility = View.GONE - //重新签名提示 - var signTime = settingBean.user.esignatureDate - if (!signTime.isNullOrEmpty()) { - var againTime = RxTimeTool.string2Milliseconds("2022-07-01 21:00:00") - var signTime = RxTimeTool.string2Milliseconds(signTime) - if (signTime < againTime) { - signDialog.show() - } - } - if (CommonUtils.isBlueTooth(MMkvHelper.getInt(Const.Watch_Device_Type))) {//如果是蓝牙设备 - startGetDeviceInfoLive() - if (settingBean.user.bluetooth != MMkvHelper.getString(Const.Blue_Tooth)) {//如果不是同一设备 - YCBBlueConnectHelper.disconnect()//断开蓝牙，断开后收到BlueToothConnectEvent会自动连接 - YCBBlueConnectHelper.cancelTimer() - } else { - LogUtils.d("startConnect::${settingBean.user.bluetooth}") - mainUIUpdate(YCBBlueConnectHelper.BLEConnectState.Connecting)//刷新蓝牙连接状态 - connect(settingBean.user.bluetooth) - } - } - }*/ - - /* if (Const.Companion.WatchDevice.LightA3.ordinal == Const.watchType) {//如果是4G设备，设置连接状态与电量信息 - setDeviceInfo( - DeviceInfoBean( - true, - YCBBlueConnectHelper.BLEConnectState.Connected, - if (Const.battery.isNullOrEmpty()) "" else "电量${Const.battery}%" - ) - ) - get24HourReportInfo(showIdInfo)// 这里调用一次接口，防止首次进入App不会刷新评估状态 - }*/ - MMkvHelper.put(Const.Blue_Tooth, settingBean.user.bluetooth) if (!settingBean.user.deviceId.isNullOrEmpty()) { Const.DeviceIdNum = settingBean.user.deviceId } else { Const.DeviceIdNum = "" } -// MMkvHelper.saveAccountConfig(requireContext(),settingBean.user.phone,Const.DEVICE_TYPE, settingBean.user.deviceId) } //个人信息拿到之后再去获取mqtt信息 mViewModel.getMqttInfo() } - //血糖信息获取 - mViewModel.xtInfo.observe(this) { - updateBloodSugarInfo(it.data) - } - - //获取首页所有信息返回 - mViewModel.allData.observe(this) { - it.data.let { bean -> - - if (null == bean) { - LogUtils.e("没得数据，不做任何处理！") - return@observe - } - - if (bean.user.name.isNullOrEmpty() || bean.user.age.isNullOrEmpty() || bean.user.age == "0") { - dialogInfoUn.show() - } - isDemonstrate = bean.demonstrate == 1 //1 演示模式，0 普通模式 - (requireActivity() as MainActivity).isDemonstrate = isDemonstrate - /* if (isDemonstrate) { - binding.mCom.mWearInfo.visibility = View.INVISIBLE - binding.mCom.mWatchType.visibility = View.INVISIBLE - } else { - binding.mCom.mWatchType.visibility = View.VISIBLE - binding.mCom.mWearInfo.visibility = View.VISIBLE - }*/ - if (mFamilyAdapter.position != -1) { - if (mFamilyAdapter.getItem(mFamilyAdapter.position).userJointId != bean.user.id.toInt()) { - if (mFamilyAdapter.position == 0 && bean.user?.id.toString() == CommonUtils.getMyUserId()) {//如果是自己加载用户头像并保存用户信息 - } else { - LogUtils.e("当前用户与请求用户信息不一致，不作处理！") - return@observe - } - } - } - - /* if (showIdInfo.isEmpty()) { //自己 -// binding.mChildHomeView.mGuide2.visibility = View.VISIBLE - binding.mChildHomeView.mInter.visibility = View.VISIBLE - binding.mChildHomeView.lleach.visibility = View.VISIBLE - } else { -// binding.mChildHomeView.mGuide2.visibility = View.GONE//隐藏健康管家 - binding.mChildHomeView.mInter.visibility = View.GONE//隐藏健康互动标题 - binding.mChildHomeView.lleach.visibility = View.GONE//隐藏健康打卡，榜单，我的家人功能 - Const.otherLiveData.value = bean - }*/ -// setWeatherInfo(bean.weather) - Const.battery = bean.power - Const.watchType = bean.watchType - - //设置健康物联手表是否绑定 - /* if (bean.deviceType.isNullOrEmpty()) { - binding.mChildHomeView.tvWatchBind.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_7c7 - ) - ) - binding.mChildHomeView.tvWatchBind.text = "未绑定手表" - } else { - binding.mChildHomeView.tvWatchBind.setTextColor( - ContextCompat.getColor( - requireContext(), - R.color.col_02c - ) - ) - binding.mChildHomeView.tvWatchBind.text = "已绑定手表" - }*/ - MMkvHelper.put(Const.Watch_Device_Type, bean.watchType) - - /*if (bean.watchType == -1) { //没有绑定设备 - binding.mCom.mBindState.apply { - text = "未绑定" - val drawable = getDrawable(R.mipmap.ic_unbind) - drawable.setBounds(0, 0, drawable.minimumWidth, drawable.minimumHeight) - setCompoundDrawables(drawable, null, null, null) - visibility = View.VISIBLE - } - binding.mChildHomeView.mRelInterBD.visibility = View.GONE - binding.mCom.mConnectStatu.visibility = View.INVISIBLE - binding.mCom.mWatchType.visibility = View.INVISIBLE - - binding.mCom.mWearManager.text = "绑定手表" - - } else if (Const.Companion.WatchDevice.LightA3.ordinal == bean.watchType) {//如果是4G设备，设置连接状态与电量信息 - setDeviceInfo( - DeviceInfoBean( - true, - YCBBlueConnectHelper.BLEConnectState.Connected, - if (Const.battery.isNullOrEmpty()) "" else "电量${Const.battery}%" - ) - ) - } else { - if (showIdInfo.isEmpty()) { //自己 - val localBlueMac = MMkvHelper.getString(Const.Blue_Tooth) - if (YCBBlueConnectHelper.getBleNowStatus() == YCBBlueConnectHelper.BLEConnectState.DisConnect) {//如果本地有蓝牙信息且属于未连接状态，则直接连接 - if (localBlueMac.isEmpty()) { - mainUIUpdate(YCBBlueConnectHelper.BLEConnectState.DisConnect)//刷新蓝牙连接状态 - } else { - mainUIUpdate(YCBBlueConnectHelper.BLEConnectState.Connecting)//刷新蓝牙连接状态 - connect(localBlueMac) - } - } else if (YCBBlueConnectHelper.getBleNowStatus() == YCBBlueConnectHelper.BLEConnectState.Connected) { - getConnectStatus() - } - } else { - setDeviceInfo(null) - } - } - mHealthAdapter.mainBean = bean - mHealthAdapter.notifyDataSetChanged() - //总佩戴 活跃 休眠 - binding.mCom.mWearInfo.text = getString( - R.string.wear_info, - bean.adorn.wearCount.toString(), - bean.adorn.activeWear.toString(), - bean.adorn.dormancy.toString() - ) - setBindDeviceInfo(bean.deviceTotal)*/ - } - } - //我家人信息 mViewModel.familyLive.observe(this) { it.data.add(0, FamilyBean().apply { @@ -1312,17 +920,6 @@ HealthHomeFrag : BaseVmFrag() { showIdInfo = "" } } - - val content = - getString(R.string.family_num, "" + "${it.data.size - 1}") - /* binding.mChildHomeView.tvFamilyContent.text = setStrSpan( - content, - 15, - getColor(R.color.col_25C), - Typeface.BOLD, - content.length - 3 - (it.data.size - 1).toString().length, - content.length - 3 - )*/ it.data.add(FamilyBean().apply { this.fCall = "家人" }) @@ -1361,13 +958,6 @@ HealthHomeFrag : BaseVmFrag() { mainScope.launch { LogUtils.d("getDeviceInfo isOk:$isok;;; value=$value") if (isok) {//获取到设备信息，设备准备就绪上传手表数据 - /* setDeviceInfo( - DeviceInfoBean( - true, - YCBBlueConnectHelper.BLEConnectState.Connected, - value - ) - )*/ } } } @@ -1401,40 +991,9 @@ HealthHomeFrag : BaseVmFrag() { var healthResult = it.data.healthy.result updateHealthDesc(healthResult) - //健康状态 - // binding.mCom.mHealthStatus.setImageResource(UserInfoDefin.healthIcon[healthResult + 1]) -// if (healthResult == 3) { -// binding.mCom.mHealthStatus.setCompoundDrawables(null, null, null, null) -// } else { -// var drawable = ContextCompat.getDrawable( -// requireContext(), -// UserInfoDefin.healthIcon[healthResult + 1] -// ) -// drawable!!.setBounds(0, 0, drawable.minimumWidth, drawable.minimumHeight) -// binding.mCom.mHealthStatus.setCompoundDrawables(drawable, null, null, null) -// } } } - var notifyStatus: Int? = -1 - /* private fun updateWarningInfo(sysMsg: MessageBean.SysMsg?) { - if (sysMsg == null || mFamilyAdapter.position > 0) { //如果不是自己，不显示预警消息 - binding.mCom.llWarning.visibility = View.GONE - return - } else if (mFamilyAdapter.position == 0 || mFamilyAdapter.position == -1) { - binding.mCom.llWarning.visibility = View.VISIBLE - } - notifyStatus = sysMsg.notifyStatus - if (notifyStatus == 0) { - //未读 显示预警消息 - binding.mCom.llWarning.visibility = View.VISIBLE - } else { - //已读 显示预警消息 - binding.mCom.llWarning.visibility = View.GONE - } - binding.mCom.tvWarning.isSelected = true - binding.mCom.tvWarning.text = sysMsg.notifyContent - }*/ /** * 通过设备型号来处理不同业务逻辑*/ @@ -1444,14 +1003,12 @@ HealthHomeFrag : BaseVmFrag() { when (MMkvHelper.getInt(Const.Watch_Device_Type)) {//如果是4GA3设备，则隐藏心电板块 Const.Companion.WatchDevice.LightA3.ordinal -> { getXtInfo(showIdInfo, false)//获取血糖信息 -// get24HourReportInfo(showIdInfo)//获取24小时日报 } else -> { if (!YCBBlueConnectHelper.isBlueExits()) {//检查蓝牙设备，如未发现蓝牙设备则获取用户上次的血糖信息和24小时信息 LogUtils.d("未发现蓝牙设备...") getXtInfo(showIdInfo)//如果手表没数据也需要获取获取血糖信息 -// get24HourReportInfo(showIdInfo)//如果手表没数据也需要获取24小时日报 } } } @@ -1470,9 +1027,6 @@ HealthHomeFrag : BaseVmFrag() { if (!info.errorMsg.isNullOrEmpty()) { CommonToastUtils.showToast(info.errorMsg) } -/* - mHealthAdapter.xtangInfo = info - mHealthAdapter.notifyDataSetChanged()*/ } @@ -1482,19 +1036,6 @@ HealthHomeFrag : BaseVmFrag() { private fun updateHealthDesc(healthStatus: Int) { canGoto24Healthresult = healthStatus != 0 && healthStatus != -1 - /* binding.mCom.mDesc.apply { - text = UserInfoDefin.getHealthArray(requireContext())[healthStatus + 1] - //todo 数据不足 不允许进入健康管理 - setTextColor( - ContextCompat.getColor( - requireContext(), - UserInfoDefin.healthCol[healthStatus + 1] - ) - ) - }*/ - -// text = -// setStrSpan(content, 13, getColor(com.xty.health.R.color.col_ff7), Typeface.BOLD, content.length - 3 - percent.length, content.length - 3) } /** @@ -1518,44 +1059,14 @@ HealthHomeFrag : BaseVmFrag() { showFamily = bean bean.userJointId.toString() } - /* binding.mCom.mWearManager.visibility = - if (showIdInfo.isNullOrEmpty()) View.VISIBLE else View.GONE*/ - /* setUserImage( - if (showIdInfo.isNullOrEmpty()) "0" else showIdInfo, - bean.avatarUrl, - bean.sex.toString() - )*/ - // binding.mCom.mUserName.text = bean.fCall + mFamilyAdapter.position = position mFamilyAdapter.notifyDataSetChanged() - mViewModel.getAllInfo(showIdInfo, true) - getXtInfo(showIdInfo) - mViewModel.getDkInfo(false, showIdInfo) -// updateWarningStatus() + EventBus.getDefault().post(ChangeFamilyEvent(showIdInfo)) } } } -/** - * 设置用户头像*/ - - -/* private fun setUserImage(userId: String, headerImage: String?, sex: String) { - binding.mCom.mHeaderImage.apply { - tag = userId - setImageUser(requireContext(), headerImage, sex) - setOnClickListener { - if (tag.toString() - .isNullOrEmpty() || tag.toString() == "0" || Const.mainLiveData.value?.user?.id.toString() == userId.toString() - ) { - RouteManager.goAct(ARouterUrl.BASE_INFO_CHANGE, bundle) - } - } - } - }*/ -/* -* - * 获取所有信息*/ private fun getAllData() { 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 a563c97..b6d2ef4 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -59,7 +59,7 @@ class MineFrag : BaseVmFrag() { if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) }else{ - RouteManager.goAct(ARouterUrl.MY_INFO) + RouteManager.goAct(ARouterUrl.BASE_INFO_CHANGE) } } @@ -73,47 +73,74 @@ class MineFrag : BaseVmFrag() { } binding.llHealthRecord.setOnClickListener { - bundle.putString("id", user?.id) - RouteManager.goAct(ARouterUrl.HEALTH_RECORD, bundle) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + bundle.putString("id", user?.id) + RouteManager.goAct(ARouterUrl.HEALTH_RECORD, bundle) + } } binding.llDataComparsion.setOnClickListener { - bundle.clear() - bundle.putString("id", user?.id) - RouteManager.goAct(ARouterUrl.COMPARE_PAGE_DATA_ACT, bundle) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + bundle.clear() + bundle.putString("id", user?.id) + RouteManager.goAct(ARouterUrl.COMPARE_PAGE_DATA_ACT, bundle) + } } binding.llSetting.setOnClickListener { - bundle.clear() - bundle.putSerializable("user", user) - bundle.putBoolean("isDemonstrate", (requireActivity() as MainActivity).isDemonstrate) - RouteManager.goAct(ARouterUrl.SETTING, bundle) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + bundle.clear() + bundle.putSerializable("user", user) + bundle.putBoolean( + "isDemonstrate", + (requireActivity() as MainActivity).isDemonstrate + ) + RouteManager.goAct(ARouterUrl.SETTING, bundle) + } } binding.llOrder.setOnClickListener { - bundle.clear() - bundle.putString("id", user?.id) - RouteManager.goAct(ARouterUrl.ORDER_LIST, bundle) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + bundle.clear() + bundle.putString("id", user?.id) + RouteManager.goAct(ARouterUrl.ORDER_LIST, bundle) + } } binding.llFamilyHealth.setOnClickListener { - RouteManager.goAct(ARouterUrl.FAMILY) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + RouteManager.goAct(ARouterUrl.FAMILY) + } } binding.llWearableDevice.setOnClickListener { - CommonUtils.getMyUserInfo()?.let { - if (it.watchName == null) { - RouteManager.goAct(ARouterUrl.DEVICE_CHOICE) - } else { - //设备信息 - // unBindDialog.show() - bundle.clear() - bundle.putSerializable("user", it) - RouteManager.goAct(ARouterUrl.DEV_INFO, bundle) + if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ + RouteManager.goAct(ARouterUrl.LOGIN_ACT) + }else { + CommonUtils.getMyUserInfo()?.let { + if (it.watchName == null) { + RouteManager.goAct(ARouterUrl.DEVICE_CHOICE) + } else { + //设备信息 + // unBindDialog.show() + bundle.clear() + bundle.putSerializable("user", it) + RouteManager.goAct(ARouterUrl.DEV_INFO, bundle) + } } } } - binding.mInfo.setOnClickListener { + /*binding.mInfo.setOnClickListener { RouteManager.goAct(ARouterUrl.BASE_INFO_CHANGE, bundle) - } + }*/ mViewModel.getNesProg("") } @@ -126,9 +153,9 @@ class MineFrag : BaseVmFrag() { mViewModel.getMySetting() } mViewModel.getScore(1) - mViewModel.getMyFamilyList() - mViewModel.getNesProg("") - mViewModel.getInviteCountRequest(CommonUtils.getMyUserId().toString()) + // mViewModel.getMyFamilyList() + // mViewModel.getNesProg("") + // mViewModel.getInviteCountRequest(CommonUtils.getMyUserId().toString()) // mViewModel.getNotReadCount() } } @@ -137,20 +164,10 @@ class MineFrag : BaseVmFrag() { /* mViewModel.familyLive.observe(this) { binding.mFamily.text = it.data.size.toString() }*/ - mViewModel.progLive.observe(this) { - binding.mProg.text = it.data.size.toString() - } mViewModel.scoreLive.observe(this) { - binding.mTvSource.text = (if (it.data.num.isNullOrEmpty()) "0" else it.data.num!!) + binding.mIntegral.text = (if (it.data.num.isNullOrEmpty()) "0" else it.data.num!!) } //设置邀请人数 - mViewModel.inviteCountLive.observe(this) { - binding.tvInviteCount.text = if (!TextUtils.isEmpty(it.data)) { - it.data - } else { - "0" - } - } Const.mainLiveData.observe(this) { if (null == it) { diff --git a/app/src/main/java/com/zj365/dc/model/ScanInfoBean.kt b/app/src/main/java/com/zj365/dc/model/ScanInfoBean.kt new file mode 100644 index 0000000..75077d1 --- /dev/null +++ b/app/src/main/java/com/zj365/dc/model/ScanInfoBean.kt @@ -0,0 +1,5 @@ +package com.zj365.dc.model + + +data class ScanInfoBean(var watchName: String = "", var deviceCode: String = "", var activationCode: String = "") + diff --git a/app/src/main/res/layout/act_binder_device_one_key.xml b/app/src/main/res/layout/act_binder_device_one_key.xml new file mode 100644 index 0000000..1a9c970 --- /dev/null +++ b/app/src/main/res/layout/act_binder_device_one_key.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/frag_mine.xml b/app/src/main/res/layout/frag_mine.xml index 2f6dc73..23072eb 100644 --- a/app/src/main/res/layout/frag_mine.xml +++ b/app/src/main/res/layout/frag_mine.xml @@ -159,8 +159,8 @@ android:orientation="vertical"> diff --git a/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.png b/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.png new file mode 100644 index 0000000..db56199 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_tips_error.png b/app/src/main/res/mipmap-xxhdpi/icon_tips_error.png new file mode 100644 index 0000000..e7cc5a6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_tips_error.png differ diff --git a/base/src/main/res/drawable/shape_head_tip_new.xml b/base/src/main/res/drawable/shape_head_tip_new.xml index fe98e19..a97dbff 100644 --- a/base/src/main/res/drawable/shape_head_tip_new.xml +++ b/base/src/main/res/drawable/shape_head_tip_new.xml @@ -2,7 +2,7 @@ + android:color="@color/col_02c"/> + + + + \ No newline at end of file diff --git a/common/src/main/res/mipmap-xhdpi/gongli.png b/common/src/main/res/mipmap-xhdpi/gongli.png index 4876613..e95b75c 100644 Binary files a/common/src/main/res/mipmap-xhdpi/gongli.png and b/common/src/main/res/mipmap-xhdpi/gongli.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_next.png b/common/src/main/res/mipmap-xhdpi/ic_next.png index 3d610b4..e5c2aae 100644 Binary files a/common/src/main/res/mipmap-xhdpi/ic_next.png and b/common/src/main/res/mipmap-xhdpi/ic_next.png differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_sel.png b/common/src/main/res/mipmap-xhdpi/ic_sel.png index b81185e..aa17340 100644 Binary files a/common/src/main/res/mipmap-xhdpi/ic_sel.png and b/common/src/main/res/mipmap-xhdpi/ic_sel.png differ diff --git a/common/src/main/res/mipmap-xhdpi/nongli.png b/common/src/main/res/mipmap-xhdpi/nongli.png index 7bee698..d365b97 100644 Binary files a/common/src/main/res/mipmap-xhdpi/nongli.png and b/common/src/main/res/mipmap-xhdpi/nongli.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_gouxuan.png b/common/src/main/res/mipmap-xxhdpi/ic_gouxuan.png index 6344dcd..36031c9 100644 Binary files a/common/src/main/res/mipmap-xxhdpi/ic_gouxuan.png and b/common/src/main/res/mipmap-xxhdpi/ic_gouxuan.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_pay_success.png b/common/src/main/res/mipmap-xxhdpi/ic_pay_success.png index c41987d..873aedb 100644 Binary files a/common/src/main/res/mipmap-xxhdpi/ic_pay_success.png and b/common/src/main/res/mipmap-xxhdpi/ic_pay_success.png differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_weigouxuan.png b/common/src/main/res/mipmap-xxhdpi/ic_weigouxuan.png index 67c9ed8..1deb9ce 100644 Binary files a/common/src/main/res/mipmap-xxhdpi/ic_weigouxuan.png and b/common/src/main/res/mipmap-xxhdpi/ic_weigouxuan.png differ diff --git a/health/src/main/java/com/zj365/health/act/AgreeAct.kt b/health/src/main/java/com/zj365/health/act/AgreeAct.kt index 5f66545..582c6e4 100644 --- a/health/src/main/java/com/zj365/health/act/AgreeAct.kt +++ b/health/src/main/java/com/zj365/health/act/AgreeAct.kt @@ -4,15 +4,21 @@ import android.annotation.SuppressLint import android.graphics.Bitmap import android.graphics.BitmapFactory import android.os.Build +import android.text.SpannableString +import android.text.Spanned +import android.text.TextPaint +import android.text.style.ClickableSpan import android.view.View import android.webkit.WebChromeClient import android.webkit.WebSettings import android.webkit.WebView import android.webkit.WebViewClient +import androidx.core.content.ContextCompat import com.alibaba.android.arouter.facade.annotation.Route import com.tamsiree.rxkit.RxNetTool import com.tamsiree.rxkit.RxTool import com.xty.base.act.BaseVmAct +import com.xty.common.Const import com.xty.common.LogUtils import com.xty.common.MyLinkedMovementMethod import com.xty.common.arouter.ARouterUrl @@ -60,7 +66,29 @@ class AgreeAct : BaseVmAct() { binding.mPrivate.setOnClickListener { it.isSelected = !it.isSelected } + var txtCol = ContextCompat.getColor(this, R.color.col_02c) binding.mPrivate.movementMethod = MyLinkedMovementMethod().getInstance() + var span = SpannableString("同意《知情同意书》") + span.setSpan(object : ClickableSpan() { + override fun onClick(widget: View) { + bundle.clear() + bundle.putString("title", "用户协议") + bundle.putInt("type", Const.AGREEMENT_1) + /* RouteManager.goActRequest( + ARouterUrl.RICH_TEXT, + this@AgreeAct, + USER_AGREEMENT, + bundle + )*/ + } + + override fun updateDrawState(ds: TextPaint) { + super.updateDrawState(ds) + ds.color = txtCol + ds.isUnderlineText = false + } + + }, 2, span.length, Spanned.SPAN_INCLUSIVE_INCLUSIVE) binding.mSubmit.setOnClickListener { if (!binding.mPrivate.isSelected) { 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 75c4056..07d561a 100644 --- a/health/src/main/java/com/zj365/health/act/PreventCancertAct.kt +++ b/health/src/main/java/com/zj365/health/act/PreventCancertAct.kt @@ -27,6 +27,7 @@ import com.xty.common.arouter.RouteManager import com.xty.common.event.WxPayEvent import com.xty.common.getImageUrl import com.xty.common.setImage +import com.xty.common.util.SpannableUtils import com.zj365.health.R import com.zj365.health.adapter.AnswerAdapter import com.zj365.health.databinding.ActPreventCancerBinding @@ -142,13 +143,13 @@ class PreventCancertAct : BaseVmAct() { var bottomSheetDialog: BottomSheetDialog? = null fun initBottomDialog() { if (bottomSheetDialog == null) { - bottomSheetDialog = BottomSheetDialog(this) + bottomSheetDialog = BottomSheetDialog(this,R.style.Theme_ChartDialogManager) bottomSheetDialog?.let { dialog -> val view = LayoutInflater.from(this).inflate(R.layout.bottom_cancer, null) dialog.setContentView(view) val tvprice = view.findViewById(R.id.tvPrice) - tvprice.text = "￥${price}" + tvprice.text = SpannableUtils.setSpanMoney(price) val ivClose = view.findViewById(R.id.close_button) ivClose.setOnClickListener { dialog.dismiss() @@ -207,7 +208,7 @@ class PreventCancertAct : BaseVmAct() { private val SDK_PAY_FLAG = 1 private val WEIXIN_PAY_FLAG = 2 - var price = "" + var price:Float = 0f var goodsId = "" var orderNo = "" var filePath = "" @@ -326,7 +327,7 @@ class PreventCancertAct : BaseVmAct() { } data?.let { - price = data.price.toString() + price = data.price!! // binding.tvPurchase.text = "￥${data.price} 立即购买" binding.tvPurchase.text = "立即购买" goodsId = data.id.toString() 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 29304f2..656dfc0 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 @@ -1,5 +1,6 @@ package com.zj365.health.act.tonguediagnosis +import android.graphics.Color import android.os.Handler import android.os.Looper import android.os.Message @@ -23,6 +24,7 @@ import com.xty.common.arouter.ARouterUrl import com.xty.common.arouter.RouteManager import com.xty.common.event.WxPayEvent import com.xty.common.setImage +import com.xty.common.util.SpannableUtils import com.zj365.health.R import com.zj365.health.databinding.ActivityTongueDiagnosisMainBinding import com.zj365.health.model.PayResult @@ -86,13 +88,13 @@ class TongueDiagnosisMainActivity : BaseVmAct() { fun initBottomDialog() { if (bottomSheetDialog == null) { - bottomSheetDialog = BottomSheetDialog(this) + bottomSheetDialog = BottomSheetDialog(this,R.style.Theme_ChartDialogManager) bottomSheetDialog?.let { dialog -> val view = LayoutInflater.from(this).inflate(R.layout.bottom_cancer, null) dialog.setContentView(view) val tvprice = view.findViewById(R.id.tvPrice) - tvprice.text = "￥${payGoodsBean.price}" + tvprice.text = SpannableUtils.setSpanMoney(payGoodsBean.price!!) val ivClose = view.findViewById(R.id.close_button) ivClose.setOnClickListener { dialog.dismiss() diff --git a/health/src/main/java/com/zj365/health/adapter/TongueRecordAdapter.kt b/health/src/main/java/com/zj365/health/adapter/TongueRecordAdapter.kt index 2c286ea..e0b7aae 100644 --- a/health/src/main/java/com/zj365/health/adapter/TongueRecordAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/TongueRecordAdapter.kt @@ -37,8 +37,8 @@ class TongueRecordAdapter: BaseAdapter(R.layout.item_tongue_rec holder.setGone(R.id.llUpload,true) holder.setText(R.id.tvEstimateStatus,getStatusText(item.status)).setTextColor(R.id.tvEstimateStatus,getStatusColor(item.status)) var helper = holder.getView(R.id.tvEstimateStatus) - if (item.status == 3) { - helper.setBackgroundResource(R.drawable.shape_stoke_25c) + if (item.status == 3 || item.status == 5) { + helper.setBackgroundResource(R.drawable.shape_r12_stroke_02c) } else { helper.setBackgroundResource(0) } @@ -66,9 +66,9 @@ class TongueRecordAdapter: BaseAdapter(R.layout.item_tongue_rec 0 -> color = context.resources.getColor(R.color.col_96D) 1 -> color = context.resources.getColor(R.color.col_96D) 2 -> color = context.resources.getColor(R.color.col_2628) - 3 -> color = context.resources.getColor(R.color.col_9BDd) + 3 -> color = context.resources.getColor(R.color.col_02c) 4 -> color = context.resources.getColor(R.color.col_96D) - 5 -> color = context.resources.getColor(R.color.col_9BDd) + 5 -> color = context.resources.getColor(R.color.col_02c) 4 -> color = context.resources.getColor(R.color.col_2628) } return color diff --git a/health/src/main/res/drawable/shape_button_bg.xml b/health/src/main/res/drawable/shape_button_bg.xml index 6b442a9..d647326 100644 --- a/health/src/main/res/drawable/shape_button_bg.xml +++ b/health/src/main/res/drawable/shape_button_bg.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:endColor="@color/col_02c"/> \ No newline at end of file diff --git a/health/src/main/res/drawable/shape_r12_stroke_02c.xml b/health/src/main/res/drawable/shape_r12_stroke_02c.xml new file mode 100644 index 0000000..95d3ab3 --- /dev/null +++ b/health/src/main/res/drawable/shape_r12_stroke_02c.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/health/src/main/res/drawable/shape_stoke.xml b/health/src/main/res/drawable/shape_stoke.xml index fba8108..75b771c 100644 --- a/health/src/main/res/drawable/shape_stoke.xml +++ b/health/src/main/res/drawable/shape_stoke.xml @@ -6,7 +6,7 @@ + android:color="@color/col_02c"/> \ No newline at end of file diff --git a/health/src/main/res/layout/act_agree.xml b/health/src/main/res/layout/act_agree.xml index ed7d8ba..838a961 100644 --- a/health/src/main/res/layout/act_agree.xml +++ b/health/src/main/res/layout/act_agree.xml @@ -37,16 +37,30 @@ android:paddingTop="@dimen/dp_23" android:paddingLeft="@dimen/dp_16" android:paddingRight="@dimen/dp_16"> - + android:layout_height="wrap_content"> + + + + + android:textColor="@color/col_313"/> @@ -92,7 +94,7 @@ android:drawablePadding="@dimen/dp_6" android:textSize="@dimen/dp_15" android:text="开通须知：此兑换码仅限本人使用，开通完成之后，无法二次兑换。" - android:textColor="@color/col_c2c" /> + android:textColor="@color/col_7c7" /> @@ -106,6 +108,7 @@ android:gravity="center" android:text="确认" android:textColor="@color/white" + android:textStyle="bold" android:textSize="@dimen/dp_18" /> \ No newline at end of file diff --git a/health/src/main/res/layout/act_pay_success.xml b/health/src/main/res/layout/act_pay_success.xml index 5b6506c..5f51e6a 100644 --- a/health/src/main/res/layout/act_pay_success.xml +++ b/health/src/main/res/layout/act_pay_success.xml @@ -19,13 +19,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@mipmap/ic_pay_success" - android:layout_marginTop="@dimen/dp_93"/> + android:layout_marginTop="@dimen/dp_70"/> @@ -327,7 +327,7 @@ android:layout_height="wrap_content" android:text="示例图" android:textColor="@color/col_c7c" - android:textSize="@dimen/dp_16" + android:textSize="@dimen/sp_15" android:paddingStart="@dimen/dp_4" /> @@ -380,7 +380,7 @@ android:layout_height="wrap_content" android:text="舌下照片" android:textColor="@color/col_313" - android:textSize="@dimen/dp_16" + android:textSize="@dimen/sp_15" android:paddingStart="@dimen/dp_4" /> @@ -424,7 +424,7 @@ android:layout_height="wrap_content" android:text="示例图" android:textColor="@color/col_c7c" - android:textSize="@dimen/dp_16" + android:textSize="@dimen/sp_15" android:paddingStart="@dimen/dp_4" /> @@ -481,6 +481,7 @@ android:background="@drawable/shape_button_bg" android:gravity="center" android:textSize="@dimen/sp_18" + android:textStyle="bold" android:text="提交" android:textColor="@color/white" /> diff --git a/health/src/main/res/layout/bottom_cancer.xml b/health/src/main/res/layout/bottom_cancer.xml index cf59532..ee4be9c 100644 --- a/health/src/main/res/layout/bottom_cancer.xml +++ b/health/src/main/res/layout/bottom_cancer.xml @@ -82,7 +82,7 @@ android:drawableLeft="@mipmap/ic_weixinzhif" android:drawablePadding="@dimen/dp_9" android:text="微信" - android:textColor="@color/black" + android:textColor="@color/col_313" android:textSize="@dimen/sp_15" android:textStyle="bold" /> @@ -114,7 +114,7 @@ android:drawableLeft="@mipmap/ic_zhifubao" android:drawablePadding="@dimen/dp_9" android:text="支付宝" - android:textColor="@color/black" + android:textColor="@color/col_313" android:textSize="@dimen/sp_15" android:textStyle="bold" /> @@ -146,7 +146,7 @@ android:drawableStart="@mipmap/ic_duihuanma" android:drawablePadding="@dimen/dp_9" android:text="兑换码" - android:textColor="@color/black" + android:textColor="@color/col_313" android:textSize="@dimen/sp_15" android:textStyle="bold" tools:ignore="UseCompatTextViewDrawableXml" /> diff --git a/health/src/main/res/layout/dialog_cancer.xml b/health/src/main/res/layout/dialog_cancer.xml index d541b8c..f0ea642 100644 --- a/health/src/main/res/layout/dialog_cancer.xml +++ b/health/src/main/res/layout/dialog_cancer.xml @@ -48,7 +48,7 @@ android:paddingTop="@dimen/dp_10" android:paddingBottom="@dimen/dp_10" android:text="@string/confirm" - android:textColor="@color/col_8D0" + android:textColor="@color/col_02c" android:textSize="@dimen/sp_16" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/mTvCancel" @@ -79,7 +79,7 @@ android:layout_centerHorizontal="true" android:padding="@dimen/dp_15" android:text="去评估!" - android:textColor="@color/col_8D0" + android:textColor="@color/col_02c" android:textSize="@dimen/dp_15" android:layout_gravity="center_horizontal"/> diff --git a/health/src/main/res/layout/dialog_sign.xml b/health/src/main/res/layout/dialog_sign.xml index 505a34e..3de553e 100644 --- a/health/src/main/res/layout/dialog_sign.xml +++ b/health/src/main/res/layout/dialog_sign.xml @@ -26,7 +26,7 @@ android:paddingBottom="@dimen/dp_13" android:background="@drawable/shape_round_white" android:text="重签" - android:textColor="@color/col_009" + android:textColor="@color/col_02c" android:textSize="@dimen/sp_16" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/mTvSub" diff --git a/health/src/main/res/layout/frag_upload_check.xml b/health/src/main/res/layout/frag_upload_check.xml index 14cf2e0..b413bec 100644 --- a/health/src/main/res/layout/frag_upload_check.xml +++ b/health/src/main/res/layout/frag_upload_check.xml @@ -232,7 +232,7 @@ diff --git a/health/src/main/res/layout/fragment_tongue_diagnosis_info.xml b/health/src/main/res/layout/fragment_tongue_diagnosis_info.xml index ab88727..37d1257 100644 --- a/health/src/main/res/layout/fragment_tongue_diagnosis_info.xml +++ b/health/src/main/res/layout/fragment_tongue_diagnosis_info.xml @@ -106,7 +106,7 @@ android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_20" app:corner_radius="@dimen/dp_2" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="@dimen/dp_16" diff --git a/health/src/main/res/layout/fragment_tongue_report.xml b/health/src/main/res/layout/fragment_tongue_report.xml index 28ef3e5..59d0108 100644 --- a/health/src/main/res/layout/fragment_tongue_report.xml +++ b/health/src/main/res/layout/fragment_tongue_report.xml @@ -73,7 +73,7 @@ app:xTabMode="scrollable" app:xTabSelectedTextColor="@color/col_02c" app:xTabTextColor="@color/col_c7c" - app:xTabTextSize="14dp" + app:xTabTextSize="@dimen/sp_15" app:xTabTextSelectedBold="true" app:xTabDisplayNum="4" app:xTabSelectedTextSize="@dimen/sp_17" diff --git a/health/src/main/res/layout/fragment_tongue_user_info.xml b/health/src/main/res/layout/fragment_tongue_user_info.xml index ae01f6b..04769d1 100644 --- a/health/src/main/res/layout/fragment_tongue_user_info.xml +++ b/health/src/main/res/layout/fragment_tongue_user_info.xml @@ -31,7 +31,7 @@ android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_20" app:corner_radius="@dimen/dp_2" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="@dimen/dp_16" @@ -219,7 +219,7 @@ android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_20" app:corner_radius="@dimen/dp_2" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="@dimen/dp_16" @@ -478,7 +478,7 @@ android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_20" app:corner_radius="@dimen/dp_2" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" android:layout_marginStart="@dimen/dp_16" diff --git a/health/src/main/res/layout/item_estimate_record.xml b/health/src/main/res/layout/item_estimate_record.xml index 824ee7d..44c2b78 100644 --- a/health/src/main/res/layout/item_estimate_record.xml +++ b/health/src/main/res/layout/item_estimate_record.xml @@ -12,7 +12,7 @@ android:orientation="vertical" android:background="@drawable/shape_white_8radius" android:layout_marginBottom="@dimen/dp_14" - android:paddingTop="@dimen/dp_23" + android:paddingTop="@dimen/dp_16" android:paddingLeft="@dimen/dp_16" android:paddingRight="@dimen/dp_16" app:layout_constraintTop_toTopOf="parent" @@ -65,14 +65,14 @@ android:id="@+id/rvRecyclerview" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/dp_11"/> + android:layout_marginBottom="@dimen/dp_5"/> @@ -127,7 +127,7 @@ android:layout_height="@dimen/dp_30" android:drawablePadding="@dimen/dp_10" android:text="去上传" - android:textColor="@color/col_3c2" + android:textColor="@color/col_02c" android:textSize="@dimen/sp_13" android:background="@drawable/shape_stoke" android:gravity="center" diff --git a/health/src/main/res/layout/item_tongue_record.xml b/health/src/main/res/layout/item_tongue_record.xml index 8033d4b..f9e82cb 100644 --- a/health/src/main/res/layout/item_tongue_record.xml +++ b/health/src/main/res/layout/item_tongue_record.xml @@ -12,9 +12,7 @@ android:orientation="vertical" android:background="@drawable/shape_white_8radius" android:layout_marginBottom="@dimen/dp_14" - android:paddingTop="@dimen/dp_23" - android:paddingLeft="@dimen/dp_16" - android:paddingRight="@dimen/dp_16" + android:padding="@dimen/dp_16" app:layout_constraintTop_toTopOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" @@ -23,50 +21,49 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> - + android:orientation="horizontal" + android:layout_marginBottom="@dimen/dp_10"> + /> - + /> - + /> + + android:layout_marginBottom="@dimen/dp_5"/> diff --git a/health/src/main/res/layout/view_health_analysis.xml b/health/src/main/res/layout/view_health_analysis.xml index b9a1408..33d5f18 100644 --- a/health/src/main/res/layout/view_health_analysis.xml +++ b/health/src/main/res/layout/view_health_analysis.xml @@ -24,7 +24,7 @@ android:id="@+id/view" android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_18" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:corner_radius="2dp" /> diff --git a/health/src/main/res/layout/view_health_state.xml b/health/src/main/res/layout/view_health_state.xml index 13701c0..f754884 100644 --- a/health/src/main/res/layout/view_health_state.xml +++ b/health/src/main/res/layout/view_health_state.xml @@ -15,7 +15,7 @@ android:id="@+id/view" android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_18" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="@dimen/dp_16" @@ -78,7 +78,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="湿热（湿热蕴脾证、膀胱湿热证)" - android:textColor="@color/col_25C" + android:textColor="@color/col_02c" android:textSize="16dp" app:layout_constraintStart_toEndOf="@id/tv" app:layout_constraintTop_toTopOf="@id/tv" @@ -90,7 +90,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:text="湿热（湿热蕴脾证、膀胱湿热证)" - android:textColor="@color/col_25C" + android:textColor="@color/col_02c" android:textSize="16dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/health/src/main/res/layout/view_tiaolifangan.xml b/health/src/main/res/layout/view_tiaolifangan.xml index 8f6add3..106e86f 100644 --- a/health/src/main/res/layout/view_tiaolifangan.xml +++ b/health/src/main/res/layout/view_tiaolifangan.xml @@ -23,7 +23,7 @@ android:id="@+id/view" android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_18" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:corner_radius="2dp" /> diff --git a/health/src/main/res/layout/view_tongue_identify.xml b/health/src/main/res/layout/view_tongue_identify.xml index cc30688..3c8c0f9 100644 --- a/health/src/main/res/layout/view_tongue_identify.xml +++ b/health/src/main/res/layout/view_tongue_identify.xml @@ -23,7 +23,7 @@ android:id="@+id/view" android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_18" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:corner_radius="2dp" /> @@ -425,7 +425,7 @@ app:border_color_normal="@color/col_25C" app:border_width_normal="0.5dp" android:textSize="12dp" - android:textColor="@color/col_25C" + android:textColor="@color/col_02c" app:background_normal="#EAF6F6" /> diff --git a/health/src/main/res/layout/view_tongue_userinfo.xml b/health/src/main/res/layout/view_tongue_userinfo.xml index 80cce12..c3e8afb 100644 --- a/health/src/main/res/layout/view_tongue_userinfo.xml +++ b/health/src/main/res/layout/view_tongue_userinfo.xml @@ -14,7 +14,7 @@ android:id="@+id/view" android:layout_width="@dimen/dp_4" android:layout_height="@dimen/dp_18" - app:background_normal="@color/col_25C" + app:background_normal="@color/col_02c" app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="@dimen/dp_16" @@ -29,6 +29,7 @@ android:textColor="@color/col_313" android:text="基础信息" android:textStyle="bold" + android:textSize="@dimen/dp_17" app:layout_constraintTop_toTopOf="@id/view" app:layout_constraintBottom_toBottomOf="@id/view" app:layout_constraintStart_toEndOf="@id/view" @@ -58,7 +59,7 @@ android:layout_height="wrap_content" android:text="姓名：" android:textColor="@color/col_C7C" - android:textSize="14dp" + android:textSize="@dimen/sp_13" /> @@ -83,7 +84,7 @@ android:layout_height="wrap_content" android:text="性别：" android:textColor="@color/col_C7C" - android:textSize="14dp" + android:textSize="@dimen/sp_13" /> @@ -108,7 +109,7 @@ android:layout_height="wrap_content" android:text="年龄：" android:textColor="@color/col_C7C" - android:textSize="14dp" + android:textSize="@dimen/sp_13" /> @@ -146,7 +147,7 @@ android:layout_height="wrap_content" android:text="报告时间：" android:textColor="@color/col_C7C" - android:textSize="14dp" + android:textSize="@dimen/sp_13" /> diff --git a/health/src/main/res/mipmap-xxhdpi/changctup.png b/health/src/main/res/mipmap-xxhdpi/changctup.png index 7424528..9170947 100644 Binary files a/health/src/main/res/mipmap-xxhdpi/changctup.png and b/health/src/main/res/mipmap-xxhdpi/changctup.png differ diff --git a/health/src/main/res/mipmap-xxhdpi/fenxiz.png b/health/src/main/res/mipmap-xxhdpi/fenxiz.png index c045b65..ca07149 100644 Binary files a/health/src/main/res/mipmap-xxhdpi/fenxiz.png and b/health/src/main/res/mipmap-xxhdpi/fenxiz.png differ diff --git a/health/src/main/res/mipmap-xxhdpi/shancg.png b/health/src/main/res/mipmap-xxhdpi/shancg.png index 7788e0b..3acabf1 100644 Binary files a/health/src/main/res/mipmap-xxhdpi/shancg.png and b/health/src/main/res/mipmap-xxhdpi/shancg.png differ diff --git a/health/src/main/res/mipmap-xxhdpi/shangchu.png b/health/src/main/res/mipmap-xxhdpi/shangchu.png index cd9a967..bf03002 100644 Binary files a/health/src/main/res/mipmap-xxhdpi/shangchu.png and b/health/src/main/res/mipmap-xxhdpi/shangchu.png differ diff --git a/health/src/main/res/mipmap-xxhdpi/shibiez.png b/health/src/main/res/mipmap-xxhdpi/shibiez.png index 4e80f0b..ccba0b2 100644 Binary files a/health/src/main/res/mipmap-xxhdpi/shibiez.png and b/health/src/main/res/mipmap-xxhdpi/shibiez.png differ diff --git a/health/src/main/res/mipmap-xxhdpi/wanc.png b/health/src/main/res/mipmap-xxhdpi/wanc.png index ddb0064..09e39df 100644 Binary files a/health/src/main/res/mipmap-xxhdpi/wanc.png and b/health/src/main/res/mipmap-xxhdpi/wanc.png differ diff --git a/health/src/main/res/mipmap-xxhdpi/yuyuecaixie.png b/health/src/main/res/mipmap-xxhdpi/yuyuecaixie.png index fda9dea..9802c00 100644 Binary files a/health/src/main/res/mipmap-xxhdpi/yuyuecaixie.png and b/health/src/main/res/mipmap-xxhdpi/yuyuecaixie.png differ diff --git a/mine/src/main/res/layout/act_base_info_change.xml b/mine/src/main/res/layout/act_base_info_change.xml index 4f1a753..d6a9e4c 100644 --- a/mine/src/main/res/layout/act_base_info_change.xml +++ b/mine/src/main/res/layout/act_base_info_change.xml @@ -35,16 +35,14 @@ android:drawablePadding="@dimen/dp_10" android:padding="@dimen/dp_10" android:text="@string/base_info" + android:textStyle="bold" android:textColor="@color/col_313" - android:textSize="@dimen/dp_17" /> + android:textSize="@dimen/sp_17" /> + android:padding="@dimen/dp_15"> - + android:src="@mipmap/ic_next" /> @@ -85,7 +84,7 @@ android:id="@+id/mRelName" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingRight="@dimen/dp_10"> + android:padding="@dimen/dp_15"> @@ -123,6 +117,7 @@ @@ -131,7 +126,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingRight="@dimen/dp_10"> + android:padding="@dimen/dp_15"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -204,25 +155,23 @@ android:layout_height="1dp" android:layout_marginLeft="@dimen/dp_10" android:layout_marginRight="@dimen/dp_10" + android:visibility="gone" android:background="@color/col_f1f" /> + android:padding="@dimen/dp_15"> @@ -245,76 +192,25 @@ android:layout_height="1dp" android:layout_marginLeft="@dimen/dp_10" android:layout_marginRight="@dimen/dp_10" + android:visibility="gone" android:background="@color/col_f1f" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + @@ -355,7 +261,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingRight="@dimen/dp_10"> + android:padding="@dimen/dp_15"> + android:layout_marginRight="@dimen/dp_5" + android:textSize="@dimen/sp_15" /> + android:textColor="@color/col_313" + android:textSize="@dimen/sp_15" /> @@ -410,19 +312,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingRight="@dimen/dp_10"> + android:padding="@dimen/dp_15"> + android:layout_marginRight="@dimen/dp_5" + android:textSize="@dimen/sp_15" /> + android:textColor="@color/col_313" + android:textSize="@dimen/sp_15" /> - + android:padding="@dimen/dp_15"> - + + + @@ -510,19 +415,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingRight="@dimen/dp_10"> + android:padding="@dimen/dp_15"> @@ -544,15 +444,16 @@ - + android:padding="@dimen/dp_15"> - + + + @@ -611,26 +520,24 @@ android:drawablePadding="@dimen/dp_10" android:padding="@dimen/dp_10" android:text="@string/urgent_people" + android:textStyle="bold" android:textColor="@color/col_313" - android:textSize="@dimen/dp_18" /> + android:textSize="@dimen/sp_17" /> + android:padding="@dimen/dp_15"> @@ -654,6 +559,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginLeft="@dimen/dp_10" + android:visibility="gone" android:layout_marginRight="@dimen/dp_10" android:background="@color/col_f1f" /> @@ -661,19 +567,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingRight="@dimen/dp_10"> + android:padding="@dimen/dp_15"> @@ -697,6 +598,7 @@ @@ -705,19 +607,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingRight="@dimen/dp_10"> + android:padding="@dimen/dp_15"> + android:textSize="@dimen/sp_15" /> @@ -749,13 +647,13 @@ + android:textSize="@dimen/sp_12" /> @@ -764,17 +662,17 @@ + android:textStyle="bold" + android:textSize="@dimen/sp_18" /> \ No newline at end of file diff --git a/mine/src/main/res/layout/act_setting_new.xml b/mine/src/main/res/layout/act_setting_new.xml index 6af9a97..b1ca9c4 100644 --- a/mine/src/main/res/layout/act_setting_new.xml +++ b/mine/src/main/res/layout/act_setting_new.xml @@ -3,76 +3,87 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/white"> + android:background="@color/col_6F7"> - - - - - + android:layout_marginTop="@dimen/dp_3" + android:orientation="vertical"> + + + + + + + + +