diff --git a/app/build.gradle b/app/build.gradle index 071b6ac..5b7659d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,7 +105,7 @@ android { repositories { flatDir { - dirs 'libs' + dirs 'libs','../common/libs' } project.afterEvaluate { diff --git a/app/libs/ycbtsdk-release.aar b/app/libs/ycbtsdk-release.aar deleted file mode 100644 index 3fc9f43..0000000 Binary files a/app/libs/ycbtsdk-release.aar and /dev/null differ diff --git a/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt b/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt index d18efe4..32c433d 100644 --- a/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt @@ -157,7 +157,7 @@ class WelcomeAct : BaseVmAct() { } 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() { override fun onResourceReady( resource: Bitmap, @@ -167,7 +167,7 @@ class WelcomeAct : BaseVmAct() { binding.mBg.setImageBitmap(resource) } } - }) + })*/ } private fun getLogoImage(url: String) { diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index 51a92b5..1399f1e 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -213,7 +213,20 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ if(MMkvHelper.getLong(Const.USER_ID).toString() == "0"){ RouteManager.goAct(ARouterUrl.LOGIN_ACT) }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("敬请期待") + } + + } + } } diff --git a/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt b/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt index c5cc644..013816c 100644 --- a/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/DynamicManagementVm.kt @@ -319,7 +319,7 @@ class DynamicManagementVm : BaseVm() { statusXY, mTimeXY, contentXY, - R.mipmap.bg_oo, + R.mipmap.bg_xl, R.mipmap.ic_oo, 1, it.type, @@ -343,7 +343,7 @@ class DynamicManagementVm : BaseVm() { statusHXL, mTimeHXL, contentHXL, - R.mipmap.bg_breath, + R.mipmap.bg_xl, R.mipmap.ic_h_breath, 2, it.type, @@ -367,7 +367,7 @@ class DynamicManagementVm : BaseVm() { statusTW, mTimeTW, contentTW, - R.mipmap.bg_temp, + R.mipmap.bg_xl, R.mipmap.ic_temp, 3, it.type, @@ -393,7 +393,7 @@ class DynamicManagementVm : BaseVm() { 0, mTimeBS, contentBS, - R.mipmap.bg_step, + R.mipmap.bg_xl, R.mipmap.ic_steps, 4, it.type, @@ -428,7 +428,7 @@ class DynamicManagementVm : BaseVm() { statusSM, mTimeSM, contentSM, - R.mipmap.bg_h_sleep, + R.mipmap.bg_xl, R.mipmap.ic_h_sleep, 5, it.type, @@ -455,7 +455,7 @@ class DynamicManagementVm : BaseVm() { statusXYa, mTimeXYa, contentXYa, - R.mipmap.bg_xya, + R.mipmap.bg_xl, R.mipmap.ic_xya, 6, it.type, @@ -535,14 +535,14 @@ class DynamicManagementVm : BaseVm() { statusXT, mTimeXT, contentXT, - R.mipmap.bg_bloodsugar, + R.mipmap.bg_xl, R.mipmap.ic_bloodsugar, 7, it.type, calorie = bloodSugarData.count ) ) - }else if(DeviceFunctionUtils.hasFunction(it,"ecg")){ //心电 + }/*else if(DeviceFunctionUtils.hasFunction(it,"ecg")){ //心电 val statusXD = 0 val contentXD = if (TextUtils.isEmpty(heartData.hrData) || heartData.hrData == "0") { @@ -563,7 +563,7 @@ class DynamicManagementVm : BaseVm() { it.type, ) ) - }else if(DeviceFunctionUtils.hasFunction(it,"uric")){ //尿酸 + }*/else if(DeviceFunctionUtils.hasFunction(it,"uric")){ //尿酸 var statusNS = 0 var contentNS = "" var mTimeNS = "" @@ -615,7 +615,7 @@ class DynamicManagementVm : BaseVm() { statusNS, mTimeNS, contentNS, - R.mipmap.bg_niaosuan, + R.mipmap.bg_xl, R.mipmap.ic_niaosuan, 9, it.type, @@ -683,7 +683,7 @@ class DynamicManagementVm : BaseVm() { statusXZ, mTimeXZ, contentXZ, - R.mipmap.bg_fat, + R.mipmap.bg_xl, R.mipmap.ic_fat, 10, it.type, diff --git a/app/src/main/res/layout/child_home_healt.xml b/app/src/main/res/layout/child_home_healt.xml deleted file mode 100644 index af3d76a..0000000 --- a/app/src/main/res/layout/child_home_healt.xml +++ /dev/null @@ -1,836 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/frag_dynamic_management_header.xml b/app/src/main/res/layout/frag_dynamic_management_header.xml index 513aefb..6edc3cf 100644 --- a/app/src/main/res/layout/frag_dynamic_management_header.xml +++ b/app/src/main/res/layout/frag_dynamic_management_header.xml @@ -260,17 +260,6 @@ app:layout_constraintTop_toTopOf="@+id/tvProfession" tools:ignore="HardcodedText,UseCompatTextViewDrawableXml" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/item_home_message.xml b/app/src/main/res/layout/item_home_message.xml index cd468fc..307cef9 100644 --- a/app/src/main/res/layout/item_home_message.xml +++ b/app/src/main/res/layout/item_home_message.xml @@ -74,7 +74,7 @@ app:layout_constraintBottom_toBottomOf="parent" android:textColor="@color/col_7c7" android:textSize="@dimen/sp_13" - android:maxLines="1" + android:singleLine="true" android:ellipsize="end" tools:text="17已经预约成功17已经预约成功17已经预约成功17已经预约成功17已经预约成功17已经预约成功"/> diff --git a/app/src/main/res/mipmap-xhdpi/bg_bloodsugar.png b/app/src/main/res/mipmap-xhdpi/bg_bloodsugar.png deleted file mode 100644 index 1e6ae1d..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_bloodsugar.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_breath.png b/app/src/main/res/mipmap-xhdpi/bg_breath.png deleted file mode 100644 index af612b2..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_breath.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_ecg.png b/app/src/main/res/mipmap-xhdpi/bg_ecg.png deleted file mode 100644 index 5a5ebf8..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_ecg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_fat.png b/app/src/main/res/mipmap-xhdpi/bg_fat.png deleted file mode 100644 index 6168926..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_fat.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_h_sleep.png b/app/src/main/res/mipmap-xhdpi/bg_h_sleep.png deleted file mode 100644 index a86daba..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_h_sleep.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_niaosuan.png b/app/src/main/res/mipmap-xhdpi/bg_niaosuan.png deleted file mode 100644 index c473bc5..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_niaosuan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_oo.png b/app/src/main/res/mipmap-xhdpi/bg_oo.png deleted file mode 100644 index 788e93c..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_oo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_step.png b/app/src/main/res/mipmap-xhdpi/bg_step.png deleted file mode 100644 index 0ad5f06..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_step.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_temp.png b/app/src/main/res/mipmap-xhdpi/bg_temp.png deleted file mode 100644 index e626d3a..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_temp.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_xl.png b/app/src/main/res/mipmap-xhdpi/bg_xl.png deleted file mode 100644 index d0af2d7..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_xl.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/bg_xya.png b/app/src/main/res/mipmap-xhdpi/bg_xya.png deleted file mode 100644 index 66a1cee..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_xya.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/hxl.png b/app/src/main/res/mipmap-xhdpi/hxl.png deleted file mode 100644 index 615ebe2..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/hxl.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_cancer_prevention.png b/app/src/main/res/mipmap-xhdpi/ic_cancer_prevention.png deleted file mode 100644 index d8d94b1..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_cancer_prevention.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_head_bg.png b/app/src/main/res/mipmap-xhdpi/ic_head_bg.png deleted file mode 100644 index 99a3b1e..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_head_bg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_health_bg.png b/app/src/main/res/mipmap-xhdpi/ic_health_bg.png deleted file mode 100644 index b43b5c2..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_health_bg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_mascot.png b/app/src/main/res/mipmap-xhdpi/ic_mascot.png deleted file mode 100644 index 9a26084..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_mascot.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_assest.png b/app/src/main/res/mipmap-xhdpi/icon_assest.png deleted file mode 100644 index 6a17f20..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_assest.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_assest_30.png b/app/src/main/res/mipmap-xhdpi/icon_assest_30.png deleted file mode 100644 index a20789f..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_assest_30.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_early.png b/app/src/main/res/mipmap-xhdpi/icon_early.png deleted file mode 100644 index 7157be2..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_early.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_early_30.png b/app/src/main/res/mipmap-xhdpi/icon_early_30.png deleted file mode 100644 index d9fdb1d..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_early_30.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_health_fa.png b/app/src/main/res/mipmap-xhdpi/icon_health_fa.png deleted file mode 100644 index c747265..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_health_fa.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_health_gj.png b/app/src/main/res/mipmap-xhdpi/icon_health_gj.png deleted file mode 100644 index bcf6036..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_health_gj.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_health_jy.png b/app/src/main/res/mipmap-xhdpi/icon_health_jy.png deleted file mode 100644 index 2a0c671..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_health_jy.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/title_img.png b/app/src/main/res/mipmap-xhdpi/title_img.png deleted file mode 100644 index 470199d..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/title_img.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/aiyujin.png b/app/src/main/res/mipmap-xxhdpi/aiyujin.png deleted file mode 100644 index 1bbe536..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/aiyujin.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_bloodsugar.png b/app/src/main/res/mipmap-xxhdpi/bg_bloodsugar.png deleted file mode 100644 index edada79..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_bloodsugar.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_breath.png b/app/src/main/res/mipmap-xxhdpi/bg_breath.png deleted file mode 100644 index c54ae28..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_breath.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_ecg.png b/app/src/main/res/mipmap-xxhdpi/bg_ecg.png deleted file mode 100644 index 165f422..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_ecg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_fat.png b/app/src/main/res/mipmap-xxhdpi/bg_fat.png deleted file mode 100644 index d54afbf..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_fat.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_h_sleep.png b/app/src/main/res/mipmap-xxhdpi/bg_h_sleep.png deleted file mode 100644 index 5b1ba58..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_h_sleep.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_niaosuan.png b/app/src/main/res/mipmap-xxhdpi/bg_niaosuan.png deleted file mode 100644 index 0d7a809..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_niaosuan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_oo.png b/app/src/main/res/mipmap-xxhdpi/bg_oo.png deleted file mode 100644 index deba49e..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_oo.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_server_header.png b/app/src/main/res/mipmap-xxhdpi/bg_server_header.png deleted file mode 100644 index 54a5719..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_server_header.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_step.png b/app/src/main/res/mipmap-xxhdpi/bg_step.png deleted file mode 100644 index b8d1d21..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_step.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_temp.png b/app/src/main/res/mipmap-xxhdpi/bg_temp.png deleted file mode 100644 index 4d0ac39..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_temp.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_xya.png b/app/src/main/res/mipmap-xxhdpi/bg_xya.png deleted file mode 100644 index 0ae826d..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_xya.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/fengxianpingg.png b/app/src/main/res/mipmap-xxhdpi/fengxianpingg.png deleted file mode 100644 index 556b07c..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/fengxianpingg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/fengxianpingg2.png b/app/src/main/res/mipmap-xxhdpi/fengxianpingg2.png deleted file mode 100644 index 89c1e84..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/fengxianpingg2.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/health_bg.png b/app/src/main/res/mipmap-xxhdpi/health_bg.png deleted file mode 100644 index e78ac2c..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/health_bg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_30yujing.png b/app/src/main/res/mipmap-xxhdpi/ic_30yujing.png deleted file mode 100644 index 3c25a57..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_30yujing.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_battery.png b/app/src/main/res/mipmap-xxhdpi/ic_battery.png deleted file mode 100644 index ca7956f..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_battery.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_battery_10.png b/app/src/main/res/mipmap-xxhdpi/ic_battery_10.png deleted file mode 100644 index 127108e..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_battery_10.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_battery_100.png b/app/src/main/res/mipmap-xxhdpi/ic_battery_100.png deleted file mode 100644 index 7bb7f79..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_battery_100.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_battery_30.png b/app/src/main/res/mipmap-xxhdpi/ic_battery_30.png deleted file mode 100644 index e0c3d48..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_battery_30.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_battery_50.png b/app/src/main/res/mipmap-xxhdpi/ic_battery_50.png deleted file mode 100644 index 7a82b9c..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_battery_50.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_battery_70.png b/app/src/main/res/mipmap-xxhdpi/ic_battery_70.png deleted file mode 100644 index 2119c63..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_battery_70.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_battery_90.png b/app/src/main/res/mipmap-xxhdpi/ic_battery_90.png deleted file mode 100644 index d78f91e..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_battery_90.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_bg_home.png b/app/src/main/res/mipmap-xxhdpi/ic_bg_home.png deleted file mode 100644 index 8abd66d..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_bg_home.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_fangai.png b/app/src/main/res/mipmap-xxhdpi/ic_fangai.png deleted file mode 100644 index f70a1ee..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_fangai.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_fengxainyujing.png b/app/src/main/res/mipmap-xxhdpi/ic_fengxainyujing.png deleted file mode 100644 index c257836..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_fengxainyujing.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_mascot.png b/app/src/main/res/mipmap-xxhdpi/ic_mascot.png deleted file mode 100644 index ef7ccc6..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_mascot.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_qrcode.png b/app/src/main/res/mipmap-xxhdpi/ic_qrcode.png deleted file mode 100644 index 3c99bfe..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_qrcode.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_watch_4g.png b/app/src/main/res/mipmap-xxhdpi/ic_watch_4g.png deleted file mode 100644 index 2c7d61d..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_watch_4g.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_watch_bluetooth.png b/app/src/main/res/mipmap-xxhdpi/ic_watch_bluetooth.png deleted file mode 100644 index a370cd4..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_watch_bluetooth.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_xueya_need_know.png b/app/src/main/res/mipmap-xxhdpi/ic_xueya_need_know.png deleted file mode 100644 index 4c400e0..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_xueya_need_know.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_yujing.png b/app/src/main/res/mipmap-xxhdpi/ic_yujing.png deleted file mode 100644 index eeea663..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_yujing.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_early_30.png b/app/src/main/res/mipmap-xxhdpi/icon_early_30.png deleted file mode 100644 index 3399f29..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_early_30.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_family.png b/app/src/main/res/mipmap-xxhdpi/icon_family.png deleted file mode 100644 index 580f91f..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_family.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/weather_cloudy.png b/app/src/main/res/mipmap-xxhdpi/weather_cloudy.png deleted file mode 100644 index 60495e0..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/weather_cloudy.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/weather_rain.png b/app/src/main/res/mipmap-xxhdpi/weather_rain.png deleted file mode 100644 index 5490c4f..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/weather_rain.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/weather_snow.png b/app/src/main/res/mipmap-xxhdpi/weather_snow.png deleted file mode 100644 index 863321b..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/weather_snow.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/weather_sunny.png b/app/src/main/res/mipmap-xxhdpi/weather_sunny.png deleted file mode 100644 index 7b8cbed..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/weather_sunny.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/weather_thunder_shower.png b/app/src/main/res/mipmap-xxhdpi/weather_thunder_shower.png deleted file mode 100644 index a63efa4..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/weather_thunder_shower.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/weather_yin.png b/app/src/main/res/mipmap-xxhdpi/weather_yin.png deleted file mode 100644 index c12ae3c..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/weather_yin.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/yujing2.png b/app/src/main/res/mipmap-xxhdpi/yujing2.png deleted file mode 100644 index ed7e855..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/yujing2.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/bg_xl.png b/app/src/main/res/mipmap-xxxhdpi/bg_xl.png deleted file mode 100644 index 7ef77db..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/bg_xl.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_diancbuz.png b/app/src/main/res/mipmap-xxxhdpi/ic_diancbuz.png deleted file mode 100644 index ec9f06a..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_diancbuz.png and /dev/null differ diff --git a/base/build.gradle b/base/build.gradle index ccd81a2..9c22be8 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -58,7 +58,7 @@ android { repositories { flatDir { - dirs 'libs' + dirs 'libs','../common/libs' } } diff --git a/base/libs/ycbtsdk-release.aar b/base/libs/ycbtsdk-release.aar deleted file mode 100644 index e69de29..0000000 diff --git a/base/src/main/java/com/xty/base/act/ChatMsgAct.kt b/base/src/main/java/com/xty/base/act/ChatMsgAct.kt index 2b313ae..ef234d3 100644 --- a/base/src/main/java/com/xty/base/act/ChatMsgAct.kt +++ b/base/src/main/java/com/xty/base/act/ChatMsgAct.kt @@ -1,3 +1,4 @@ +/* package com.xty.base.act import android.annotation.SuppressLint @@ -42,9 +43,11 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import java.io.File +*/ /** * 聊天界面 - */ + *//* + @Route(path = ARouterUrl.CHAT_MSG) class ChatMsgAct : BaseVmAct() { val audioUtils by lazy { RecordAudio() } @@ -353,9 +356,11 @@ class ChatMsgAct : BaseVmAct() { } } - /** + */ +/** * 监听屏幕的可用高度 - */ + *//* + private fun getLKeyBoardHeight() { binding.mRecycle.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom -> @@ -415,9 +420,11 @@ class ChatMsgAct : BaseVmAct() { } } - /** + */ +/** * 根据生命周期 管理播放录音 - */ + *//* + override fun onPause() { super.onPause() audioUtils.pause() @@ -433,4 +440,4 @@ class ChatMsgAct : BaseVmAct() { FileUtils.deleteAllFile(audioFile) super.onDestroy() } -} \ No newline at end of file +}*/ diff --git a/base/src/main/res/layout/act_xtang_how_open.xml b/base/src/main/res/layout/act_xtang_how_open.xml deleted file mode 100644 index 8bd92ec..0000000 --- a/base/src/main/res/layout/act_xtang_how_open.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/base/src/main/res/mipmap-xhdpi/ic_niaosuanka.png b/base/src/main/res/mipmap-xhdpi/ic_niaosuanka.png deleted file mode 100644 index c653237..0000000 Binary files a/base/src/main/res/mipmap-xhdpi/ic_niaosuanka.png and /dev/null differ diff --git a/base/src/main/res/mipmap-xhdpi/ic_xuetangka.png b/base/src/main/res/mipmap-xhdpi/ic_xuetangka.png deleted file mode 100644 index 42075f7..0000000 Binary files a/base/src/main/res/mipmap-xhdpi/ic_xuetangka.png and /dev/null differ diff --git a/common/src/main/java/com/xty/common/TimeSelect.kt b/common/src/main/java/com/xty/common/TimeSelect.kt index 97c8e23..ab937f6 100644 --- a/common/src/main/java/com/xty/common/TimeSelect.kt +++ b/common/src/main/java/com/xty/common/TimeSelect.kt @@ -327,7 +327,7 @@ class TimeSelect(var context: Context, var select: (String) -> Unit) { var tvCancel = v!!.findViewById(R.id.tv_cancel) - var checkLuna = v!!.findViewById(R.id.check_brithday) + // var checkLuna = v!!.findViewById(R.id.check_brithday) tvSubmit.setOnClickListener { pvLunarTime?.returnData() @@ -338,14 +338,14 @@ class TimeSelect(var context: Context, var select: (String) -> Unit) { pvLunarTime?.dismiss() } - checkLuna.setOnCheckedChangeListener { compoundButton, b -> + /* checkLuna.setOnCheckedChangeListener { compoundButton, b -> isLanu = b - /*if(b){ + *//*if(b){ (timeType as TextView).text = "农历" }else{ (timeType as TextView).text = "公历" - }*/ - } + }*//* + }*/ } }) diff --git a/common/src/main/java/com/xty/common/WxUtils.kt b/common/src/main/java/com/xty/common/WxUtils.kt index 06a6544..a9df5ce 100644 --- a/common/src/main/java/com/xty/common/WxUtils.kt +++ b/common/src/main/java/com/xty/common/WxUtils.kt @@ -75,7 +75,7 @@ class WxUtils { var msg=WXMediaMessage(webPage) msg.title=title 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) @@ -102,7 +102,7 @@ class WxUtils { var msg=WXMediaMessage(webPage) msg.title=title 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) diff --git a/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt b/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt index 82a6c94..68e9a3e 100644 --- a/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt +++ b/common/src/main/java/com/xty/common/arouter/ARouterUrl.kt @@ -51,7 +51,7 @@ class ARouterUrl { 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_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 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 PROGRAMME_HISTORY = "/health/com/zj365/health/act/ProgrammeHistoryAct" 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 BLOOD_ALIGN_HISTORY = "/health/com/zj365/health/act/BloodCalibrationHistoryAct" 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_REPORTMain = "/health/com/zj365/health/act/SubmitReportMainAct" 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_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 URIC_ACID_EXCEPTION_DATA_ACT = "/health/com/zj365/health/act/UricAcidExceptionAct" 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_HISTORY = "/health/com/zj365/health/act/XTangHistoryAct" 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_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 URIC_CALIBRATION_SUBMIT = "/health/com/xty/health/act/UricCalibrationSubmitAct" 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 TEMP_REMIND = "/mine/com/zj365/dc/mime/act/TempRemindAct" 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_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 AGREEMNT_READ_WEB_ACT = "/base/com/xty/base/act/AgreementReadWebAct" 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 H5_ACT = "/base/com/xty/base/act/BaseTenCentWebViewActivity" @@ -265,7 +265,7 @@ class ARouterUrl { //service const val NONE_SERVICE = "/common/com/xty/common/services/NoneService" 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" //调试模式 diff --git a/common/src/main/java/com/xty/common/receiver/JpushReceive.kt b/common/src/main/java/com/xty/common/receiver/JpushReceive.kt index 51d1923..e21c226 100644 --- a/common/src/main/java/com/xty/common/receiver/JpushReceive.kt +++ b/common/src/main/java/com/xty/common/receiver/JpushReceive.kt @@ -59,7 +59,7 @@ class JpushReceive : JPushMessageReceiver() { bundle.putString("toUserId", bean.toUserId) bundle.putString("fromUserId", it.id.toString()) bundle.putString("chatImage", getImageUrl(image)) - RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle) + // RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle) } } else->{ diff --git a/common/src/main/java/com/xty/common/services/MqTTService.kt b/common/src/main/java/com/xty/common/services/MqTTService.kt index 0dac82b..17d593c 100644 --- a/common/src/main/java/com/xty/common/services/MqTTService.kt +++ b/common/src/main/java/com/xty/common/services/MqTTService.kt @@ -1,3 +1,4 @@ +/* package com.xty.common.services import android.app.* @@ -21,9 +22,11 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode +*/ /** * mqtt服务 - */ + *//* + @Route(path = ARouterUrl.MQTT_SERVICE) class MqTTService : Service(), MqttCallback, OrderProiver { @@ -87,9 +90,11 @@ class MqTTService : Service(), MqttCallback, OrderProiver { } - /** + */ +/** * 设置连接信息 - */ + *//* + private fun setClientInfo() :Boolean{ if (userName.isNullOrEmpty()) { return false @@ -148,19 +153,23 @@ class MqTTService : Service(), MqttCallback, OrderProiver { } } - /** 连接MQTT服务器 */ + */ +/** 连接MQTT服务器 *//* + private fun doClientConnection() { if (!client!!.isConnected && isConnectIsNomarl()) { try { --connectNum - /* + */ +/* MainScope().launch { withContext(Dispatchers.IO){ val connect = client!!.connect(conOpt, null, mqttListener) connect.waitForCompletion() } } -*/ +*//* + if(!isClose){ client!!.connect(conOpt, null, mqttListener) @@ -209,9 +218,11 @@ class MqTTService : Service(), MqttCallback, OrderProiver { } } - /** + */ +/** * 睡眠一分钟继续发起连接 - */ + *//* + private fun sleepConnect() { sleepJob = mapScope.launch { delay(connectIntervalTime) //睡眠时长 @@ -236,7 +247,9 @@ class MqTTService : Service(), MqttCallback, OrderProiver { } } - /** 判断网络是否连接 */ + */ +/** 判断网络是否连接 *//* + private fun isConnectIsNomarl(): Boolean { val connectivityManager: ConnectivityManager = this.applicationContext.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager @@ -304,3 +317,4 @@ class MqTTService : Service(), MqttCallback, OrderProiver { } } +*/ diff --git a/common/src/main/res/drawable-xhdpi/selector_check_birthday.xml b/common/src/main/res/drawable-xhdpi/selector_check_birthday.xml deleted file mode 100644 index 14041d8..0000000 --- a/common/src/main/res/drawable-xhdpi/selector_check_birthday.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/common/src/main/res/drawable/selector_check_birthday.xml b/common/src/main/res/drawable/selector_check_birthday.xml deleted file mode 100644 index 14041d8..0000000 --- a/common/src/main/res/drawable/selector_check_birthday.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/common/src/main/res/layout/layout_customer_date_picker.xml b/common/src/main/res/layout/layout_customer_date_picker.xml index 8d0e6a8..a16fb12 100644 --- a/common/src/main/res/layout/layout_customer_date_picker.xml +++ b/common/src/main/res/layout/layout_customer_date_picker.xml @@ -44,16 +44,6 @@ - - + > - + - @@ -271,9 +270,6 @@ - diff --git a/health/src/main/assets/forest.mp3 b/health/src/main/assets/forest.mp3 deleted file mode 100644 index 832436f..0000000 Binary files a/health/src/main/assets/forest.mp3 and /dev/null differ diff --git a/health/src/main/assets/安瑜无创血糖趋势监测功能说明.html b/health/src/main/assets/安瑜无创血糖趋势监测功能说明.html deleted file mode 100644 index ae59759..0000000 --- a/health/src/main/assets/安瑜无创血糖趋势监测功能说明.html +++ /dev/null @@ -1,893 +0,0 @@ -

н޴ѪƼ⹦˵

 

һǰ

1ʹöһ룬ͨ޴ѪƼ

2ͨû7ÿʱ䲻8Сʱ

  3ʱҪ21ѪʵⲢϴappȷʱǰ30Ӷֱ7δ21ϴģԶ˳ֱһϴѪǽģڽģɺ1СʱʼһѪ

4ÿһǰ1СʱѪƽֵ8ϵͳû7-8֮Ѫƽֵ

5н޴ѪƼʵѪԼ20%ǰұ׼ڹұ׼15%

 

ѪǼԭ

ûѪѪѹģΪû721ѪݽûѪģͨ˹㷨ûֱÿСʱƽѪ

 

ûѪǽģ21ʱҪ

121ʱҪ

630    730    800

830    900    930

1000   1100   1200

1300   1400   1500

1600   1700   1830

1900   1930   2000

2030   2100   2200

2ÿѪDzʱʱǰ20

3ûÿɼһݼappϴҲһʱϴ

4ʱֱ¼ѪΪʵݣȷûģ͵׼ȷ

5ģɺappѪֵʵѪֵнϴڳƫʱٽģУ׼

6Ѫûÿ²ɼ4ѪУ׼һѪ

 

ġѪϴ˵

1Ѫϴʱѡڣѡ䣬ѡʱ䣻

221䣬ÿϴһݣϴɺ´βٴѡ䣻

3ϴʱһϴݣһʱδֱʱϵͳʾʱδϴɹʱݾϴ´νϴδֱʱεݼɣ

4ûʵѪDzѡոǰͺ˯ǰ

5ÿտϴݣ7ϴ21ݡ

 

\ No newline at end of file diff --git a/health/src/main/assets/血压校准流程和方法.html b/health/src/main/assets/血压校准流程和方法.html deleted file mode 100644 index 1302afd..0000000 --- a/health/src/main/assets/血压校准流程和方法.html +++ /dev/null @@ -1,849 +0,0 @@ -

ѪѹУ׼׼

 

һΪʲôҪѪѹУ׼

appѪѹֱֱֵӲɼǸûѪݽûѪѹģͨ˹㷨Ѫѹ쳣ûһʱѪѹУ׼ԱٽԼĸѪѹģδУ׼ѪѹappѪѹʵѪѹֵܻнϴ

 

ʲôʱѪѹУ׼

1ȷѪѹûֱѪѹʵѪѹ10%ûֱһʱѪѹģУ׼

2һУ׼APPѪѹʵѪѹнϴٽ1-2ѪѹУ׼

3ѪѹûÿУ׼һѪѹ

 

ѪѹУ׼

1ѪѹȺѪѹƫδҩȺ

ȷѪѹƺֱͬһֱֱۣе£ɼ 4 ʱεʵѪѹֵ

6-8

12-14

5-7

④ 8-10

4 ʱʹѪѹƸ1 ݣ¼òʱӦѪѹֵɲ󣬽롰н彡 APP ѪѹУ׼ҳ¼ݣȷύ30 ӼѪѹУ׼IJ

 

2ѪѹҩûѪѹУ׼̣

ȷѪѹƺֱͬһֱֱۣе£ɼ 4 ʱεʵѪѹֵ

ϷýѪѹҩû

ٷѪѹҩǰ 1 Сʱ

ڷѪѹҩ 1-2 Сʱ

5-7

④ 8-10

 

ýѪѹҩû

峿 6-8

ڷѪѹҩǰ 1 Сʱ

۷Ѫѹҩ 1-2 Сʱ

④ 8-10

 

ϷýѪѹҩû

峿 6-8

12-14

۷Ѫѹҩǰ 1 Сʱ

④Ѫѹҩ 1-2 Сʱ

 

νѪѹҩû

ٵһηѪѹҩǰ 1 Сʱ

ڵһηѪѹҩ 1-2 Сʱ

۵ڶηѪѹҩǰ 1 Сʱ

④ڶηѪѹҩ 1-2 Сʱ

 

4 ʱʹѪѹƸ1 ݣ¼òʱӦѪѹֵɲ󣬽롰н彡 APP ѪѹУ׼ҳ¼ݣȷύ30 ӼѪѹУ׼IJ

\ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/BloodStudyAct.kt b/health/src/main/java/com/zj365/health/act/BloodStudyAct.kt deleted file mode 100644 index b866ce8..0000000 --- a/health/src/main/java/com/zj365/health/act/BloodStudyAct.kt +++ /dev/null @@ -1,77 +0,0 @@ -package com.zj365.health.act - -import com.alibaba.android.arouter.facade.annotation.Route -import com.xty.base.act.BaseVmAct -import com.xty.common.TimeSelect -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager -import com.xty.common.util.CommonToastUtils -import com.zj365.health.databinding.ActBloodStudyBinding -import com.zj365.health.vm.BloodCalibrationVm - -/** - * 血压校准 - */ -@Route(path = ARouterUrl.BLOOD_STUDY) -class BloodStudyAct : BaseVmAct() { - val timSelect by lazy { - TimeSelect(this) { - }.apply { - showHour = true - showMin = true - showSec = false - } - } - - val binding by lazy { ActBloodStudyBinding.inflate(layoutInflater) } - override fun liveObserver() { - mViewModel.recordStudyLive.observe(this) { - CommonToastUtils.showToast(it.data) - binding.edHighXy.text.clear() - binding.edLowXy.text.clear() - } - } - - override fun setLayout() = binding.root - override fun initData() { - super.initData() - } - - override fun initView() { - super.initView() - statusBar(binding.title.mView) - binding.title.mIvBack.setOnClickListener { finish() } - binding.title.mTvTitle.text = "血压学习" - binding.mTip.setOnClickListener { -// var webUrl = "https://mp.weixin.qq.com/s/gQdOW45OfSU0Y-J-zhHq1A" -// bundle.clear() -// bundle.putString("title", "血压学习须知") -// bundle.putString("url", webUrl) - RouteManager.goAct(ARouterUrl.BLOOD_STUDY_NEED_KNOW) - } - binding.tvStudyRecord.setOnClickListener { - RouteManager.goAct(ARouterUrl.XUEYA_XUEXIJILU) - } - binding.tvBindDeviceImdiatly.setOnClickListener { - val edHighXy = binding.edHighXy.text.toString().trim() - if (edHighXy.isNullOrEmpty()){ - CommonToastUtils.showToast("请输入您测量的高压数据") - return@setOnClickListener - } - val edLowXy = binding.edLowXy.text.toString().trim() - if (edLowXy.isNullOrEmpty()){ - CommonToastUtils.showToast("请输入您测量的低压数据") - return@setOnClickListener - } - var gbp = edHighXy.toInt() - var dbp = edLowXy.toInt() - // gbp 高压 - // dbp 低压 - if (gbp <= 70||dbp>=260||dbp<=40||dbp>=150||dbp>gbp){ - CommonToastUtils.showToast("您输入的信息有误，请重新输入有效值") - return@setOnClickListener - } - mViewModel.createStudyRecord(edHighXy.toInt(),edLowXy.toInt()) - } - } -} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/BloodStudyNeedKnowAct.kt b/health/src/main/java/com/zj365/health/act/BloodStudyNeedKnowAct.kt deleted file mode 100644 index b70f408..0000000 --- a/health/src/main/java/com/zj365/health/act/BloodStudyNeedKnowAct.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.zj365.health.act - -import com.alibaba.android.arouter.facade.annotation.Route -import com.xty.base.act.BaseVmAct -import com.xty.common.arouter.ARouterUrl -import com.zj365.health.databinding.ActBloodStudyNeedknowBinding -import com.zj365.health.vm.BloodCalibrationVm - -/** - * 血压校准 - */ -@Route(path = ARouterUrl.BLOOD_STUDY_NEED_KNOW) -class BloodStudyNeedKnowAct : BaseVmAct() { - val binding by lazy { ActBloodStudyNeedknowBinding.inflate(layoutInflater) } - override fun liveObserver() { - } - - override fun setLayout() = binding.root - override fun initData() { - super.initData() - } - - override fun initView() { - super.initView() - statusBar(binding.title.mView) - binding.title.mIvBack.setOnClickListener { finish() } - binding.title.mTvTitle.text = "血压学习须知" - } - -} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/FamilyAct.kt b/health/src/main/java/com/zj365/health/act/FamilyAct.kt index 0f09a36..c03821d 100644 --- a/health/src/main/java/com/zj365/health/act/FamilyAct.kt +++ b/health/src/main/java/com/zj365/health/act/FamilyAct.kt @@ -102,7 +102,7 @@ class FamilyAct : BaseListAct() { adapter.setOnItemClickListener { adapter, view, position -> bundle.clear() bundle.putSerializable("bean", adapter.getItem(position) as FamilyBean) - RouteManager.goAct(ARouterUrl.FRIEND_WATCH,bundle) + // RouteManager.goAct(ARouterUrl.FRIEND_WATCH,bundle) } adapter.setOnItemChildClickListener { adapter, view, position -> val item = adapter.getItem(position) as FamilyBean @@ -125,7 +125,7 @@ class FamilyAct : BaseListAct() { R.id.mChild -> { bundle.clear() bundle.putSerializable("bean", item) - RouteManager.goAct(ARouterUrl.FRIEND_WATCH,bundle) + // RouteManager.goAct(ARouterUrl.FRIEND_WATCH,bundle) // RouteManager.goAct(ARouterUrl.FAMILY_INFO, bundle) } } diff --git a/health/src/main/java/com/zj365/health/act/FriendWatchAct.kt b/health/src/main/java/com/zj365/health/act/FriendWatchAct.kt deleted file mode 100644 index 5719c41..0000000 --- a/health/src/main/java/com/zj365/health/act/FriendWatchAct.kt +++ /dev/null @@ -1,171 +0,0 @@ -package com.zj365.health.act - -import android.text.TextUtils -import android.view.KeyEvent -import android.view.View -import android.view.inputmethod.EditorInfo -import android.widget.TextView -import android.widget.TextView.OnEditorActionListener -import androidx.core.content.ContextCompat -import com.alibaba.android.arouter.facade.annotation.Route -import com.xty.base.act.BaseVmAct -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager -import com.xty.common.event.FamilyEvent -import com.xty.common.util.CommonToastUtils -import com.xty.common.util.EditTextMonitor -import com.zj365.health.R -import com.zj365.health.databinding.ActFriendWatchBinding -import com.zj365.health.vm.BindFamilyVm -import com.xty.network.model.FamilyBean -import com.xty.network.model.FriendInfo -import org.greenrobot.eventbus.EventBus - -/** - * 家人朋友信息 - */ -@Route(path = ARouterUrl.FRIEND_WATCH) -class FriendWatchAct : BaseVmAct() { - val status by lazy { arrayOf("未佩戴", "已佩戴") } - val binding by lazy { ActFriendWatchBinding.inflate(layoutInflater) } - private val monitor by lazy { EditTextMonitor() } - var bean: FamilyBean? = null - var friedInfo: FriendInfo? = null - override fun setLayout() = binding.root - override fun initData() { - super.initData() - isDarkBar = true - intent.extras?.let { - if (it.containsKey("bean")) { - bean = it.getSerializable("bean") as FamilyBean - - } - } - } - - override fun initView() { - super.initView() - statusBar(binding.title.mView) - binding.title.mIvBack.setOnClickListener { - finish() - } - if (bean == null) { - return - } - - binding.title.mTvTitle.text = "家人的健康手表" - binding.title.mTvRight.apply { - text = getString(R.string.save) - //visibility = View.VISIBLE - setTextColor(ContextCompat.getColor(this@FriendWatchAct, R.color.col_009)) - setOnClickListener { - } - } - - binding.tvName.setOnClickListener { - bundle.putSerializable("personInfo", friedInfo) - RouteManager.goAct(ARouterUrl.PERSON_INFO, bundle) - } - - mViewModel.getFriendInfo(bean!!.id, bean!!.userJointId.toString()) - - binding.etBelong.setOnEditorActionListener(object : OnEditorActionListener { - override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean { - if (actionId == EditorInfo.IME_ACTION_DONE) { - val belong = binding.etBelong.text.toString() - val nickName = binding.etNickName.text.toString() - if (TextUtils.isEmpty(belong)) { - CommonToastUtils.showToast("请输入关系") - return false - } - val nickname = if (TextUtils.isEmpty(nickName)) { - bean?.fCall - } else { - nickName - } - mViewModel.changeFamilyNickName( - bean, - nickname, - binding.etBelong.text.toString(), - ) - return true - } - return false - } - }) - - binding.etNickName.setOnEditorActionListener(object :OnEditorActionListener{ - override fun onEditorAction(v: TextView?, actionId: Int, event: KeyEvent?): Boolean { - if (actionId == EditorInfo.IME_ACTION_DONE) { - val belong = binding.etBelong.text.toString() - val nickName = binding.etNickName.text.toString() - if (TextUtils.isEmpty(nickName)) { - CommonToastUtils.showToast("请输入称呼") - return false - } - val bel = if (TextUtils.isEmpty(belong)) { - bean?.type - } else { - belong - } - mViewModel.changeFamilyNickName( - bean, - binding.etNickName.text.toString(), - bel, - ) - return true - } - return false - } - - }) - } - - override fun liveObserver() { - mViewModel.friendLive.observe(this) { - - friedInfo = it.data - - binding.etNickName.setText(if (it.data.fcall.isNullOrEmpty()) bean!!.type else it.data.fcall) - binding.etBelong.setText(it.data.type) - binding.tvName.text = it.data.name - - var whatchName = if (it.data.watchName == null) "" else it.data.watchName - binding.mInfo.text = "设备名称: ${whatchName}" - binding.mDevidCode.text = "设备编号: ${it.data.deviceId}" - binding.mTime.text = "服务时间: ${it.data.speriodic}" - binding.mStatus.text = "实时状态: ${it.data.adornState}" - - if (it.data.deviceType != null) { - when (it.data.deviceType) { - "U32" -> { - binding.mImage.setImageResource(R.mipmap.ic_watch_u32_big) - binding.mStatus.visibility = View.GONE - } - - "A3" -> { - binding.mImage.setImageResource(R.mipmap.ic_watch_a3_big) - } - - "X1" -> { - binding.mImage.setImageResource(R.mipmap.ic_watch_x1_big) - } - - "X2" -> { - binding.mImage.setImageResource(R.mipmap.ic_watch_x2_big) - } - } - } - } - - mViewModel.changeOk.observe(this) { - CommonToastUtils.showSucceedToast("修改成功") - EventBus.getDefault().post(FamilyEvent()) - } - } - -// @Subscribe(threadMode = ThreadMode.MAIN) -// fun familyChange(event:FamilyEvent){ -// mViewModel.getFriendInfo(bean!!.id,bean!!.userJointId.toString()) -// } -} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/HealthMainAct.kt b/health/src/main/java/com/zj365/health/act/HealthMainAct.kt index a4d5940..1dca2ff 100644 --- a/health/src/main/java/com/zj365/health/act/HealthMainAct.kt +++ b/health/src/main/java/com/zj365/health/act/HealthMainAct.kt @@ -11,8 +11,6 @@ import com.alibaba.android.arouter.facade.annotation.Route import com.androidkun.xtablayout.XTabLayout import com.gyf.immersionbar.ImmersionBar import com.xty.base.act.BaseVmAct -import com.xty.base.act.IBaseAct -import com.xty.base.vm.BaseVm import com.xty.base.vp2.VpAdapter import com.xty.common.* import com.xty.common.arouter.ARouterUrl @@ -22,26 +20,16 @@ import com.xty.common.weight.tablayout.listener.CustomTabEntity import com.xty.network.model.DeviceFunctionBean import com.zj365.health.R import com.zj365.health.databinding.ActHealthMainBinding -import com.zj365.health.fragment.BreathCompareDataFrag import com.zj365.health.fragment.bloodlipid.BloodFatFrag import com.zj365.health.fragment.BreathFrag -import com.zj365.health.fragment.SleepCompareDataFrag import com.zj365.health.weight.DialogTip import com.zj365.health.fragment.SleepFrag import com.zj365.health.fragment.TemFrag -import com.zj365.health.fragment.TempCompareDataFrag -import com.zj365.health.fragment.UricAcidCompareDataFrag import com.zj365.health.fragment.UricAcidFrag -import com.zj365.health.fragment.XYangCompareDataFrag -import com.zj365.health.fragment.XdFrag import com.zj365.health.fragment.XinlvFrag -import com.zj365.health.fragment.XlCompareDataFrag -import com.zj365.health.fragment.XueTangCompareDataFrag import com.zj365.health.fragment.XueTangFrag -import com.zj365.health.fragment.XueYaCompareDataFrag import com.zj365.health.fragment.XueyaFrag import com.zj365.health.fragment.XueyangFrag -import com.zj365.health.fragment.bloodlipid.BloodFatCompareDataFrag import com.zj365.health.vm.HealthMainVm /** diff --git a/health/src/main/java/com/zj365/health/act/NSuanHowOpenAct.kt b/health/src/main/java/com/zj365/health/act/NSuanHowOpenAct.kt deleted file mode 100644 index aa29fbd..0000000 --- a/health/src/main/java/com/zj365/health/act/NSuanHowOpenAct.kt +++ /dev/null @@ -1,32 +0,0 @@ -package com.zj365.health.act - -import android.view.View -import com.alibaba.android.arouter.facade.annotation.Route -import com.xty.base.act.IBaseAct -import com.xty.common.arouter.ARouterUrl -import com.zj365.health.databinding.ActNsuanHowOpenBinding - -/** - * 尿酸如何获取兑换码 显示加载 - */ -@Route(path = ARouterUrl.NS_HOW_OPEN) -class NSuanHowOpenAct : IBaseAct() { - - val binding by lazy { ActNsuanHowOpenBinding.inflate(layoutInflater) } - override fun setLayout(): View = binding.root - - private var url = "" - private var titleName = "如何获取兑换码" - - override fun initData() { - super.initData() - isDarkBar = true - } - - override fun initView() { - super.initView() - statusBar(binding.title.mView) - binding.title.mIvBack.setOnClickListener { finish() } - binding.title.mTvTitle.text = titleName - } -} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt b/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt index 7998965..3529bab 100644 --- a/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/NSuanOpenAct.kt @@ -75,7 +75,7 @@ class NSuanOpenAct : BaseVmAct() , EasyPermissions.PermissionCallbacks //获取兑换码 R.id.mTvConvert -> { bundle.clear() - RouteManager.goAct(ARouterUrl.NS_HOW_OPEN) + // RouteManager.goAct(ARouterUrl.NS_HOW_OPEN) } //开通须知 R.id.mPrivate -> { diff --git a/health/src/main/java/com/zj365/health/act/XTangHowOpenAct.kt b/health/src/main/java/com/zj365/health/act/XTangHowOpenAct.kt deleted file mode 100644 index d96289d..0000000 --- a/health/src/main/java/com/zj365/health/act/XTangHowOpenAct.kt +++ /dev/null @@ -1,36 +0,0 @@ -package com.zj365.health.act - -import com.alibaba.android.arouter.facade.annotation.Route -import com.xty.base.act.IBaseAct -import com.xty.base.databinding.ActXtangHowOpenBinding -import com.xty.common.arouter.ARouterUrl - - -/** - * 血糖如何获取兑换码 显示加载 - */ -@Route(path = ARouterUrl.XT_HOW_OPEN) -class XTangHowOpenAct : IBaseAct() { - val binding by lazy { ActXtangHowOpenBinding.inflate(layoutInflater) } - override fun setLayout() = binding.root - private var url = "" - private var titleName = "如何获取兑换码" - override fun initData() { - super.initData() - isDarkBar = true -// intent.extras?.let { -// url = it.getString("url", "") -// titleName = it.getString("title", "") -// } - } - - override fun initView() { - super.initView() - statusBar(binding.title.mView) - binding.title.mIvBack.setOnClickListener { finish() } - binding.title.mTvTitle.text = titleName - } - -} - - diff --git a/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt b/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt index c04989d..fc9838a 100644 --- a/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt +++ b/health/src/main/java/com/zj365/health/act/XTangOpenAct.kt @@ -107,7 +107,7 @@ class XTangOpenAct : BaseVmAct(), EasyPermissions.PermissionCallbacks , //获取兑换码 R.id.mTvConvert -> { bundle.clear() - RouteManager.goAct(ARouterUrl.XT_HOW_OPEN) + // RouteManager.goAct(ARouterUrl.XT_HOW_OPEN) } //开通须知 R.id.mPrivate -> { diff --git a/health/src/main/java/com/zj365/health/act/XdDetailAct.kt b/health/src/main/java/com/zj365/health/act/XdDetailAct.kt deleted file mode 100644 index f47369c..0000000 --- a/health/src/main/java/com/zj365/health/act/XdDetailAct.kt +++ /dev/null @@ -1,204 +0,0 @@ -package com.zj365.health.act - -import android.view.View -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.GridLayoutManager -import com.alibaba.android.arouter.facade.annotation.Route -import com.google.android.flexbox.AlignItems -import com.google.android.flexbox.FlexDirection -import com.google.android.flexbox.FlexWrap -import com.google.android.flexbox.FlexboxLayoutManager -import com.tamsiree.rxkit.RxTimeTool -import com.xty.base.act.BaseVmAct -import com.xty.common.* -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager -import com.xty.common.picture.PictureUtils -import com.xty.common.recycleUtils.RecycleItem -import com.xty.common.util.CommonToastUtils -import com.xty.common.util.CommonUtils -import com.zj365.health.R -import com.zj365.health.adapter.XdAnswerAdapter -import com.zj365.health.databinding.ActXdDetailBinding -import com.zj365.health.vm.XdVm -import com.xty.network.model.XdInfoBean -import java.text.SimpleDateFormat - -/** - * - * 心电分析详情 - */ -@Route(path = ARouterUrl.XD_DETAIL) -class XdDetailAct: BaseVmAct() { - //val mAdapter by lazy{ XdAdapter() } - - var typeName="" - var isAif:Boolean=false - val array by lazy{ arrayOf("窦性心动过缓","窦性心动过速","窦性心律不齐","房颤","房性早搏","室性早搏","ST段抬高","ST段压低","T波倒置","房室传导阻滞")} - val mAdapterAnswer by lazy{ XdAnswerAdapter() } - val binding by lazy {ActXdDetailBinding.inflate(layoutInflater)} - var dataLiat= mutableListOf() - var bean: XdInfoBean?=null - var hr="" -// var hrv="" -// var dbp="" - var imagePath="" - var state=-1 //状态 - override fun setLayout()=binding.root - override fun initData() { - super.initData() - intent.extras?.let { - if(it.containsKey("bean")){ - bean=it.getSerializable("bean") as XdInfoBean - }else{ - hr=it.getString("hr").toString() -// hrv= it.getString("hrv").toString() -// dbp=it.getString("dbp").toString() - typeName=it.getString("typeName").toString() - imagePath= it.getString("image").toString() - isAif= it.getBoolean("isAif") - } - } - - - } - - - override fun initView() { - super.initView() - statusBar(binding.mTitle.mView) - binding.mTitle.mTvTitle.text=resources.getString(R.string.xd_detail) - var time=RxTimeTool.getCurTimeString(SimpleDateFormat("HH:mm")) - - var parentView = binding.mTitle.mTvTitle.parent as View - var bg = ContextCompat.getDrawable(this, R.drawable.shape_bg_health_round) - parentView.background = bg - binding.mTitle.mIvBack.apply { - this.setImageResource(R.mipmap.icon_back_white) - this.setOnClickListener { - finish() - } - } - binding.mTitle.mIvReight.apply { - this.visibility=View.VISIBLE - this.setImageResource(R.mipmap.icon_share) - this.setOnClickListener { - - getPageScreen() - - } - } - - //默认拿本人的信息 - if(null != bean && null != Const.otherLiveData && bean!!.userId == Const.otherLiveData!!.value?.user?.id){ - //如果非本人则拿otherLiveData里面的性别年龄信息 - Const.otherLiveData?.value?.let { - binding.mTv2.text=if(it.user.sex==1) "男" else "女" - binding.mTv3.text=it.user.age - } - }else{ - //如果是本人则拿mainLiveData里面的性别年龄信息 - CommonUtils.getMyUserInfo()?.let { - binding.mTv2.text=if(it.sex==1) "男" else "女" - binding.mTv3.text=it.age.toString() - } - } - - - if(bean!=null){ - binding.mTv1.text=bean!!.hrData.toString() -// binding.mTv4.text=bean!!.dbpData -// binding.mTv5.text=bean!!.hrvData.toString() - binding.mImage.apply { - setImage(context, getImageUrl(bean!!.fileUrl)) - } - binding.mImage.tag= getImageUrl(bean!!.fileUrl) - var time=RxTimeTool.milliseconds2String( RxTimeTool.string2Milliseconds(bean!!.createTime),SimpleDateFormat("HH:mm")) - var mTypeName = if(bean!!.state == "正常") "未见异常" else bean!!.state - binding.mTypeName.setCenterBottom(mTypeName, time) - if(bean!!.state=="正常"){ - binding.mDesc.visibility= View.VISIBLE - }else{ - binding.mDesc.visibility= View.GONE - } - }else{ - binding.mTv1.text=hr -// binding.mTv4.text=dbp -// binding.mTv5.text=hrv - binding.mImage.setImage(this,imagePath) - binding.mImage.tag=imagePath - var mTypeName = if (typeName == "正常") "未见异常" else typeName - binding.mTypeName.setCenterBottom(mTypeName, time) - if(typeName=="正常"){ - binding.mDesc.visibility= View.VISIBLE - }else{ - binding.mDesc.visibility= View.GONE - } - } - var stateStr=binding.mTypeName.center_txt - when(stateStr){ - "房颤"->state=3 - "室性早博"->state=5 - "房性早博"->state=4 - } - - mAdapterAnswer.status=state - binding.mImage.setOnClickListener { - if(it.tag!=null){ - PictureUtils.httpPreviewImage(this,0, mutableListOf(it.tag.toString())) - } - - } - initRecycle() - } - - /** - *截取当前界面的图片 - */ - fun getPageScreen() { - binding.mChildView.post { - var startH=0 - // var startH=(binding.mTitle.mTvTitle.parent as View).height - var bitmap = binding.mChildView.Screen(startH) - WxUtils.shareBitmap(this, bitmap) - } - } - - private fun initRecycle() { - var flexBox= FlexboxLayoutManager(this) - //设置主轴排列方式 - flexBox.flexDirection = FlexDirection.ROW - //设置是否换行 - flexBox.setFlexWrap(FlexWrap.WRAP); - flexBox.setAlignItems(AlignItems.STRETCH) - binding.mRecycleAnswer.adapter=mAdapterAnswer - //binding.mRecycleAnswer.layoutManager=flexBox - val recycleItem = RecycleItem(this, 4, 1) - recycleItem.setSpace(40, 40) - binding.mRecycleAnswer.addItemDecoration(recycleItem) - binding.mRecycleAnswer.layoutManager=GridLayoutManager(this,3) - mAdapterAnswer.setNewInstance(array.toMutableList()) - mAdapterAnswer.setOnItemClickListener { adapter, view, position -> - var name=adapter.getItem(position) as String - mViewModel.uploadXmInfo("${position+1}") - } - - // - } - - override fun liveObserver() { - mViewModel.xdLive.observe(this){ - if(it.data==null){ - CommonToastUtils.showToast("无此解释") - return@observe - } - bundle.clear() - bundle.putSerializable("bean",it.data) - RouteManager.goAct(ARouterUrl.XD_INFO,bundle) - - } - - } - - -} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/XdHistoryAct.kt b/health/src/main/java/com/zj365/health/act/XdHistoryAct.kt deleted file mode 100644 index cbb3a7c..0000000 --- a/health/src/main/java/com/zj365/health/act/XdHistoryAct.kt +++ /dev/null @@ -1,71 +0,0 @@ -package com.zj365.health.act - -import androidx.recyclerview.widget.LinearLayoutManager -import com.alibaba.android.arouter.facade.annotation.Route -import com.xty.base.act.BaseListAct -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager -import com.xty.common.recycleUtils.RecycleItem -import com.zj365.health.R -import com.zj365.health.adapter.XdHistoryAdapter -import com.zj365.health.databinding.ActHistoryXdBinding -import com.zj365.health.vm.XdVm -import com.xty.network.model.XdInfoBean - -/** - * - * 历史心电 - */ -@Route(path = ARouterUrl.XD_HISTORY) -class XdHistoryAct : BaseListAct() { - val binding by lazy { ActHistoryXdBinding.inflate(layoutInflater) } - val adapter by lazy { XdHistoryAdapter() } - var userId="" - override fun setLayout() = binding.root - override fun initData() { - super.initData() - isDarkBar = true - intent.extras?.let { - if(it.containsKey("id")){ - userId=it.getString("id").toString() - } - } - - - } - - override fun initView() { - super.initView() - statusBar(binding.title.mView) - setRecycleRefresh(binding.mRecycle,binding.mRefresh) - binding.title.mTvTitle.text = getString(R.string.history_detail) - binding.title.mIvBack.setOnClickListener { - finish() - } - - } - - - override fun liveObserver() { - mViewModel.uploadLive.observe(this) { - setDate(adapter,it.data) - } - } - - override fun loadData() { - mViewModel.getXdHistory(userId) - } - - override fun initAdapter() { - - binding.mRecycle.addItemDecoration(RecycleItem(this, 10)) - binding.mRecycle.layoutManager = LinearLayoutManager(this) - binding.mRecycle.adapter = adapter - adapter.setOnItemClickListener { adapter, view, position -> - var bean=adapter.getItem(position) as XdInfoBean - bundle.clear() - bundle.putSerializable("bean",bean) - RouteManager.goAct( ARouterUrl.XD_DETAIL,bundle) - } - } -} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/binddevice/PreferenceStorage.java b/health/src/main/java/com/zj365/health/act/binddevice/PreferenceStorage.java deleted file mode 100644 index bd5bcc9..0000000 --- a/health/src/main/java/com/zj365/health/act/binddevice/PreferenceStorage.java +++ /dev/null @@ -1,119 +0,0 @@ -package com.zj365.health.act.binddevice; - -import android.content.Context; -import android.content.SharedPreferences; -import android.text.TextUtils; -import android.util.Log; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.annimon.stream.Optional; -import com.lifesense.android.ble.core.valueobject.DeviceInfo; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - -public class PreferenceStorage { - private static final String TAG = PreferenceStorage.class.getSimpleName(); - private static Context context; - public static String PREFERENCE_NAME = "TrineaAndroidCommon"; - public static void init(Context context) { - PreferenceStorage.context = context.getApplicationContext(); - } - - public static List getBondedMac() { - String macs = getString("bonded_devices"); - return (List)(TextUtils.isEmpty(macs) ? Collections.emptyList() : new ArrayList<>(Arrays.asList(macs.split(",")))); - } - - public static void addBondDevice(String mac) { - String macs = getString("bonded_devices"); - if (TextUtils.isEmpty(macs)) { - putString("bonded_devices", mac); - } else if (!macs.contains(mac)) { - putString("bonded_devices", macs.concat(",").concat(mac)); - } - - } - - - public static void removeBondDevice(String mac) { - List bondedMac = getBondedMac(); - if (!bondedMac.isEmpty()) { - bondedMac.remove(mac); - putString("bonded_devices", TextUtils.join(",", bondedMac)); - } - } - - - public static String getString(String key) { - return getString(key, (String)null); - } - - public static String getString(String key, String defaultValue) { - SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, 0); - return settings.getString(key, defaultValue); - } - - public static boolean putString(String key, String value) { - SharedPreferences settings = context.getSharedPreferences(PREFERENCE_NAME, 0); - SharedPreferences.Editor editor = settings.edit(); - editor.putString(key, value); - return editor.commit(); - } - - - public static void cacheDeviceInfo(String mac, DeviceInfo deviceInfo) { - putString(mac, JSONObject.toJSONString(deviceInfo)); - deviceInfo.setReaded(true); - } - - - public static DeviceInfo fillDeviceInfoFromCache(String mac, DeviceInfo deviceInfo) { - String cacheDeviceInfo = getString(mac, null); - if (TextUtils.isEmpty(cacheDeviceInfo)) { - return null; - } - DeviceInfo cachedDeviceInfo = JSON.parseObject(cacheDeviceInfo, DeviceInfo.class); - try { - deviceInfo.setDeviceType(cachedDeviceInfo.getDeviceType()); - deviceInfo.setMac(cachedDeviceInfo.getMac()); - deviceInfo.setDeviceId(cachedDeviceInfo.getDeviceId()); - deviceInfo.setDeviceName(cachedDeviceInfo.getDeviceName()); - deviceInfo.setModelNumber(cachedDeviceInfo.getModelNumber()); - deviceInfo.setDeviceType(cachedDeviceInfo.getDeviceType()); - deviceInfo.setSoftwareVersion(cachedDeviceInfo.getSoftwareVersion()); - deviceInfo.setHardwareVersion(cachedDeviceInfo.getHardwareVersion()); - deviceInfo.setManufactureName(cachedDeviceInfo.getManufactureName()); - deviceInfo.setProtocolType(cachedDeviceInfo.getProtocolType()); - deviceInfo.setManufactureId(cachedDeviceInfo.getManufactureId()); - deviceInfo.setReaded(true); - } catch (Exception e) { - Log.i(TAG,Optional.of(e.getMessage()).orElse("NPE")); - } - return deviceInfo; - } - - public static List getBondedDeviceInfo() { - List bondedMacs = getBondedMac(); - List bondedDeviceInfos = new ArrayList<>(); - if(bondedMacs != null) { - for (String mac : bondedMacs) { - DeviceInfo deviceInfo = new DeviceInfo(); - fillDeviceInfoFromCache(mac,deviceInfo); - bondedDeviceInfos.add(deviceInfo); - } - } - return bondedDeviceInfos; - } - - public static DeviceInfo getBondedDeviceInfoByMac(String mac) { - DeviceInfo deviceInfo = new DeviceInfo(); - fillDeviceInfoFromCache(mac,deviceInfo); - return deviceInfo; - } - - -} diff --git a/health/src/main/java/com/zj365/health/act/datamanage/DataManageBaseInfoAct.kt b/health/src/main/java/com/zj365/health/act/datamanage/DataManageBaseInfoAct.kt index ce83ae6..d560b94 100644 --- a/health/src/main/java/com/zj365/health/act/datamanage/DataManageBaseInfoAct.kt +++ b/health/src/main/java/com/zj365/health/act/datamanage/DataManageBaseInfoAct.kt @@ -26,7 +26,7 @@ import java.text.SimpleDateFormat import java.util.Calendar @SuppressLint("SimpleDateFormat") -@Route(path = ARouterUrl.DATA_MANAGE_BASE_INFO) +//@Route(path = ARouterUrl.DATA_MANAGE_BASE_INFO) class DataManageBaseInfoAct : BaseVmAct() { private val binding by lazy { ActBaseInfoBinding.inflate(layoutInflater) } @@ -136,7 +136,7 @@ class DataManageBaseInfoAct : BaseVmAct() { } val sex = if (binding.checkSex.isChecked) 2 else 1 - val birthdayType = if (binding.checkBirthday.isChecked) 2 else 1 + // val birthdayType = if (binding.checkBirthday.isChecked) 2 else 1 val birthday = binding.mBirthday.text.toString() val nation = binding.tvNationName.text.toString() val height = binding.mHeight.text.toString() @@ -197,7 +197,7 @@ class DataManageBaseInfoAct : BaseVmAct() { userInfo?.apply { binding.mName.setText(name) binding.checkSex.isChecked = sex == 2 - binding.checkBirthday.isChecked = birthdayType == 2 + // binding.checkBirthday.isChecked = birthdayType == 2 binding.mBirthday.text = birthday binding.tvNationName.text = nation binding.mHeight.setText("$height") diff --git a/health/src/main/java/com/zj365/health/act/datamanage/NewHealthRecordAct.kt b/health/src/main/java/com/zj365/health/act/datamanage/NewHealthRecordAct.kt index 5cb37ca..f1368c7 100644 --- a/health/src/main/java/com/zj365/health/act/datamanage/NewHealthRecordAct.kt +++ b/health/src/main/java/com/zj365/health/act/datamanage/NewHealthRecordAct.kt @@ -71,7 +71,7 @@ class NewHealthRecordAct : BaseVmAct() { bundle.clear() bundle.putSerializable("userInfo", userInfo) } - RouteManager.goAct(ARouterUrl.DATA_MANAGE_BASE_INFO, bundle) + // RouteManager.goAct(ARouterUrl.DATA_MANAGE_BASE_INFO, bundle) } //住院记录 diff --git a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt index a3f4137..0f71818 100644 --- a/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt +++ b/health/src/main/java/com/zj365/health/act/healthrecord/HealthRecordsListAct.kt @@ -11,6 +11,8 @@ import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.alibaba.android.arouter.facade.annotation.Route import com.tamsiree.rxkit.RxKeyboardTool +import com.xiaoguang.widget.viewer.PhotoViewer +import com.xiaoguang.widget.viewer.TransferConfig import com.xty.base.act.BaseListAct import com.xty.base.vm.BaseVm import com.xty.common.arouter.ARouterUrl @@ -28,6 +30,8 @@ class HealthRecordsListAct : BaseListAct() { val mAdapter by lazy { HealthRecordsAdapter()} + + var searchTitle:String ? = null override fun initAdapter() { @@ -51,6 +55,7 @@ class HealthRecordsListAct : BaseListAct() { super.initView() statusBar(binding.title.mView) binding.title.mTvTitle.text = "报告记录" + binding.title.mIvBack.setOnClickListener { finish() } diff --git a/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt b/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt index 0133c5b..b863c37 100644 --- a/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt +++ b/health/src/main/java/com/zj365/health/act/healthrecord/UploadHealthRecordAct.kt @@ -1,14 +1,21 @@ package com.zj365.health.act.healthrecord import android.content.Intent +import android.graphics.BitmapFactory +import android.net.Uri +import android.provider.MediaStore import android.text.TextUtils import android.view.View +import androidx.core.content.res.ResourcesCompat import androidx.recyclerview.widget.GridLayoutManager import com.alibaba.android.arouter.facade.annotation.Route +import com.core.glideimageloader.GlideImageLoader import com.luck.picture.lib.PictureSelector import com.luck.picture.lib.config.PictureConfig import com.luck.picture.lib.config.PictureMimeType import com.tamsiree.rxkit.RxKeyboardTool +import com.xiaoguang.widget.viewer.PhotoViewer +import com.xiaoguang.widget.viewer.TransferConfig import com.xty.base.act.BaseListAct import com.xty.base.act.BaseVmAct import com.xty.base.vm.BaseVm @@ -43,6 +50,9 @@ class UploadHealthRecordAct : BaseVmAct() { private var result = mutableListOf() + private var phoneView: PhotoViewer? = null + private var config: TransferConfig? = null + private val uploadTypeData = arrayOf( EatTypeBean("体检报告", "1"), EatTypeBean("病历报告", "2"), @@ -85,9 +95,20 @@ class UploadHealthRecordAct : BaseVmAct() { super.initView() statusBar(binding.title.mView) binding.title.mTvTitle.text = "上传报告" + + phoneView = PhotoViewer.getDefault(this) + + config = TransferConfig.build() + .setImageLoader(GlideImageLoader.with(this)) + .bindImageView(binding.imgTemplete,"http://zjdr.oss-cn-beijing.aliyuncs.com/zjapp/5c18e4d8e85488fe9c9da135da542b81126a3482.jpg") + phoneView?.apply(config) binding.title.mIvBack.setOnClickListener { finish() } + binding.imgTemplete.setOnClickListener { + // config?.nowThumbnailIndex = 1 + phoneView?.apply(config)?.show() + } binding.tvUploadTime.setOnClickListener { RxKeyboardTool.hideSoftInput(this) @@ -202,4 +223,9 @@ class UploadHealthRecordAct : BaseVmAct() { } } } + + override fun onDestroy() { + super.onDestroy() + phoneView?.destroy() + } } \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/act/skin/AiIcingPaySuccessDialog.kt b/health/src/main/java/com/zj365/health/act/skin/AiIcingPaySuccessDialog.kt index 8f3be6e..271d620 100644 --- a/health/src/main/java/com/zj365/health/act/skin/AiIcingPaySuccessDialog.kt +++ b/health/src/main/java/com/zj365/health/act/skin/AiIcingPaySuccessDialog.kt @@ -1,10 +1,13 @@ package com.zj365.health.act.skin +import android.os.Bundle import android.view.Gravity import android.view.View import com.xty.base.dialog.BaseDialogFragment import com.xty.common.Const import com.xty.common.Dateutils +import com.xty.common.arouter.ARouterUrl +import com.xty.common.arouter.RouteManager import com.xty.common.util.CommonUtils import com.zj365.health.databinding.DialogAiIcingBinding @@ -28,6 +31,9 @@ class AiIcingPaySuccessDialog(var orderNo:String) : BaseDialogFragment() { override fun initListener() { binding.tvConfirm.setOnClickListener { + var bundle = Bundle() + bundle.putInt("type",1) + RouteManager.goAct(ARouterUrl.ORDER_LIST,bundle) dismiss() } diff --git a/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt b/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt index 63a4cde..f07430a 100644 --- a/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/healthrecord/HealthRecordsAdapter.kt @@ -5,6 +5,10 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.chad.library.adapter.base.viewholder.BaseViewHolder +import com.core.glideimageloader.GlideImageLoader +import com.xiaoguang.widget.entry.BaseImgUrlBean +import com.xiaoguang.widget.viewer.PhotoViewer +import com.xiaoguang.widget.viewer.TransferConfig import com.xty.base.adapter.BaseAdapter import com.xty.network.model.HealthReportListBean import com.zj365.health.R @@ -30,7 +34,9 @@ class HealthRecordsAdapter : BaseAdapter( } var imgs = item.pic.split(",") as MutableList - + var phoneView: PhotoViewer? = null + var config: TransferConfig? = null + phoneView = PhotoViewer.getDefault(context) var imgAdapter = HealthRecordsChildAdapter() var recycler = holder.getView(R.id.recycler) recycler.addItemDecoration(object : RecyclerView.ItemDecoration() { @@ -40,11 +46,25 @@ class HealthRecordsAdapter : BaseAdapter( outRect.right = 12 } }) - + val list = mutableListOf() recycler.adapter = imgAdapter recycler.layoutManager = GridLayoutManager(context,4) if (imgs.size > 0){ + imgs.forEach { + val url = BaseImgUrlBean(it) + list.add(url) + } + config = TransferConfig.build() + .setSourceBeanList(list) + .setImageLoader(GlideImageLoader.with(context)).bindRecyclerView(recycler, R.id.img_pic) imgAdapter.setNewInstance(imgs) } + + imgAdapter.setOnItemClickListener { adapter, view, position -> + config?.nowThumbnailIndex = position + phoneView?.apply(config)?.show() + } } + + } \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/fragment/SleepFrag.kt b/health/src/main/java/com/zj365/health/fragment/SleepFrag.kt index 32018a0..077b078 100644 --- a/health/src/main/java/com/zj365/health/fragment/SleepFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/SleepFrag.kt @@ -54,7 +54,7 @@ class SleepFrag : BaseVmFrag() { var type = 2 var initFrag = false - private val musicInfoBinding by lazy { SleepMusicInfoBinding.bind(binding.root)} + // private val musicInfoBinding by lazy { SleepMusicInfoBinding.bind(binding.root)} val timeDaySelect by lazy{TimeSelect(requireContext()){ var time=binding.tvShowDate.text.toString() getData(time) @@ -286,23 +286,6 @@ class SleepFrag : BaseVmFrag() { // initTabVp2() initTab() initTimeSelect() - val assets = context?.assets?.open("forest.mp3") - //保存到手机的路劲 - val appDir = File(context?.let { FileUtils.getCacheFile(it) } + "/asset") - if (!appDir.exists()) { - appDir.mkdir() - } - val file = File(appDir, "forest.mp3") - val fos = FileOutputStream(file) - var bytes = ByteArray(1024) - var byteCount: Int = assets!!.read(bytes) - while (byteCount !== -1) { - fos.write(bytes, 0, byteCount) - byteCount = assets.read(bytes) - } - fos.flush() - assets.close() - fos.close() binding.compareTv.setOnClickListener { if (isDemonstrate){ (requireActivity() as HealthMainAct).dialogBind.show() @@ -313,46 +296,6 @@ class SleepFrag : BaseVmFrag() { bundle.putString("type", "5")//4 睡眠 RouteManager.goAct(ARouterUrl.COMPARE_DATA_ACT, bundle) } - - musicInfoBinding.mImagePlay.setOnClickListener { - - if (isAudioPlay){ - isAudioPlay = false - musicInfoBinding.mImagePlay.setImageResource(R.mipmap.ic_play) - musicInfoBinding.mName.setTextColor(resources.getColor(R.color.black)) - musicInfoBinding.mPosition.setTextColor(resources.getColor(R.color.black)) - musicInfoBinding.mName.setTypeface(null, Typeface.NORMAL) - musicInfoBinding.mPosition.setTypeface(null, Typeface.NORMAL) - audioUtils.stopPlay() - }else{ - isAudioPlay = true - musicInfoBinding.mImagePlay.setImageResource(R.mipmap.ic_pause) - musicInfoBinding.mName.setTextColor(resources.getColor(R.color.col_02c)) - musicInfoBinding.mName.setTypeface(null, Typeface.BOLD) - musicInfoBinding.mPosition.setTypeface(null, Typeface.BOLD) - musicInfoBinding.mPosition.setTextColor(resources.getColor(R.color.col_02c)) - - - file.path?.let { it1 -> - audioUtils.audioPlay( - it1, - object : RecordAudio.AudioPlayStateListener { - override fun onStart() { - - } - - override fun onComplet() { - isAudioPlay = false - } - - override fun onError() { - isAudioPlay = false - } - - }) - } - } - } } private fun initTimeSelect() { diff --git a/health/src/main/java/com/zj365/health/fragment/SleepStaticDayFrag.kt b/health/src/main/java/com/zj365/health/fragment/SleepStaticDayFrag.kt index bea3282..a7ba0ae 100644 --- a/health/src/main/java/com/zj365/health/fragment/SleepStaticDayFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/SleepStaticDayFrag.kt @@ -85,7 +85,7 @@ class SleepStaticDayFrag : BaseVmFrag() { getData(TimeUtils.getCurrentTime(), isDemonstrate) - val assets = context?.assets?.open("forest.mp3") + /* val assets = context?.assets?.open("forest.mp3") //保存到手机的路劲 val appDir = File(context?.let { FileUtils.getCacheFile(it) } + "/asset") @@ -102,7 +102,7 @@ class SleepStaticDayFrag : BaseVmFrag() { } fos.flush() assets.close() - fos.close() + fos.close()*/ setScaleInfo() } diff --git a/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt b/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt index 5398029..7b9e884 100644 --- a/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/UricAcidFrag.kt @@ -420,6 +420,17 @@ class UricAcidFrag : BaseVmFrag() { binding.tvRenew.visibility = View.GONE binding.compareTv.visibility = View.VISIBLE binding.tvModelingExplain.visibility = View.VISIBLE + val expireDay = RxTimeTool.getIntervalByNow( + expireTimeStr, + RxConstTool.TimeUnit.DAY, + SimpleDateFormat("yyyy-MM-dd HH:mm:ss") + ) + 1 + Log.i("terry","过期时间还剩：$expireDay 天；有效期截至：$expireTimeStr") + if (expireDay > 30) { + binding.tvRenew.visibility = View.GONE + } else { + binding.tvRenew.visibility = View.VISIBLE + } } else -> { @@ -437,6 +448,19 @@ class UricAcidFrag : BaseVmFrag() { binding.mTvUricCalibration.isVisible = id == MMkvHelper.getLong(Const.USER_ID).toString() + + val expireDay = RxTimeTool.getIntervalByNow( + expireTimeStr, + RxConstTool.TimeUnit.DAY, + SimpleDateFormat("yyyy-MM-dd HH:mm:ss") + ) + 1 + LogUtils.d("过期时间还剩：$expireDay 天；有效期截至：$expireTimeStr") + if (expireDay > 30) { + binding.tvRenew.visibility = View.GONE + } else if (it.data.status == 2) { + binding.tvRenew.visibility = View.VISIBLE + } + } } @@ -480,17 +504,6 @@ class UricAcidFrag : BaseVmFrag() { } else { binding.tvNsValue.text = "--" } - val expireDay = RxTimeTool.getIntervalByNow( - expireTimeStr, - RxConstTool.TimeUnit.DAY, - SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - ) + 1 - LogUtils.d("过期时间还剩：$expireDay 天；有效期截至：$expireTimeStr") - if (expireDay > 30) { - binding.tvRenew.visibility = View.GONE - } else if (it.data.status == 2) { - binding.tvRenew.visibility = View.VISIBLE - } val format = SimpleDateFormat("yyyy-MM-dd HH:mm:ss") val calendar = Calendar.getInstance() diff --git a/health/src/main/java/com/zj365/health/fragment/XdFrag.kt b/health/src/main/java/com/zj365/health/fragment/XdFrag.kt deleted file mode 100644 index 2f1f4b6..0000000 --- a/health/src/main/java/com/zj365/health/fragment/XdFrag.kt +++ /dev/null @@ -1,502 +0,0 @@ -package com.zj365.health.fragment - -import android.graphics.Bitmap -import android.graphics.Canvas -import android.graphics.Paint -import android.graphics.drawable.GradientDrawable -import android.media.MediaPlayer -import android.os.Build -import android.view.View -import androidx.annotation.RequiresApi -import androidx.core.content.ContextCompat -import androidx.lifecycle.MutableLiveData -import com.xty.base.fragment.BaseVmFrag -import com.xty.common.bracelet.YCBBlueConnectHelper -import com.xty.common.bracelet.YCBManager -import com.xty.common.bracelet.YCBOrder -import com.xty.common.FileUtils -import com.xty.common.LogUtils -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager -import com.xty.common.picture.PictureUtils -import com.xty.common.util.CommonToastUtils -import com.zj365.health.R -import com.zj365.health.databinding.FragXdBinding -import com.zj365.health.vm.XdVm -import com.zj365.health.weight.XdDialog -import com.yucheng.ycbtsdk.AITools -import kotlinx.coroutines.* -import java.io.File -import java.io.FileNotFoundException -import java.io.FileOutputStream -import java.io.IOException - -/** - * 心电 - */ -class XdFrag : BaseVmFrag() { - - private val binding by lazy { FragXdBinding.inflate(layoutInflater) } - override fun setLayout(): View = binding.root - override fun setViewModel() = XdVm() - - //声音播放 - val mMediaPlay by lazy { MediaPlayer.create(requireContext(), R.raw.vidio); } - var audioInterval = false// 是否到心电声音播放的时间点 - val intervalLive by lazy { MutableLiveData() } - - val liveHeart by lazy { MutableLiveData>() } //心率血压数据 - - // val liveHrv by lazy { MutableLiveData() } //HRV数据 - val listGet by lazy { MutableLiveData>() } - val status by lazy { MutableLiveData() } - private val mEcgMeasureList = mutableListOf() // 心电测量数据 - private var isSpeeded = false - var isStart = false - private var index = 0 // 遍历 心电测量数据 mEcgMeasureList - var count = 0 - private val drawLists = mutableListOf() - var showStartDate = 0 //第一个可见数据 - private var isProgressBar = true - var job: Job? = null - var listBitmap = mutableListOf() //截图数据 - var savePath = "" //保存地址 - var id = "" - - var typeName = "" - private val dialog by lazy { - XdDialog(requireContext()) { - YCBManager.settingHandWear(it) { - mainScope.launch { - CommonToastUtils.showToast("设置成功") - binding.cardiographView.keepScreenOn = true //开启常亮 - openEcg() - - } - } - } - } - - override fun initData() { - super.initData() - id = arguments?.getString("id").toString() - } - - @RequiresApi(Build.VERSION_CODES.M) - override fun initView() { - super.initView() - - binding.mStart.setOnClickListener { - if (!it.isSelected) { - if (YCBBlueConnectHelper.getBlueStatus()) { - dialog.showHand(YCBOrder.LEFT_HAND) - } - } else { - endEcg() - } - } - binding.mTvHistory.setOnClickListener { - bundle.putString("id", id) - RouteManager.goAct(ARouterUrl.XD_HISTORY, bundle) - } - - liveHeart.observe(requireActivity()) { - binding.mTvStatus.visibility = View.VISIBLE - binding.mTv1.text = it[0] - binding.mTv1.tag = it[0] - - binding.mTv3.text = it[1] - binding.mTv3.tag = it[1] - } -// liveHrv.observe(requireActivity()) { -// binding.mTv2.text = AITools.getInstance().getHRV().toString() -// binding.mTv2.tag = AITools.getInstance().getHRV().toString() -// } - listGet.observe(requireActivity()) { - mEcgMeasureList.addAll(it) - var index = 0 - it.forEach { v -> - if (index % 3 == 0) { - val value = v.toInt() / 40 - drawLists.add(if (value > 500) 500 else value) - } - index++ - // drawLists.add(v.toInt()) - } - } - status.observe(requireActivity()) { - binding.mTvStatus.visibility = View.VISIBLE - when (it) { - 0 -> { - binding.mTvStatus.text = getString(R.string.fall_on) - var bg = binding.mTvStatus.background as GradientDrawable - bg.setColor(ContextCompat.getColor(requireContext(), R.color.col_41c)) - bg.mutate() - binding.mTvStatus.setCompoundDrawables(null, null, null, null) - } - - else -> { - binding.mTvStatus.text = getString(R.string.fall_off) - var bg = binding.mTvStatus.background as GradientDrawable - bg.setColor(ContextCompat.getColor(requireContext(), R.color.col_e0b)) - bg.mutate() - var leftDraw = ContextCompat.getDrawable(requireContext(), R.mipmap.ic_fall_off) - leftDraw!!.setBounds(0, 0, leftDraw.minimumWidth, leftDraw.minimumHeight) - binding.mTvStatus.setCompoundDrawables(leftDraw, null, null, null) - } - - } - } - intervalLive.observe(this) { - audioInterval = true - if (isStart) { - edgAudio() - } - } - - endEcg() - } - - /** - * 开启监测 - */ - private fun openEcg() { - isProgressBar = true - binding.cardiographView.plist.clear() - binding.cardiographView.initList() - binding.cardiographView.invalidate() - binding.mProgress!!.progress = count - isStart = true - edgAudio() - - mEcgMeasureList.clear() - mainScope.launch { - YCBManager.startEcg( - { list -> - listGet.postValue(list) -// var sb = StringBuilder() -// list!!.forEach { -// sb.append("$it\n") -// } - // saveFile(sb.toString()) - - }, /*{ - liveHrv.postValue(it) - },*/ { - status.postValue(it) - }, { - binding.mStart.isSelected = it - if (it) { - binding.mStart.text = getString(R.string.end_test) - } - }, { heart, dbp, sbp, hrv -> - var array = arrayOf(heart, "$sbp/$dbp", hrv) - liveHeart.postValue(array) - - }) { - if (isStart) { - if (mMediaPlay != null) { - LogUtils.d("XD日志:长度:${drawLists.size}") - /*if (drawLists.size > 200&&audioInterval) { - audioInterval=false - mMediaPlay.start() - }*/ - if (audioInterval) { - audioInterval = false - mMediaPlay.start() - } - } - } - } - } - - MainScope().launch(Dispatchers.IO) { - while (isStart) { - try { - if (binding.cardiographView!!.plist.size > binding.cardiographView!!.WidthDots + 23) { - isSpeeded = true - } else if (binding.cardiographView!!.plist.size < binding.cardiographView!!.WidthDots + 3) { - isSpeeded = false - } - if (isSpeeded) { - delay(6)//1 - } else { - delay(13)//3 - } - } catch (e: InterruptedException) { - e.stackTrace - } - withContext(Dispatchers.Main) { - if (index < drawLists!!.size) { - if (binding.cardiographView!!.plist.size > binding.cardiographView!!.WidthDots) { - //第一个数据是否要被移除屏幕 - if (showStartDate == binding.cardiographView!!.plist[0]) { - LogUtils.i("心电旧数据:${showStartDate}") - saveBitmap() - //将最新数据赋值 - showStartDate = - binding.cardiographView!!.plist[binding.cardiographView!!.plist.size - 1] - LogUtils.i("心电新数据:$showStartDate ") - } - binding.cardiographView!!.plist.removeAt(0) - } - if (index == 0) { - listBitmap.clear() - //将第一个数据保存 - showStartDate = drawLists[0] - } - binding.cardiographView!!.plist.add(drawLists[index]) - index++ - binding.cardiographView!!.invalidate() - } - if (0 == drawLists.size) { - } else { - if (isProgressBar) { - oldRunable() - isProgressBar = false - } - } - } - } - } - - } - - /** - * 心电声音的时间间隔 - */ - private fun edgAudio() { - mainScope.launch(Dispatchers.IO) { - delay(3000) - intervalLive.postValue("") - - } - } - - //应该是开启循环刷新 产生连续的心电图标表信息 - fun oldRunable() { - job = MainScope().launch { - if (count == 0) { - // tvStartFinish!!.text = "开始" - } - //如果进度小于100,则延迟1000毫秒之后重复执行runnable - if (count < 100 && isStart) { - count++ - binding.mProgress!!.progress = count - delay(600) - oldRunable() - } else { - // 心电测量结束 - endEcg() - } - } - - } - - /* - * ecg结束并分析 - */ - fun endEcg() { - LogUtils.d("XD日志:endEcg!!!") - binding.cardiographView.keepScreenOn = false //关闭常亮 - isStart = false - if (job != null && !job!!.isCancelled) { - job!!.cancel() - } - - YCBManager.ecgMeasureStop { - mainScope.launch { - LogUtils.d("XD日志:ecgMeasureStop!!!") - loadingView.dismiss() - binding.mStart.isSelected = false - listGet.value?.let { - it.clear() - } - count = 0 - binding.mProgress.progress = 0 - binding.mStart.text = getString(R.string.start_test) - binding.mTvStatus.visibility = View.INVISIBLE - index = 0 - LogUtils.d("XD日志:mEcgMeasureListSize:${mEcgMeasureList.size}") - if (mEcgMeasureList.size > 2800) { - // 心率分析 - loadingView.show() - YCBManager.getAiResult { heart, type, isAif -> - mainScope.launch { - loadingView.dismiss() - var typeName = "" - when (type) { - 1 -> { - // 正常 - typeName = "正常" - } - - 5 -> { - //室早心拍 - typeName = "室性早博" - } - - 9 -> { - //房早心拍 - typeName = "房性早博" - } - - 15 -> { - //噪声 - typeName = "噪声" - - } - } - LogUtils.d("XD日志:getAiResult TypeName:${typeName}") - -// var sb = StringBuilder() -// drawLists.forEach { -// sb.append("$it").append("\n") -// } - //saveFile(sb.toString()) - //mViewModel.uploadXd(heart,isAif) - splicingBitmap(typeName, isAif) - } - } - } else { - CommonToastUtils.showToast("测量数据不记录 无效") - } - drawLists.clear() //清除绘制数据 避免重复测量时导致的绘制问题 - } - } - } - - override fun observer() { - mViewModel.uploadXd.observe(this) { - bundle.clear() - - bundle.putString( - "hr", - if (binding.mTv1.tag == null) "0" else binding.mTv1.tag.toString() - ) -// bundle.putString( -// "hrv", -// if (binding.mTv2.tag == null) "0" else binding.mTv2.tag.toString() -// ) -// bundle.putString( -// "dbp", -// if (binding.mTv3.tag == null) "0" else binding.mTv3.tag.toString() -// ) - - bundle.putString("typeName", typeName) - bundle.putString("image", savePath) - RouteManager.goAct(ARouterUrl.XD_DETAIL, bundle) - - binding.mTv1.tag = "0" -// binding.mTv2.tag = "0" - binding.mTv3.tag = "0" - - - } - } - - override fun onDestroy() { - loadingView.dismiss() - for (bitmap in listBitmap) { - if (bitmap != null && !bitmap.isRecycled) { - bitmap.recycle() - } - } - listBitmap.clear() - super.onDestroy() - } - - override fun onPause() { - endEcg() - super.onPause() - } - - //保存bitmap - private fun saveBitmap() { - var bitmap = Bitmap.createBitmap( - binding.mBitmap.width, - binding.mBitmap.height, - Bitmap.Config.ARGB_8888 - ) - var canvas = Canvas(bitmap) - - binding.mBitmap.layout( - 0, - binding.mTopView.height, - binding.mBitmap.width, - binding.mTopView.height + binding.mBitmap.height - ) - binding.mBitmap.draw(canvas) - listBitmap.add(bitmap) - - } - - private fun saveFile(str: String) { - val absolutePath: String = - requireActivity().getExternalFilesDir(null)!!.getAbsoluteFile().getAbsolutePath() - val file = File(absolutePath) - if (!file.exists()) { - file.mkdirs() - } - val s = absolutePath + File.separator.toString() + "右手.txt" - val file1 = File(absolutePath) - try { - val fos = FileOutputStream(s, true) - fos.write(str.toByteArray()) - val a = System.getProperty("line.separator") - fos.write(a.toByteArray()) - fos.flush() - fos.close() - } catch (e: FileNotFoundException) { - e.printStackTrace() - } catch (e: IOException) { - e.printStackTrace() - } - } - - /** - * 图片合成 - */ - private fun splicingBitmap(typeName: String, isAif: Boolean) { - LogUtils.d("XD日志:开始图片合成！！") - if (listBitmap.isEmpty()) { - return - } - - this.typeName = if (isAif) "房颤" else typeName - var bitmap = listBitmap[0] - var bitmaps = Bitmap.createBitmap( - bitmap.width * listBitmap.size, - bitmap.height, - Bitmap.Config.ARGB_8888 - ) - var canvas = Canvas(bitmaps) - val paint = Paint() - listBitmap.forEachIndexed { index, bitmap -> - canvas.drawBitmap(bitmap, index * (bitmap.width).toFloat(), 0f, paint) - } - savePath = - FileUtils.getCacheFile(requireContext()) + File.separator + System.currentTimeMillis() + ".jpg" - PictureUtils.saveBitmapToFile(savePath, bitmaps) - - - var hr = if (binding.mTv1.tag == null) "0" else binding.mTv1.tag.toString() - var hrv = if (AITools.getInstance().getHRV() != 0) AITools.getInstance().getHRV() - .toString() else "0" - var dbp = if (binding.mTv3.tag == null) "0" else binding.mTv3.tag.toString() - - LogUtils.d("XD日志:开始上传心电信息SavePath:$savePath;; typeName:$typeName;; hr:$hr;; hrv:$hrv;; dbp:$dbp;;") - mViewModel.uploadXdInfo(savePath, this.typeName, hr, hrv, dbp) - - - /* bundle.clear() - bundle.putString("hr",binding.mTv1.text.toString()) - bundle.putString("hrv",binding.mTv2.text.toString()) - bundle.putString("dbp",binding.mTv3.text.toString()) - bundle.putString("typeName",if(isAif) "房颤" else typeName) - bundle.putString("image",savePath) - bundle.putBoolean("isAif",isAif) - RouteManager.goAct(ARouterUrl.XD_DETAIL,bundle)*/ - - } -} \ No newline at end of file diff --git a/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt b/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt index 406fc66..8afc34c 100644 --- a/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt +++ b/health/src/main/java/com/zj365/health/fragment/XueyaFrag.kt @@ -137,23 +137,7 @@ class XueyaFrag : BaseVmFrag() { super.initView() initTab() initTimeSelect() - context?.let { - dialog = XyStudyDialog(it, "首次校准，请先完成血压学习后 再进行校准。") { - //血压学习 - RouteManager.goAct(ARouterUrl.BLOOD_STUDY) - } - dialog1 = XyStudyDialog(it, "再次学习校准数据会被删除") { - //血压学习 - RouteManager.goAct(ARouterUrl.BLOOD_STUDY) - } - - dialogStuding = XyStudyDialog(it, "血压数据在学习中，请稍候") { - } - dialogStudyFail = XyStudyDialog(it, "血压学习失败，继续学习") { - RouteManager.goAct(ARouterUrl.BLOOD_STUDY) - } - } binding.mBarChart.setNoDataText(getString(R.string.line_chart_not_data)) binding.mBarChart.setNoDataTextColor( ContextCompat.getColor( @@ -292,55 +276,7 @@ class XueyaFrag : BaseVmFrag() { return@setOnClickListener } RouteManager.goAct(ARouterUrl.BLOOD_ALIGN) -// //血压校准 -// //4g才有血压学习 -// if (!isBlueTooth()){ -// //4g手表点击血压校准 -// if (isFirstAlignTest ){ -// //如果是首次血压校准，判断血压学习数据 -// -// when(studyStatus){ -// 0 -> { -// //学习成功,继续校准 -// RouteManager.goAct(ARouterUrl.BLOOD_ALIGN) -// return@setOnClickListener -// } -// 1 -> { -// //学习中 -// dialogStuding?.show() -// } -// 2 -> { -// //学习失败 -// dialogStudyFail?.show() -// } -// } -// -// } else { -// //有校准数据，继续校准 -// RouteManager.goAct(ARouterUrl.BLOOD_ALIGN) -// } -// } else { -// RouteManager.goAct(ARouterUrl.BLOOD_ALIGN) -// } } -// binding.mCardBloodStudy.setOnClickListener { -// //4g才有血压学习 -// if (isFirstAlignTest ){ -// //如果是首次血压校准，跳转去血压学习 -// dialog?.show() -// return@setOnClickListener -// } else { -// //如果有数据提示之后再跳转 -// dialog1?.show() -// return@setOnClickListener -// } -// } -// binding.mCardBloodStudy.visibility = View.GONE -// if (isBlueTooth()){ -// binding.mCardBloodStudy.visibility = View.GONE -// } else { -// binding.mCardBloodStudy.visibility = View.VISIBLE -// } binding.tvTips.text = "了解血压：\n血压是指血液在血管内流动时作用于单位面积血管壁的侧压力，它是推动血液在血管内流动的动力。" + diff --git a/health/src/main/java/com/zj365/health/vm/XdVm.kt b/health/src/main/java/com/zj365/health/vm/XdVm.kt deleted file mode 100644 index 16f7b79..0000000 --- a/health/src/main/java/com/zj365/health/vm/XdVm.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.zj365.health.vm - -import androidx.lifecycle.MutableLiveData -import com.xty.base.vm.BaseVm -import com.xty.network.model.XdBean -import com.xty.network.model.RespBody -import com.xty.network.model.XdInfoBean -import okhttp3.MultipartBody -import org.json.JSONObject -import java.io.File - -class XdVm: BaseVm() { - val uploadLive by lazy{MutableLiveData>>()} - val uploadXd by lazy{MutableLiveData>()} - val xdLive by lazy{MutableLiveData>()} - - - - - fun uploadXdInfo(file:String,state:String,hr:String,hrv:String,dbp:String){ - startHttp { - var files=File(file) - - var fileBody= MultipartBody.Part.createFormData("file",files.name,retrofits.getMultiPartFileRb(files)) - var hrBody=retrofits.getRequestBody(hr) - var hrvBody=retrofits.getRequestBody(hrv) - var dbpBody=retrofits.getRequestBody(dbp) - var statusBody=retrofits.getRequestBody(state) - var response= apiInterface().uploadXmInfo(fileBody,hrvBody,hrBody,dbpBody,statusBody) - response.getCodeStatus(uploadXd,nowData) - } - } - - fun getXdHistory(id:String){ - startHttp { - var json=JSONObject() - json.put("userId",id) - var history= apiInterface().getXdHistory(retrofits.getRequestBody(json.toString())) - history.getCodeStatus(uploadLive,nowData) - - } - } - fun uploadXmInfo(name:String){ - startHttp { - var history= apiInterface().getXdDesc(name) - history.getCodeStatus(xdLive,nowData) - - } - } -} \ No newline at end of file diff --git a/health/src/main/res/layout/act_base_info.xml b/health/src/main/res/layout/act_base_info.xml index ff1982d..75c4ffc 100644 --- a/health/src/main/res/layout/act_base_info.xml +++ b/health/src/main/res/layout/act_base_info.xml @@ -133,13 +133,13 @@ android:textColor="@color/col_7c7" android:textSize="@dimen/sp_15" /> - + android:checked="true" />--> diff --git a/health/src/main/res/layout/act_bind_base_info.xml b/health/src/main/res/layout/act_bind_base_info.xml index c57789c..91a0ee3 100644 --- a/health/src/main/res/layout/act_bind_base_info.xml +++ b/health/src/main/res/layout/act_bind_base_info.xml @@ -92,7 +92,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:checked="true" - android:background="@drawable/selector_check_birthday" android:button="@null" /> diff --git a/health/src/main/res/layout/act_blood_study.xml b/health/src/main/res/layout/act_blood_study.xml deleted file mode 100644 index ffe5f74..0000000 --- a/health/src/main/res/layout/act_blood_study.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/health/src/main/res/layout/act_blood_study_needknow.xml b/health/src/main/res/layout/act_blood_study_needknow.xml deleted file mode 100644 index cb0bc83..0000000 --- a/health/src/main/res/layout/act_blood_study_needknow.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/health/src/main/res/layout/act_friend_watch.xml b/health/src/main/res/layout/act_friend_watch.xml deleted file mode 100644 index 3a904ce..0000000 --- a/health/src/main/res/layout/act_friend_watch.xml +++ /dev/null @@ -1,246 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/health/src/main/res/layout/act_nsuan_how_open.xml b/health/src/main/res/layout/act_nsuan_how_open.xml deleted file mode 100644 index 95c4df8..0000000 --- a/health/src/main/res/layout/act_nsuan_how_open.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/health/src/main/res/layout/act_upload_health_record.xml b/health/src/main/res/layout/act_upload_health_record.xml index 4c616a8..49dfe6a 100644 --- a/health/src/main/res/layout/act_upload_health_record.xml +++ b/health/src/main/res/layout/act_upload_health_record.xml @@ -72,6 +72,7 @@ android:layout_marginTop="@dimen/dp_20"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/health/src/main/res/layout/activity_tongue_diagnosis_main.xml b/health/src/main/res/layout/activity_tongue_diagnosis_main.xml index 6073df5..118576d 100644 --- a/health/src/main/res/layout/activity_tongue_diagnosis_main.xml +++ b/health/src/main/res/layout/activity_tongue_diagnosis_main.xml @@ -20,7 +20,7 @@ app:layout_constraintTop_toBottomOf="@id/title" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintBottom_toTopOf="@+id/tvSubmit" > - - + diff --git a/health/src/main/res/layout/frag_xd.xml b/health/src/main/res/layout/frag_xd.xml deleted file mode 100644 index 9fe13bb..0000000 --- a/health/src/main/res/layout/frag_xd.xml +++ /dev/null @@ -1,350 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/health/src/main/res/layout/frag_xl_compare_data.xml b/health/src/main/res/layout/frag_xl_compare_data.xml index 188a148..92da40e 100644 --- a/health/src/main/res/layout/frag_xl_compare_data.xml +++ b/health/src/main/res/layout/frag_xl_compare_data.xml @@ -203,7 +203,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="@dimen/dp_15" - android:textColor="@color/read_dot_bg" + android:textColor="@color/col_313" android:layout_marginLeft="@dimen/dp_14" android:layout_marginRight="@dimen/dp_14" android:layout_marginBottom="@dimen/dp_14" diff --git a/health/src/main/res/layout/frag_xy_compare_data.xml b/health/src/main/res/layout/frag_xy_compare_data.xml index 5fd5227..2cb4966 100644 --- a/health/src/main/res/layout/frag_xy_compare_data.xml +++ b/health/src/main/res/layout/frag_xy_compare_data.xml @@ -233,7 +233,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="@dimen/dp_15" - android:textColor="@color/read_dot_bg" + android:textColor="@color/col_313" android:layout_marginLeft="@dimen/dp_14" android:layout_marginRight="@dimen/dp_14" android:layout_marginBottom="@dimen/dp_14" diff --git a/mine/build.gradle b/mine/build.gradle index 86b7547..ebe70c6 100644 --- a/mine/build.gradle +++ b/mine/build.gradle @@ -67,11 +67,11 @@ android { repositories { flatDir { - dirs 'libs' + dirs 'libs','../common/libs' } } dependencies { api project(':base') - implementation (name: 'ycbtsdk-release', ext: 'aar') + // implementation (name: 'ycbtsdk-release', ext: 'aar') kapt rely.arouter_compiler } \ No newline at end of file diff --git a/mine/libs/ycbtsdk-release.aar b/mine/libs/ycbtsdk-release.aar deleted file mode 100644 index 3fc9f43..0000000 Binary files a/mine/libs/ycbtsdk-release.aar and /dev/null differ diff --git a/mine/src/main/java/com/zj365/mime/act/AccountSafeAct.kt b/mine/src/main/java/com/zj365/mime/act/AccountSafeAct.kt index b882598..824e775 100644 --- a/mine/src/main/java/com/zj365/mime/act/AccountSafeAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/AccountSafeAct.kt @@ -179,11 +179,11 @@ class AccountSafeAct : BaseVmAct() { intent.putExtra("close", "") stopService(intent) //结束mqtt服务 - var mqttService = RouteManager.getAny(ARouterUrl.MQTT_SERVICE) as Service - var mqttIntent = Intent(this, mqttService::class.java) - mqttIntent.putExtra("close", "") + /* var mqttService = RouteManager.getAny(ARouterUrl.MQTT_SERVICE) as Service + var mqttIntent = Intent(this, mqttService::class.java)*/ + // mqttIntent.putExtra("close", "") YCBBlueConnectHelper.disconnect() - stopService(mqttIntent) + // stopService(mqttIntent) //清除用户登录信息 Const.mainLiveData.value = null diff --git a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt b/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt index b53a82c..c91d8bc 100644 --- a/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/BaseInfoChangeAct.kt @@ -366,7 +366,7 @@ class BaseInfoChangeAct : BaseVmAct() , EasyPermissions.PermissionCa val height = binding.mHeight.text.toString().trim() val wieght = binding.mWeight.text.toString().trim() val address = binding.mAddress.text.toString().trim() - birthdayType = if (binding.checkBirthday.isChecked) 2 else 1 + // birthdayType = if (binding.checkBirthday.isChecked) 2 else 1 val otherName = binding.mOtherName.text.toString().trim() val otherPhone = binding.mOtherPhone.text.toString().trim() val rela = binding.mRela.text.toString().trim() diff --git a/mine/src/main/java/com/zj365/mime/act/DebugAct.kt b/mine/src/main/java/com/zj365/mime/act/DebugAct.kt index ce7b83b..72d738c 100644 --- a/mine/src/main/java/com/zj365/mime/act/DebugAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/DebugAct.kt @@ -16,12 +16,10 @@ import com.xty.common.bracelet.* import com.xty.common.recycleUtils.RecycleItem import com.xty.common.util.CommonToastUtils import com.zj365.mime.R -import com.zj365.mime.adapter.DebugDevAdapter +//import com.zj365.mime.adapter.DebugDevAdapter import com.zj365.mime.databinding.ActDebugBinding import com.zj365.mime.vm.DebugVm import com.zj365.mime.weight.NoticeSettingDialog -import com.yucheng.ycbtsdk.YCBTClient -import com.yucheng.ycbtsdk.bean.ScanDeviceBean import java.io.BufferedReader import java.io.InputStreamReader import java.text.SimpleDateFormat @@ -38,8 +36,8 @@ class DebugAct : BaseVmAct() { //传统蓝牙 初始化 private val bluetoothManager by lazy { getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager } private val blueAdapter by lazy { bluetoothManager.adapter } - val adapter by lazy { DebugDevAdapter() } - var bean = ScanDeviceBean() + // val adapter by lazy { DebugDevAdapter() } + // var bean = ScanDeviceBean() private var mReader: BufferedReader? = null private var sb = StringBuilder() @@ -65,13 +63,16 @@ class DebugAct : BaseVmAct() { thread.start() - binding.tvFirst.setOnClickListener(onClickListener) + /* binding.tvFirst.setOnClickListener(onClickListener) binding.tvSecond.setOnClickListener(onClickListener) binding.tvThird.setOnClickListener(onClickListener) binding.tvFour.setOnClickListener(onClickListener) binding.tvFive.setOnClickListener(onClickListener) binding.mSubmit.setOnClickListener(onClickListener) - binding.tvSix.setOnClickListener(onClickListener) + binding.tvSix.setOnClickListener(onClickListener)*/ + } + + override fun liveObserver() { } @@ -111,19 +112,19 @@ class DebugAct : BaseVmAct() { private fun initAdapter() { - adapter.macAddress = "" + /* adapter.macAddress = "" binding.mRecycle.addItemDecoration(RecycleItem(this, 10)) binding.mRecycle.layoutManager = LinearLayoutManager(this) binding.mRecycle.adapter = adapter adapter.setOnItemClickListener { a, view, position -> - bean = a.getItem(position) as ScanDeviceBean + *//* bean = a.getItem(position) as ScanDeviceBean closeBlueSearch() binding.mResult.text = "已选择蓝牙：${bean.deviceName}" - mViewModel.uploadLog(binding.mResult.text.toString()) - } + mViewModel.uploadLog(binding.mResult.text.toString())*//* + }*/ } - private val onClickListener = View.OnClickListener { + /* private val onClickListener = View.OnClickListener { when (it.id) { R.id.tv_first -> {//蓝牙搜索 binding.mRecycle.visibility = View.VISIBLE @@ -150,11 +151,11 @@ class DebugAct : BaseVmAct() { } } - var scanDeviceBean = ScanDeviceBean() + *//* var scanDeviceBean = ScanDeviceBean() scanDeviceBean.deviceName = it.deviceName scanDeviceBean.deviceMac = it.deviceMac scanDeviceBean.deviceRssi = it.deviceRssi//信号强度,暂时不需要 - adapter.addData(scanDeviceBean) + adapter.addData(scanDeviceBean)*//* } } R.id.tv_second -> {//蓝牙连接 @@ -165,7 +166,7 @@ class DebugAct : BaseVmAct() { } binding.mRecycle.visibility = View.GONE - if (null == bean || bean.deviceMac.isNullOrEmpty()) { + *//*if (null == bean || bean.deviceMac.isNullOrEmpty()) { CommonToastUtils.showToast("请先选择需要连接的蓝牙！") return@OnClickListener } @@ -184,7 +185,7 @@ class DebugAct : BaseVmAct() { updateResultText("${bean.deviceName};${bean.deviceMac}蓝牙未连接") } } - } + }*//* } R.id.tv_third -> {//设备信息获取 binding.mRecycle.visibility = View.GONE @@ -198,9 +199,9 @@ class DebugAct : BaseVmAct() { } R.id.tv_four -> {//蓝牙连接状态获取 binding.mRecycle.visibility = View.GONE - var boolean = YCBBlueConnectHelper.getBlueStatus(false) + *//* var boolean = YCBBlueConnectHelper.getBlueStatus(false) var connectState = YCBTClient.connectState() - updateResultText("是否连接：$boolean;;连接状态:$connectState;;") + updateResultText("是否连接：$boolean;;连接状态:$connectState;;")*//* } R.id.tv_five -> {//蓝牙权限检查 binding.mRecycle.visibility = View.GONE @@ -226,13 +227,13 @@ class DebugAct : BaseVmAct() { upload() } } - } + }*/ /** * 开启蓝牙搜索 */ - private fun startBlueSearch() { + /* private fun startBlueSearch() { if (!checkBlueConnectPermission(baseContext)) { CommonToastUtils.showToast("请开启App蓝牙搜索权限！") return @@ -261,9 +262,9 @@ class DebugAct : BaseVmAct() { blueAdapter.bluetoothLeScanner.startScan(scanCallBack) } - /** + *//** * 关闭蓝牙搜索 - */ + *//* private fun closeBlueSearch() { if (!checkBlueConnectPermission(baseContext)) { @@ -335,9 +336,9 @@ class DebugAct : BaseVmAct() { return locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) } - /** + *//** * 输出手机系统信息 - */ + *//* private fun printSystemInfo(): String { var date = Date(System.currentTimeMillis()) var dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss") @@ -396,9 +397,9 @@ class DebugAct : BaseVmAct() { mViewModel.uploadLog(searchBlueData.toString()) } mViewModel.uploadLog(printSystemInfo()) - } + }*/ - private fun updateResultText(result: String) { + /* private fun updateResultText(result: String) { showToast = true binding.mResult.text = result mViewModel.uploadLog(result.toString()) @@ -410,7 +411,7 @@ class DebugAct : BaseVmAct() { CommonToastUtils.showSucceedToast("操作已完成") } } - } + }*/ override fun onDestroy() { if (mLogcatProc != null) { diff --git a/mine/src/main/java/com/zj365/mime/act/InviteFriendsAct.kt b/mine/src/main/java/com/zj365/mime/act/InviteFriendsAct.kt deleted file mode 100644 index a9e90ea..0000000 --- a/mine/src/main/java/com/zj365/mime/act/InviteFriendsAct.kt +++ /dev/null @@ -1,187 +0,0 @@ -package com.zj365.mime.act - -import android.graphics.Color -import android.view.View -import androidx.core.view.isVisible -import com.alibaba.android.arouter.facade.annotation.Route -import com.google.zxing.client.android.utils.ZXingUtils -import com.xty.base.act.BaseVmAct -import com.xty.common.BuildConfig -import com.xty.common.arouter.ARouterUrl -import com.xty.common.arouter.RouteManager -import com.xty.common.setImageUser -import com.xty.common.util.CommonUtils -import com.xty.common.util.PermissionUtils -import com.xty.common.util.ViewScreenshotUtils -import com.xty.network.model.SettingBean -import com.zj365.mime.R -import com.zj365.mime.databinding.ActInviteFriendsBinding -import com.zj365.mime.vm.InviteFriendsVm -import com.zj365.mime.weight.InviteFriendShareDialog -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.launch - -/** - * 邀请好友 - */ -@Route(path = ARouterUrl.INVITE_FRIENDS) -class InviteFriendsAct : BaseVmAct() { - - val binding by lazy { ActInviteFriendsBinding.inflate(layoutInflater) } - override fun setLayout() = binding.root - - private val defaultIcon by lazy { - arrayOf( - R.mipmap.ic_default_man, - R.mipmap.ic_default_women - ) - } - - private var user: SettingBean.User? = null - - override fun liveObserver() { - } - - override fun initData() { - super.initData() - val userBean = intent.extras!!.getSerializable("user") - if (userBean != null) { - user = userBean as SettingBean.User - } - - user?.let { - binding.styleOne.tvUsername.text = it.name - binding.styleOne.tvUserTel.text = CommonUtils.replaceMiddleNumber(it.phone) - - binding.styleOne.tvUsernameSave.text = it.name - binding.styleOne.tvUserTelSave.text = CommonUtils.replaceMiddleNumber(it.phone) - - binding.styleTwo.tvUsernameTwo.text = it.name - binding.styleTwo.tvUserTelTwo.text = CommonUtils.replaceMiddleNumber(it.phone) - binding.styleTwo.tvUsernameTwoSave.text = it.name - binding.styleTwo.tvUserTelTwoSave.text = CommonUtils.replaceMiddleNumber(it.phone) - - val url = "${BuildConfig.url}shareApi/register/${it.phone}" - val whitBitmap = ZXingUtils.createQRCodeImage(url,200,0, Color.parseColor("#FFFFFF"),Color.parseColor("#00000000"),"L",null) - //XQRCode.createQRCodeWithLogo(url, null) - - val bitmap = ZXingUtils.createQRCodeImage(url) - binding.styleOne.imgQr.setImageBitmap(bitmap) - binding.styleOne.imgQrSave.setImageBitmap(bitmap) - - binding.styleTwo.imgQrTwo.setImageBitmap(whitBitmap) - binding.styleTwo.imgQrTwoSave.setImageBitmap(whitBitmap) - - if (it.avatarUrl.isNullOrEmpty()) { - binding.styleOne.mImage.setImageResource(defaultIcon[if (it.sex - 1 < 0) 0 else it.sex - 1]) - binding.styleOne.mImageSave.setImageResource(defaultIcon[if (it.sex - 1 < 0) 0 else it.sex - 1]) - - binding.styleTwo.mImageTwo.setImageResource(defaultIcon[if (it.sex - 1 < 0) 0 else it.sex - 1]) - binding.styleTwo.mImageTwoSave.setImageResource(defaultIcon[if (it.sex - 1 < 0) 0 else it.sex - 1]) - } else { - binding.styleOne.mImage.setImageUser( - this, - it.avatarUrl, - it.sex.toString() - ) - binding.styleOne.mImageSave.setImageUser( - this, - it.avatarUrl, - it.sex.toString() - ) - - binding.styleTwo.mImageTwo.setImageUser( - this, - it.avatarUrl, - it.sex.toString() - ) - binding.styleTwo.mImageTwoSave.setImageUser( - this, - it.avatarUrl, - it.sex.toString() - ) - } - } - } - - override fun initView() { - super.initView() - statusBar(binding.title.mView) - binding.title.mTvTitle.text = "邀请好友" - - binding.title.mTvRight.apply { - visibility = View.VISIBLE - text = "邀请记录" - setTextColor(resources.getColor(R.color.col_02c)) - setOnClickListener { - user?.let { - bundle.clear() - bundle.putSerializable("user", it) - RouteManager.goAct(ARouterUrl.LNVITATION_MESSAGE, bundle) - } - } - } - binding.title.mIvBack.setOnClickListener { finish() } - - //更换样式 - binding.styleOne.tvChange.setOnClickListener { - if (binding.styleOne.fmOne.isVisible) { - binding.styleOne.fmOne.visibility = View.GONE - binding.styleTwo.fmTwo.visibility = View.VISIBLE - } - } - - binding.styleTwo.tvChange.setOnClickListener { - if (binding.styleTwo.fmTwo.isVisible) { - binding.styleTwo.fmTwo.visibility = View.GONE - binding.styleOne.fmOne.visibility = View.VISIBLE - } - } - - //保存图片 - binding.styleOne.tvSave.setOnClickListener { - mainScope.launch(Dispatchers.IO) { - - /* PermissionUtils.requestPermission(this@InviteFriendsAct, - {ViewScreenshotUtils.viewSaveToImage( - binding.styleOne.clOneSave, - this@InviteFriendsAct - )}, Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE)*/ - - } - } - - binding.styleTwo.tvSave.setOnClickListener { - mainScope.launch(Dispatchers.IO) { - - /* PermissionUtils.requestPermission(this@InviteFriendsAct, - {ViewScreenshotUtils.viewSaveToImage( - binding.styleOne.clOneSave, - this@InviteFriendsAct - )}, Permission.READ_EXTERNAL_STORAGE, Permission.WRITE_EXTERNAL_STORAGE)*/ - - } - } - - //邀请好友 - binding.styleOne.llInvite.setOnClickListener { - user?.let { - InviteFriendShareDialog( - this@InviteFriendsAct,0, - it, - ViewScreenshotUtils.loadBitmapFromView(binding.styleOne.clOneSave) - ).showDialog() - } - } - - binding.styleTwo.llInviteTwo.setOnClickListener { - user?.let { - InviteFriendShareDialog( - this@InviteFriendsAct,0, - it, - ViewScreenshotUtils.loadBitmapFromView(binding.styleTwo.clTwoSave) - ).showDialog() - } - } - } -} \ No newline at end of file diff --git a/mine/src/main/java/com/zj365/mime/act/LnvitationMessageAct.kt b/mine/src/main/java/com/zj365/mime/act/LnvitationMessageAct.kt index a07c757..5550fc6 100644 --- a/mine/src/main/java/com/zj365/mime/act/LnvitationMessageAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/LnvitationMessageAct.kt @@ -74,7 +74,7 @@ class LnvitationMessageAct : BaseListAct() { setOnClickListener { bundle.clear() bundle.putSerializable("user", user) - RouteManager.goAct(ARouterUrl.INVITE_FRIENDS, bundle) + // RouteManager.goAct(ARouterUrl.INVITE_FRIENDS, bundle) } } binding.title.mIvBack.setOnClickListener { finish() } diff --git a/mine/src/main/java/com/zj365/mime/act/MessageAct.kt b/mine/src/main/java/com/zj365/mime/act/MessageAct.kt index f1f892c..c9467a7 100644 --- a/mine/src/main/java/com/zj365/mime/act/MessageAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/MessageAct.kt @@ -81,7 +81,7 @@ class MessageAct : BaseListAct() { } bundle.putString("chatImage", getImageUrl(bean.avatar)) - RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle) + // RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle) } else { val data = bean as MessageBean.SysMsg if (data.notifyStatus == 0) { diff --git a/mine/src/main/java/com/zj365/mime/act/MessageTypeListAct.kt b/mine/src/main/java/com/zj365/mime/act/MessageTypeListAct.kt index 5c52aee..fc3f7fb 100644 --- a/mine/src/main/java/com/zj365/mime/act/MessageTypeListAct.kt +++ b/mine/src/main/java/com/zj365/mime/act/MessageTypeListAct.kt @@ -133,7 +133,7 @@ class MessageTypeListAct : BaseListAct() { } bundle.putString("chatImage", getImageUrl(bean.avatar)) - RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle) + // RouteManager.goAct(ARouterUrl.CHAT_MSG, bundle) } else { val data = bean as MessageTypeDataBean.MessageTypeBean if (data.notifyStatus == 0) { diff --git a/mine/src/main/java/com/zj365/mime/adapter/DataAdapter.kt b/mine/src/main/java/com/zj365/mime/adapter/DataAdapter.kt index 44960cf..046f3fe 100644 --- a/mine/src/main/java/com/zj365/mime/adapter/DataAdapter.kt +++ b/mine/src/main/java/com/zj365/mime/adapter/DataAdapter.kt @@ -1,3 +1,4 @@ +/* package com.zj365.mime.adapter import com.chad.library.adapter.base.viewholder.BaseViewHolder @@ -132,4 +133,4 @@ class DataAdapter: BaseAdapter(R.layout.item_data) { } -} \ No newline at end of file +}*/ diff --git a/mine/src/main/java/com/zj365/mime/adapter/DebugDevAdapter.kt b/mine/src/main/java/com/zj365/mime/adapter/DebugDevAdapter.kt index 53309a1..93fb2f5 100644 --- a/mine/src/main/java/com/zj365/mime/adapter/DebugDevAdapter.kt +++ b/mine/src/main/java/com/zj365/mime/adapter/DebugDevAdapter.kt @@ -3,8 +3,9 @@ package com.zj365.mime.adapter import com.chad.library.adapter.base.viewholder.BaseViewHolder import com.xty.base.adapter.BaseAdapter import com.zj365.mime.R -import com.yucheng.ycbtsdk.bean.ScanDeviceBean +//import com.yucheng.ycbtsdk.bean.ScanDeviceBean +/* class DebugDevAdapter(var macAddress:String=""):BaseAdapter(R.layout.item_debug_dev) { override fun convert(holder: BaseViewHolder, item: ScanDeviceBean) { // holder.layoutPosition @@ -13,4 +14,4 @@ class DebugDevAdapter(var macAddress:String=""):BaseAdapter(R.la } -} \ No newline at end of file +}*/ diff --git a/mine/src/main/java/com/zj365/mime/fragment/SportDetailProgrammeFrag.kt b/mine/src/main/java/com/zj365/mime/fragment/SportDetailProgrammeFrag.kt index 5b5425a..501dbb3 100644 --- a/mine/src/main/java/com/zj365/mime/fragment/SportDetailProgrammeFrag.kt +++ b/mine/src/main/java/com/zj365/mime/fragment/SportDetailProgrammeFrag.kt @@ -16,7 +16,7 @@ import com.xty.common.TimeSelect import com.xty.message.adapter.SportDetailAdapter import com.zj365.mime.R import com.zj365.mime.act.SportDetailAct -import com.zj365.mime.adapter.DataAdapter +//import com.zj365.mime.adapter.DataAdapter import com.zj365.mime.databinding.FragDetailProgrammeBinding import com.zj365.mime.vm.SportDetailVm import com.xty.network.model.WatchData @@ -26,7 +26,7 @@ import org.greenrobot.eventbus.EventBus class SportDetailProgrammeFrag: BaseVmFrag() { val binding by lazy { FragDetailProgrammeBinding.inflate(layoutInflater) } var mAdapter= SportDetailAdapter() - var mDataAdapter= DataAdapter() + //var mDataAdapter= DataAdapter() var nowStatus=0 private val timeSelect by lazy { TimeSelect(requireContext() ){ @@ -40,7 +40,7 @@ class SportDetailProgrammeFrag: BaseVmFrag() { mViewModel. userId = requireArguments() .getString("userId").toString() mViewModel.id = requireArguments().getString("id").toString() - binding.mRecycle.adapter=mDataAdapter + /* binding.mRecycle.adapter=mDataAdapter binding.mRecycle.layoutManager= GridLayoutManager(requireContext(),3) mDataAdapter.setNewInstance(mutableListOf("","","","","","")) @@ -88,7 +88,7 @@ class SportDetailProgrammeFrag: BaseVmFrag() { }} } - } + }*/ } @@ -132,7 +132,7 @@ class SportDetailProgrammeFrag: BaseVmFrag() { binding.mV7.setValues(it.beforeTargetMuscle) var watchBean=Gson().fromJson(it.beforeWatchDate,WatchData::class.java) - mDataAdapter.setAdapterData(watchBean) + //mDataAdapter.setAdapterData(watchBean) when(it.status){ 1,2,3,4-> { it.actionList.forEach { b -> diff --git a/mine/src/main/res/layout/act_base_info_change.xml b/mine/src/main/res/layout/act_base_info_change.xml index 7773d96..7e2e211 100644 --- a/mine/src/main/res/layout/act_base_info_change.xml +++ b/mine/src/main/res/layout/act_base_info_change.xml @@ -212,15 +212,6 @@ android:text="@string/birthday" android:textColor="@color/col_c7c" android:textSize="@dimen/sp_14" /> - - + android:layout_width="@dimen/dp_133" + android:layout_height="133dp" + android:layout_gravity="center" + android:scaleType="centerCrop" + /> - - - - - - - - - - \ No newline at end of file diff --git a/mine/src/main/res/layout/item_enterprise_info_child.xml b/mine/src/main/res/layout/item_enterprise_info_child.xml index a9c78b3..23e136c 100644 --- a/mine/src/main/res/layout/item_enterprise_info_child.xml +++ b/mine/src/main/res/layout/item_enterprise_info_child.xml @@ -51,15 +51,5 @@ tools:text="2022-02-03 15:36" /> - \ No newline at end of file diff --git a/mine/src/main/res/layout/layout_invite_one_style.xml b/mine/src/main/res/layout/layout_invite_one_style.xml deleted file mode 100644 index bc016ee..0000000 --- a/mine/src/main/res/layout/layout_invite_one_style.xml +++ /dev/null @@ -1,275 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mine/src/main/res/layout/layout_invite_two_style.xml b/mine/src/main/res/layout/layout_invite_two_style.xml deleted file mode 100644 index 27e0a8f..0000000 --- a/mine/src/main/res/layout/layout_invite_two_style.xml +++ /dev/null @@ -1,284 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/mine/src/main/res/mipmap-xhdpi/ic_device_watch.png b/mine/src/main/res/mipmap-xhdpi/ic_device_watch.png deleted file mode 100644 index a4fb97c..0000000 Binary files a/mine/src/main/res/mipmap-xhdpi/ic_device_watch.png and /dev/null differ diff --git a/mine/src/main/res/mipmap-xxhdpi/bg_bloodsugar.png b/mine/src/main/res/mipmap-xxhdpi/bg_bloodsugar.png deleted file mode 100644 index 9f79c38..0000000 Binary files a/mine/src/main/res/mipmap-xxhdpi/bg_bloodsugar.png and /dev/null differ diff --git a/mine/src/main/res/mipmap-xxhdpi/bg_breath.png b/mine/src/main/res/mipmap-xxhdpi/bg_breath.png deleted file mode 100644 index 6ea99db..0000000 Binary files a/mine/src/main/res/mipmap-xxhdpi/bg_breath.png and /dev/null differ diff --git a/mine/src/main/res/mipmap-xxhdpi/bg_my_integral.png b/mine/src/main/res/mipmap-xxhdpi/bg_my_integral.png deleted file mode 100644 index 70a7cdc..0000000 Binary files a/mine/src/main/res/mipmap-xxhdpi/bg_my_integral.png and /dev/null differ diff --git a/mine/src/main/res/mipmap-xxhdpi/bg_oo.png b/mine/src/main/res/mipmap-xxhdpi/bg_oo.png deleted file mode 100644 index a33a3c1..0000000 Binary files a/mine/src/main/res/mipmap-xxhdpi/bg_oo.png and /dev/null differ diff --git a/mine/src/main/res/mipmap-xxhdpi/bg_temp.png b/mine/src/main/res/mipmap-xxhdpi/bg_temp.png deleted file mode 100644 index 3b9b593..0000000 Binary files a/mine/src/main/res/mipmap-xxhdpi/bg_temp.png and /dev/null differ diff --git a/mine/src/main/res/mipmap-xxhdpi/bg_xl.png b/mine/src/main/res/mipmap-xxhdpi/bg_xl.png deleted file mode 100644 index 1be2452..0000000 Binary files a/mine/src/main/res/mipmap-xxhdpi/bg_xl.png and /dev/null differ diff --git a/mine/src/main/res/mipmap-xxhdpi/bg_xya.png b/mine/src/main/res/mipmap-xxhdpi/bg_xya.png deleted file mode 100644 index 49ca30e..0000000 Binary files a/mine/src/main/res/mipmap-xxhdpi/bg_xya.png and /dev/null differ diff --git a/network/src/main/java/com/xty/network/ApiInterface.kt b/network/src/main/java/com/xty/network/ApiInterface.kt index 6086ce3..5e8ae6f 100644 --- a/network/src/main/java/com/xty/network/ApiInterface.kt +++ b/network/src/main/java/com/xty/network/ApiInterface.kt @@ -1121,7 +1121,7 @@ interface ApiInterface { /** * 心电信息上传 */ - @POST("customer/watchEcg/save") + /* @POST("customer/watchEcg/save") @Multipart suspend fun uploadXmInfo( @Part part: MultipartBody.Part, @@ -1131,11 +1131,11 @@ interface ApiInterface { @Part("state") state: RequestBody, ): RespBody - /** + *//** * 心电信息上传 - */ + *//* @HTTP(method = "GET", path = "customer/watchEcg/listName/{type}") - suspend fun getXdDesc(@Path("type") type: String): RespBody + suspend fun getXdDesc(@Path("type") type: String): RespBody*/ /** * 血压校准 diff --git a/network/src/main/java/com/xty/network/model/UserOtherInfo.kt b/network/src/main/java/com/xty/network/model/UserOtherInfo.kt index f6322ac..582669e 100644 --- a/network/src/main/java/com/xty/network/model/UserOtherInfo.kt +++ b/network/src/main/java/com/xty/network/model/UserOtherInfo.kt @@ -8,4 +8,5 @@ data class UserOtherInfo( var operation_guide:String, var coupons_count:Int, var serviceOrderCount:Int, + var vip_server:String, var placard:String) diff --git a/server/build.gradle b/server/build.gradle index 460ea7a..4ca4c1b 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -63,11 +63,11 @@ android { repositories { flatDir { - dirs 'libs' + dirs 'libs','../common/libs' } } dependencies { api project(':base') - implementation (name: 'ycbtsdk-release', ext: 'aar') + // implementation (name: 'ycbtsdk-release', ext: 'aar') kapt rely.arouter_compiler } \ No newline at end of file diff --git a/server/libs/ycbtsdk-release.aar b/server/libs/ycbtsdk-release.aar deleted file mode 100644 index 3fc9f43..0000000 Binary files a/server/libs/ycbtsdk-release.aar and /dev/null differ diff --git a/server/src/main/ic_launcher-playstore.png b/server/src/main/ic_launcher-playstore.png deleted file mode 100644 index 55c35b1..0000000 Binary files a/server/src/main/ic_launcher-playstore.png and /dev/null differ diff --git a/server/src/main/res/layout/act_expert_chief.xml b/server/src/main/res/layout/act_expert_chief.xml index 67a88ac..47998d0 100644 --- a/server/src/main/res/layout/act_expert_chief.xml +++ b/server/src/main/res/layout/act_expert_chief.xml @@ -17,7 +17,6 @@ android:id="@+id/info_photo" android:layout_width="match_parent" android:layout_height="wrap_content" - android:src="@mipmap/ic_detail" android:scaleType="matrix" /> \ No newline at end of file diff --git a/server/src/main/res/mipmap-xhdpi/ic_detail.png b/server/src/main/res/mipmap-xhdpi/ic_detail.png deleted file mode 100644 index 523e6aa..0000000 Binary files a/server/src/main/res/mipmap-xhdpi/ic_detail.png and /dev/null differ