中建365-二期开发-bug修复

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

@@ -98,7 +98,7 @@ class RegisterAct : BaseVmAct<RegisterVm>() {
 
         binding.mRegister.setOnClickListener {
             RxKeyboardTool.hideSoftInput(this)
-            if (!binding.mPrivate.isSelected) {
+            if (!binding.seleck.isSelected) {
                 CommonToastUtils.showToast(R.string.please_agree_all)
                 return@setOnClickListener
             }

mine/src/main/java/com/zj365/mime/act/EnterpriseInformationAct.kt

@@ -5,6 +5,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.xty.base.act.BaseListAct
+import com.xty.base.act.BaseVmAct
 import com.xty.common.arouter.ARouterUrl
 import com.xty.common.arouter.RouteManager
 import com.xty.network.model.EnterpriseInfoHomeBean
@@ -17,14 +18,21 @@ import com.zj365.mime.vm.EnterpriseInformationVm
  * 企业资料
  */
 @Route(path = ARouterUrl.ENTERPRISE_INFO)
-class EnterpriseInformationAct : BaseListAct<EnterpriseInformationVm>() {
+class EnterpriseInformationAct : BaseVmAct<EnterpriseInformationVm>() {
     val binding by lazy { ActEnterpriseInformationBinding.inflate(layoutInflater) }
 
     val mAdapter by lazy { EnterpriseInformationAdapter() }
-    override fun initAdapter() {
+
+    override fun initView() {
+        super.initView()
+        statusBar(binding.title.mView)
+        binding.title.mTvTitle.text = "企业资料"
+        binding.title.mIvBack.setOnClickListener {
+            finish()
+        }
+
         binding.recyclerView.layoutManager = LinearLayoutManager(this)
         binding.recyclerView.adapter = mAdapter
-        setRecycleRefresh(binding.recyclerView,binding.mRefresh,true)
         binding.recyclerView.addItemDecoration(object : RecyclerView.ItemDecoration() {
             override fun getItemOffsets(outRect: Rect, itemPosition: Int, parent: RecyclerView) {
                 super.getItemOffsets(outRect, itemPosition, parent)
@@ -44,21 +52,10 @@ class EnterpriseInformationAct : BaseListAct<EnterpriseInformationVm>() {
                 }
             }
         }
-    }
 
-    override fun loadData() {
         mViewModel.getEnterpriseInformationHomeList()
     }
 
-    override fun initView() {
-        super.initView()
-        statusBar(binding.title.mView)
-        binding.title.mTvTitle.text = "企业资料"
-        binding.title.mIvBack.setOnClickListener {
-            finish()
-        }
-    }
-
     override fun liveObserver() {
 
         mViewModel.enterpriseInfoHomeLiveData.observe(this){

mine/src/main/res/layout/act_enterprise_information.xml

@@ -8,28 +8,12 @@
     <include layout="@layout/title_white_bar"
         android:id="@+id/title"/>
 
-    <com.scwang.smart.refresh.layout.SmartRefreshLayout
-        android:id="@+id/mRefresh"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/col_f4f">
-
-        <com.scwang.smart.refresh.header.ClassicsHeader
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/dp_12"
-            android:layout_marginLeft="@dimen/dp_14"
-            android:layout_marginRight="@dimen/dp_14"/>
-
-        <com.scwang.smart.refresh.footer.ClassicsFooter
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
-
-    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
+        android:layout_marginTop="@dimen/dp_12"
+        android:layout_marginLeft="@dimen/dp_14"
+        android:layout_marginRight="@dimen/dp_14"/>
 
 </LinearLayout>

network/src/main/java/com/xty/network/model/BalanceDietBean.kt

@@ -1,4 +1,4 @@
 package com.xty.network.model
 
-data class BalanceDietBean(var fat_percent:Int,var protein_percent:Int,var heat_val:String,var cho_percent:Int) {
+data class BalanceDietBean(var fat_percent:Int,var protein_percent:Int,var heat_val:Int,var cho_percent:Int) {
 }

network/src/main/java/com/xty/network/model/HealthArchiveBean.kt

@@ -3,13 +3,13 @@ package com.xty.network.model
 import com.umeng.commonsdk.debug.D
 
 data class HealthArchiveBean(
-    var bmiInfo:BMIInfo,
+    var bmiInfo:BMIInfo?,
     var healData:ArrayList<FamilyHealthBean.FamilyTargetBean>,
-    var bmr:String, //bmr值
+    var bmr:Double, //bmr值
 
     var bmi:String,
     var userSchedule:Int,//完善进度
-    var bodyFat:Double, //体脂率
+    var bodyFat:String, //体脂率
     var surveys:SurveysBean
 
 ){