修复bug

baselib/src/main/res/layout/rv_empty.xml

@@ -15,9 +15,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/there_is_currently_no_data_available"
             android:textColor="@color/color_d8000000"
             android:textSize="@dimen/divider_42px" />
 
+        <androidx.appcompat.widget.AppCompatImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@mipmap/empty_view_message">
+
+        </androidx.appcompat.widget.AppCompatImageView>
     </LinearLayout>
 </layout>

baselib/src/main/res/values/dimens.xml

@@ -80,6 +80,7 @@
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
     <dimen name="divider_176px" tools:ignore="ResourceName">176px</dimen>
     <dimen name="divider_160px" tools:ignore="ResourceName">160px</dimen>
+    <dimen name="divider_158px" tools:ignore="ResourceName">158px</dimen>
     <dimen name="divider_146px" tools:ignore="ResourceName">146px</dimen>
     <dimen name="divider_140px" tools:ignore="ResourceName">140px</dimen>
     <dimen name="divider_133px" tools:ignore="ResourceName">133px</dimen>

config.gradle

@@ -13,7 +13,7 @@ ext {
             applicationId    : "com.yingyangfly",
             minSdkVersion    : 19,
             targetSdkVersion : 30,
-            versionCode      : 7,
+            versionCode      : 9,
             versionName      : "1.0.0",
     ]
     //androidx配置

home/src/main/java/com/yingyangfly/home/evaluation/EvaluationHistoryActivity.kt

@@ -30,24 +30,24 @@ class EvaluationHistoryActivity :
     /**
      * 其他测评
      */
