中建365-二期开发-项目瘦包

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-fatscale-2.9.5.jar')
-    implementation files('libs/bluetooth-mini-core-2.9.5.jar')
+//    implementation files('libs/bluetooth-mini-core-2.9.5.jar')
     implementation project(':Health')
     implementation project(':server')
     implementation project(':mine')

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.core.serializer.AbstractMeasureData
-import com.lifesense.android.ble.device.fatscale.model.WeightMeasureData
+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<MainVm>(), Consumer<AbstractMeasureData>  {
+class MainActivity : BaseVmAct<MainVm>()/*, Consumer<AbstractMeasureData>*/  {
 
     private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) }
     override fun setLayout(): View = binding.root
@@ -470,7 +470,7 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData>  {
     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<MainVm>(), Consumer<AbstractMeasureData>  {
                 return
             }
         }
-    }
+    }*/
 
 
 

app/src/main/java/com/zj365/dc/activity/WelcomeAct.kt

@@ -171,7 +171,7 @@ class WelcomeAct : BaseVmAct<WelcomeVm>() {
     }
 
     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<Bitmap?>() {
                 override fun onResourceReady(
                     resource: Bitmap,
@@ -198,7 +198,7 @@ class WelcomeAct : BaseVmAct<WelcomeVm>() {
                         }
                     }
                 }
-            })
+            })*/
     }
 
     private fun startTimer() {

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

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()
-    }
+    }*/
 }

app/src/main/res/layout/child_healt.xml

@@ -19,159 +19,6 @@
             android:layout_height="wrap_content"
             android:id="@+id/home_content_rv"/>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:id="@+id/ll_ai_tongue_diagnosis"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:background="@mipmap/bg_home_item"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_34"
-                    android:layout_height="@dimen/dp_34"
-                    android:background="@mipmap/icon_ai_tongue_diagnosis"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="AI舌诊"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/dp_10"/>
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ll_ai_skin_measurement"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:background="@mipmap/bg_home_item"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_34"
-                    android:layout_height="@dimen/dp_34"
-                    android:background="@mipmap/icon__ai_skin_measurement"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="AI测肤"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/dp_10"/>
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ll_ai_confectioner"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:background="@mipmap/bg_home_item"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_34"
-                    android:layout_height="@dimen/dp_34"
-                    android:background="@mipmap/icon_ai_confectioner"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="AI糖医"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/dp_10"/>
-
-            </LinearLayout>
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:id="@+id/ll_mental_test"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:background="@mipmap/bg_home_item"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_34"
-                    android:layout_height="@dimen/dp_34"
-                    android:background="@mipmap/icon_mental_test"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="心理测试"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/dp_10"/>
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ll_cancer_screening"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:background="@mipmap/bg_home_item"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_34"
-                    android:layout_height="@dimen/dp_34"
-                    android:background="@mipmap/icon_cancer_screening"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="防癌筛查"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/dp_10"/>
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ll_diet_management"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:background="@mipmap/bg_home_item"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_34"
-                    android:layout_height="@dimen/dp_34"
-                    android:background="@mipmap/icon_diet_management"/>
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="膳食管理"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="@dimen/dp_10"/>
-
-            </LinearLayout>
-        </LinearLayout>
 
     </LinearLayout>
 

app/src/main/res/layout/frag_health_header.xml

@@ -92,81 +92,7 @@
                 android:id="@+id/rv_layout"/>
 
 
-            <LinearLayout
-                android:id="@+id/ll_video_interview"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:visibility="gone"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_45"
-                    android:layout_height="@dimen/dp_45"
-                    android:background="@mipmap/icon__video_interview"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="视频问诊"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="11dp"/>
-
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ll_health_records"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:visibility="gone"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_45"
-                    android:layout_height="@dimen/dp_45"
-                    android:background="@mipmap/icon__health_records"/>
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="健康档案"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="11dp"/>
-
-
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ll_health_code"
-                android:layout_width="@dimen/dp_0"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:visibility="gone"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:layout_width="@dimen/dp_45"
-                    android:layout_height="@dimen/dp_45"
-                    android:background="@mipmap/icon__health_code"/>
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="健康医典"
-                    android:textSize="@dimen/sp_14"
-                    android:textColor="@color/col_313"
-                    android:textStyle="bold"
-                    android:layout_marginTop="11dp"/>
-
-
-            </LinearLayout>
 
         </LinearLayout>
 

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'

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