1.添加大屏绑定手机号弹窗

.idea/misc.xml

@@ -477,6 +477,8 @@
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/item_training_content_details.xml" value="0.4" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/layout_empty.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/workbenches/src/main/res/layout/spinner_list_item.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_binding_phone_btn.xml" value="0.1415" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_binding_phone_edit.xml" value="0.1415" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_dialog_ring.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_game_background_settlement.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/bg_game_loading.xml" value="0.151" />
@@ -485,6 +487,7 @@
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/drawable/layer_rating_bar.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/activity_base.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/activity_base_web_view.xml" value="0.23697916666666666" />
+        <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_binding_phone.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_evaluate.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_game_loading.xml" value="0.264" />
         <entry key="..\:/workspace/hcp-pads/baselib/src/main/res/layout/dialog_loading.xml" value="0.23697916666666666" />

baselib/src/main/java/com/yingyangfly/baselib/dialog/BindingPhoneDialog.kt

@@ -0,0 +1,27 @@
+package com.yingyangfly.baselib.dialog
+
+import android.os.Bundle
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import com.yingyangfly.baselib.R
+
+/**
+ * 大屏测评绑定手机号弹窗
+ */
+class BindingPhoneDialog : DialogFragment() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        isCancelable = false
+        dialog?.setCanceledOnTouchOutside(true)
+    }
+
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.setLayout(
+            ViewGroup.LayoutParams.MATCH_PARENT,
+            ViewGroup.LayoutParams.MATCH_PARENT
+        )
+        dialog?.window?.setBackgroundDrawableResource(R.color.transparent)
+    }
+}

baselib/src/main/res/drawable/bg_binding_phone_btn.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="@dimen/divider_12px" />
+            <gradient
+                android:angle="180"
+                android:endColor="@color/color_FF1AA1FF"
+                android:startColor="@color/color_FF81D7FF"
+                android:type="linear"
+                android:useLevel="true" />
+        </shape>
+    </item>
+
+</layer-list>

baselib/src/main/res/drawable/bg_binding_phone_edit.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+    <corners android:radius="@dimen/divider_12px" />
+    <stroke
+        android:width="@dimen/divider_1px"
+        android:color="@color/color_FF979797" />
+    <solid android:color="@android:color/white" />
+</shape>

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

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="@dimen/divider_670px"
+        android:layout_height="@dimen/divider_524px"
+        android:theme="@style/Theme.MaterialComponents.NoActionBar"
+        app:cardBackgroundColor="@color/color_FF3961A1"
+        app:cardCornerRadius="@dimen/divider_40px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:strokeColor="@color/color_FF6BB0FF"
+        app:strokeWidth="@dimen/divider_4px">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tvTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/divider_56px"
+                android:gravity="center_horizontal"
+                android:text="绑定您的手机号"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_32px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/editPhone"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider_80px"
+                android:layout_marginStart="@dimen/divider_65px"
+                android:layout_marginTop="@dimen/divider_29px"
+                android:layout_marginEnd="@dimen/divider_64px"
+                android:background="@drawable/bg_binding_phone_edit"
+                android:gravity="center_vertical"
+                android:hint="输入手机号"
+                android:paddingStart="@dimen/divider_24px"
+                android:paddingEnd="@dimen/divider_24px"
+                android:textColor="@color/color_FF333333"
+                android:textColorHint="@color/color_FF333333"
+                android:textSize="@dimen/divider_32px"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
+
+            <LinearLayout
+                android:id="@+id/codeLayout"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider_80px"
+                android:layout_marginStart="@dimen/divider_65px"
+                android:layout_marginTop="@dimen/divider_38px"
+                android:layout_marginEnd="@dimen/divider_64px"
+                android:background="@drawable/bg_binding_phone_edit"
+                android:orientation="horizontal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/editPhone">
+
+                <androidx.appcompat.widget.AppCompatEditText
+                    android:id="@+id/editCode"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:background="@null"
+                    android:gravity="center_vertical"
+                    android:hint="输入验证码"
+                    android:paddingStart="@dimen/divider_24px"
+                    android:paddingEnd="@dimen/divider_24px"
+                    android:textColor="@color/color_FF333333"
+                    android:textColorHint="@color/color_FF333333"
+                    android:textSize="@dimen/divider_32px" />
+
+                <androidx.appcompat.widget.AppCompatButton
+                    android:id="@+id/btnCode"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@null"
+                    android:gravity="center"
+                    android:paddingStart="@dimen/divider_23px"
+                    android:paddingEnd="@dimen/divider_23px"
+                    android:text="获取验证码"
+                    android:textColor="@color/color_FF3855FF"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/btnBinding"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/divider_80px"
+                android:layout_marginStart="@dimen/divider_65px"
+                android:layout_marginTop="@dimen/divider_52px"
+                android:layout_marginEnd="@dimen/divider_64px"
+                android:background="@drawable/bg_binding_phone_btn"
+                android:text="确认绑定"
+                android:textColor="@android:color/white"
+                android:textSize="@dimen/divider_28px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/codeLayout" />
+
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </com.google.android.material.card.MaterialCardView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -30,4 +30,10 @@
     <color name="color_FF9FBBFF">#FF9FBBFF</color>
     <color name="color_FFD2DDFF">#FFD2DDFF</color>
     <color name="color_D63658F7">#D63658F7</color>
+    <color name="color_FF3961A1">#FF3961A1</color>
+    <color name="color_FF6BB0FF">#FF6BB0FF</color>
+    <color name="color_FF979797">#FF979797</color>
+    <color name="color_FF3855FF">#FF3855FF</color>
+    <color name="color_FF81D7FF">#FF81D7FF</color>
+    <color name="color_FF1AA1FF">#FF1AA1FF</color>
 </resources>

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

@@ -9,10 +9,12 @@
     <dimen name="divider_800px" tools:ignore="ResourceName">800px</dimen>
     <dimen name="divider_760px" tools:ignore="ResourceName">760px</dimen>
     <dimen name="divider_689px" tools:ignore="ResourceName">689px</dimen>
+    <dimen name="divider_670px" tools:ignore="ResourceName">670px</dimen>
     <dimen name="divider_667px" tools:ignore="ResourceName">667px</dimen>
     <dimen name="divider_600px" tools:ignore="ResourceName">600px</dimen>
     <dimen name="divider_533px" tools:ignore="ResourceName">533px</dimen>
     <dimen name="divider_527px" tools:ignore="ResourceName">527px</dimen>
+    <dimen name="divider_524px" tools:ignore="ResourceName">524px</dimen>
     <dimen name="divider_520px" tools:ignore="ResourceName">520px</dimen>
     <dimen name="divider_502px" tools:ignore="ResourceName">502px</dimen>
     <dimen name="divider_483px" tools:ignore="ResourceName">483px</dimen>

workbenches/src/main/java/com/yingyang/workbenches/entity/TrainContentBean.kt

@@ -1,5 +1,7 @@
 package com.yingyang.workbenches.entity
 
+import android.text.TextUtils
+
 /**
  * 训练内容bean
  */
@@ -23,7 +25,7 @@ data class TrainContentBean(
     val userId: String
 ) {
     fun getTrainingProgress(): String{
-        return if (totalTaskNum != currentTaskNum) {
+        return if (TextUtils.equals("1", status)) {
             "未完成"
         } else {
             "已完成"