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 572205947c
commit 1b6900b0d3
192 changed files with 253 additions and 6424 deletions
Show Stats Download Patch File Download Diff File

2
app/build.gradle
Unescape Escape View File

@ -105,7 +105,7 @@ android {
repositories { repositories {
flatDir { flatDir {
dirs 'libs' dirs 'libs','../common/libs'
} }
project.afterEvaluate { project.afterEvaluate {

BIN
app/libs/ycbtsdk-release.aar
View File

Binary file not shown.

4
app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt
Unescape Escape View File

@ -157,7 +157,7 @@ class WelcomeAct : BaseVmAct<WelcomeVm>() {
} }
private fun getBgImage(url: String) { private fun getBgImage(url: String) {
Glide.with(this).asBitmap().load(url).error(R.mipmap.ic_welcome_main_bg) /* Glide.with(this).asBitmap().load(url).error(R.mipmap.ic_welcome_main_bg)
.into(object : SimpleTarget<Bitmap?>() { .into(object : SimpleTarget<Bitmap?>() {
override fun onResourceReady( override fun onResourceReady(
resource: Bitmap, resource: Bitmap,
@ -167,7 +167,7 @@ class WelcomeAct : BaseVmAct<WelcomeVm>() {
binding.mBg.setImageBitmap(resource) binding.mBg.setImageBitmap(resource)
} }
} }
}) })*/
} }
private fun getLogoImage(url: String) { private fun getLogoImage(url: String) {

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

@ -213,7 +213,20 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){
RouteManager.goAct(ARouterUrl.LOGIN_ACT) RouteManager.goAct(ARouterUrl.LOGIN_ACT)
}else { }else {
CommonToastUtils.showToast("敬请期待") otherInfo?.let {
if(!TextUtils.isEmpty(it.vip_server)){
bundle.clear()
bundle.putString(
"web_site_url",
"${it.start_business}"
)
RouteManager.goAct(ARouterUrl.H5_ACT, bundle)
}else{
CommonToastUtils.showToast("敬请期待")
}
}
} }
} }

22
app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt
Unescape Escape View File

@ -319,7 +319,7 @@ class DynamicManagementVm : BaseVm() {
statusXY, statusXY,
mTimeXY, mTimeXY,
contentXY, contentXY,
R.mipmap.bg_oo, R.mipmap.bg_xl,
R.mipmap.ic_oo, R.mipmap.ic_oo,
1, 1,
it.type, it.type,
@ -343,7 +343,7 @@ class DynamicManagementVm : BaseVm() {
statusHXL, statusHXL,
mTimeHXL, mTimeHXL,
contentHXL, contentHXL,
R.mipmap.bg_breath, R.mipmap.bg_xl,
R.mipmap.ic_h_breath, R.mipmap.ic_h_breath,
2, 2,
it.type, it.type,
@ -367,7 +367,7 @@ class DynamicManagementVm : BaseVm() {
statusTW, statusTW,
mTimeTW, mTimeTW,
contentTW, contentTW,
R.mipmap.bg_temp, R.mipmap.bg_xl,
R.mipmap.ic_temp, R.mipmap.ic_temp,
3, 3,
it.type, it.type,
@ -393,7 +393,7 @@ class DynamicManagementVm : BaseVm() {
0, 0,
mTimeBS, mTimeBS,
contentBS, contentBS,
R.mipmap.bg_step, R.mipmap.bg_xl,
R.mipmap.ic_steps, R.mipmap.ic_steps,
4, 4,
it.type, it.type,
@ -428,7 +428,7 @@ class DynamicManagementVm : BaseVm() {
statusSM, statusSM,
mTimeSM, mTimeSM,
contentSM, contentSM,
R.mipmap.bg_h_sleep, R.mipmap.bg_xl,
R.mipmap.ic_h_sleep, R.mipmap.ic_h_sleep,
5, 5,
it.type, it.type,
@ -455,7 +455,7 @@ class DynamicManagementVm : BaseVm() {
statusXYa, statusXYa,
mTimeXYa, mTimeXYa,
contentXYa, contentXYa,
R.mipmap.bg_xya, R.mipmap.bg_xl,
R.mipmap.ic_xya, R.mipmap.ic_xya,
6, 6,
it.type, it.type,
@ -535,14 +535,14 @@ class DynamicManagementVm : BaseVm() {
statusXT, statusXT,
mTimeXT, mTimeXT,
contentXT, contentXT,
R.mipmap.bg_bloodsugar, R.mipmap.bg_xl,
R.mipmap.ic_bloodsugar, R.mipmap.ic_bloodsugar,
7, 7,
it.type, it.type,
calorie = bloodSugarData.count calorie = bloodSugarData.count
) )
) )
}else if(DeviceFunctionUtils.hasFunction(it,"ecg")){ //心电 }/*else if(DeviceFunctionUtils.hasFunction(it,"ecg")){ //心电
val statusXD = 0 val statusXD = 0
val contentXD = val contentXD =
if (TextUtils.isEmpty(heartData.hrData) || heartData.hrData == "0") { if (TextUtils.isEmpty(heartData.hrData) || heartData.hrData == "0") {
@ -563,7 +563,7 @@ class DynamicManagementVm : BaseVm() {
it.type, it.type,
) )
) )
}else if(DeviceFunctionUtils.hasFunction(it,"uric")){ //尿酸 }*/else if(DeviceFunctionUtils.hasFunction(it,"uric")){ //尿酸
var statusNS = 0 var statusNS = 0
var contentNS = "" var contentNS = ""
var mTimeNS = "" var mTimeNS = ""
@ -615,7 +615,7 @@ class DynamicManagementVm : BaseVm() {
statusNS, statusNS,
mTimeNS, mTimeNS,
contentNS, contentNS,
R.mipmap.bg_niaosuan, R.mipmap.bg_xl,
R.mipmap.ic_niaosuan, R.mipmap.ic_niaosuan,
9, 9,
it.type, it.type,
@ -683,7 +683,7 @@ class DynamicManagementVm : BaseVm() {
statusXZ, statusXZ,
mTimeXZ, mTimeXZ,
contentXZ, contentXZ,
R.mipmap.bg_fat, R.mipmap.bg_xl,
R.mipmap.ic_fat, R.mipmap.ic_fat,
10, 10,
it.type, it.type,

836
app/src/main/res/layout/child_home_healt.xml
Unescape Escape View File

@ -1,836 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="@dimen/dp_14"
android:paddingRight="@dimen/dp_14">
<!-- 健康管理 -->
<LinearLayout
android:id="@+id/llmanage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_white_8radius"
android:orientation="vertical"
android:paddingTop="@dimen/dp_23"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:id="@+id/mTvManage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/shape_head_tip_new"
android:drawablePadding="@dimen/dp_10"
android:paddingLeft="@dimen/dp_16"
android:paddingRight="@dimen/dp_16"
android:text="@string/health_manage"
android:textColor="#313131"
android:textSize="@dimen/sp_17"
android:textStyle="bold" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_10"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_15"
android:gravity="center"
android:orientation="vertical"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/llmanage">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rlv_health_manage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:layout_marginEnd="@dimen/dp_5"/>
<com.zj365.dc.weight.HIndicator
android:id="@+id/hi_indicator"
android:layout_width="@dimen/dp_26"
android:layout_height="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_10"
android:visibility="gone"
app:hi_bgColor="@color/col_298D0"
app:hi_indicatorColor="@color/col_8D0" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/llguide"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_white_8radius"
android:orientation="vertical"
android:paddingTop="@dimen/dp_23"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent">
<!-- 健康指导 -->
<TextView
android:id="@+id/mTvGuid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/shape_head_tip_new"
android:drawablePadding="@dimen/dp_10"
android:paddingLeft="@dimen/dp_16"
android:paddingRight="@dimen/dp_16"
android:text="@string/health_guid"
android:textColor="#313131"
android:textSize="@dimen/sp_17"
android:textStyle="bold" />
<androidx.cardview.widget.CardView
android:id="@+id/mGuidCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_5"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mTvGuid">
<LinearLayout
android:id="@+id/mRecycle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:padding="@dimen/dp_10"
app:layout_constraintTop_toBottomOf="@+id/mTvGuid">
<androidx.cardview.widget.CardView
android:id="@+id/mGuide_4"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="@dimen/dp_0">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@mipmap/ic_shangchuan" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10"
android:gravity="center"
android:paddingTop="@dimen/dp_10"
android:text="数据管理"
android:textColor="@color/col_455"
android:textSize="@dimen/dp_14"
android:textStyle="bold" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/mGuide2"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_10"
android:layout_weight="1"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="@dimen/dp_0">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@mipmap/ic_my_guanjia" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10"
android:gravity="center"
android:paddingTop="@dimen/dp_10"
android:text="我的管家"
android:textColor="@color/col_455"
android:textSize="@dimen/dp_14"
android:textStyle="bold" />
</LinearLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/mGuide_1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginRight="@dimen/dp_10"
android:layout_weight="1"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="@dimen/dp_0">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@mipmap/ic_my_fangan" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10"
android:gravity="center"
android:paddingTop="@dimen/dp_10"
android:text="我的方案"
android:textColor="@color/col_455"
android:textSize="@dimen/dp_14"
android:textStyle="bold" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/mReport"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="@dimen/dp_0">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical">
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@mipmap/ic_my_report" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_10"
android:gravity="center"
android:paddingTop="@dimen/dp_10"
android:text="我的报告"
android:textColor="@color/col_455"
android:textSize="@dimen/dp_14"
android:textStyle="bold" />
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:id="@+id/llWarning"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/shape_white_8radius"
android:orientation="vertical"
android:paddingTop="@dimen/dp_23"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/llguide">
<!-- 健康预警 -->
<!-- 健康指导 -->
<TextView
android:id="@+id/mTvEarly"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/shape_head_tip_new"
android:drawablePadding="@dimen/dp_10"
android:paddingLeft="@dimen/dp_16"
android:paddingRight="@dimen/dp_16"
android:text="@string/health_early"
android:textColor="#313131"
android:textSize="@dimen/sp_17"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.cardview.widget.CardView
android:id="@+id/mEarlyCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginBottom="@dimen/dp_5"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mTvEarly">
<LinearLayout
android:id="@+id/mLinEary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="@dimen/dp_15">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/ivWarn3"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="6dp"
android:scaleType="centerCrop"
android:src="@mipmap/ic_fangai"
android:visibility="visible"
app:layout_constraintDimensionRatio="152:65"
app:layout_constraintEnd_toStartOf="@id/ivWarn2"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivWarn2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="6dp"
android:layout_marginEnd="16dp"
android:scaleType="centerCrop"
android:src="@mipmap/ic_fengxainyujing"
app:layout_constraintDimensionRatio="152:65"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/ivWarn3"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp">
<ImageView
android:id="@+id/ivWarn1"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="6dp"
android:scaleType="centerCrop"
android:src="@mipmap/ic_30yujing"
app:layout_constraintDimensionRatio="152:65"
app:layout_constraintEnd_toStartOf="@id/ivTongueDiagnosis"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/ivTongueDiagnosis"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="6dp"
android:layout_marginEnd="16dp"
android:scaleType="centerCrop"
android:src="@mipmap/img_tongue_diagnosis"
app:layout_constraintDimensionRatio="152:65"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/ivWarn1"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:id="@+id/llIot"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:paddingBottom="@dimen/dp_10"
android:background="@drawable/shape_white_8radius"
android:orientation="vertical"
android:paddingTop="@dimen/dp_23"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/llmanage">
<TextView
android:id="@+id/mTvThingNet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/shape_head_tip_new"
android:drawablePadding="@dimen/dp_10"
android:paddingLeft="@dimen/dp_16"
android:paddingRight="@dimen/dp_16"
android:text="@string/health_thing_net"
android:textColor="#313131"
android:textSize="@dimen/sp_17"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="UseCompatTextViewDrawableXml" />
<androidx.cardview.widget.CardView
android:id="@+id/mThingNetCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_8"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mTvThingNet">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:id="@+id/mLinThingNet"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="@dimen/dp_21"
android:paddingBottom="@dimen/dp_22">
<LinearLayout
android:id="@+id/llWatch"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_34"
android:layout_marginRight="@dimen/dp_6"
android:src="@mipmap/ic_watch_small" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_2"
android:text="手表"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tvWatchBind"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="未绑定手表"
android:textColor="@color/col_7c7"
android:textSize="@dimen/sp_11" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_36"
android:layout_gravity="center"
android:visibility="gone"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:background="@color/gray_eb"/>
<LinearLayout
android:id="@+id/llXueya"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_34"
android:layout_marginRight="@dimen/dp_6"
android:src="@mipmap/ic_xueya" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_2"
android:text="血压计"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tvXueyaNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已绑定0台"
android:textColor="@color/col_7c7"
android:textSize="@dimen/sp_11" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/llXuetang"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_34"
android:layout_marginRight="@dimen/dp_6"
android:src="@mipmap/ic_xuetang" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_2"
android:text="血糖仪"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tvXuetangNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已绑定0台"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_11" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="@dimen/dp_1"
android:layout_height="@dimen/dp_36"
android:layout_gravity="center"
android:visibility="gone"
android:layout_marginEnd="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_10"
android:background="@color/gray_eb"/>
<LinearLayout
android:id="@+id/llBodyFat"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<ImageView
android:layout_width="@dimen/dp_34"
android:layout_height="@dimen/dp_34"
android:layout_marginRight="@dimen/dp_6"
android:src="@mipmap/ic_body_fat" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_2"
android:text="体脂秤"
android:textColor="@color/black"
android:textSize="@dimen/sp_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tvBodyFatNum"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="已绑定0台"
android:textColor="@color/col_c7c"
android:textSize="@dimen/sp_11" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
<LinearLayout
android:id="@+id/lleach"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:background="@drawable/shape_white_8radius"
android:orientation="vertical"
android:paddingTop="@dimen/dp_23"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/llIot">
<TextView
android:id="@+id/mInter"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/shape_head_tip_new"
android:drawablePadding="@dimen/dp_10"
android:paddingLeft="@dimen/dp_16"
android:paddingRight="@dimen/dp_16"
android:text="@string/health_inter"
android:textColor="#313131"
android:textSize="@dimen/sp_17"
android:textStyle="bold"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.cardview.widget.CardView
android:id="@+id/mRecyclemCardview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginRight="@dimen/dp_10"
android:layout_marginBottom="@dimen/dp_5"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mInter">
<LinearLayout
android:id="@+id/mRecyclemInter"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/dp_10"
android:orientation="vertical"
android:padding="@dimen/dp_10"
android:paddingTop="@dimen/dp_20">
<RelativeLayout
android:id="@+id/mRelInterBD"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/ic_bd"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:layout_centerVertical="true"
android:src="@mipmap/icon_bd_new" />
<TextView
android:id="@+id/tv_bd_tittle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_toRightOf="@+id/ic_bd"
android:text="@string/intera_2"
android:textColor="@color/col_3a4"
android:textSize="@dimen/dp_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_bd_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_bd_tittle"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_toRightOf="@+id/ic_bd"
android:textColor="@color/col_B8B"
android:textSize="@dimen/dp_10" />
<TextView
android:id="@+id/btn_bd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/shape_bind_bg_new_3"
android:paddingLeft="@dimen/dp_15"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_15"
android:paddingBottom="@dimen/dp_5"
android:text="查看"
android:textColor="@color/col_8D0"
android:textSize="@dimen/sp_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/mRelInterDk"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12">
<ImageView
android:id="@+id/ic_dk"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:layout_centerVertical="true"
android:src="@mipmap/icon_dk_new" />
<TextView
android:id="@+id/tv_dk_tittle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_toRightOf="@+id/ic_dk"
android:text="@string/intera_1"
android:textColor="@color/col_3a4"
android:textSize="@dimen/dp_14"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_dk_tittle"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_toRightOf="@+id/ic_dk"
android:text="养成生活好习惯"
android:textColor="@color/col_B8B"
android:textSize="@dimen/dp_10" />
<TextView
android:id="@+id/btn_dk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/shape_bind_bg_new_3"
android:paddingLeft="@dimen/dp_15"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_15"
android:paddingBottom="@dimen/dp_5"
android:text="打卡"
android:textColor="@color/col_8D0"
android:textSize="@dimen/dp_12" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/mRelInterFamily"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12">
<ImageView
android:id="@+id/ic_family"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
android:layout_centerVertical="true"
android:src="@mipmap/icon_family_new" />
<TextView
android:id="@+id/tv_family_tittle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_15"
android:layout_toRightOf="@+id/ic_family"
android:text="@string/intera_3"
android:textColor="@color/col_3a4"
android:textSize="@dimen/dp_14"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_family_content"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_family_tittle"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_5"
android:layout_toRightOf="@+id/ic_family"
android:textColor="@color/col_B8B"
android:textSize="@dimen/dp_10" />
<TextView
android:id="@+id/btn_family"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/shape_bind_bg_new_3"
android:paddingLeft="@dimen/dp_15"
android:paddingTop="@dimen/dp_5"
android:paddingRight="@dimen/dp_15"
android:paddingBottom="@dimen/dp_5"
android:text="关注"
android:textColor="@color/col_8D0"
android:textSize="@dimen/dp_12" />
</RelativeLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

11
app/src/main/res/layout/frag_dynamic_management_header.xml
Unescape Escape View File

@ -260,17 +260,6 @@
app:layout_constraintTop_toTopOf="@+id/tvProfession" app:layout_constraintTop_toTopOf="@+id/tvProfession"
tools:ignore="HardcodedText,UseCompatTextViewDrawableXml" /> tools:ignore="HardcodedText,UseCompatTextViewDrawableXml" />
<!-- 吉祥物 -->
<ImageView
android:layout_width="@dimen/dp_90"
android:layout_height="@dimen/dp_106"
android:layout_marginEnd="@dimen/dp_1"
android:layout_marginBottom="@dimen/dp_3"
android:src="@mipmap/ic_mascot"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent" />
<!-- 评估状态 --> <!-- 评估状态 -->
<ImageView <ImageView
android:id="@+id/mHealthStatus" android:id="@+id/mHealthStatus"

327
app/src/main/res/layout/frag_health_home.xml
Unescape Escape View File

@ -1,327 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#F2F6F7"
android:orientation="vertical">
<LinearLayout
android:id="@+id/statusBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/shape_health_bg_new"
android:orientation="horizontal"
android:visibility="gone" />
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_86">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_12"
android:scaleType="fitXY"
android:src="@mipmap/ic_head_bg" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:gravity="center_vertical"
android:orientation="horizontal">
<!-- 我的家人列表 -->
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/mRecycle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_17"
android:layout_marginBottom="@dimen/dp_3"
android:layout_weight="1" />
<RelativeLayout
android:id="@+id/mMsgLayout"
android:layout_width="@dimen/dp_32"
android:layout_height="@dimen/dp_32"
android:layout_marginRight="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_6"
android:visibility="gone">
<ImageView
android:id="@+id/mMsg"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:src="@mipmap/ic_health_msg" />
<androidx.cardview.widget.CardView
android:id="@+id/mBadgeCard"
android:layout_width="@dimen/dp_13"
android:layout_height="@dimen/dp_13"
android:layout_alignParentEnd="true"
android:visibility="gone"
app:cardBackgroundColor="@color/col_f23"
app:cardCornerRadius="@dimen/dp_10"
app:cardElevation="0dp">
<TextView
android:id="@+id/mBadge"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:textColor="@color/white"
android:textSize="@dimen/sp_10"
tools:text="12" />
</androidx.cardview.widget.CardView>
</RelativeLayout>
</LinearLayout>
</FrameLayout>
<!-- 下拉刷新控件 -->
<com.scwang.smart.refresh.layout.SmartRefreshLayout
android:id="@+id/mRefresh"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
app:srlAccentColor="@color/white">
<!-- 经典下拉头部 -->
<com.scwang.smart.refresh.header.ClassicsHeader
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foregroundTint="@color/black"
app:srlAccentColor="@color/black"
app:srlPrimaryColor="@color/white" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/dp_72"
android:layout_marginStart="@dimen/dp_39"
android:scaleType="fitXY"
android:src="@mipmap/ic_status_bg" />
<include
android:id="@+id/mCom"
layout="@layout/frag_dynamic_management_header"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</FrameLayout>
<LinearLayout
android:id="@+id/ll_my_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_14"
android:orientation="horizontal"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mCom">
<androidx.cardview.widget.CardView
android:id="@+id/my_manager"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_13"
android:drawableStart="@mipmap/ic_my_manager"
android:drawablePadding="@dimen/dp_9"
android:gravity="center"
android:text="我的管家"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_15" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/my_health_da"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_14"
android:layout_weight="1"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_13"
android:drawableStart="@mipmap/ic_my_da"
android:drawablePadding="@dimen/dp_9"
android:gravity="center"
android:text="健康档案"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_15" />
</androidx.cardview.widget.CardView>
</LinearLayout>
<androidx.cardview.widget.CardView
android:id="@+id/mBannerCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_14"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ll_my_info">
<com.youth.banner.Banner
android:id="@+id/mBanner"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_90"
android:background="@drawable/shape_banner_bg"
app:banner_indicator_normal_color="@color/col_298D0"
app:banner_indicator_selected_color="@color/col_8D0"
app:banner_infinite_loop="true"
app:banner_loop_time="4000" />
</androidx.cardview.widget.CardView>
<androidx.cardview.widget.CardView
android:id="@+id/cv_tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginRight="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_12"
app:cardCornerRadius="@dimen/dp_5"
app:cardElevation="@dimen/dp_0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mBannerCard">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="@dimen/dp_15"
android:paddingBottom="@dimen/dp_15">
<TextView
android:id="@+id/tv_risk_commit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/early_2"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_12"
app:drawableTopCompat="@mipmap/ic_risk_evaluate" />
<TextView
android:id="@+id/tv_tongue_diagnosis"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/tongue_diagnoise"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_12"
app:drawableTopCompat="@mipmap/ic_tongue_diagnosis" />
<TextView
android:id="@+id/tv_check_cancer"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/ic_cancer_prevention"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/cancer_prevention"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/tv_health_risk"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawableTop="@mipmap/ic_health_risk"
android:drawablePadding="@dimen/dp_5"
android:gravity="center"
android:text="@string/health_risk"
android:textColor="@color/col_313"
android:textSize="@dimen/sp_12" />
</LinearLayout>
</androidx.cardview.widget.CardView>
<!-- 健康监测 -->
<include
android:id="@+id/mOrgan_view"
layout="@layout/child_organ_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_10"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginRight="@dimen/dp_10"
android:visibility="gone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mBannerCard" />
<include
android:id="@+id/mChild_home_view"
layout="@layout/child_home_healt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/cv_tools" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:gravity="center_horizontal"
android:padding="@dimen/dp_15"
android:text="- 用科技守护健康 -"
android:textColor="@color/col_8D0"
android:textSize="@dimen/dp_15"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@+id/mChild_home_view" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
</LinearLayout>

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

@ -74,7 +74,7 @@
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/col_7c7" android:textColor="@color/col_7c7"
android:textSize="@dimen/sp_13" android:textSize="@dimen/sp_13"
android:maxLines="1" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
tools:text="17已经预约成功17已经预约成功17已经预约成功17已经预约成功17已经预约成功17已经预约成功"/> tools:text="17已经预约成功17已经预约成功17已经预约成功17已经预约成功17已经预约成功17已经预约成功"/>

BIN
app/src/main/res/mipmap-xhdpi/bg_bloodsugar.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_breath.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_ecg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_fat.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_h_sleep.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_niaosuan.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_oo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 10 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_step.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_temp.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 16 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_xl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.2 KiB

BIN
app/src/main/res/mipmap-xhdpi/bg_xya.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/mipmap-xhdpi/hxl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.3 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_cancer_prevention.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_head_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 96 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_health_bg.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_mascot.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_assest.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 71 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_assest_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 123 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_early.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 96 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_early_30.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 133 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_health_fa.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 84 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_health_gj.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 94 KiB

BIN
app/src/main/res/mipmap-xhdpi/icon_health_jy.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 129 KiB

BIN
app/src/main/res/mipmap-xhdpi/title_img.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 30 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 19 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 613 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 32 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.0 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 659 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 21 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 635 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 273 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 65 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 95 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.4 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 281 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.2 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 262 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 18 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 24 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/bg_xl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_diancbuz.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 737 B

2
base/build.gradle
Unescape Escape View File

@ -58,7 +58,7 @@ android {
repositories { repositories {
flatDir { flatDir {
dirs 'libs' dirs 'libs','../common/libs'
} }
} }

0
base/libs/ycbtsdk-release.aar
Unescape Escape View File

19
base/src/main/java/com/xty/base/act/ChatMsgAct.kt
Unescape Escape View File

@ -1,3 +1,4 @@
/*
package com.xty.base.act package com.xty.base.act
import android.annotation.SuppressLint import android.annotation.SuppressLint
@ -42,9 +43,11 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
import java.io.File import java.io.File
*/
/** /**
* 聊天界面 * 聊天界面
*/ *//*
@Route(path = ARouterUrl.CHAT_MSG) @Route(path = ARouterUrl.CHAT_MSG)
class ChatMsgAct : BaseVmAct<ChatMsgVm>() { class ChatMsgAct : BaseVmAct<ChatMsgVm>() {
val audioUtils by lazy { RecordAudio() } val audioUtils by lazy { RecordAudio() }
@ -353,9 +356,11 @@ class ChatMsgAct : BaseVmAct<ChatMsgVm>() {
} }
} }
/** */
/**
* 监听屏幕的可用高度 * 监听屏幕的可用高度
*/ *//*
private fun getLKeyBoardHeight() { private fun getLKeyBoardHeight() {
binding.mRecycle.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom -> binding.mRecycle.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom ->
@ -415,9 +420,11 @@ class ChatMsgAct : BaseVmAct<ChatMsgVm>() {
} }
} }
/** */
/**
* 根据生命周期 管理播放录音 * 根据生命周期 管理播放录音
*/ *//*
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
audioUtils.pause() audioUtils.pause()
@ -433,4 +440,4 @@ class ChatMsgAct : BaseVmAct<ChatMsgVm>() {
FileUtils.deleteAllFile(audioFile) FileUtils.deleteAllFile(audioFile)
super.onDestroy() super.onDestroy()
} }
} }*/

46
base/src/main/res/layout/act_xtang_how_open.xml
Unescape Escape View File

@ -1,46 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:ignore="MissingDefaultResource">
<include
android:id="@+id/title"
layout="@layout/title_dark_bar" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/dp_12"
android:background="@drawable/shape_round_white"
android:orientation="vertical"
android:padding="@dimen/dp_24">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_18"
android:drawableLeft="@drawable/shape_head_tip_new"
android:drawablePadding="@dimen/dp_10"
android:text="如何获取兑换码 "
android:textColor="@color/col_313"
android:textSize="@dimen/dp_16" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/xtang_how_open" />
</LinearLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_16"
android:layout_marginRight="@dimen/dp_16"
android:src="@mipmap/ic_xuetangka"
android:layout_gravity="center"
/>
</LinearLayout>

BIN
base/src/main/res/mipmap-xhdpi/ic_niaosuanka.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 221 KiB

BIN
base/src/main/res/mipmap-xhdpi/ic_xuetangka.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 229 KiB

10
common/src/main/java/com/xty/common/TimeSelect.kt
Unescape Escape View File

@ -327,7 +327,7 @@ class TimeSelect(var context: Context, var select: (String) -> Unit) {
var tvCancel = v!!.findViewById<TextView>(R.id.tv_cancel) var tvCancel = v!!.findViewById<TextView>(R.id.tv_cancel)
var checkLuna = v!!.findViewById<CheckBox>(R.id.check_brithday) // var checkLuna = v!!.findViewById<CheckBox>(R.id.check_brithday)
tvSubmit.setOnClickListener { tvSubmit.setOnClickListener {
pvLunarTime?.returnData() pvLunarTime?.returnData()
@ -338,14 +338,14 @@ class TimeSelect(var context: Context, var select: (String) -> Unit) {
pvLunarTime?.dismiss() pvLunarTime?.dismiss()
} }
checkLuna.setOnCheckedChangeListener { compoundButton, b -> /* checkLuna.setOnCheckedChangeListener { compoundButton, b ->
isLanu = b isLanu = b
/*if(b){ *//*if(b){
(timeType as TextView).text = "农历" (timeType as TextView).text = "农历"
}else{ }else{
(timeType as TextView).text = "公历" (timeType as TextView).text = "公历"
}*/ }*//*
} }*/
} }
}) })

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

