1.修改主页样式

.idea/misc.xml

@@ -49,7 +49,7 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_leisure_brain.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_service_package.xml" value="0.22826086956521738" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_train_data.xml" value="0.4700413223140496" />
-        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_workbenches.xml" value="0.264" />
+        <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/activity_workbenches.xml" value="0.72" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_brain_ability.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_content.xml" value="0.21014492753623187" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/fragment_train_report.xml" value="0.22826086956521738" />

baselib/src/main/java/com/yingyangfly/baselib/adapter/DatabindingAdapter.kt

@@ -10,7 +10,7 @@ import com.yingyangfly.baselib.utils.ImageUtil.loadUrl
 import com.yingyangfly.baselib.utils.ScreenUtil
 
 /**
- * IM医生图片
+ * 加载图片
  */
 @BindingAdapter(value = ["loadHeadImg", "isCircle"], requireAll = false)
 fun ImageView.loadHeadImg(url: String?, isCircle: Boolean? = false) {
@@ -19,6 +19,16 @@ fun ImageView.loadHeadImg(url: String?, isCircle: Boolean? = false) {
     }
 }
 
+/**
+ * 加载图片
+ */
+@BindingAdapter(value = ["loadImg", "roundRadius"], requireAll = false)
+fun ImageView.loadImg(url: String?, roundRadius: Float = 0F) {
+    url?.let {
+        loadUrl(url, roundRadius = roundRadius)
+    }
+}
+
 /**
  * View的可见
  */

baselib/src/main/java/com/yingyangfly/baselib/utils/ImageUtil.kt

@@ -53,6 +53,32 @@ object ImageUtil {
         }
     }
 
+    /**
+     * 加载网络图片
+     * @param url 图片地址
+     * @param isCircle 是否为圆形
+     * @param roundRadius 圆角
+     */
+    fun ImageView.loadUrl(
+        url: String?,
+        roundRadius: Float = 0F
+    ) {
+        val load = Glide.with(AppUtil.getContext())
+            .load(url)
+//            .placeholder(resId)
+//            .format(DecodeFormat.PREFER_RGB_565)
+            .diskCacheStrategy(DiskCacheStrategy.ALL)
+
+        if (roundRadius > 0) {
+            load.transform(
+                CenterCrop(),
+                RoundedCorners(ScreenUtil.dp2px(roundRadius))
+            ).into(this)
+        } else {
+            load.into(this)
+        }
+    }
+
     /**
      * 加载网络图片
      * @param url 图片地址

baselib/src/main/java/com/yingyangfly/baselib/utils/ViewTool.java

@@ -16,11 +16,15 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.appcompat.widget.AppCompatButton;
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.cardview.widget.CardView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import java.lang.reflect.Field;
 
 public class ViewTool {
+
     public static int heightPixels;
     public static int widthPixels;
 
@@ -95,37 +99,23 @@ public class ViewTool {
                     fllp.topMargin = (int) (((float) fllp.topMargin) / height * heightPixels);
                     fllp.bottomMargin = (int) (((float) fllp.bottomMargin)
                             / height * heightPixels);
+                } else if (views instanceof CardView) {
+                    RelativeLayout.LayoutParams fllp = (RelativeLayout.LayoutParams) lp;
+                    fllp.leftMargin = (int) (((float) fllp.leftMargin) / width * widthPixels);
+                    fllp.rightMargin = (int) (((float) fllp.rightMargin)
+                            / width * widthPixels);
+                    fllp.topMargin = (int) (((float) fllp.topMargin) / height * heightPixels);
+                    fllp.bottomMargin = (int) (((float) fllp.bottomMargin)
+                            / height * heightPixels);
                 }
-                if (view instanceof TextView) {
+                if (view instanceof TextView || view instanceof AppCompatTextView) {
                     TextView textView = (TextView) view;
                     float sp = (float) (height) / (float) (heightPixels);
-                    textView.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                            textView.getTextSize() / sp);
-//					int maxWidth= textView.getMaxWidth();
-//					if(maxWidth>0){
-//						textView.setMaxWidth(textView.getMaxWidth()/ width
-//								/ widthPixels);
-//					}
-//					int maxHeight= textView.getMaxHeight();
-//					if(maxHeight>0){
-//						textView.setMaxHeight(textView.getMaxHeight() / height
-//								/ heightPixels);
-//					}
-                } else if (view instanceof Button) {
+                    textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, textView.getTextSize() / sp);
+                } else if (view instanceof Button || view instanceof AppCompatButton) {
                     Button button = (Button) view;
                     float sp = (float) (height) / (float) (heightPixels);
-                    button.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                            button.getTextSize() / sp);
-//					int maxWidth= button.getMaxWidth();
-//					if(maxWidth>0){
-//						button.setMaxWidth(button.getMaxWidth()/ width
-//								/ widthPixels);
-//					}
-//					int maxHeight= button.getMaxHeight();
-//					if(maxHeight>0){
-//						button.setMaxHeight(button.getMaxHeight() / height
-//								/ heightPixels);
-//					}
+                    button.setTextSize(TypedValue.COMPLEX_UNIT_PX, button.getTextSize() / sp);
                 } else if (view instanceof ViewGroup) {
                     initPixels(view, width, height);
                 }

workbenches/src/main/java/com/yingyang/workbenches/WorkbenchesActivity.kt

@@ -130,7 +130,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
     }
 
     /**
-     * 跳转设置页面
+     * 训练完成弹窗页面
      */
     private fun showTipDialog() {
         TipDialogFragment.TipDialogBuilder()
@@ -141,8 +141,7 @@ class WorkbenchesActivity : BaseMVVMActivity<ActivityWorkbenchesBinding, Workben
             .leftClick({
             }, dimiss = true)
             .rightClick({
-                val intent = Intent(Settings.ACTION_PRIVACY_SETTINGS)
-                startActivity(intent)
+                JumpUtil.jumpActivity(RouterUrlCommon.trainData)
             }, dimiss = true)
             .show(supportFragmentManager)
     }

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

