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

中建365-优化/bug修复

Browse Source
develop
wlh 1 year ago
parent f6d7269d3d
commit dca44182de
35 changed files with 451 additions and 123 deletions
Show Stats Download Patch File Download Diff File

41
app/src/main/java/com/zj365/dc/activity/DietManagementAct.kt
Unescape Escape View File

@ -4,6 +4,8 @@ import android.view.View
import com.alibaba.android.arouter.facade.annotation.Route
import com.xty.base.act.BaseVmAct
import com.xty.base.vm.BaseVm
import com.xty.common.Const
import com.xty.common.MMkvHelper
import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
import com.xty.common.util.CommonToastUtils
@ -42,23 +44,44 @@ class DietManagementAct : BaseVmAct<BaseVm>(){
}
R.id.rx_healthy_diet ->{
bundle.clear()
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
bundle.clear()
// bundle.putString("web_site_url","http://testbuilt.zhongjian365.com/ ")
bundle.putString("web_site_url","${BuildConfig.h5url}pages/index/index?pageId=cookbook")
RouteManager.goAct(ARouterUrl.H5_ACT,bundle)
bundle.putString(
"web_site_url",
"${BuildConfig.h5url}pages/index/index?pageId=cookbook"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
}
// var url = "${BuildConfig.}"
}
R.id.rx_medicine_food ->{
bundle.clear()
bundle.putString("web_site_url","${BuildConfig.h5url}pages/index/index?pageId=herbal")
RouteManager.goAct(ARouterUrl.H5_ACT,bundle)
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
bundle.clear()
bundle.putString(
"web_site_url",
"${BuildConfig.h5url}pages/index/index?pageId=herbal"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
}
}
R.id.rx_food_diary ->{
bundle.clear()
bundle.putString("web_site_url","${BuildConfig.h5url}pages/index/index?pageId=diary")
RouteManager.goAct(ARouterUrl.H5_ACT,bundle)
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
bundle.clear()
bundle.putString(
"web_site_url",
"${BuildConfig.h5url}pages/index/index?pageId=diary"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
}
}
R.id.rx_more ->{

2
app/src/main/java/com/zj365/dc/adapter/HomeTopLayoutAdapter.kt
Unescape Escape View File

@ -19,7 +19,7 @@ class HomeTopLayoutAdapter(var mContext: Context): BaseAdapter<HomeLayoutBean.Ho
var screenWidth = context.resources.displayMetrics.widthPixels
val layoutParam = holder.getView<LinearLayout>(R.id.root).layoutParams
layoutParam.width = screenWidth /4
layoutParam.width = screenWidth /data.size
holder.getView<LinearLayout>(R.id.root).layoutParams = layoutParam
holder.getView<ImageView>(R.id.img_top).setImage(context,item.imageUrl)

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

@ -612,15 +612,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
}
private fun request() {
// mViewModel.getBanners(CommonUtils.getMyUserId())//当期登录用户id
mViewModel.getAllInfo(showIdInfo, false)
// mViewModel.getDkInfo(false, showIdInfo)
// 如果显示的是家人Tab则不刷新用户信息，防止头像错乱
/*if (mFamilyAdapter.position < 1) {
mViewModel.getMySetting()
}
mViewModel.getMyFamilyList()*/
mViewModel.getMySetting()
mViewModel.getTips()
mViewModel.getRank(2)
@ -1771,4 +1763,15 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
fun addSuccess(event: AddSuccessEvent){
request()
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){
showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") {
""
} else {
MMkvHelper.getLong(Const.USER_ID).toString()
}
request()
}
}

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