@ -75,7 +75,7 @@ class WxUtils {
var msg=WXMediaMessage(webPage) var msg=WXMediaMessage(webPage)
msg.title=title msg.title=title
msg.description=subTitle msg.description=subTitle
var bmp=BitmapFactory.decodeResource(context.resources,R.mipmap.ic_share_logo) var bmp=BitmapFactory.decodeResource(context.resources,R.mipmap.ic_logo)
//设置缩略图 //设置缩略图
val thumbBmp = Bitmap.createScaledBitmap(bmp, bmp.width, bmp.height, true) val thumbBmp = Bitmap.createScaledBitmap(bmp, bmp.width, bmp.height, true)
@ -102,7 +102,7 @@ class WxUtils {
var msg=WXMediaMessage(webPage) var msg=WXMediaMessage(webPage)
msg.title=title msg.title=title
msg.description=subTitle msg.description=subTitle
var bmp=BitmapFactory.decodeResource(context.resources,R.mipmap.ic_share_logo) var bmp=BitmapFactory.decodeResource(context.resources,R.mipmap.ic_logo)
//设置缩略图 //设置缩略图
val thumbBmp = Bitmap.createScaledBitmap(bmp, bmp.width, bmp.height, true) val thumbBmp = Bitmap.createScaledBitmap(bmp, bmp.width, bmp.height, true)

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

@ -51,7 +51,7 @@ class ARouterUrl {
const val HEALTH_RECORD = "/health/com/zj365/health/act/HealthRecordAct" const val HEALTH_RECORD = "/health/com/zj365/health/act/HealthRecordAct"
const val DATA_MANAGE_USE_MEDICAL = "/health/com/zj365/health/act/DataManageUseMedicalAct" const val DATA_MANAGE_USE_MEDICAL = "/health/com/zj365/health/act/DataManageUseMedicalAct"
const val DATA_MANAGE_TIJIAN = "/health/com/zj365/health/act/DataManageTijianAct" const val DATA_MANAGE_TIJIAN = "/health/com/zj365/health/act/DataManageTijianAct"
const val DATA_MANAGE_BASE_INFO = "/health/com/zj365/health/act/DataManageBaseInfoAct" //const val DATA_MANAGE_BASE_INFO = "/health/com/zj365/health/act/DataManageBaseInfoAct"
const val DATA_MANAGE_HOSPITAL = "/health/com/zj365/health/act/DataManageHospitalAct" const val DATA_MANAGE_HOSPITAL = "/health/com/zj365/health/act/DataManageHospitalAct"
const val ONLINE_MAKE = "/health/com/zj365/health/act/OnLineMakeAct" const val ONLINE_MAKE = "/health/com/zj365/health/act/OnLineMakeAct"
@ -66,7 +66,7 @@ class ARouterUrl {
const val BIND_FAMILY = "/health/com/zj365/health/act/BindFamilyAct" const val BIND_FAMILY = "/health/com/zj365/health/act/BindFamilyAct"
const val PROGRAMME_HISTORY = "/health/com/zj365/health/act/ProgrammeHistoryAct" const val PROGRAMME_HISTORY = "/health/com/zj365/health/act/ProgrammeHistoryAct"
const val BLOOD_ALIGN = "/health/com/zj365/health/act/BloodCalibrationAct" const val BLOOD_ALIGN = "/health/com/zj365/health/act/BloodCalibrationAct"
const val BLOOD_STUDY = "/health/com/zj365/health/act/BloodStudyAct" // const val BLOOD_STUDY = "/health/com/zj365/health/act/BloodStudyAct"
const val XUEYA_XUEXIJILU = "/health/com/zj365/health/act/study_record" const val XUEYA_XUEXIJILU = "/health/com/zj365/health/act/study_record"
const val BLOOD_ALIGN_HISTORY = "/health/com/zj365/health/act/BloodCalibrationHistoryAct" const val BLOOD_ALIGN_HISTORY = "/health/com/zj365/health/act/BloodCalibrationHistoryAct"
const val BLOOD_TIP_Web = "/health/com/zj365/health/act/BloodTipWebAct" const val BLOOD_TIP_Web = "/health/com/zj365/health/act/BloodTipWebAct"
@ -79,10 +79,10 @@ class ARouterUrl {
const val SUBMIT_REPORT = "/health/com/zj365/health/act/SubmitReportListAct" const val SUBMIT_REPORT = "/health/com/zj365/health/act/SubmitReportListAct"
const val SUBMIT_REPORTMain = "/health/com/zj365/health/act/SubmitReportMainAct" const val SUBMIT_REPORTMain = "/health/com/zj365/health/act/SubmitReportMainAct"
const val QUEST_DETAIL = "/health/com/zj365/health/act/QuestDetailAct" const val QUEST_DETAIL = "/health/com/zj365/health/act/QuestDetailAct"
const val FRIEND_WATCH = "/health/com/zj365/health/act/FriendWatchAct" // const val FRIEND_WATCH = "/health/com/zj365/health/act/FriendWatchAct"
const val COMPARE_DATA_ACT = "/health/com/zj365/health/act/CompareAct" const val COMPARE_DATA_ACT = "/health/com/zj365/health/act/CompareAct"
const val COMPARE_PAGE_DATA_ACT = "/health/com/zj365/health/act/ComparePageAct" const val COMPARE_PAGE_DATA_ACT = "/health/com/zj365/health/act/ComparePageAct"
const val BLOOD_STUDY_NEED_KNOW = "/health/com/zj365/health/act/BloodStudyNeedKnowAct" // const val BLOOD_STUDY_NEED_KNOW = "/health/com/zj365/health/act/BloodStudyNeedKnowAct"
const val XINLV_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/XinLvExceptionAct" const val XINLV_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/XinLvExceptionAct"
const val URIC_ACID_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/UricAcidExceptionAct" const val URIC_ACID_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/UricAcidExceptionAct"
const val ALL_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/AllExceptionDataActivity" const val ALL_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/AllExceptionDataActivity"
@ -171,11 +171,11 @@ class ARouterUrl {
const val XT_OPEN = "/health/com/zj365/health/act/XTangOpenAct" const val XT_OPEN = "/health/com/zj365/health/act/XTangOpenAct"
const val XT_HISTORY = "/health/com/zj365/health/act/XTangHistoryAct" const val XT_HISTORY = "/health/com/zj365/health/act/XTangHistoryAct"
const val XT_UPLOAD = "/health/com/zj365/health/act/XTangUploadAct" const val XT_UPLOAD = "/health/com/zj365/health/act/XTangUploadAct"
const val XT_HOW_OPEN = "/health/com/zj365/health/act/XTangHowOpenAct" // const val XT_HOW_OPEN = "/health/com/zj365/health/act/XTangHowOpenAct"
//尿酸 //尿酸
const val NS_OPEN = "/health/com/zj365/health/act/NSuanOpenAct" const val NS_OPEN = "/health/com/zj365/health/act/NSuanOpenAct"
const val NS_HOW_OPEN = "/health/com/zj365/health/act/NSuanHowOpenAct" // const val NS_HOW_OPEN = "/health/com/zj365/health/act/NSuanHowOpenAct"
const val NS_MESSAGE_PERFECT = "/health/com/zj365/health/act/NSuanMessagePerfectAct" const val NS_MESSAGE_PERFECT = "/health/com/zj365/health/act/NSuanMessagePerfectAct"
const val URIC_CALIBRATION_SUBMIT = "/health/com/xty/health/act/UricCalibrationSubmitAct" const val URIC_CALIBRATION_SUBMIT = "/health/com/xty/health/act/UricCalibrationSubmitAct"
const val URIC_CALIBRATION_HISTORY = "/health/com/xty/health/act/UricCalibrationHistoryAct" const val URIC_CALIBRATION_HISTORY = "/health/com/xty/health/act/UricCalibrationHistoryAct"
@ -214,7 +214,7 @@ class ARouterUrl {
const val OO_REMIND = "/mine/com/zj365/dc/mime/act/OoRemindAct" const val OO_REMIND = "/mine/com/zj365/dc/mime/act/OoRemindAct"
const val TEMP_REMIND = "/mine/com/zj365/dc/mime/act/TempRemindAct" const val TEMP_REMIND = "/mine/com/zj365/dc/mime/act/TempRemindAct"
const val PERSON_INFO = "/mine/com/zj365/dc/mime/act/PersonInfoAct" const val PERSON_INFO = "/mine/com/zj365/dc/mime/act/PersonInfoAct"
const val INVITE_FRIENDS = "/mine/com/zj365/dc/mime/act/InviteFriendsAct" //邀请好友 // const val INVITE_FRIENDS = "/mine/com/zj365/dc/mime/act/InviteFriendsAct" //邀请好友
const val ENTERPRISE_INFO = "/mine/com/zj365/dc/mime/act/EnterpriseInformationAct" //企业资料 const val ENTERPRISE_INFO = "/mine/com/zj365/dc/mime/act/EnterpriseInformationAct" //企业资料
const val ENTERPRISE_TYPE_INFO = "/mine/com/zj365/dc/mime/act/EnterpriseInformationForTypeAct" //企业资料 const val ENTERPRISE_TYPE_INFO = "/mine/com/zj365/dc/mime/act/EnterpriseInformationForTypeAct" //企业资料
@ -257,7 +257,7 @@ class ARouterUrl {
const val WEB_ACT = "/base/com/xty/base/act/WebAct" const val WEB_ACT = "/base/com/xty/base/act/WebAct"
const val AGREEMNT_READ_WEB_ACT = "/base/com/xty/base/act/AgreementReadWebAct" const val AGREEMNT_READ_WEB_ACT = "/base/com/xty/base/act/AgreementReadWebAct"
const val RICH_TEXT = "/base/com/xty/base/act/RichTextAct" const val RICH_TEXT = "/base/com/xty/base/act/RichTextAct"
const val CHAT_MSG = "/base/com/xty/base/act/ChatMsgAct" // const val CHAT_MSG = "/base/com/xty/base/act/ChatMsgAct"
const val VIDEO_PLAY = "/base/com/xty/base/act/VideoPlayerAct" const val VIDEO_PLAY = "/base/com/xty/base/act/VideoPlayerAct"
const val H5_ACT = "/base/com/xty/base/act/BaseTenCentWebViewActivity" const val H5_ACT = "/base/com/xty/base/act/BaseTenCentWebViewActivity"
@ -265,7 +265,7 @@ class ARouterUrl {
//service //service
const val NONE_SERVICE = "/common/com/xty/common/services/NoneService" const val NONE_SERVICE = "/common/com/xty/common/services/NoneService"
const val MUSIC_SERVICE = "/common/com/xty/common/services/MusicService" const val MUSIC_SERVICE = "/common/com/xty/common/services/MusicService"
const val MQTT_SERVICE = "/common/com/xty/common/services/MqTTService" // const val MQTT_SERVICE = "/common/com/xty/common/services/MqTTService"
const val NOTIFICATION_LISTENER = "/common/com/xty/common/services/NotifictionCollector" const val NOTIFICATION_LISTENER = "/common/com/xty/common/services/NotifictionCollector"
//调试模式 //调试模式

2
common/src/main/java/com/xty/common/receiver/JpushReceive.kt
Unescape Escape View File

@ -59,7 +59,7 @@ class JpushReceive : JPushMessageReceiver() {
bundle.putString("toUserId", bean.toUserId) bundle.putString("toUserId", bean.toUserId)
bundle.putString("fromUserId", it.id.toString()) bundle.putString("fromUserId", it.id.toString())
bundle.putString("chatImage", getImageUrl(image)) bundle.putString("chatImage", getImageUrl(image))
RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle) // RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle)
} }
} }
else->{ else->{

32
common/src/main/java/com/xty/common/services/MqTTService.kt
Unescape Escape View File

@ -1,3 +1,4 @@
/*
package com.xty.common.services package com.xty.common.services
import android.app.* import android.app.*
@ -21,9 +22,11 @@ import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode import org.greenrobot.eventbus.ThreadMode
*/
/** /**
* mqtt服务 * mqtt服务
*/ *//*
@Route(path = ARouterUrl.MQTT_SERVICE) @Route(path = ARouterUrl.MQTT_SERVICE)
class MqTTService : Service(), MqttCallback, OrderProiver { class MqTTService : Service(), MqttCallback, OrderProiver {
@ -87,9 +90,11 @@ class MqTTService : Service(), MqttCallback, OrderProiver {
} }
/** */
/**
* 设置连接信息 * 设置连接信息
*/ *//*
private fun setClientInfo() :Boolean{ private fun setClientInfo() :Boolean{
if (userName.isNullOrEmpty()) { if (userName.isNullOrEmpty()) {
return false return false
@ -148,19 +153,23 @@ class MqTTService : Service(), MqttCallback, OrderProiver {
} }
} }
/** 连接MQTT服务器 */ */
/** 连接MQTT服务器 *//*
private fun doClientConnection() { private fun doClientConnection() {
if (!client!!.isConnected && isConnectIsNomarl()) { if (!client!!.isConnected && isConnectIsNomarl()) {
try { try {
--connectNum --connectNum
/* */
/*
MainScope().launch { MainScope().launch {
withContext(Dispatchers.IO){ withContext(Dispatchers.IO){
val connect = client!!.connect(conOpt, null, mqttListener) val connect = client!!.connect(conOpt, null, mqttListener)
connect.waitForCompletion() connect.waitForCompletion()
} }
} }
*/ *//*
if(!isClose){ if(!isClose){
client!!.connect(conOpt, null, mqttListener) client!!.connect(conOpt, null, mqttListener)
@ -209,9 +218,11 @@ class MqTTService : Service(), MqttCallback, OrderProiver {
} }
} }
/** */
/**
* 睡眠一分钟继续发起连接 * 睡眠一分钟继续发起连接
*/ *//*
private fun sleepConnect() { private fun sleepConnect() {
sleepJob = mapScope.launch { sleepJob = mapScope.launch {
delay(connectIntervalTime) //睡眠时长 delay(connectIntervalTime) //睡眠时长
@ -236,7 +247,9 @@ class MqTTService : Service(), MqttCallback, OrderProiver {
} }
} }
/** 判断网络是否连接 */ */
/** 判断网络是否连接 *//*
private fun isConnectIsNomarl(): Boolean { private fun isConnectIsNomarl(): Boolean {
val connectivityManager: ConnectivityManager = val connectivityManager: ConnectivityManager =
this.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager this.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
@ -304,3 +317,4 @@ class MqTTService : Service(), MqttCallback, OrderProiver {
} }
} }
*/

6
common/src/main/res/drawable-xhdpi/selector_check_birthday.xml
Unescape Escape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/nongli" android:state_checked="false"/>
<item android:drawable="@mipmap/gongli" android:state_checked="true"/>
</selector>

6
common/src/main/res/drawable/selector_check_birthday.xml
Unescape Escape View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/nongli" android:state_checked="false"/>
<item android:drawable="@mipmap/gongli" android:state_checked="true"/>
</selector>

10
common/src/main/res/layout/layout_customer_date_picker.xml
Unescape Escape View File

@ -44,16 +44,6 @@
</RelativeLayout> </RelativeLayout>
<CheckBox
android:id="@+id/check_brithday"
android:layout_width="wrap_content"
android:layout_marginLeft="@dimen/dp_31"
android:visibility="gone"
android:layout_height="wrap_content"
android:background="@drawable/selector_check_birthday"
android:button="@null"
android:checked="false" />
<LinearLayout <LinearLayout
android:id="@+id/timepicker" android:id="@+id/timepicker"
android:layout_width="match_parent" android:layout_width="match_parent"

2
common/src/main/res/layout/view_no_network.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@mipmap/bg_no_network"> >
<LinearLayout <LinearLayout

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1012 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.9 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 681 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 680 B

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
common/src/main/res/mipmap-xhdpi/ic_share_logo.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
common/src/main/res/mipmap-xhdpi/ic_watch.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 133 KiB

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

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 76 KiB

Some files were not shown because too many files have changed in this diff Show More

Write Preview
Loading…
Cancel
Save