@@ -177,30 +177,23 @@
                 android:layout_weight="1"
                 android:background="@drawable/bg_home_task">
 
-                <androidx.cardview.widget.CardView
-                    android:id="@+id/iamgeTask"
+                <ImageView
+                    android:id="@+id/taskImage"
                     android:layout_width="@dimen/divider_354px"
                     android:layout_height="@dimen/divider_354px"
                     android:layout_marginStart="@dimen/divider_31px"
-                    app:cardCornerRadius="@dimen/divider_18px"
+                    android:layout_marginTop="@dimen/divider_31px"
+                    android:layout_marginBottom="@dimen/divider_31px"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <ImageView
-                        android:id="@+id/taskImage"
-                        android:layout_width="@dimen/divider_354px"
-                        android:layout_height="@dimen/divider_354px"
-                        android:scaleType="fitXY"
-                        app:isCircle="@{false}"
-                        app:loadHeadImg="@{task.getGameImage()}" />
-
-                </androidx.cardview.widget.CardView>
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:loadImg="@{task.getGameImage()}"
+                    app:roundRadius="@{8}" />
 
                 <androidx.appcompat.widget.AppCompatButton
                     android:layout_width="@dimen/divider_264px"
                     android:layout_height="@dimen/divider_50px"
-                    android:layout_marginStart="@dimen/divider_39px"
+                    android:layout_marginStart="@dimen/divider_57px"
                     android:layout_marginBottom="@dimen/divider_39px"
                     android:background="@drawable/bg_task_progress"
                     android:text='@{"当前游戏"+task.currentTaskNum+"/8"}'
@@ -219,7 +212,7 @@
                     android:layout_marginBottom="@dimen/divider_2px"
                     android:background="@color/color_FFE0E0E0"
                     app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintLeft_toRightOf="@id/iamgeTask"
+                    app:layout_constraintLeft_toRightOf="@id/taskImage"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <LinearLayout
@@ -250,7 +243,7 @@
 
                     <Button
                         android:id="@+id/taskBtn"
-                        android:layout_width="@dimen/divider_354px"
+                        android:layout_width="@dimen/divider_348px"
                         android:layout_height="@dimen/divider_65px"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginBottom="@dimen/divider_32px"
@@ -261,7 +254,6 @@
 
                 </LinearLayout>
 
-
             </androidx.constraintlayout.widget.ConstraintLayout>
 
             <androidx.recyclerview.widget.RecyclerView
@@ -277,7 +269,7 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="@dimen/divider_200px"
                 android:layout_height="@dimen/divider_413px"
-                android:layout_marginStart="@dimen/divider_8px"
+                android:layout_marginStart="@dimen/divider_20px"
                 android:layout_marginTop="@dimen/divider_20px"
                 android:layout_marginEnd="@dimen/divider_52px"
                 android:layout_marginBottom="@dimen/divider_20px"
@@ -345,12 +337,9 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/layoutOperation"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_marginTop="@dimen/divider_50px"
-            android:layout_marginBottom="@dimen/divider_38px"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/businessLayout">
+            android:layout_marginBottom="@dimen/divider_38px">
 
             <Button
                 android:id="@+id/layoutFreeTraining"

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

@@ -9,7 +9,11 @@
     <dimen name="divider_413px" tools:ignore="PxUsage">413px</dimen>
     <dimen name="divider_409px" tools:ignore="PxUsage">409px</dimen>
     <dimen name="divider_354px" tools:ignore="PxUsage">354px</dimen>
+    <dimen name="divider_348px" tools:ignore="PxUsage">348px</dimen>
+    <dimen name="divider_345px" tools:ignore="PxUsage">345px</dimen>
     <dimen name="divider_340px" tools:ignore="PxUsage">340px</dimen>
+    <dimen name="divider_330px" tools:ignore="PxUsage">330px</dimen>
+    <dimen name="divider_320px" tools:ignore="PxUsage">320px</dimen>
     <dimen name="divider_270px" tools:ignore="PxUsage">270px</dimen>
     <dimen name="divider_264px" tools:ignore="PxUsage">264px</dimen>
     <dimen name="divider_260px" tools:ignore="PxUsage">260px</dimen>