@ -12,6 +12,8 @@ import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack
import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram
import com.tencent.mm.opensdk.openapi.WXAPIFactory
import com.xty.base.fragment.BaseVmFrag
import com.xty.common.Const
import com.xty.common.MMkvHelper
import com.xty.common.UmengEventId
import com.xty.common.arouter.ARouterUrl
import com.xty.common.arouter.RouteManager
@ -260,7 +262,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}*/
}
binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),3)
binding.mChildView.homeContentRv.adapter = layoutContentAdapter
layoutContentAdapter.setOnItemClickListener { adapter, view, position ->
@ -270,22 +272,30 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
contentData.jumpUrl?.let {
when(contentData.jumpUrl){
"AI_TONGUE" ->{ //AI 舌诊
onEventObject(requireContext(), UmengEventId.HealthRisk)
bundle.clear()
bundle.putString("id", showIdInfo)
RouteManager.goAct(ARouterUrl.TONGUE_MAIN_ACTIVITY, bundle)
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
onEventObject(requireContext(), UmengEventId.HealthRisk)
bundle.clear()
bundle.putString("id", showIdInfo)
RouteManager.goAct(ARouterUrl.TONGUE_MAIN_ACTIVITY, bundle)
}
}
"AI_TUMOR" ->{ //防癌
bundle.clear()
bundle.putString("id", showIdInfo)
RouteManager.goAct(ARouterUrl.PRVENT_CANCER, bundle)
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
bundle.clear()
bundle.putString("id", showIdInfo)
RouteManager.goAct(ARouterUrl.PRVENT_CANCER, bundle)
}
}
"MEALS"->{ //膳食管理
bundle.clear()
bundle.putString("userId",showIdInfo)
RouteManager.goAct(ARouterUrl.DIET_MANAGEMENT,bundle)
bundle.clear()
bundle.putString("userId", showIdInfo)
RouteManager.goAct(ARouterUrl.DIET_MANAGEMENT, bundle)
}
@ -477,6 +487,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
//防癌
R.id.ll_cancer_screening -> {
// onEventObject(requireContext(), UmengEventId.HealthRisk)
bundle.clear()
bundle.putString("id", showIdInfo)
@ -514,7 +525,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
mViewModel.getHomeLayout()
// mViewModel.getBanners(CommonUtils.getMyUserId(),2)//当期登录用户id
mViewModel.getBanners(CommonUtils.getMyUserId(),2)//当期登录用户id
}
@ -574,6 +585,7 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
mViewModel.layoutLive.observe(this){
layoutTopAdapter.setNewInstance(it.data.top)
binding.mChildView.homeContentRv.layoutManager = GridLayoutManager(requireContext(),it.data.middle.size/2)
layoutContentAdapter.setNewInstance(it.data.middle)
}
}
@ -655,6 +667,11 @@ HealthHomeFrag : BaseVmFrag<HomeVm>() {
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun LoginOrRegisterChange(event: LoginOrRegisterEvent){
showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") {
""
} else {
MMkvHelper.getLong(Const.USER_ID).toString()
}
request()
}

2
app/src/main/java/com/zj365/dc/fragment/MessageFragment.kt
Unescape Escape View File

