xieyongming
/
anyu_zhongjian_android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

中建365

Browse Source
develop
wlh 2 years ago
parent 8bbaa5fc45
commit 778116e36e
61 changed files with 670 additions and 934 deletions
Show Stats Download Patch File Download Diff File

8
app/src/main/AndroidManifest.xml
Unescape Escape View File

@ -130,6 +130,10 @@
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".activity.OneKeyBinderDeviceAct"
android:launchMode="singleTop"
android:screenOrientation="portrait"/>
<activity
android:name="com.xty.server.act.ScienceDetailAct"
android:launchMode="singleTop"
@ -292,6 +296,10 @@
<activity android:name="com.xty.base.act.RichTextAct"
android:launchMode="singleTop"
android:screenOrientation="portrait"/>
<activity
android:name="com.xty.common.xqr_code.XQRCodeAct"
android:launchMode="singleTop"
android:screenOrientation="portrait"/>
</application>

1
app/src/main/java/com/zj365/dc/activity/LoginAct.kt
Unescape Escape View File

@ -197,6 +197,7 @@ class LoginAct : BaseVmAct<LoginVm>() {
*/
fun initTab() {
binding.tabTitle.removeAllTabs()
tabName.forEach {
var tab = binding.tabTitle.newTab()
tab.text = it

99
app/src/main/java/com/zj365/dc/activity/OneKeyBinderDeviceAct.kt
Unescape Escape View File

@ -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<BaseVm>() {
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 = "继续绑定"
}
}
}
}
}
}
}

8
app/src/main/java/com/zj365/dc/adapter/HealthMonitoringAdapter.kt
Unescape Escape View File

@ -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,

51
app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt
Unescape Escape View File

