diff --git a/app/build.gradle b/app/build.gradle index 5b7659d..6a69df4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -121,8 +121,8 @@ dependencies { implementation (name: 'ycbtsdk-release', ext: 'aar') implementation (name: 'push-3.0.0', ext: 'aar') - implementation files('libs/bluetooth-mini-fatscale-2.9.5.jar') - implementation files('libs/bluetooth-mini-core-2.9.5.jar') +// implementation files('libs/bluetooth-mini-fatscale-2.9.5.jar') +// implementation files('libs/bluetooth-mini-core-2.9.5.jar') implementation project(':Health') implementation project(':server') implementation project(':mine') diff --git a/app/libs/bluetooth-mini-core-2.9.5.jar b/app/libs/bluetooth-mini-core-2.9.5.jar deleted file mode 100644 index 09aa57f..0000000 Binary files a/app/libs/bluetooth-mini-core-2.9.5.jar and /dev/null differ diff --git a/app/libs/bluetooth-mini-fatscale-2.9.5.jar b/app/libs/bluetooth-mini-fatscale-2.9.5.jar deleted file mode 100644 index 27d19b0..0000000 Binary files a/app/libs/bluetooth-mini-fatscale-2.9.5.jar and /dev/null differ diff --git a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt index 6b1041f..bc732be 100644 --- a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt +++ b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt @@ -25,8 +25,8 @@ import com.amap.api.location.AMapLocationClientOption import com.blankj.utilcode.util.ArrayUtils import com.google.android.material.bottomnavigation.BottomNavigationItemView import com.google.android.material.bottomnavigation.BottomNavigationMenuView -import com.lifesense.android.ble.core.serializer.AbstractMeasureData -import com.lifesense.android.ble.device.fatscale.model.WeightMeasureData +/*import com.lifesense.android.ble.core.serializer.AbstractMeasureData +import com.lifesense.android.ble.device.fatscale.model.WeightMeasureData*/ import com.tamsiree.rxkit.RxActivityTool import com.tamsiree.rxkit.RxSPTool import com.xty.base.act.BaseVmAct @@ -74,7 +74,7 @@ import org.greenrobot.eventbus.ThreadMode import java.util.Date @Route(path = ARouterUrl.MAIN_ACT) -class MainActivity : BaseVmAct(), Consumer { +class MainActivity : BaseVmAct()/*, Consumer*/ { private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) } override fun setLayout(): View = binding.root @@ -470,7 +470,7 @@ class MainActivity : BaseVmAct(), Consumer { fun reveiveMsg(event: MqttReceive) { } - override fun accept(abstractMeasureData: AbstractMeasureData) { + /* override fun accept(abstractMeasureData: AbstractMeasureData) { if (abstractMeasureData is WeightMeasureData) { if (!abstractMeasureData.isProcessingData) { Log.i("LS-Bluetooth", "收到测量过程数据:${JSON.toJSONString(abstractMeasureData)}") @@ -485,7 +485,7 @@ class MainActivity : BaseVmAct(), Consumer { return } } - } + }*/ 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 32c433d..d96eab5 100644 --- a/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt +++ b/app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt @@ -171,7 +171,7 @@ class WelcomeAct : BaseVmAct() { } private fun getLogoImage(url: String) { - Glide.with(this).asBitmap().load(url).error(R.mipmap.ic_welcome_logo) + /*Glide.with(this).asBitmap().load(url).error(R.mipmap.ic_welcome_logo) .into(object : SimpleTarget() { override fun onResourceReady( resource: Bitmap, @@ -198,7 +198,7 @@ class WelcomeAct : BaseVmAct() { } } } - }) + })*/ } private fun startTimer() { diff --git a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt index a5950bc..a2bd350 100644 --- a/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/HealthHomeFrag.kt @@ -7,7 +7,6 @@ import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.alibaba.android.arouter.facade.annotation.Route -import com.lifesense.android.ble.core.application.ApplicationContext import com.shuyu.gsyvideoplayer.listener.VideoAllCallBack import com.tencent.mm.opensdk.modelbiz.WXLaunchMiniProgram import com.tencent.mm.opensdk.openapi.WXAPIFactory diff --git a/app/src/main/java/com/zj365/dc/model/DeviceStateWrapper.kt b/app/src/main/java/com/zj365/dc/model/DeviceStateWrapper.kt index 20ed4af..1e81db0 100644 --- a/app/src/main/java/com/zj365/dc/model/DeviceStateWrapper.kt +++ b/app/src/main/java/com/zj365/dc/model/DeviceStateWrapper.kt @@ -1,13 +1,11 @@ package com.zj365.dc.model -import com.lifesense.android.ble.core.application.BleDeviceManager -import com.lifesense.android.ble.core.application.model.enums.ConnectionState -import com.lifesense.android.ble.core.valueobject.DeviceInfo + import com.zj365.health.act.binddevice.BlueUtil class DeviceStateWrapper { - protected var device: DeviceInfo? = null + /* protected var device: DeviceInfo? = null constructor() {} constructor(device: DeviceInfo?, state: ConnectionState?){ @@ -48,5 +46,5 @@ class DeviceStateWrapper { state = BlueUtil.getBlueManage().getDeviceConnectState(device!!.mac) } return isConnected() - } + }*/ } \ No newline at end of file diff --git a/app/src/main/res/layout/child_healt.xml b/app/src/main/res/layout/child_healt.xml index 61b5e77..619ffaf 100644 --- a/app/src/main/res/layout/child_healt.xml +++ b/app/src/main/res/layout/child_healt.xml @@ -19,159 +19,6 @@ android:layout_height="wrap_content" android:id="@+id/home_content_rv"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/frag_health_header.xml b/app/src/main/res/layout/frag_health_header.xml index fd345dc..c4ecdbb 100644 --- a/app/src/main/res/layout/frag_health_header.xml +++ b/app/src/main/res/layout/frag_health_header.xml @@ -92,81 +92,7 @@ android:id="@+id/rv_layout"/> - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-xhdpi/bg_24hour_tittle.png b/app/src/main/res/mipmap-xhdpi/bg_24hour_tittle.png deleted file mode 100644 index abc3703..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/bg_24hour_tittle.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_flood_mesure_manage.png b/app/src/main/res/mipmap-xhdpi/ic_flood_mesure_manage.png deleted file mode 100644 index 28f524d..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_flood_mesure_manage.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_flood_sugr_manage.png b/app/src/main/res/mipmap-xhdpi/ic_flood_sugr_manage.png deleted file mode 100644 index 464d0d1..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_flood_sugr_manage.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_health_risk.png b/app/src/main/res/mipmap-xhdpi/ic_health_risk.png deleted file mode 100644 index ec98fbc..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_health_risk.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_msg_select.png b/app/src/main/res/mipmap-xhdpi/ic_msg_select.png deleted file mode 100644 index ab88a5e..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_msg_select.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_msg_un_select.png b/app/src/main/res/mipmap-xhdpi/ic_msg_un_select.png deleted file mode 100644 index e2055df..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_msg_un_select.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_my_da.png b/app/src/main/res/mipmap-xhdpi/ic_my_da.png deleted file mode 100644 index 42d49f7..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_my_da.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_my_manager.png b/app/src/main/res/mipmap-xhdpi/ic_my_manager.png deleted file mode 100644 index 21e9fce..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_my_manager.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_my_plan.png b/app/src/main/res/mipmap-xhdpi/ic_my_plan.png deleted file mode 100644 index 469cb96..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_my_plan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_risk_evaluate.png b/app/src/main/res/mipmap-xhdpi/ic_risk_evaluate.png deleted file mode 100644 index 9c198ac..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_risk_evaluate.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_status_bg.png b/app/src/main/res/mipmap-xhdpi/ic_status_bg.png deleted file mode 100644 index 0812e49..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_status_bg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_tongue_diagnosis.png b/app/src/main/res/mipmap-xhdpi/ic_tongue_diagnosis.png deleted file mode 100644 index 62b3eb3..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_tongue_diagnosis.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_white_bg.png b/app/src/main/res/mipmap-xhdpi/ic_white_bg.png deleted file mode 100644 index 7a6f5de..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_white_bg.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_xuezhi_manage.png b/app/src/main/res/mipmap-xhdpi/ic_xuezhi_manage.png deleted file mode 100644 index f74e4ef..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_xuezhi_manage.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_health.png b/app/src/main/res/mipmap-xhdpi/icon_health.png deleted file mode 100644 index ac4fefc..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_health.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/icon_health_dis.png b/app/src/main/res/mipmap-xhdpi/icon_health_dis.png deleted file mode 100644 index f9eeb03..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/icon_health_dis.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/sm_small.png b/app/src/main/res/mipmap-xhdpi/sm_small.png deleted file mode 100644 index ae51b89..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/sm_small.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/tw.png b/app/src/main/res/mipmap-xhdpi/tw.png deleted file mode 100644 index d8bddcf..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/tw.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/xd.png b/app/src/main/res/mipmap-xhdpi/xd.png deleted file mode 100644 index f4fd371..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/xd.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/xd_small.png b/app/src/main/res/mipmap-xhdpi/xd_small.png deleted file mode 100644 index ed2ccc2..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/xd_small.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/xl.png b/app/src/main/res/mipmap-xhdpi/xl.png deleted file mode 100644 index 8df79af..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/xl.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/xtang.png b/app/src/main/res/mipmap-xhdpi/xtang.png deleted file mode 100644 index a7712ff..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/xtang.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/xtang_small.png b/app/src/main/res/mipmap-xhdpi/xtang_small.png deleted file mode 100644 index 3d3c4c3..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/xtang_small.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/xy.png b/app/src/main/res/mipmap-xhdpi/xy.png deleted file mode 100644 index 9b02edd..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/xy.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/xya.png b/app/src/main/res/mipmap-xhdpi/xya.png deleted file mode 100644 index 8e99f0a..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/xya.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_24hour_tittle.png b/app/src/main/res/mipmap-xxhdpi/bg_24hour_tittle.png deleted file mode 100644 index b463346..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_24hour_tittle.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.png b/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.png deleted file mode 100644 index db56199..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.webp b/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.webp new file mode 100644 index 0000000..e34056a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_binder_decive_one.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_health_header_two.png b/app/src/main/res/mipmap-xxhdpi/bg_health_header_two.png deleted file mode 100644 index 799d561..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_health_header_two.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_health_header_two.webp b/app/src/main/res/mipmap-xxhdpi/bg_health_header_two.webp new file mode 100644 index 0000000..a191d52 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_health_header_two.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_health_main_two.png b/app/src/main/res/mipmap-xxhdpi/bg_health_main_two.png deleted file mode 100644 index 9b3ced4..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_health_main_two.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_health_main_two.webp b/app/src/main/res/mipmap-xxhdpi/bg_health_main_two.webp new file mode 100644 index 0000000..f066948 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_health_main_two.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_hot_card_analysis.png b/app/src/main/res/mipmap-xxhdpi/bg_hot_card_analysis.png deleted file mode 100644 index 751d24c..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_hot_card_analysis.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_hot_card_analysis.webp b/app/src/main/res/mipmap-xxhdpi/bg_hot_card_analysis.webp new file mode 100644 index 0000000..8fbcf2b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_hot_card_analysis.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_slogan.png b/app/src/main/res/mipmap-xxhdpi/bg_slogan.png deleted file mode 100644 index 43506a6..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_slogan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_xl.png b/app/src/main/res/mipmap-xxhdpi/bg_xl.png deleted file mode 100644 index 75e1182..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/bg_xl.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/bg_xl.webp b/app/src/main/res/mipmap-xxhdpi/bg_xl.webp new file mode 100644 index 0000000..f5a8760 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_xl.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_my_fangan.png b/app/src/main/res/mipmap-xxhdpi/ic_my_fangan.png deleted file mode 100644 index 188200e..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_my_fangan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_my_guanjia.png b/app/src/main/res/mipmap-xxhdpi/ic_my_guanjia.png deleted file mode 100644 index 7b0161f..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_my_guanjia.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_my_report.png b/app/src/main/res/mipmap-xxhdpi/ic_my_report.png deleted file mode 100644 index acf1c22..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_my_report.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_shangchuan.png b/app/src/main/res/mipmap-xxhdpi/ic_shangchuan.png deleted file mode 100644 index 41dfece..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_shangchuan.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon__ai_skin_measurement.png b/app/src/main/res/mipmap-xxhdpi/icon__ai_skin_measurement.png deleted file mode 100644 index d4c7eca..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon__ai_skin_measurement.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon__health_code.png b/app/src/main/res/mipmap-xxhdpi/icon__health_code.png deleted file mode 100644 index a0d3f2a..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon__health_code.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon__health_records.png b/app/src/main/res/mipmap-xxhdpi/icon__health_records.png deleted file mode 100644 index 4feb9c6..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon__health_records.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon__health_records.webp b/app/src/main/res/mipmap-xxhdpi/icon__health_records.webp new file mode 100644 index 0000000..f106293 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon__health_records.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon__video_interview.png b/app/src/main/res/mipmap-xxhdpi/icon__video_interview.png deleted file mode 100644 index 5783aaa..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon__video_interview.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_ai_confectioner.png b/app/src/main/res/mipmap-xxhdpi/icon_ai_confectioner.png deleted file mode 100644 index 5184844..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_ai_confectioner.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_ai_tongue_diagnosis.png b/app/src/main/res/mipmap-xxhdpi/icon_ai_tongue_diagnosis.png deleted file mode 100644 index 96e79b5..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_ai_tongue_diagnosis.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_assest_30.png b/app/src/main/res/mipmap-xxhdpi/icon_assest_30.png deleted file mode 100644 index 93348b7..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_assest_30.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_bd.png b/app/src/main/res/mipmap-xxhdpi/icon_bd.png deleted file mode 100644 index 0516712..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_bd.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_bd.webp b/app/src/main/res/mipmap-xxhdpi/icon_bd.webp new file mode 100644 index 0000000..b38b4a4 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_bd.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_blood_sugar.png b/app/src/main/res/mipmap-xxhdpi/icon_blood_sugar.png deleted file mode 100644 index d033c62..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_blood_sugar.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_cancer_screening.png b/app/src/main/res/mipmap-xxhdpi/icon_cancer_screening.png deleted file mode 100644 index de73f3b..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_cancer_screening.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_daily_benefit.png b/app/src/main/res/mipmap-xxhdpi/icon_daily_benefit.png deleted file mode 100644 index 70e3408..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_daily_benefit.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_data_comparison.png b/app/src/main/res/mipmap-xxhdpi/icon_data_comparison.png deleted file mode 100644 index 48246ca..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_data_comparison.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_data_comparison.webp b/app/src/main/res/mipmap-xxhdpi/icon_data_comparison.webp new file mode 100644 index 0000000..d5d8e78 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_data_comparison.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_diet_management.png b/app/src/main/res/mipmap-xxhdpi/icon_diet_management.png deleted file mode 100644 index fdb3f95..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_diet_management.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_mental_test.png b/app/src/main/res/mipmap-xxhdpi/icon_mental_test.png deleted file mode 100644 index a979f78..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_mental_test.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_psychology.png b/app/src/main/res/mipmap-xxhdpi/icon_psychology.png deleted file mode 100644 index f612075..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_psychology.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_tumor_risk.png b/app/src/main/res/mipmap-xxhdpi/icon_tumor_risk.png deleted file mode 100644 index 6253310..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/icon_tumor_risk.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/img_tongue_diagnosis.png b/app/src/main/res/mipmap-xxhdpi/img_tongue_diagnosis.png deleted file mode 100644 index 68fd9c7..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/img_tongue_diagnosis.png and /dev/null differ diff --git a/base/src/main/res/mipmap-hdpi/xuetangka_bg.webp b/base/src/main/res/mipmap-hdpi/xuetangka_bg.webp deleted file mode 100644 index 250613b..0000000 Binary files a/base/src/main/res/mipmap-hdpi/xuetangka_bg.webp and /dev/null differ diff --git a/base/src/main/res/mipmap-xhdpi/ic_upload.png b/base/src/main/res/mipmap-xhdpi/ic_upload.png deleted file mode 100644 index 90813f5..0000000 Binary files a/base/src/main/res/mipmap-xhdpi/ic_upload.png and /dev/null differ diff --git a/base/src/main/res/mipmap-xxhdpi/ic_upload.png b/base/src/main/res/mipmap-xxhdpi/ic_upload.png deleted file mode 100644 index 6fc2ade..0000000 Binary files a/base/src/main/res/mipmap-xxhdpi/ic_upload.png and /dev/null differ diff --git a/base/src/main/res/mipmap-xxhdpi/ic_upload.webp b/base/src/main/res/mipmap-xxhdpi/ic_upload.webp new file mode 100644 index 0000000..bb75428 Binary files /dev/null and b/base/src/main/res/mipmap-xxhdpi/ic_upload.webp differ diff --git a/common/build.gradle b/common/build.gradle index 3d533fe..bc59757 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -103,7 +103,7 @@ dependencies { api 'com.liulishuo.filedownloader:library:1.7.7' api 'com.google.zxing:core:3.3.3' - api 'com.github.maning0303:MNZXingCode:V2.1.9' + // api 'com.github.maning0303:MNZXingCode:V2.1.9' api 'pub.devrel:easypermissions:3.0.0' api 'com.alipay.sdk:alipaysdk-android:+@aar' diff --git a/common/src/main/java/com/xty/common/ExtendUtils.kt b/common/src/main/java/com/xty/common/ExtendUtils.kt index e935174..ee4482d 100644 --- a/common/src/main/java/com/xty/common/ExtendUtils.kt +++ b/common/src/main/java/com/xty/common/ExtendUtils.kt @@ -32,9 +32,11 @@ fun ImageView.setRoundImage(context: Context, string: String?) { /** * 欢迎界面图片绑定 绑定 */ +/* fun ImageView.setImageWelcome(context: Context, string: String?) { Glide.with(context).load(string).error(R.mipmap.ic_welcome_logo).into(this) } +*/ fun getImageUrl(url: String?): String { return if (url.isNullOrEmpty()) "" else if (url.startsWith("http")) url else BuildConfig.image_prefix + url diff --git a/common/src/main/res/mipmap-xhdpi/ic_bg_oval.png b/common/src/main/res/mipmap-xhdpi/ic_bg_oval.png deleted file mode 100644 index d1444d5..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_bg_oval.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_bg_oval.webp b/common/src/main/res/mipmap-xhdpi/ic_bg_oval.webp new file mode 100644 index 0000000..c080c1e Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_bg_oval.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_body.png b/common/src/main/res/mipmap-xhdpi/ic_body.png deleted file mode 100644 index 2ae336e..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_body.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_female_body_disease.png b/common/src/main/res/mipmap-xhdpi/ic_female_body_disease.png deleted file mode 100644 index 81aeee0..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_female_body_disease.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_female_body_health.png b/common/src/main/res/mipmap-xhdpi/ic_female_body_health.png deleted file mode 100644 index aa3c9bc..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_female_body_health.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_female_body_none_data.png b/common/src/main/res/mipmap-xhdpi/ic_female_body_none_data.png deleted file mode 100644 index f5c2701..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_female_body_none_data.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_female_body_warning.png b/common/src/main/res/mipmap-xhdpi/ic_female_body_warning.png deleted file mode 100644 index 4042931..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_female_body_warning.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_gold.png b/common/src/main/res/mipmap-xhdpi/ic_gold.png deleted file mode 100644 index f501b01..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_gold.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_gold.webp b/common/src/main/res/mipmap-xhdpi/ic_gold.webp new file mode 100644 index 0000000..a5b62b5 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_gold.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_male_body_disease.png b/common/src/main/res/mipmap-xhdpi/ic_male_body_disease.png deleted file mode 100644 index 30a5204..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_male_body_disease.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_male_body_health.png b/common/src/main/res/mipmap-xhdpi/ic_male_body_health.png deleted file mode 100644 index 5ff9dca..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_male_body_health.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_male_body_health.webp b/common/src/main/res/mipmap-xhdpi/ic_male_body_health.webp new file mode 100644 index 0000000..0252f38 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_male_body_health.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_male_body_none_data.png b/common/src/main/res/mipmap-xhdpi/ic_male_body_none_data.png deleted file mode 100644 index 9cb2997..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_male_body_none_data.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_male_body_warning.png b/common/src/main/res/mipmap-xhdpi/ic_male_body_warning.png deleted file mode 100644 index 7e8da73..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_male_body_warning.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_no_data.png b/common/src/main/res/mipmap-xhdpi/ic_no_data.png deleted file mode 100644 index 0751766..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_no_data.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_no_data.webp b/common/src/main/res/mipmap-xhdpi/ic_no_data.webp new file mode 100644 index 0000000..3f84373 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_no_data.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_no_network.png b/common/src/main/res/mipmap-xhdpi/ic_no_network.png deleted file mode 100644 index 9932512..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_no_network.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_no_network.webp b/common/src/main/res/mipmap-xhdpi/ic_no_network.webp new file mode 100644 index 0000000..6381e84 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_no_network.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_none_data.png b/common/src/main/res/mipmap-xhdpi/ic_none_data.png deleted file mode 100644 index f7f0f91..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_none_data.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_operastion.png b/common/src/main/res/mipmap-xhdpi/ic_operastion.png deleted file mode 100644 index 3a5b8ef..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_operastion.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_operation.png b/common/src/main/res/mipmap-xhdpi/ic_operation.png deleted file mode 100644 index dbd4091..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_operation.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_start_bg.png b/common/src/main/res/mipmap-xhdpi/ic_start_bg.png deleted file mode 100644 index e2ef1ee..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_start_bg.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_start_bg.webp b/common/src/main/res/mipmap-xhdpi/ic_start_bg.webp new file mode 100644 index 0000000..27eeea5 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/ic_start_bg.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_welcome_logo.png b/common/src/main/res/mipmap-xhdpi/ic_welcome_logo.png deleted file mode 100644 index 8a4b99c..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_welcome_logo.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/ic_welcome_txt.png b/common/src/main/res/mipmap-xhdpi/ic_welcome_txt.png deleted file mode 100644 index ac0a4ba..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/ic_welcome_txt.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_1.png b/common/src/main/res/mipmap-xhdpi/icon_health_man_1.png deleted file mode 100644 index 9424dc1..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_man_1.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_1.webp b/common/src/main/res/mipmap-xhdpi/icon_health_man_1.webp new file mode 100644 index 0000000..e0cf8e6 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_man_1.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_2.png b/common/src/main/res/mipmap-xhdpi/icon_health_man_2.png deleted file mode 100644 index d463f68..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_man_2.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_2.webp b/common/src/main/res/mipmap-xhdpi/icon_health_man_2.webp new file mode 100644 index 0000000..bf65032 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_man_2.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_3.png b/common/src/main/res/mipmap-xhdpi/icon_health_man_3.png deleted file mode 100644 index 33ef424..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_man_3.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_3.webp b/common/src/main/res/mipmap-xhdpi/icon_health_man_3.webp new file mode 100644 index 0000000..0fa0e94 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_man_3.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_4.png b/common/src/main/res/mipmap-xhdpi/icon_health_man_4.png deleted file mode 100644 index 15f46ba..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_man_4.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_man_4.webp b/common/src/main/res/mipmap-xhdpi/icon_health_man_4.webp new file mode 100644 index 0000000..b463b22 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_man_4.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_1.png b/common/src/main/res/mipmap-xhdpi/icon_health_women_1.png deleted file mode 100644 index fdd4248..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_women_1.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_1.webp b/common/src/main/res/mipmap-xhdpi/icon_health_women_1.webp new file mode 100644 index 0000000..d844cd4 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_women_1.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_2.png b/common/src/main/res/mipmap-xhdpi/icon_health_women_2.png deleted file mode 100644 index ab44414..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_women_2.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_2.webp b/common/src/main/res/mipmap-xhdpi/icon_health_women_2.webp new file mode 100644 index 0000000..8603f4e Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_women_2.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_3.png b/common/src/main/res/mipmap-xhdpi/icon_health_women_3.png deleted file mode 100644 index b8cbe0e..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_women_3.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_3.webp b/common/src/main/res/mipmap-xhdpi/icon_health_women_3.webp new file mode 100644 index 0000000..9835ad2 Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_women_3.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_4.png b/common/src/main/res/mipmap-xhdpi/icon_health_women_4.png deleted file mode 100644 index 937f2e3..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_health_women_4.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_health_women_4.webp b/common/src/main/res/mipmap-xhdpi/icon_health_women_4.webp new file mode 100644 index 0000000..4f04f2a Binary files /dev/null and b/common/src/main/res/mipmap-xhdpi/icon_health_women_4.webp differ diff --git a/common/src/main/res/mipmap-xhdpi/icon_lnvitation_message_yellow.png b/common/src/main/res/mipmap-xhdpi/icon_lnvitation_message_yellow.png deleted file mode 100644 index 35d785f..0000000 Binary files a/common/src/main/res/mipmap-xhdpi/icon_lnvitation_message_yellow.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_chart_empty.png b/common/src/main/res/mipmap-xxhdpi/bg_chart_empty.png deleted file mode 100644 index 853ff0b..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/bg_chart_empty.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_health_body.png b/common/src/main/res/mipmap-xxhdpi/bg_health_body.png deleted file mode 100644 index 2ec4004..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/bg_health_body.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_health_body.webp b/common/src/main/res/mipmap-xxhdpi/bg_health_body.webp new file mode 100644 index 0000000..fb17ebb Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/bg_health_body.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_home_item.png b/common/src/main/res/mipmap-xxhdpi/bg_home_item.png deleted file mode 100644 index e381556..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/bg_home_item.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_home_item.webp b/common/src/main/res/mipmap-xxhdpi/bg_home_item.webp new file mode 100644 index 0000000..67fdeb2 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/bg_home_item.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_mine_appreciation.png b/common/src/main/res/mipmap-xxhdpi/bg_mine_appreciation.png deleted file mode 100644 index ef2f3e0..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/bg_mine_appreciation.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_mine_appreciation.webp b/common/src/main/res/mipmap-xxhdpi/bg_mine_appreciation.webp new file mode 100644 index 0000000..bfb9d32 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/bg_mine_appreciation.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_mine_member.png b/common/src/main/res/mipmap-xxhdpi/bg_mine_member.png deleted file mode 100644 index 6136206..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/bg_mine_member.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_mine_member.webp b/common/src/main/res/mipmap-xxhdpi/bg_mine_member.webp new file mode 100644 index 0000000..d46fe23 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/bg_mine_member.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_tongue_point.png b/common/src/main/res/mipmap-xxhdpi/bg_tongue_point.png deleted file mode 100644 index c8c161c..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/bg_tongue_point.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/bg_tongue_point.webp b/common/src/main/res/mipmap-xxhdpi/bg_tongue_point.webp new file mode 100644 index 0000000..85d2ab4 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/bg_tongue_point.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_pay_success.png b/common/src/main/res/mipmap-xxhdpi/ic_pay_success.png deleted file mode 100644 index 873aedb..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/ic_pay_success.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_pay_success.webp b/common/src/main/res/mipmap-xxhdpi/ic_pay_success.webp new file mode 100644 index 0000000..fd970f5 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_pay_success.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_start_bg.png b/common/src/main/res/mipmap-xxhdpi/ic_start_bg.png deleted file mode 100644 index f27a3aa..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/ic_start_bg.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/ic_start_bg.webp b/common/src/main/res/mipmap-xxhdpi/ic_start_bg.webp new file mode 100644 index 0000000..754c820 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/ic_start_bg.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_about_logo.png b/common/src/main/res/mipmap-xxhdpi/icon_about_logo.png deleted file mode 100644 index d3b47bc..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/icon_about_logo.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_about_logo.webp b/common/src/main/res/mipmap-xxhdpi/icon_about_logo.webp new file mode 100644 index 0000000..2b12904 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_about_logo.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_mine_invite.png b/common/src/main/res/mipmap-xxhdpi/icon_mine_invite.png deleted file mode 100644 index 8351be8..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/icon_mine_invite.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_mine_invite_white.png b/common/src/main/res/mipmap-xxhdpi/icon_mine_invite_white.png deleted file mode 100644 index 9a3f20e..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/icon_mine_invite_white.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_pay_success.png b/common/src/main/res/mipmap-xxhdpi/icon_pay_success.png deleted file mode 100644 index f02da67..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/icon_pay_success.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/icon_pay_success.webp b/common/src/main/res/mipmap-xxhdpi/icon_pay_success.webp new file mode 100644 index 0000000..6312ad2 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/icon_pay_success.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/img_tongue_bottom.png b/common/src/main/res/mipmap-xxhdpi/img_tongue_bottom.png deleted file mode 100644 index 88fd332..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/img_tongue_bottom.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/img_tongue_bottom.webp b/common/src/main/res/mipmap-xxhdpi/img_tongue_bottom.webp new file mode 100644 index 0000000..3ec7cac Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/img_tongue_bottom.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/img_tongue_top.png b/common/src/main/res/mipmap-xxhdpi/img_tongue_top.png deleted file mode 100644 index 381330e..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/img_tongue_top.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/img_tongue_top.webp b/common/src/main/res/mipmap-xxhdpi/img_tongue_top.webp new file mode 100644 index 0000000..c52836e Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/img_tongue_top.webp differ diff --git a/common/src/main/res/mipmap-xxhdpi/myorder_line.png b/common/src/main/res/mipmap-xxhdpi/myorder_line.png deleted file mode 100644 index e31e8f5..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/myorder_line.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/zanwu.png b/common/src/main/res/mipmap-xxhdpi/zanwu.png deleted file mode 100644 index d3d82bb..0000000 Binary files a/common/src/main/res/mipmap-xxhdpi/zanwu.png and /dev/null differ diff --git a/common/src/main/res/mipmap-xxhdpi/zanwu.webp b/common/src/main/res/mipmap-xxhdpi/zanwu.webp new file mode 100644 index 0000000..fe792d6 Binary files /dev/null and b/common/src/main/res/mipmap-xxhdpi/zanwu.webp differ diff --git a/config.gradle b/config.gradle index 1091e77..b2667f4 100644 --- a/config.gradle +++ b/config.gradle @@ -6,8 +6,8 @@ ext { appId : "com.zj365.dc", minSdk : 23, targetSdk : 32, - versionCode : 118, - versionName : "1.2.0" + versionCode : 116, + versionName : "1.1.2" ] @@ -25,28 +25,27 @@ ext { url = [ releaseTime: String.valueOf(new Date().format("ddHHmm")), //正式环境 - debug_url : "https://app.zhongjian365.com/app/", + /*debug_url : "https://app.zhongjian365.com/app/", release_url: "https://app.zhongjian365.com/app/", h5_debug_url : "https://built.zhongjian365.com/", - h5_release_url : "https://built.zhongjian365.com/" + h5_release_url : "https://built.zhongjian365.com/"*/ //测试环境 - /* debug_url : "http://java01.zhongjian365.com/app/", + debug_url : "http://java01.zhongjian365.com/app/", release_url: "http://java01.zhongjian365.com/app/", h5_debug_url : "http://testbuilt.zhongjian365.com/", - h5_release_url : "http://testbuilt.zhongjian365.com/"*/ + h5_release_url : "http://testbuilt.zhongjian365.com/" ] image_preifx = [ -/* debug_url : "http://java01.zhongjian365.com/app/", - release_url: "http://java01.zhongjian365.com/app/"*/ + release_url: "http://java01.zhongjian365.com/app/" - debug_url : "https://app.zhongjian365.com/app/", - release_url: "https://app.zhongjian365.com/app/" + /* debug_url : "https://app.zhongjian365.com/app/", + release_url: "https://app.zhongjian365.com/app/"*/ ] diff --git a/health/src/main/java/com/zj365/health/adapter/Health24HourAdapter.kt b/health/src/main/java/com/zj365/health/adapter/Health24HourAdapter.kt index 4399329..6f62854 100644 --- a/health/src/main/java/com/zj365/health/adapter/Health24HourAdapter.kt +++ b/health/src/main/java/com/zj365/health/adapter/Health24HourAdapter.kt @@ -210,13 +210,13 @@ class Health24HourAdapter : BaseMultiItemQuickAdapter(R.id.mBody) .setImageResource(bodyImgResId) diff --git a/health/src/main/java/com/zj365/health/fragment/FragDayReport.kt b/health/src/main/java/com/zj365/health/fragment/FragDayReport.kt index 194f91b..966f128 100644 --- a/health/src/main/java/com/zj365/health/fragment/FragDayReport.kt +++ b/health/src/main/java/com/zj365/health/fragment/FragDayReport.kt @@ -262,13 +262,13 @@ class FragDayReport : BaseVmFrag() { var statusInt = if (mViewModel.infoLive.value!!.data!!.healthy == null) 0 else mViewModel.infoLive.value!!.data!!.healthy!!.result var bodyImgResId = if (statusInt == 2) { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_warning else R.mipmap.ic_female_body_warning + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } else if (statusInt == 3) { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_disease else R.mipmap.ic_female_body_disease + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } else if (statusInt == 1) { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_female_body_health + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } else { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_none_data else R.mipmap.ic_female_body_none_data + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } binding.mBody.setImageResource(bodyImgResId) diff --git a/health/src/main/java/com/zj365/health/fragment/FragWeekReport.kt b/health/src/main/java/com/zj365/health/fragment/FragWeekReport.kt index 8118873..5e53e69 100644 --- a/health/src/main/java/com/zj365/health/fragment/FragWeekReport.kt +++ b/health/src/main/java/com/zj365/health/fragment/FragWeekReport.kt @@ -503,13 +503,13 @@ class FragWeekReport : BaseVmFrag() { var statusInt = if (respBody.data.analyse == null) 0 else respBody.data.analyse.status.toInt() var bodyImgResId = if (statusInt == 2) { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_warning else R.mipmap.ic_female_body_warning + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } else if (statusInt == 3) { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_disease else R.mipmap.ic_female_body_disease + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } else if (statusInt == 1) { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_female_body_health + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } else { - if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_none_data else R.mipmap.ic_female_body_none_data + if (mViewModel.infoLive.value!!.data!!.user!!.sex == "1") R.mipmap.ic_male_body_health else R.mipmap.ic_male_body_health } binding.child.mBody.setImageResource(bodyImgResId) diff --git a/health/src/main/res/layout/act_body_fat_detail.xml b/health/src/main/res/layout/act_body_fat_detail.xml index fcb2ea2..b4efcfe 100644 --- a/health/src/main/res/layout/act_body_fat_detail.xml +++ b/health/src/main/res/layout/act_body_fat_detail.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/dp_287" android:scaleType="fitXY" - android:src="@mipmap/bg_my_integral" /> + /> + /> diff --git a/health/src/main/res/layout/act_prevent_cancer.xml b/health/src/main/res/layout/act_prevent_cancer.xml index f538498..8af34e3 100644 --- a/health/src/main/res/layout/act_prevent_cancer.xml +++ b/health/src/main/res/layout/act_prevent_cancer.xml @@ -45,8 +45,7 @@ android:layout_height="wrap_content" android:layout_marginLeft="@dimen/dp_15" android:layout_marginRight="@dimen/dp_15" - android:scaleType="center" - tools:background="@mipmap/ic_fangai_bg" /> + android:scaleType="center" /> diff --git a/health/src/main/res/layout/blood_fat_chart.xml b/health/src/main/res/layout/blood_fat_chart.xml index 499d414..f220c33 100644 --- a/health/src/main/res/layout/blood_fat_chart.xml +++ b/health/src/main/res/layout/blood_fat_chart.xml @@ -94,9 +94,9 @@ android:layout_marginBottom="@dimen/dp_100" tools:visibility="visible"> + android:layout_width="@dimen/dp_179" + android:layout_height="@dimen/dp_105" + android:background="@mipmap/zanwu"/> diff --git a/health/src/main/res/layout/view_device_none_data.xml b/health/src/main/res/layout/view_device_none_data.xml index cfbeb45..0ba33ff 100644 --- a/health/src/main/res/layout/view_device_none_data.xml +++ b/health/src/main/res/layout/view_device_none_data.xml @@ -16,7 +16,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_50" - android:src="@mipmap/ic_view_none_data" /> + android:src="@mipmap/zanwu" /> + />