-    private var page = 1
-    private val otherEvaluationHistoryAdapter by lazy { OtherEvaluationHistoryAdapter() }
-    private var selectAnswerRecord = mutableListOf<SelectAnswerRecord>()
+//    private var page = 1
+//    private val otherEvaluationHistoryAdapter by lazy { OtherEvaluationHistoryAdapter() }
+//    private var selectAnswerRecord = mutableListOf<SelectAnswerRecord>()
 
     private var results = mutableListOf<EvaluationHistoryBean>()
     private val adapter by lazy { EvaluationHistoryAdapter() }
 
     override fun initViews() {
         binding {
-            swipeOtherResult.setEnableLoadMore(true)
-            swipeOtherResult.setEnableRefresh(true)
-            rvOtherResult.adapter = otherEvaluationHistoryAdapter
-            otherEvaluationHistoryAdapter.setData(selectAnswerRecord)
-            otherEvaluationHistoryAdapter.onClickListener = {
-                JumpUtil.jumpActivityWithUrl(
-                    RouterUrlCommon.otherReviewResultDetail, it.recordId, mContext
-                )
-            }
+//            swipeOtherResult.setEnableLoadMore(true)
+//            swipeOtherResult.setEnableRefresh(true)
+//            rvOtherResult.adapter = otherEvaluationHistoryAdapter
+//            otherEvaluationHistoryAdapter.setData(selectAnswerRecord)
+//            otherEvaluationHistoryAdapter.onClickListener = {
+//                JumpUtil.jumpActivityWithUrl(
+//                    RouterUrlCommon.otherReviewResultDetail, it.recordId, mContext
+//                )
+//            }
 
             rvResult.adapter = adapter
             adapter.setData(results)
@@ -67,22 +67,22 @@ class EvaluationHistoryActivity :
     override fun initListener() {
         binding {
             layoutHead.setOnTouchListener(this@EvaluationHistoryActivity)
-            radioEvaluation.setOnCheckedChangeListener { group, checkedId ->
-                if (checkedId == R.id.radioProfessionalEvaluation) {
-                    showEvaluationsView(false)
-                    getReviewTaskHistoryList()
-                } else if (checkedId == R.id.radioOtherEvaluation) {
-                    showEvaluationsView(true)
-                    getOtherReviewTaskHistory(isRefresh = true, isShowLoading = true)
-                }
-            }
-            swipeOtherResult.setOnRefreshListener {
-                getOtherReviewTaskHistory(isRefresh = true, isShowLoading = false)
-            }
-
-            swipeOtherResult.setOnLoadMoreListener {
-                getOtherReviewTaskHistory(isRefresh = false, isShowLoading = false)
-            }
+//            radioEvaluation.setOnCheckedChangeListener { group, checkedId ->
+//                if (checkedId == R.id.radioProfessionalEvaluation) {
+//                    showEvaluationsView(false)
+//                    getReviewTaskHistoryList()
+//                } else if (checkedId == R.id.radioOtherEvaluation) {
+//                    showEvaluationsView(true)
+//                    getOtherReviewTaskHistory(isRefresh = true, isShowLoading = true)
+//                }
+//            }
+//            swipeOtherResult.setOnRefreshListener {
+//                getOtherReviewTaskHistory(isRefresh = true, isShowLoading = false)
+//            }
+//
+//            swipeOtherResult.setOnLoadMoreListener {
+//                getOtherReviewTaskHistory(isRefresh = false, isShowLoading = false)
+//            }
         }
     }
 
@@ -95,32 +95,7 @@ class EvaluationHistoryActivity :
         getReviewTaskHistoryList()
     }
 
-    /**
-     * 获取其他测评历史记录
-     */
-    private fun getOtherReviewTaskHistory(isRefresh: Boolean, isShowLoading: Boolean) {
-        if (isRefresh) {
-            page = 1
-            binding.swipeOtherResult.resetNoMoreData()
-        } else {
-            page++
-        }
-        viewModel.getSelectAnswerRecord(page, isShowLoading, fail = {
-            endRefresh()
-            it.toast()
-        }, success = {
-            endRefresh()
-            if (isRefresh) {
-                selectAnswerRecord.clear()
-            }
-            if (it != null && it.records.isNullOrEmpty().not()) {
-                selectAnswerRecord.addAll(it.records)
-            } else {
-                binding.swipeOtherResult.finishLoadMoreWithNoMoreData()
-            }
-            otherEvaluationHistoryAdapter.setData(selectAnswerRecord)
-        })
-    }
+
 
 
     /**

home/src/main/res/drawable/bg_left_selected_professional_evaluation.xml

@@ -3,8 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners
+        android:topLeftRadius="@dimen/divider_12px"
+        android:topRightRadius="@dimen/divider_12px"
         android:bottomLeftRadius="@dimen/divider_12px"
-        android:topLeftRadius="@dimen/divider_12px" />
+        android:bottomRightRadius="@dimen/divider_12px" />
     <stroke
         android:width="@dimen/divider_2px"
         android:color="@android:color/white" />

home/src/main/res/drawable/bg_left_unselected_professional_evaluation.xml

@@ -3,8 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="ResourceName">
     <corners
+        android:topLeftRadius="@dimen/divider_12px"
+        android:topRightRadius="@dimen/divider_12px"
         android:bottomLeftRadius="@dimen/divider_12px"
-        android:topLeftRadius="@dimen/divider_12px" />
+        android:bottomRightRadius="@dimen/divider_12px" />
     <stroke
         android:width="@dimen/divider_2px"
         android:color="@android:color/white" />

home/src/main/res/layout/activity_evaluation_history.xml

@@ -30,40 +30,55 @@
 <!--            <androidx.appcompat.widget.AppCompatTextView style="@style/back_text" />-->
         </LinearLayout>
 
-        <RadioGroup
-            android:id="@+id/radioEvaluation"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_36px"
+<!--        <RadioGroup-->
+<!--            android:id="@+id/radioEvaluation"-->
+<!--            android:layout_width="wrap_content"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginTop="@dimen/divider_36px"-->
+<!--            android:gravity="center"-->
+<!--            android:orientation="horizontal"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintTop_toTopOf="parent">-->
+
+<!--            <RadioButton-->
+<!--                android:id="@+id/radioProfessionalEvaluation"-->
+<!--                android:layout_width="@dimen/divider_195px"-->
+<!--                android:layout_height="@dimen/divider_55px"-->
+<!--                android:background="@drawable/bg_left_selected_professional_evaluation_result"-->
+<!--                android:button="@null"-->
+<!--                android:checked="true"-->
+<!--                android:gravity="center"-->
+<!--                android:text="@string/professional_evaluation_1"-->
+<!--                android:textColor="@color/selector_radio_evaluation_color"-->
+<!--                android:textSize="@dimen/divider_24px" />-->
+
+<!--            <RadioButton-->
+<!--                android:id="@+id/radioOtherEvaluation"-->
+<!--                android:layout_width="@dimen/divider_195px"-->
+<!--                android:layout_height="@dimen/divider_55px"-->
+<!--                android:background="@drawable/bg_right_selected_professional_evaluation_result"-->
+<!--                android:button="@null"-->
+<!--                android:gravity="center"-->
+<!--                android:text="@string/other_evaluations"-->
+<!--                android:textColor="@color/selector_radio_evaluation_color"-->
+<!--                android:textSize="@dimen/divider_24px" />-->
+<!--        </RadioGroup>-->
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/liangbiaoceping"
+            android:layout_width="@dimen/divider_600px"
+            android:layout_height="@dimen/divider_80px"
+            android:layout_marginTop="@dimen/divider_30px"
+            android:text="@string/evaluation_history_info"
+            android:background="@mipmap/tittle_bg_1"
             android:gravity="center"
-            android:orientation="horizontal"
+            android:textColor="@android:color/white"
+            android:textSize="@dimen/divider_34px"
+            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <RadioButton
-                android:id="@+id/radioProfessionalEvaluation"
-                android:layout_width="@dimen/divider_195px"
-                android:layout_height="@dimen/divider_55px"
-                android:background="@drawable/bg_left_selected_professional_evaluation_result"
-                android:button="@null"
-                android:checked="true"
-                android:gravity="center"
-                android:text="@string/professional_evaluation_1"
-                android:textColor="@color/selector_radio_evaluation_color"
-                android:textSize="@dimen/divider_24px" />
-
-            <RadioButton
-                android:id="@+id/radioOtherEvaluation"
-                android:layout_width="@dimen/divider_195px"
-                android:layout_height="@dimen/divider_55px"
-                android:background="@drawable/bg_right_selected_professional_evaluation_result"
-                android:button="@null"
-                android:gravity="center"
-                android:text="@string/other_evaluations"
-                android:textColor="@color/selector_radio_evaluation_color"
-                android:textSize="@dimen/divider_24px" />
-        </RadioGroup>
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
@@ -78,7 +93,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/radioEvaluation">
+            app:layout_constraintTop_toBottomOf="@+id/liangbiaoceping">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"

home/src/main/res/layout/activity_home.xml

@@ -107,7 +107,7 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/layoutHelp"
                     android:layout_width="@dimen/divider_111px"
-                    android:layout_height="@dimen/divider_96px"
+                    android:layout_height="@dimen/divider_107px"
                     android:background="@mipmap/icon_help"
                     app:layout_constraintEnd_toStartOf="@+id/layoutNotify"
                     app:layout_constraintStart_toEndOf="@+id/layoutLiveBroadcast"
@@ -117,7 +117,7 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/layoutNotify"
                     android:layout_width="@dimen/divider_111px"
-                    android:layout_height="@dimen/divider_96px"
+                    android:layout_height="@dimen/divider_107px"
                     android:background="@mipmap/icon_notify"
                     app:layout_constraintEnd_toStartOf="@+id/layoutServicePackage"
                     app:layout_constraintStart_toEndOf="@+id/layoutHelp"
@@ -127,7 +127,7 @@
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:id="@+id/layoutServicePackage"
                     android:layout_width="@dimen/divider_111px"
-                    android:layout_height="@dimen/divider_96px"
+                    android:layout_height="@dimen/divider_107px"
                     android:background="@mipmap/icon_service_package"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/layoutNotify"
@@ -561,8 +561,7 @@
                     <Button
                         android:id="@+id/btnCheck"
                         android:layout_width="@dimen/divider_128px"
-                        android:layout_height="@dimen/divider_48px"
-                        android:layout_marginEnd="@dimen/divider_26px"
+                        android:layout_height="@dimen/divider_40px"
                         android:background="@mipmap/shouye_btn_chakan"
                         android:textSize="@dimen/divider_28px" />
 

home/src/main/res/layout/item_game.xml

@@ -41,8 +41,8 @@
                 app:loadImg="@{data.gameCoverImage}" />
 
             <TextView
-                android:layout_width="@dimen/divider_108px"
-                android:layout_height="@dimen/divider_46px"
+                android:layout_width="@dimen/divider_125px"
+                android:layout_height="@dimen/divider_40px"
                 android:gravity="center"
                 android:text="@{data.gameType}"
                 android:textColor="@color/color_F4792B"

workbenches/src/main/res/layout/fragment_brain_ability.xml

@@ -54,10 +54,10 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/empty_view_message"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:gravity="center"
-            android:text="@string/there_is_currently_no_data_available"
+            android:background="@mipmap/empty_view_message"
             android:textColor="@color/color_d8000000"
             android:textSize="@dimen/divider_42px"
             android:visibility="gone"

workbenches/src/main/res/layout/fragment_data_monitor.xml

@@ -145,7 +145,7 @@
         <LinearLayout
             android:id="@+id/weekLayout"
             android:layout_width="0dp"
-            android:layout_height="@dimen/divider_533px"
+            android:layout_height="@dimen/divider_505px"
             android:layout_marginStart="@dimen/divider_32px"
             android:layout_marginTop="@dimen/divider_32px"
             android:layout_marginEnd="@dimen/divider_40px"

workbenches/src/main/res/layout/fragment_train_content.xml

@@ -31,10 +31,10 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/contentTitleLayout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/divider_70px"
-            android:layout_marginStart="@dimen/divider_32px"
+            android:layout_height="@dimen/divider_62px"
+            android:layout_marginStart="@dimen/divider_36px"
             android:layout_marginTop="@dimen/divider_140px"
-            android:layout_marginEnd="@dimen/divider_32px"
+            android:layout_marginEnd="@dimen/divider_36px"
             android:background="@drawable/bg_training_content_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -93,9 +93,8 @@
             android:id="@+id/rvTrainingContent"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            android:layout_marginStart="@dimen/divider_32px"
-            android:layout_marginEnd="@dimen/divider_32px"
-            android:layout_marginBottom="@dimen/divider_32px"
+            android:layout_marginStart="@dimen/divider_36px"
+            android:layout_marginEnd="@dimen/divider_36px"
             android:background="@drawable/bg_training_content_list"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
             app:layout_constraintBottom_toBottomOf="parent"

workbenches/src/main/res/layout/item_free_training.xml

@@ -35,7 +35,7 @@
 
                 <com.google.android.material.card.MaterialCardView
                     android:id="@+id/cardImage"
-                    android:layout_width="@dimen/divider_160px"
+                    android:layout_width="@dimen/divider_158px"
                     android:layout_height="@dimen/divider_160px"
                     android:layout_marginTop="@dimen/divider_5px"
                     android:theme="@style/Theme.MaterialComponents.NoActionBar"

workbenches/src/main/res/layout/item_order_list.xml

@@ -33,7 +33,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="@mipmap/wenzhen_btn_1"
+            android:background="@mipmap/wenzhen_btn_2"
             android:paddingBottom="@dimen/divider_28px"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

workbenches/src/main/res/layout/item_service_package_list.xml

@@ -34,11 +34,11 @@
         <androidx.appcompat.widget.AppCompatTextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/divider_29px"
+            android:layout_marginTop="@dimen/divider_40px"
             android:gravity="center"
             android:text='@{data.priceYUAN+"元"}'
             android:textColor="@color/color_FF9203"
-            android:textSize="@dimen/divider_48px"
+            android:textSize="@dimen/divider_34px"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
@@ -50,7 +50,7 @@
             android:layout_marginStart="@dimen/divider_55px"
             android:layout_marginEnd="@dimen/divider_54px"
             android:layout_marginBottom="@dimen/divider_48px"
-            android:background="@drawable/bg_work_benches_btn"
+            android:background="@mipmap/btn_taocan_2"
             android:text="@string/purchase"
             android:textColor="@android:color/white"
             android:textSize="@dimen/divider_24px"

workbenches/src/main/res/values/dimens.xml

@@ -7,6 +7,7 @@
     <dimen name="divider_667px" tools:ignore="ResourceName">667px</dimen>
     <dimen name="divider_597px" tools:ignore="ResourceName">597px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
+    <dimen name="divider_505px" tools:ignore="ResourceName">505px</dimen>
     <dimen name="divider_440px" tools:ignore="ResourceName">440px</dimen>
     <dimen name="divider_432px" tools:ignore="ResourceName">432px</dimen>
     <dimen name="divider_430px" tools:ignore="ResourceName">430px</dimen>

workbenches/src/main/res/values/styles.xml

@@ -164,7 +164,7 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
-        <item name="android:textSize">@dimen/divider_28px</item>
+        <item name="android:textSize">@dimen/divider_24px</item>
         <item name="android:textColor">@android:color/white</item>
         <item name="layout_constraintBottom_toBottomOf">parent</item>
         <item name="layout_constraintTop_toTopOf">parent</item>