@ -87,7 +87,7 @@ class MessageFragment : BaseFragList<MessageVm>() {
@Subscribe(threadMode = ThreadMode.MAIN)
fun loginOutChange(event: LoginOutEvent){
// refresh()
}
@Subscribe(threadMode = ThreadMode.MAIN)

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

@ -49,6 +49,8 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
}
}
}
var isDemonstrate: Boolean = false
override fun setLayout(): View = binding.root
private val defaultIcon by lazy {
@ -58,6 +60,7 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
)
}
var user: SettingBean.User? = null
private var showIdInfo = "" //需要显示的信息的id
private val dialogBind by lazy {
DialogTip(requireContext(), "需绑定中健三六五健康手表，才能查看", "去绑定") {
@ -71,9 +74,18 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
override fun initView() {
super.initView()
// statusBar(binding.mStatusBar)
showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") {
""
} else {
MMkvHelper.getLong(Const.USER_ID).toString()
}
isDemonstrate = (requireActivity() as MainActivity).isDemonstrate
binding.mNoNetwork.mRefreshBtn.isSelected = true
binding.mNoNetwork.mRefreshBtn.setOnClickListener {
mViewModel.getMySetting()
mViewModel.getAllInfo(showIdInfo,false)
}
binding.clInfo.setOnClickListener {
@ -108,6 +120,50 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
CommonToastUtils.showToast("敬请期待")
}
}
binding.llEarlyWarningOfDisease.setOnClickListener {
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
if (isDemonstrate) {
bundle.clear()
bundle.putString("id", showIdInfo)
bundle.putInt("page", 1)
RouteManager.goAct(ARouterUrl.WARRING, bundle)
return@setOnClickListener
}
mViewModel.allData.value?.apply {
data.apply {
if (adorn.wearCount > 29 && adorn.activeWear > 14) {
onEventObject(requireContext(), UmengEventId.Health30Day)
bundle.clear()
bundle.putString("id", showIdInfo)
bundle.putInt("page", 1)
RouteManager.goAct(ARouterUrl.WARRING, bundle)
} else {
onEventObject(
requireContext(),
UmengEventId.Health30Day,
"佩戴未满30天或活跃天数未满15天。"
)
CommonToastUtils.showToast("尊敬的用户您好，该功能需要佩戴30天且活跃佩戴15天查看，请坚持佩戴且每日同步数据！")
}
}
}
}
}
binding.llRiskAssessment.setOnClickListener {
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else {
bundle.clear()
bundle.putString("id", showIdInfo)
RouteManager.goAct(ARouterUrl.SUBMIT_REPORTMain, bundle)
}
}
/*binding.llOrder.setOnClickListener {
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT)
@ -309,6 +365,8 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
if (binding.mNoNetwork.root.visibility == View.VISIBLE) {*/
mViewModel.getMySetting()
// }
mViewModel.getAllInfo(showIdInfo,false)
mViewModel.getScore(1)
// }
}
@ -351,30 +409,9 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
Const.CHAT_IMAGE = it.user.avatarUrl
}
/* if (it.user.sign == 0) {
binding.mSign.text = "签到"
} else {
binding.mSign.text = "已签到"
}*/
}
mViewModel.unbindLive.observe(this) {
user!!.bluetooth = ""
/* YCBBlueConnectHelper.disconnect()
YCBBlueConnectHelper.cancelTimer()*/
EventBus.getDefault().post(MyInfoEvent()) //刷新个人信息
}
/* mViewModel.signLive.observe(this) {
CommonToastUtils.showSucceedToast("签到成功")
binding.mSign.text = "已签到"
user!!.sign = 1
}*/
/* mViewModel.countLive.observe(this) {
// setBadge(it.data.count)
(requireActivity() as MainActivity).setUnreadcount(it.data.count)
EventBus.getDefault()
.post(ShowSystemMessageEvent(it.data.msg, it.data.time, it.data.count))
}*/
//个人设置信息获取
mViewModel.settingLive.observe(this) {
if (null == it.data) return@observe
@ -394,6 +431,11 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){
showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") {
""
} else {
MMkvHelper.getLong(Const.USER_ID).toString()
}
mViewModel.getMySetting()
mViewModel.getScore(1)
}
@ -406,6 +448,13 @@ class MineFrag : BaseVmFrag<SettingVm>(),EasyPermissions.PermissionCallbacks {
@Subscribe(threadMode = ThreadMode.MAIN)
fun addSuccess(event: AddSuccessEvent){
mViewModel.getMySetting()
mViewModel.getAllInfo(showIdInfo,false)
mViewModel.getScore(1)
}
@Subscribe(threadMode = ThreadMode.MAIN)
fun refreshUI(event: MyInfoEvent){
mViewModel.getMySetting()
mViewModel.getAllInfo(showIdInfo,false)
mViewModel.getScore(1)
}

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

@ -338,7 +338,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_156"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginLeft="@dimen/dp_14"
android:layout_marginRight="@dimen/dp_14"
@ -368,6 +368,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_24"
android:orientation="horizontal">
<LinearLayout
@ -465,6 +466,108 @@
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/dp_17"
android:layout_marginBottom="21dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_family_health"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:src="@mipmap/icon_health_family"
android:scaleType="centerCrop"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="家人健康"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_12"
android:textColor="@color/col_7c7"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_early_warning_of_disease"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:background="@mipmap/icon_health_warning"
android:scaleType="centerCrop"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="疾病预警"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_12"
android:textColor="@color/col_7c7"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_risk_assessment"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:background="@mipmap/icon_risk_assessment"
android:scaleType="centerCrop"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="风险评估"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_12"
android:textColor="@color/col_7c7"/>
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:visibility="invisible"
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:background="@mipmap/icon_data_comparison"
android:scaleType="centerCrop"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="数据对比"
android:textSize="@dimen/sp_14"
android:textStyle="bold"
android:layout_marginTop="@dimen/dp_12"
android:textColor="@color/col_7c7"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
@ -571,11 +674,12 @@
</LinearLayout>
<LinearLayout
android:id="@+id/ll_family_health"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:visibility="invisible"
android:orientation="vertical">
<ImageView

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

2
base/src/main/java/com/xty/base/dialog/AppUpdateDialog.kt
Unescape Escape View File

@ -77,7 +77,7 @@ class AppUpdateDialog(
isShow.invoke(false)
return
}
binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE
// binding.mClose.visibility = if (isUpdate) View.GONE else View.VISIBLE
isShow.invoke(true)
loadPath = url
show()

12
common/src/main/java/com/xty/common/weight/StepView.kt
Unescape Escape View File

@ -31,7 +31,7 @@ class StepView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {
isDither = true
isAntiAlias = true
style = Paint.Style.FILL_AND_STROKE
color = ContextCompat.getColor(getContext(), R.color.col_009)
color = ContextCompat.getColor(getContext(), R.color.col_02c)
}
}
@ -81,7 +81,7 @@ class StepView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {
var r = measureText / 2 + 10f
paintText.color=ContextCompat.getColor(context, R.color.white)
paintCircle.color=ContextCompat.getColor(context, R.color.col_009)
paintCircle.color=ContextCompat.getColor(context, R.color.col_02c)
paintCircle.style=Paint.Style.FILL_AND_STROKE
canvas.drawCircle(line.toFloat(), height / 2f, r, paintCircle)
@ -95,7 +95,7 @@ class StepView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {
private fun drawSectCircle(canvas: Canvas) {
if(stepSec){
paintText.color=ContextCompat.getColor(context, R.color.white)
paintCircle.color=ContextCompat.getColor(context, R.color.col_009)
paintCircle.color=ContextCompat.getColor(context, R.color.col_02c)
paintCircle.style=Paint.Style.FILL_AND_STROKE
}else{
paintText.color=ContextCompat.getColor(context, R.color.col_d1d)
@ -121,7 +121,7 @@ class StepView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {
private fun drawThrCircle(canvas: Canvas) {
if(stepThr){
paintText.color=ContextCompat.getColor(context, R.color.white)
paintCircle.color=ContextCompat.getColor(context, R.color.col_009)
paintCircle.color=ContextCompat.getColor(context, R.color.col_02c)
paintCircle.style=Paint.Style.FILL_AND_STROKE
}else{
paintText.color=ContextCompat.getColor(context, R.color.col_d1d)
@ -144,7 +144,7 @@ class StepView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {
private fun drawFistLine(canvas: Canvas) {
if(stepSec){
paintLine.color=ContextCompat.getColor(context, R.color.col_009)
paintLine.color=ContextCompat.getColor(context, R.color.col_02c)
}else{
paintLine.color=ContextCompat.getColor(context, R.color.col_d1d)
}
@ -153,7 +153,7 @@ class StepView(context: Context?, attrs: AttributeSet?) : View(context, attrs) {
private fun drawSecLine(canvas: Canvas) {
if(stepThr){
paintLine.color=ContextCompat.getColor(context, R.color.col_009)
paintLine.color=ContextCompat.getColor(context, R.color.col_02c)
}else{
paintLine.color=ContextCompat.getColor(context, R.color.col_d1d)
}

2
common/src/main/res/drawable/progress_bg.xml
Unescape Escape View File

@ -13,7 +13,7 @@
<!--clip 直接裁切的话 会成直角-->
<scale android:scaleWidth="100%">
<shape>
<solid android:color="@color/col_19a" />
<solid android:color="@color/col_02c" />
<corners android:radius="@dimen/dp_10" />
</shape>

31
health/src/main/AndroidManifest.xml
Unescape Escape View File

@ -272,6 +272,37 @@
<activity android:name=".act.familyhealth.FamilyHealthRealTimeAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.SubmitReportMainAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.SubmitReportListAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.QuestListAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.RiskAssessAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.QuestDetailAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.EarlyWarringAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.WarringContentAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.XTangUploadAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
<activity android:name=".act.XTangHistoryAct"
android:launchMode="singleTop"
android:screenOrientation="portrait" />
</application>
</manifest>

7
health/src/main/java/com/zj365/health/act/QuestListAct.kt
Unescape Escape View File

@ -181,10 +181,11 @@ class QuestListAct: BaseVmAct<QuestListVm>() {
* 第几步 step
*/
private fun changeTitle(step:Int) {
binding.mTvStep.text = subTitle[step-1]
var draw=ContextCompat.getDrawable(this,topImage[step-1])
binding.tvSteps.text = subTitle[step-1]
binding.imgSteps.setImageResource(topImage[step-1])
/*var draw=ContextCompat.getDrawable(this,topImage[step-1])
draw!!.setBounds(0,0,draw!!.minimumWidth,draw!!.minimumHeight)
binding.mTvStep.setCompoundDrawables(null,draw,null,null)
binding.mTvStep.setCompoundDrawables(null,draw,null,null)*/
if(step<3){
binding.mNext.text=getString(R.string.next_step)
}else{

4
health/src/main/java/com/zj365/health/act/SubmitReportMainAct.kt
Unescape Escape View File

@ -60,9 +60,9 @@ class SubmitReportMainAct : BaseListAct<RiskAssessVm>() {
binding.title.mIvBack.setOnClickListener { finish() }
binding.title.mTvRight.apply {
visibility = if (userId.isEmpty()) View.VISIBLE else View.GONE
visibility = View.VISIBLE
text = "开始评估"
setTextColor(resources.getColorStateList(R.color.col_25C))
setTextColor(resources.getColorStateList(R.color.col_02c))
setOnClickListener {
mViewModel.getQuestTime()
}

3
health/src/main/java/com/zj365/health/act/exception/XueyaExceptionDataAct.kt
Unescape Escape View File

@ -228,12 +228,14 @@ class XueyaExceptionDataAct : BaseExceptionDataAct<ExceptionVm>() {
MarkerView(context, layoutResource) {
private val mData: TextView
private val mTime: TextView
override fun refreshContent(e: Entry, highlight: Highlight) {
// 在 refreshContent 方法中设置需要显示的内容。
val barEntry = e as BarEntry
val x = barEntry.x
val get = result.get(x.toInt())
var data = get.data + "mmHg"
mData.setText(data)
mTime.setText(
RxTimeTool.milliseconds2String(
@ -248,6 +250,7 @@ class XueyaExceptionDataAct : BaseExceptionDataAct<ExceptionVm>() {
// 在构造函数中获取 MarkerView 中的 TextView。
mData = findViewById<View>(R.id.tvData) as TextView
mTime = findViewById<View>(R.id.tvTime) as TextView
}
}

5
health/src/main/java/com/zj365/health/act/familyhealth/AddFamilyGuardianAct.kt
Unescape Escape View File

@ -2,8 +2,10 @@ package com.zj365.health.act.familyhealth
import android.text.TextUtils
import com.alibaba.android.arouter.facade.annotation.Route
import com.tamsiree.rxkit.RxRegTool
import com.xty.base.act.BaseVmAct
import com.xty.base.vm.BaseVm
import com.xty.common.R
import com.xty.common.arouter.ARouterUrl
import com.xty.common.event.AddSuccessEvent
import com.xty.common.util.CommonToastUtils
@ -48,6 +50,9 @@ class AddFamilyGuardianAct : BaseVmAct<AddFamilyGuardianVm>() {
}else if (TextUtils.isEmpty(familyPhone)){
CommonToastUtils.showToast("请填写手机号码")
return@setOnClickListener
}else if (!RxRegTool.isMobileSimple(familyPhone)){
CommonToastUtils.showToast(getString(R.string.please_input_ok_phone))
return@setOnClickListener
}
if(isFrist){

19
health/src/main/java/com/zj365/health/adapter/QuestAdapter.kt
Unescape Escape View File

@ -1,5 +1,7 @@
package com.zj365.health.adapter
import android.util.DisplayMetrics
import android.util.TypedValue
import android.view.ViewGroup
import android.widget.EditText
import android.widget.RadioButton
@ -10,9 +12,8 @@ import com.chad.library.adapter.base.BaseMultiItemQuickAdapter
import com.chad.library.adapter.base.viewholder.BaseViewHolder
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.googlecode.mp4parser.authoring.Edit
import com.zj365.health.R
import com.xty.network.model.QuestBean
import com.zj365.health.R
class QuestAdapter(): BaseMultiItemQuickAdapter<QuestBean.Question, BaseViewHolder>() {
@ -25,7 +26,7 @@ class QuestAdapter(): BaseMultiItemQuickAdapter<QuestBean.Question, BaseViewHold
override fun convert(holder: BaseViewHolder, item: QuestBean.Question) {
when(item.itemType){
2->{
holder.setText(R.id.mNum,"${holder.layoutPosition+1}")
holder.setText(R.id.mNum,"${holder.layoutPosition+1}/${data.size}")
.setText(R.id.nQuestName,item.question)
val replace = item.descAnswer.replace("\\", "")
var beanArray: List<QuestBean.Answer> =Gson().fromJson(replace, object : TypeToken<List<QuestBean.Answer>>(){}.type)
@ -34,12 +35,13 @@ class QuestAdapter(): BaseMultiItemQuickAdapter<QuestBean.Question, BaseViewHold
beanArray.forEachIndexed { i, answer ->
var tempButton = RadioButton(context);//this就是你的activity
var lp = RadioGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
lp.setMargins(12, 5, 0, 5);// 设置RadioButton边距 (int left, int top, int right, int bottom)
lp.setMargins( dp2px(12f), dp2px(8f), 0, dp2px(8f));// 设置RadioButton边距 (int left, int top, int right, int bottom)
// tempButton.setBackgroundResource(R.drawable.shape_corners_delivered_14dp_bg); // 设置RadioButton的背景图片
tempButton.setPadding(12, 5, 12, 5); // 设置文字距离按钮四周的距离
tempButton.setPadding(dp2px(12f), 0, dp2px(12f), 0); // 设置文字距离按钮四周的距离
tempButton.setTextColor(ContextCompat.getColor(context,R.color.col_455));//字体颜色
tempButton.buttonDrawable = ContextCompat.getDrawable(context,R.drawable.selector_check_medical);//取消前面的圆点
tempButton.text = "${answer.value} ${answer.label}"
tempButton.textSize = 14f
tempButton.id=i
tempButton.tag=answer
tempButton.isChecked=item.selectPosition==i
@ -58,7 +60,7 @@ class QuestAdapter(): BaseMultiItemQuickAdapter<QuestBean.Question, BaseViewHold
}
4->{
holder.setText(R.id.mNum,"${holder.layoutPosition+1}")
holder.setText(R.id.mNum,"${holder.layoutPosition+1}/${data.size}")
.setText(R.id.mQuestName,item.question)
holder.getView<EditText>(R.id.mHeight).addTextChangedListener {
item.height=it.toString().trim()
@ -72,4 +74,9 @@ class QuestAdapter(): BaseMultiItemQuickAdapter<QuestBean.Question, BaseViewHold
}
}
private fun dp2px(dp: Float): Int {
val displayMetrics: DisplayMetrics = context.resources.displayMetrics
return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, displayMetrics).toInt()
}
}

2
health/src/main/java/com/zj365/health/adapter/XTangHistoryAdapter.kt
Unescape Escape View File

@ -17,7 +17,7 @@ class XTangHistoryAdapter : BaseAdapter<BloodSugarNewbean>(R.layout.item_xuetang
private val textColor by lazy {
arrayOf(
R.color.col_9BD,
R.color.col_25C,
R.color.col_02c,
R.color.col_FDA481
)
}

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

@ -4,5 +4,5 @@
<corners
android:radius="@dimen/dp_20"/>
<solid
android:color="@color/col_8D0"/>
android:color="@color/col_02c"/>
</shape>

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

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

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

@ -57,7 +57,7 @@
android:layout_height="@dimen/dp_18"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_20"
app:background_normal="@color/col_25C"
app:background_normal="@color/col_02c"
app:corner_radius="2dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -102,7 +102,7 @@
android:layout_height="@dimen/dp_18"
android:layout_marginStart="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_20"
app:background_normal="@color/col_25C"
app:background_normal="@color/col_02c"
app:corner_radius="2dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -166,7 +166,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=" 点击查看>>"
android:textColor="@color/col_009"
android:textColor="@color/col_02c"
android:textSize="@dimen/dp_14" />
</LinearLayout>

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

@ -52,7 +52,7 @@
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:text="退出管理"
android:textColor="@color/col_8D0"
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
android:visibility="gone" />

64
health/src/main/res/layout/act_quest_list.xml
Unescape Escape View File

@ -9,6 +9,58 @@
android:id="@+id/title"
layout="@layout/title_white_bar"/>
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"
android:layout_below="@+id/title"
android:layout_above="@+id/mNext">
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@mipmap/bg_risk_question"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_16"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/img_steps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@mipmap/ic_step_1"/>
<TextView
android:id="@+id/tv_steps"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="第一步：个人基本情况"
android:textSize="@dimen/sp_14"
android:textColor="@color/col_313"
android:layout_marginLeft="@dimen/dp_12"/>
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecycle"
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_20"
android:overScrollMode="never" />
</LinearLayout>
<TextView
android:id="@+id/mTvStep"
android:layout_width="match_parent"
@ -18,8 +70,9 @@
android:drawableTop="@mipmap/ic_step_1"
android:drawablePadding="@dimen/dp_10"
android:gravity="center"
android:visibility="gone"
android:text="第一步"
android:textColor="@color/col_009"
android:textColor="@color/col_02c"
android:textSize="@dimen/dp_18" />
<com.xty.common.weight.StepView
@ -28,16 +81,9 @@
android:layout_height="@dimen/dp_30"
android:layout_below="@+id/mTvStep"
android:layout_marginTop="@dimen/dp_10"
android:visibility="gone"
app:step_size="@dimen/dp_14" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecycle"
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="wrap_content"
android:layout_above="@+id/mNext"
android:layout_below="@+id/Step"
android:overScrollMode="never" />
<TextView

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

@ -61,7 +61,7 @@
android:drawablePadding="@dimen/dp_10"
android:gravity="center_vertical"
android:text="添加"
android:textColor="@color/col_25C"
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
tools:ignore="HardcodedText,UseCompatTextViewDrawableXml" />
@ -91,7 +91,7 @@
android:gravity="center"
android:padding="@dimen/dp_10"
android:text="@string/blood_align_history"
android:textColor="@color/col_02b"
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />

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

@ -40,7 +40,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"
@ -228,7 +228,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"

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

@ -138,6 +138,7 @@
android:layout_marginBottom="@dimen/dp_85"
android:orientation="horizontal"
android:paddingTop="@dimen/dp_10"
android:visibility="gone"
android:paddingBottom="@dimen/dp_10">
<TextView

3
health/src/main/res/layout/custom_marker_view1.xml
Unescape Escape View File

@ -20,8 +20,9 @@
android:layout_height="wrap_content"
android:textSize="@dimen/dp_10"
android:textColor="@color/col_c7c"
android:text="140/89mmHg"
android:text="140.0/110.0mmHg"
/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"

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

@ -12,8 +12,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:textColor="@color/col_009"
android:textSize="@dimen/dp_16" />
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/nQuestName"
@ -22,8 +22,9 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/mNum"
android:text="收到克己复礼看"
android:textColor="@color/col_009"
android:textSize="@dimen/dp_16" />
android:textColor="@color/col_313"
android:textSize="@dimen/sp_14" />
<RadioGroup

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

@ -12,8 +12,8 @@
android:id="@+id/mNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/col_009"
android:textSize="@dimen/dp_16" />
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_14" />
<TextView
android:id="@+id/mQuestName"
@ -22,8 +22,8 @@
android:layout_marginLeft="@dimen/dp_10"
android:layout_toRightOf="@+id/mNum"
android:text=""
android:textColor="@color/col_009"
android:textSize="@dimen/dp_16" />
android:textColor="@color/col_313"
android:textSize="@dimen/sp_14" />

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

@ -108,7 +108,7 @@
android:layout_height="@dimen/dp_30"
android:drawablePadding="@dimen/dp_10"
android:text="去上传"
android:textColor="@color/col_25C"
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_13"
android:background="@drawable/shape_stoke_25c"
android:gravity="center"

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 339 KiB

15
mine/src/main/java/com/zj365/mime/vm/SettingVm.kt
Unescape Escape View File

@ -4,6 +4,7 @@ import androidx.lifecycle.MutableLiveData
import com.xty.base.vm.BaseVm
import com.xty.common.Const
import com.xty.network.model.FamilyBean
import com.xty.network.model.MainBean
import com.xty.network.model.ProgrammeBean
import com.xty.network.model.RespBody
import com.xty.network.model.ScoreBean
@ -27,6 +28,8 @@ class SettingVm : BaseVm() {
val updateLive by lazy { MutableLiveData<RespBody<Update>>() }
val allData by lazy { MutableLiveData<RespBody<MainBean>>() }
fun getNesProg(id: String) {
startHttp {
val json = JSONObject()
@ -145,4 +148,16 @@ class SettingVm : BaseVm() {
response.getCodeStatus(updateLive, nowData)
}
}
/**
* 获取所有信息
*/
fun getAllInfo(id:String,isSHowDialog:Boolean) {
startHttp(isSHowDialog) {
var json=JSONObject()
json.put("id",id)
var body = apiInterface().getMainInfo(retrofits.getRequestBody(json.toString()))
body.getCodeStatus(allData,nowData)
}
}
}

59
mine/src/main/res/layout/act_dev_info.xml
Unescape Escape View File

@ -47,59 +47,80 @@
android:id="@+id/mNickName"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_16"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_16" />
android:textSize="@dimen/sp_15" />
<!--android:text="13325442743"-->
<TextView
android:id="@+id/mNum"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_16"
android:inputType="number"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_16" />
android:textSize="@dimen/sp_15" />
<!--android:text="13325442743"-->
<TextView
android:id="@+id/mCode"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_16"
android:inputType="number"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_16" />
android:textSize="@dimen/sp_15" />
<!--android:text="13325442743"-->
<TextView
android:id="@+id/mActiveCode"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_27"
android:layout_marginLeft="@dimen/dp_20"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginRight="@dimen/dp_20"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_16"
android:visibility="gone" />
android:layout_marginRight="@dimen/dp_16"
android:orientation="horizontal">
<TextView
android:id="@+id/mActiveCode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dp_10"
android:paddingBottom="@dimen/dp_10"
android:singleLine="true"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_15"
/>
<TextView
android:layout_width="@dimen/dp_68"
android:layout_height="@dimen/dp_26"
android:text="点击充值"
android:textColor="@color/col_02c"
android:textSize="@dimen/sp_11"
android:background="@drawable/shape_r25_stroke_02c"
android:gravity="center"
android:layout_marginLeft="@dimen/dp_12"
android:id="@+id/tv_recharge"/>
</LinearLayout>
<!--android:text="13325442743"-->
</LinearLayout>

Write Preview
Loading…
Cancel
Save