@ -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<DynamicManagementVm>() {
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<DynamicManagementVm>() {
*/
@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<DynamicManagementVm>() {
// mViewModel.getDkInfo(false, showIdInfo)
updateWarningStatus()
}
}
}*/
}
//点击事件
@ -596,10 +597,11 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() {
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<DynamicManagementVm>() {
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<DynamicManagementVm>() {
return@observe
}
}
}
}*/
if (showIdInfo.isNotEmpty()) { //自己
//// binding.mChildView.mGuide2.visibility = View.VISIBLE
@ -956,7 +958,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() {
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<DynamicManagementVm>() {
return@observe
}
}
}
}*/
reportBean = it.data
@ -974,7 +976,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() {
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<DynamicManagementVm>() {
// 激活过才能开启定是我任务
//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<DynamicManagementVm>() {
}
//我家人信息
mViewModel.familyLive.observe(this) {
/* mViewModel.familyLive.observe(this) {
it.data.add(0, FamilyBean().apply {
this.fCall = "我"
})
@ -1197,7 +1199,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() {
mFamilyAdapter.position = selectPosition
mFamilyAdapter.setNewInstance(it.data)
}
}*/
//手表信息组装上传
mViewModel.allDataInfo.observe(this) {
@ -1591,13 +1593,13 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() {
}
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<DynamicManagementVm>() {
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<DynamicManagementVm>() {
}
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<DynamicManagementVm>() {
}
} else {
binding.mHeader.llWarning.visibility = View.GONE
}
}*/
}
/**
@ -1814,6 +1816,15 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() {
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()

499
app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt
Unescape Escape View File

@ -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<HealthVm>() {
// }
}
/**
* 设置设备信息*/
/* 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<HealthVm>() {
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<HealthVm>() {
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<HealthVm>() {
} else {//如果获取手表信息失败，断开连接以后让用户手动连接
YCBBlueConnectHelper.disconnect()
// initBlueToothStatu()
}
}
}
@ -844,95 +762,12 @@ HealthHomeFrag : BaseVmFrag<HealthVm>() {
}
}
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<String>) {
// val datas: List<String> = listOf(
// "《赋得古原草送别》",
// "离离原上草，一岁一枯荣。",
// "野火烧不尽，春风吹又生。",
// "远芳侵古道，晴翠接荒城。",
// "又送王孙去，萋萋满别情。"
// )
val marqueeFactory: SimpleMF<String?> = 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<HealthVm>() {
}
//手表数据上传
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<HealthVm>() {
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<HealthVm>() {
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<HealthVm>() {
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<HealthVm>() {
mainScope.launch {
LogUtils.d("getDeviceInfo isOk:$isok;;; value=$value")
if (isok) {//获取到设备信息，设备准备就绪上传手表数据
/* setDeviceInfo(
DeviceInfoBean(
true,
YCBBlueConnectHelper.BLEConnectState.Connected,
value
)
)*/
}
}
}
@ -1401,40 +991,9 @@ HealthHomeFrag : BaseVmFrag<HealthVm>() {
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<HealthVm>() {
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<HealthVm>() {
if (!info.errorMsg.isNullOrEmpty()) {
CommonToastUtils.showToast(info.errorMsg)
}
/*
mHealthAdapter.xtangInfo = info
mHealthAdapter.notifyDataSetChanged()*/
}
@ -1482,19 +1036,6 @@ HealthHomeFrag : BaseVmFrag<HealthVm>() {
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<HealthVm>() {
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() {

53
app/src/main/java/com/zj365/dc/fragment/MineFrag.kt
Unescape Escape View File

@ -59,7 +59,7 @@ class MineFrag : BaseVmFrag<SettingVm>() {
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,32 +73,58 @@ class MineFrag : BaseVmFrag<SettingVm>() {
}
binding.llHealthRecord.setOnClickListener {
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 {
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 {
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)
bundle.putBoolean(
"isDemonstrate",
(requireActivity() as MainActivity).isDemonstrate
)
RouteManager.goAct(ARouterUrl.SETTING, bundle)
}
}
binding.llOrder.setOnClickListener {
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 {
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
RouteManager.goAct(ARouterUrl.FAMILY)
}
}
binding.llWearableDevice.setOnClickListener {
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)
@ -111,9 +137,10 @@ class MineFrag : BaseVmFrag<SettingVm>() {
}
}
}
binding.mInfo.setOnClickListener {
RouteManager.goAct(ARouterUrl.BASE_INFO_CHANGE, bundle)
}
/*binding.mInfo.setOnClickListener {
RouteManager.goAct(ARouterUrl.BASE_INFO_CHANGE, bundle)
}*/
mViewModel.getNesProg("")
}
@ -126,9 +153,9 @@ class MineFrag : BaseVmFrag<SettingVm>() {
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<SettingVm>() {
/* 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) {

5
app/src/main/java/com/zj365/dc/model/ScanInfoBean.kt
Unescape Escape View File

@ -0,0 +1,5 @@
package com.zj365.dc.model
data class ScanInfoBean(var watchName: String = "", var deviceCode: String = "", var activationCode: String = "")

77
app/src/main/res/layout/act_binder_device_one_key.xml
Unescape Escape View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/col_f2f">
<include layout="@layout/title_white_bar"
android:id="@+id/title"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="@dimen/dp_17"
android:layout_marginLeft="@dimen/dp_14"
android:layout_marginRight="@dimen/dp_14"
android:gravity="center"
android:background="@drawable/shape_8round_white">
<FrameLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<ImageView
android:layout_width="@dimen/dp_204"
android:layout_height="@dimen/dp_189"
android:layout_marginTop="@dimen/dp_51"
android:background="@mipmap/bg_binder_decive_one"/>
<TextView
android:id="@+id/tv_error_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="@dimen/sp_15"
android:textColor="@color/col_2621"
android:text="扫码失败"
android:visibility="gone"
android:drawableLeft="@mipmap/icon_tips_error"
android:layout_marginBottom="@dimen/dp_11"
android:layout_gravity="center|bottom"/>
</FrameLayout>
<TextView
android:id="@+id/tv_scan"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_50"
android:background="@drawable/shape_r25_02c"
android:text="扫码"
android:textStyle="bold"
android:textSize="@dimen/sp_18"
android:gravity="center"
android:textColor="@color/white"
android:layout_marginLeft="@dimen/dp_11"
android:layout_marginRight="@dimen/dp_11"
android:layout_marginTop="@dimen/dp_21"/>
<TextView
android:id="@+id/tv_back_home"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="回到首页"
android:textSize="@dimen/sp_18"
android:textColor="@color/col_7c7"
android:layout_marginBottom="@dimen/dp_34"
android:layout_marginTop="21dp"/>
</LinearLayout>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_14"
android:text="提示:\n 1.请确认您的产品为中健三六五正规产品，扫描包装条形码进行验证。 \n2.请确定您的手环包装是否正常，未被拆封。 \n3.请确认您的手表是否已经激活。"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_21"
android:layout_marginRight="@dimen/dp_27"/>
</LinearLayout>

8
app/src/main/res/layout/frag_mine.xml
Unescape Escape View File

@ -159,8 +159,8 @@
android:orientation="vertical">
<TextView
android:id="@+id/mProg"
android:layout_width="wrap_content"
android:id="@+id/mCoupon"
android:layout_width="37dp"
android:layout_height="wrap_content"
android:text="0"
android:textColor="@color/col_313"
@ -187,7 +187,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/mTvSource"
android:id="@+id/mTvWallet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
@ -215,7 +215,7 @@
android:orientation="vertical">
<TextView
android:id="@+id/tvInviteCount"
android:id="@+id/tvOrder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"

2
app/src/main/res/layout/item_health.xml
Unescape Escape View File

@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_3"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_14"
android:textSize="@dimen/sp_10"
android:textStyle="bold"
tools:text="sdfsdg" />

BIN
app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 116 KiB

BIN
app/src/main/res/mipmap-xxhdpi/icon_tips_error.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

2
base/src/main/res/drawable/shape_head_tip_new.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid
android:color="@color/col_8D0"/>
android:color="@color/col_02c"/>
<corners android:radius="@dimen/dp_2"/>
<size
android:width="@dimen/dp_4"

BIN
base/src/main/res/mipmap-xxhdpi/ic_close.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

2
common/src/main/java/com/xty/common/arouter/ARouterUrl.kt
Unescape Escape View File

@ -6,7 +6,7 @@ class ARouterUrl {
const val MAIN_ACT = "/com/zj365/dc/act/MainActivity"
const val LOGIN_ACT = "/com/zj365/dc/act/LoginAct"
const val REGIST_ACT = "/com/zj365/dc/act/RegisterAct"
const val DEVICE_ACTIVE = "/com/zj365/dc/act/DeviceActiveAct"
const val DEVICE_ACTIVE = "/com/zj365/dc/act/OneKeyBinderDeviceAct"
const val BASIC_INFO = "/com/zj365/dc/act/BasicInfoAct"
const val BIND_WX_PHONE = "/com/zj365/dc/act/BindWxPhone"
const val DEVICE_CONNECT = "/com/zj365/dc/act/DeviceConnectAct"

4
common/src/main/java/com/xty/common/event/ChangeFamilyEvent.kt
Unescape Escape View File

@ -0,0 +1,4 @@
package com.xty.common.event
class ChangeFamilyEvent(var showUserId:String) {
}

29
common/src/main/java/com/xty/common/util/SpannableUtils.kt
Unescape Escape View File

@ -82,5 +82,34 @@ object SpannableUtils {
return statuSpan
}
fun setSpanMoney(num:Float): SpannableString{
var statuSpan = SpannableString("¥ ${num}")
//设置字体大小(绝对值,单位：像素),第二个参数boolean dip，如果为true，表示前面的字体大小单位为dip，否则为像素
statuSpan.setSpan(
AbsoluteSizeSpan(20, true),
0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
//设置字体样式: NORMAL正常，BOLD粗体，ITALIC斜体，BOLD_ITALIC粗斜体
statuSpan.setSpan(
StyleSpan(Typeface.BOLD),
0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
//设置字体大小(绝对值,单位：像素),第二个参数boolean dip，如果为true，表示前面的字体大小单位为dip，否则为像素
statuSpan.setSpan(
AbsoluteSizeSpan(30, true),
1, statuSpan.length , Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
//设置字体样式: NORMAL正常，BOLD粗体，ITALIC斜体，BOLD_ITALIC粗斜体
statuSpan.setSpan(
StyleSpan(Typeface.BOLD),
1, statuSpan.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
return statuSpan
}
}

7
common/src/main/res/drawable/shape_r25_02c.xml
Unescape Escape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid
android:color="@color/col_02c"/>
<corners
android:radius="@dimen/dp_25"/>
</shape>

BIN
common/src/main/res/mipmap-xhdpi/gongli.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

BIN
common/src/main/res/mipmap-xhdpi/ic_next.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 489 B

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
common/src/main/res/mipmap-xhdpi/ic_sel.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 714 B

After

Width:  |  Height:  |  Size: 694 B

BIN
common/src/main/res/mipmap-xhdpi/nongli.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
common/src/main/res/mipmap-xxhdpi/ic_gouxuan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
common/src/main/res/mipmap-xxhdpi/ic_pay_success.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
common/src/main/res/mipmap-xxhdpi/ic_weigouxuan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

28
health/src/main/java/com/zj365/health/act/AgreeAct.kt
Unescape Escape View File

@ -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<PayCancerVm>() {
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) {

9
health/src/main/java/com/zj365/health/act/PreventCancertAct.kt
Unescape Escape View File

@ -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<PayCancerVm>() {
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<TextView>(R.id.tvPrice)
tvprice.text = "￥${price}"
tvprice.text = SpannableUtils.setSpanMoney(price)
val ivClose = view.findViewById<ImageView>(R.id.close_button)
ivClose.setOnClickListener {
dialog.dismiss()
@ -207,7 +208,7 @@ class PreventCancertAct : BaseVmAct<PayCancerVm>() {
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<PayCancerVm>() {
}
data?.let {
price = data.price.toString()
price = data.price!!
// binding.tvPurchase.text = "￥${data.price} 立即购买"
binding.tvPurchase.text = "立即购买"
goodsId = data.id.toString()

6
health/src/main/java/com/zj365/health/act/tonguediagnosis/TongueDiagnosisMainActivity.kt
Unescape Escape View File

@ -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<TongueDiagnosisVm>() {
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<TextView>(R.id.tvPrice)
tvprice.text = "￥${payGoodsBean.price}"
tvprice.text = SpannableUtils.setSpanMoney(payGoodsBean.price!!)
val ivClose = view.findViewById<ImageView>(R.id.close_button)
ivClose.setOnClickListener {
dialog.dismiss()

8
health/src/main/java/com/zj365/health/adapter/TongueRecordAdapter.kt
Unescape Escape View File

@ -37,8 +37,8 @@ class TongueRecordAdapter: BaseAdapter<CancerGoodsBean>(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<TextView>(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<CancerGoodsBean>(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

2
health/src/main/res/drawable/shape_button_bg.xml
Unescape Escape View File

@ -3,7 +3,7 @@
android:shape="rectangle">
<gradient
android:startColor="@color/col_02c"
android:endColor="#03B1C0"/>
android:endColor="@color/col_02c"/>
<corners
android:radius="@dimen/dp_25"/>
</shape>

9
health/src/main/res/drawable/shape_r12_stroke_02c.xml
Unescape Escape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<stroke
android:width="@dimen/dp_1"
android:color="@color/col_02c"/>
<corners
android:radius="@dimen/dp_12"/>
</shape>

2
health/src/main/res/drawable/shape_stoke.xml
Unescape Escape View File

@ -6,7 +6,7 @@
<solid android:color="@color/white" />
<stroke
android:width="@dimen/dp_1"
android:color="@color/col_3c2"/>
android:color="@color/col_02c"/>
<corners
android:radius="@dimen/dp_12"/>
</shape>

16
health/src/main/res/layout/act_agree.xml
Unescape Escape View File

@ -37,8 +37,12 @@
android:paddingTop="@dimen/dp_23"
android:paddingLeft="@dimen/dp_16"
android:paddingRight="@dimen/dp_16">
<TextView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/shape_head_tip_new"
android:drawablePadding="@dimen/dp_10"
@ -47,6 +51,16 @@
android:textSize="@dimen/sp_17"
android:textStyle="bold"
android:layout_marginBottom="@dimen/dp_10"/>
<TextView
android:id="@+id/tv_sign_again"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:text="重签"
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_15"/>
</RelativeLayout>
<androidx.cardview.widget.CardView
android:id="@+id/mSign"

7
health/src/main/res/layout/act_duihuanma.xml
Unescape Escape View File

@ -24,7 +24,7 @@
android:text="兑换码开通"
android:textSize="@dimen/sp_18"
android:textStyle="bold"
android:textColor="@color/black"/>
android:textColor="@color/col_313"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_55"
@ -42,6 +42,8 @@
android:textColor="@color/col_313"
android:textSize="@dimen/dp_16"
android:hint="请输入兑换码"
android:textColorHint="@color/col_6B6"
android:textStyle="bold"
android:paddingLeft="@dimen/dp_20"
android:ems="12"/>
@ -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" />
</LinearLayout>
</LinearLayout>

7
health/src/main/res/layout/act_pay_success.xml
Unescape Escape View File

@ -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"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="支付成功"
android:textSize="@dimen/sp_18"
android:textColor="@color/black"
android:textColor="@color/col_313"
android:layout_marginTop="@dimen/dp_7"
android:textStyle="bold"/>
<!-- 确定兑换 -->
<com.ruffian.library.widget.RTextView
@ -33,7 +34,7 @@
android:layout_width="@dimen/dp_172"
android:layout_height="@dimen/dp_50"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/dp_46"
android:layout_marginTop="@dimen/dp_90"
android:background="@drawable/selector_login_btn"
android:gravity="center"
android:text="下一步"

2
health/src/main/res/layout/act_upload_check.xml
Unescape Escape View File

@ -199,7 +199,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/col_8D0"
android:textColor="@color/col_02c"
android:background="@drawable/shape_stoke"
android:paddingTop="@dimen/dp_6"
android:paddingBottom="@dimen/dp_6"

9
health/src/main/res/layout/activity_edit_tongue_info.xml
Unescape Escape View File

@ -285,7 +285,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"
/>
</LinearLayout>
@ -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"
/>
</LinearLayout>
@ -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"
/>

6
health/src/main/res/layout/bottom_cancer.xml
Unescape Escape View File

@ -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" />

4
health/src/main/res/layout/dialog_cancer.xml
Unescape Escape View File

@ -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"/>
</LinearLayout>

2
health/src/main/res/layout/dialog_sign.xml
Unescape Escape View File

@ -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"

11
health/src/main/res/layout/frag_upload_check.xml
Unescape Escape View File

@ -232,7 +232,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/col_8D0"
android:textColor="@color/col_02c"
android:background="@drawable/shape_stoke"
android:paddingTop="@dimen/dp_6"
android:paddingBottom="@dimen/dp_6"
@ -276,14 +276,15 @@
android:id="@+id/mSubmit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginRight="@dimen/dp_25"
android:background="@drawable/shape_btn_select_bg"
android:gravity="center"
android:padding="@dimen/dp_10"
android:padding="@dimen/dp_16"
android:text="上传检验单"
android:textColor="@color/white"
android:textSize="@dimen/dp_16"
android:textStyle="bold"
android:textSize="@dimen/sp_18"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_10"
android:visibility="visible"/>

2
health/src/main/res/layout/fragment_tongue_diagnosis_info.xml
Unescape Escape View File

@ -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"

2
health/src/main/res/layout/fragment_tongue_report.xml
Unescape Escape View File

@ -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"

6
health/src/main/res/layout/fragment_tongue_user_info.xml
Unescape Escape View File

@ -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"

8
health/src/main/res/layout/item_estimate_record.xml
Unescape Escape View File

@ -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"/>
<TextView
android:id="@+id/tvHint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="* 评估报告周期预计3天内，请耐心等待"
android:textSize="@dimen/sp_12"
android:textSize="@dimen/sp_11"
android:textColor="@color/col_c7c"
android:layout_marginBottom="@dimen/dp_15"/>
</LinearLayout>
@ -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"

43
health/src/main/res/layout/item_tongue_record.xml
Unescape Escape View File

@ -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">
<LinearLayout
android:layout_width="wrap_content"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginBottom="@dimen/dp_10">
<TextView
android:layout_width="match_parent"
android:id="@+id/tv_time_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:text="上传时间："
android:textColor="#313131"
android:textSize="@dimen/sp_15"
android:layout_marginBottom="@dimen/dp_10"/>
/>
<TextView
android:id="@+id/tvTime"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:text="2023-06-05"
android:layout_toRightOf="@+id/tv_time_desc"
android:textColor="#313131"
android:textSize="@dimen/sp_15"
android:layout_marginBottom="@dimen/dp_10"/>
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1"/>
/>
<TextView
android:id="@+id/tvEstimateStatus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_25"
android:text="识别中"
android:paddingHorizontal="12dp"
android:paddingVertical="8dp"
android:gravity="right"
android:layout_alignParentEnd="true"
android:paddingLeft="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:gravity="center"
android:textColor="#313131"
android:textSize="@dimen/sp_13"
android:layout_marginBottom="@dimen/dp_10"/>
</LinearLayout>
/>
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvRecyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_8"/>
android:layout_marginBottom="@dimen/dp_5"/>
</LinearLayout>
</LinearLayout>

2
health/src/main/res/layout/view_health_analysis.xml
Unescape Escape View File

@ -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"
/>

6
health/src/main/res/layout/view_health_state.xml
Unescape Escape View File

@ -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"

2
health/src/main/res/layout/view_tiaolifangan.xml
Unescape Escape View File

@ -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"
/>

4
health/src/main/res/layout/view_tongue_identify.xml
Unescape Escape View File

@ -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"
/>
</LinearLayout>

19
health/src/main/res/layout/view_tongue_userinfo.xml
Unescape Escape View File

@ -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"
/>
<TextView
@ -67,7 +68,7 @@
android:layout_height="wrap_content"
android:text="张项聚"
android:textColor="@color/col_313"
android:textSize="14dp"
android:textSize="@dimen/sp_13"
/>
</LinearLayout>
@ -83,7 +84,7 @@
android:layout_height="wrap_content"
android:text="性别："
android:textColor="@color/col_C7C"
android:textSize="14dp"
android:textSize="@dimen/sp_13"
/>
<TextView
@ -92,7 +93,7 @@
android:layout_height="wrap_content"
android:text="男"
android:textColor="@color/col_313"
android:textSize="14dp"
android:textSize="@dimen/sp_13"
/>
</LinearLayout>
@ -108,7 +109,7 @@
android:layout_height="wrap_content"
android:text="年龄："
android:textColor="@color/col_C7C"
android:textSize="14dp"
android:textSize="@dimen/sp_13"
/>
<TextView
@ -117,7 +118,7 @@
android:layout_height="wrap_content"
android:text="24岁"
android:textColor="@color/col_313"
android:textSize="14dp"
android:textSize="@dimen/sp_13"
/>
</LinearLayout>
@ -146,7 +147,7 @@
android:layout_height="wrap_content"
android:text="报告时间："
android:textColor="@color/col_C7C"
android:textSize="14dp"
android:textSize="@dimen/sp_13"
/>
<TextView
@ -155,7 +156,7 @@
android:layout_height="wrap_content"
android:text="张项聚"
android:textColor="@color/col_313"
android:textSize="14dp"
android:textSize="@dimen/sp_13"
/>
</LinearLayout>
</LinearLayout>

BIN
health/src/main/res/mipmap-xxhdpi/changctup.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.5 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

BIN
health/src/main/res/mipmap-xxhdpi/fenxiz.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

BIN
health/src/main/res/mipmap-xxhdpi/shancg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
health/src/main/res/mipmap-xxhdpi/shangchu.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
health/src/main/res/mipmap-xxhdpi/shibiez.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
health/src/main/res/mipmap-xxhdpi/wanc.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
health/src/main/res/mipmap-xxhdpi/yuyuecaixie.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

332
mine/src/main/res/layout/act_base_info_change.xml
Unescape Escape View File

@ -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" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_10"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10">
android:padding="@dimen/dp_15">
<TextView
android:layout_width="wrap_content"
@ -53,16 +51,16 @@
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:text="@string/head_portrait"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/dp_16" />
<TextView
<ImageView
android:id="@+id/right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:drawableRight="@mipmap/ic_next" />
android:src="@mipmap/ic_next" />
<de.hdodenhof.circleimageview.CircleImageView
android:id="@+id/mImage"
@ -77,6 +75,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
@ -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">
<TextView
android:id="@+id/m1"
@ -94,12 +93,9 @@
android:layout_centerVertical="true"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/name"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/dp_16" />
<EditText
@ -111,11 +107,9 @@
android:layout_toRightOf="@+id/m1"
android:background="@null"
android:gravity="center|right"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15"
android:textSize="@dimen/sp_15"
tools:text="asdasdasda" />
</RelativeLayout>
@ -123,6 +117,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
@ -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">
<TextView
android:layout_width="0dp"
@ -140,12 +135,9 @@
android:layout_weight="1"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/sex"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<CheckBox
@ -155,47 +147,6 @@
android:background="@drawable/selector_check_sex_new"
android:button="@null"
android:checked="false" />
<!-- <RadioGroup-->
<!-- android:id="@+id/mGroup"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_gravity="center"-->
<!-- android:layout_marginTop="@dimen/dp_8"-->
<!-- android:layout_marginBottom="@dimen/dp_8"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/shape_radio_group_bg"-->
<!-- android:orientation="horizontal">-->
<!-- <RadioButton-->
<!-- android:id="@+id/mMale"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/selector_check_sex"-->
<!-- android:button="@null"-->
<!-- android:checked="true"-->
<!-- android:drawableLeft="@drawable/selector_male"-->
<!-- android:gravity="center"-->
<!-- android:paddingLeft="@dimen/dp_10"-->
<!-- android:text="@string/male"-->
<!-- android:textColor="@color/color_check_sex" />-->
<!-- <RadioButton-->
<!-- android:id="@+id/mGirl"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="match_parent"-->
<!-- android:layout_weight="1"-->
<!-- android:background="@drawable/selector_check_sex"-->
<!-- android:button="@null"-->
<!-- android:drawableLeft="@drawable/selector_girl"-->
<!-- android:gravity="center"-->
<!-- android:paddingLeft="@dimen/dp_10"-->
<!-- android:text="@string/girl"-->
<!-- android:textColor="@color/color_check_sex" />-->
<!-- </RadioGroup>-->
</LinearLayout>
@ -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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingRight="@dimen/dp_10">
android:padding="@dimen/dp_15">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/phone_call"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<TextView
@ -232,10 +181,8 @@
android:layout_marginStart="@dimen/dp_10"
android:background="@null"
android:gravity="center|right"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_455"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15" />
</LinearLayout>
@ -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" />
<!-- <RelativeLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:paddingRight="@dimen/dp_10">-->
<!-- <com.xty.common.weight.RequiredTextView-->
<!-- android:id="@+id/m3"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:drawablePadding="@dimen/dp_10"-->
<!-- android:ellipsize="end"-->
<!-- android:paddingLeft="@dimen/dp_10"-->
<!-- android:paddingTop="@dimen/dp_15"-->
<!-- android:paddingBottom="@dimen/dp_15"-->
<!-- android:singleLine="true"-->
<!-- android:text="@string/ic_card"-->
<!-- android:textColor="@color/col_455"-->
<!-- android:textSize="@dimen/sp_14" />-->
<!-- <EditText-->
<!-- android:id="@+id/mId"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_alignParentRight="true"-->
<!-- android:layout_centerVertical="true"-->
<!-- android:layout_toRightOf="@+id/m3"-->
<!-- android:background="@null"-->
<!-- android:digits="0123456789Xx"-->
<!-- android:gravity="center|right"-->
<!-- android:hint="@string/please_input_id"-->
<!-- android:maxLength="18"-->
<!-- android:paddingTop="@dimen/dp_15"-->
<!-- android:paddingBottom="@dimen/dp_15"-->
<!-- android:singleLine="true"-->
<!-- android:textColor="@color/col_455"-->
<!-- android:textSize="@dimen/dp_16"-->
<!-- />-->
<!-- </RelativeLayout>-->
<!-- <View-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="1dp"-->
<!-- android:layout_marginLeft="@dimen/dp_10"-->
<!-- android:layout_marginRight="@dimen/dp_10"-->
<!-- android:background="@color/col_f1f" />-->
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:padding="@dimen/dp_15"
android:orientation="horizontal">
<com.xty.common.weight.RequiredTextView
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_weight="1"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/birthday"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<CheckBox
@ -323,30 +219,40 @@
android:layout_height="wrap_content"
android:background="@drawable/selector_check_birthday"
android:button="@null"
android:visibility="gone"
android:checked="true" />
<TextView
android:id="@+id/mBirthday"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0.8"
android:background="@null"
android:drawableRight="@mipmap/ic_next"
android:gravity="right"
android:hint="@string/birthday"
android:paddingLeft="@dimen/dp_4"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:singleLine="true"
android:text="2032-33-32"
android:layout_marginRight="@dimen/dp_8"
android:layout_toLeftOf="@+id/birthday_right"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_14" />
</LinearLayout>
<ImageView
android:id="@+id/birthday_right"
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@mipmap/ic_next" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
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">
<com.xty.common.weight.RequiredTextView
android:layout_width="wrap_content"
@ -363,12 +269,9 @@
android:layout_centerVertical="true"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/height"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<EditText
@ -382,26 +285,25 @@
android:hint="@string/please_input_height"
android:inputType="numberDecimal"
android:maxLength="10"
android:paddingTop="@dimen/dp_15"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15" />
android:layout_marginRight="@dimen/dp_5"
android:textSize="@dimen/sp_15" />
<TextView
android:id="@+id/mHUnit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="cm"
android:textColor="@color/col_455"
android:textSize="@dimen/dp_16" />
android:textColor="@color/col_313"
android:textSize="@dimen/sp_15" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
@ -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">
<com.xty.common.weight.RequiredTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/weight"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<EditText
@ -436,12 +335,10 @@
android:hint="@string/please_input_weight"
android:inputType="numberDecimal"
android:maxLength="4"
android:paddingTop="@dimen/dp_15"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15" />
android:layout_marginRight="@dimen/dp_5"
android:textSize="@dimen/sp_15" />
<TextView
android:id="@+id/mWUnit"
@ -450,35 +347,34 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="kg"
android:textColor="@color/col_455"
android:textSize="@dimen/dp_16" />
android:textColor="@color/col_313"
android:textSize="@dimen/sp_15" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingRight="@dimen/dp_10">
android:padding="@dimen/dp_15">
<com.xty.common.weight.RequiredTextView
android:id="@+id/tv_area_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/area_loc"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<TextView
@ -487,21 +383,30 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:background="@null"
android:drawableEnd="@mipmap/ic_next"
android:gravity="center|right"
android:hint="@string/please_input_area"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15"
android:layout_toLeftOf="@+id/area_right"
android:layout_toRightOf="@+id/tv_area_desc"
android:layout_marginRight="@dimen/dp_8"
tools:ignore="UseCompatTextViewDrawableXml" />
</LinearLayout>
<ImageView
android:id="@+id/area_right"
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@mipmap/ic_next" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
@ -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">
<com.xty.common.weight.RequiredTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/address"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<EditText
@ -533,8 +435,6 @@
android:background="@null"
android:gravity="center|right"
android:hint="@string/please_input_address"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15" />
@ -544,15 +444,16 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingRight="@dimen/dp_10">
android:padding="@dimen/dp_15">
<com.xty.common.weight.RequiredTextView
android:id="@+id/ill"
@ -561,12 +462,9 @@
android:layout_centerVertical="true"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/medic_history"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<TextView
@ -575,21 +473,32 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:background="@null"
android:drawableEnd="@mipmap/ic_next"
android:gravity="center|right"
android:hint="@string/please_input_medic"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColorHint="@color/col_c7c"
android:textColor="@color/col_313"
android:layout_toLeftOf="@+id/right1"
android:layout_toRightOf="@+id/ill"
android:layout_marginRight="@dimen/dp_8"
android:textSize="@dimen/dp_15"
tools:text="eeeeeee"
tools:ignore="UseCompatTextViewDrawableXml" />
</LinearLayout>
<ImageView
android:id="@+id/right1"
android:layout_width="@dimen/dp_11"
android:layout_height="@dimen/dp_11"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@mipmap/ic_next" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
@ -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" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingRight="@dimen/dp_10">
android:padding="@dimen/dp_15">
<com.xty.common.weight.RequiredTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/name"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<EditText
@ -642,8 +549,6 @@
android:gravity="center|right"
android:hint="@string/please_input_name"
android:maxLength="10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@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">
<com.xty.common.weight.RequiredTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/contact"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<EditText
@ -686,8 +589,6 @@
android:hint="@string/please_input_contact"
android:inputType="number"
android:maxLength="11"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15" />
@ -697,6 +598,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
@ -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">
<com.xty.common.weight.RequiredTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawablePadding="@dimen/dp_10"
android:ellipsize="end"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:text="@string/relat"
android:textColor="@color/col_455"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_14" />
<EditText
@ -729,17 +628,16 @@
android:gravity="center|right"
android:hint="@string/hint_relat"
android:maxLength="20"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/dp_15" />
android:textSize="@dimen/sp_15" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:visibility="gone"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:background="@color/col_f1f" />
@ -749,13 +647,13 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_12"
android:layout_marginBottom="@dimen/dp_50"
android:text="请完善以上信息，以便于更好的为您提供健管的服务"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_8"
android:text="*请完善以上信息，以便于更好的为您提供健管的服务请扫机构用户授权码"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_13" />
android:textSize="@dimen/sp_12" />
</LinearLayout>
@ -764,17 +662,17 @@
<TextView
android:id="@+id/mSubmit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/dp_50"
android:layout_alignParentBottom="true"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginLeft="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_25"
android:layout_marginBottom="@dimen/dp_10"
android:background="@drawable/shape_btn_select_bg"
android:gravity="center"
android:padding="@dimen/dp_10"
android:text="@string/confirm_1"
android:textColor="@color/white"
android:textSize="@dimen/dp_16" />
android:textStyle="bold"
android:textSize="@dimen/sp_18" />
</RelativeLayout>

15
mine/src/main/res/layout/act_setting_new.xml
Unescape Escape View File

@ -3,11 +3,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/col_6F7">
<include
android:id="@+id/title"
layout="@layout/title_white_bar" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_below="@+id/title"
android:layout_marginTop="@dimen/dp_3"
android:orientation="vertical">
<TextView
android:id="@+id/mTvModifyPwd"
@ -20,7 +27,7 @@
android:paddingTop="@dimen/dp_20"
android:paddingRight="@dimen/dp_21"
android:paddingBottom="@dimen/dp_20"
android:layout_below="@+id/title"
android:singleLine="true"
android:text="@string/change_pwd"
android:textColor="@color/col_313"
@ -74,6 +81,10 @@
android:textColor="@color/col_313"
android:textSize="@dimen/sp_15" />
</LinearLayout>
<TextView
android:id="@+id/tv_logout"
android:layout_width="match_parent"

Write Preview
Loading…
Cancel
Save