1.修改帮助页面UI

.idea/misc.xml

@@ -608,6 +608,7 @@
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_login_out.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_personal_center.xml" value="0.151" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/drawable/bg_setting_center.xml" value="0.1715" />
+        <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_agreement.xml" value="0.8" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_help.xml" value="0.536" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_personal_center.xml" value="0.4421768707482993" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_setting.xml" value="0.23697916666666666" />

baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -110,6 +110,11 @@ object RouterUrlCommon {
      */
     const val help = "/help/center"
 
+    /**
+     * 用户协议页面
+     */
+    const val agreement = "/agreement/agreement"
+
     /**
      * 版本记录
      */

livebroadcast/src/main/res/drawable/bg_common_head_layout.xml

@@ -4,7 +4,7 @@
     android:shape="rectangle"
     tools:ignore="ResourceName">
     <stroke
-        android:width="@dimen/divider_1px"
+        android:width="@dimen/divider_4px"
         android:color="@color/color_80BFDAFF" />
     <corners android:radius="@dimen/divider_39px" />
     <solid android:color="@android:color/white" />

personalcenter/src/main/AndroidManifest.xml

@@ -30,6 +30,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+        <activity
+            android:name=".agreement.AgreementActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 
 </manifest>

personalcenter/src/main/java/com/yingyang/personalcenter/agreement/AgreementActivity.kt

@@ -0,0 +1,87 @@
+package com.yingyang.personalcenter.agreement
+
+import android.annotation.SuppressLint
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.MotionEvent
+import android.view.View
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.personalcenter.R
+import com.yingyang.personalcenter.databinding.ActivityAgreementBinding
+import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.ext.getEndAnimation
+import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
+
+/**
+ * 用户协议页面
+ */
+@Route(path = RouterUrlCommon.agreement)
+class AgreementActivity : BaseActivity<ActivityAgreementBinding>(),
+    View.OnTouchListener {
+
+    private var titile = ""
+    private var content = ""
+
+    override fun initViews() {
+        titile = intent.getStringExtra("titile") ?: ""
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun initListener() {
+        binding.backLayout.setOnTouchListener(this@AgreementActivity)
+    }
+
+    override fun initData() {
+        binding {
+            tvTitle.text = if (TextUtils.isEmpty(titile)) {
+                ""
+            } else {
+                titile
+            }
+        }
+        if (TextUtils.isEmpty(titile).not()) {
+            when (titile) {
+                "什么是认知障碍数字疗法" -> {
+                    binding.tvContent.text = resources.getString(R.string.agreement_one)
+                }
+
+                "训练须知" -> {
+                    binding.tvContent.text = resources.getString(R.string.agreement_two)
+                }
+
+                "订单服务协议" -> {
+                    binding.tvContent.text = resources.getString(R.string.agreement_threee)
+                }
+
+                "设备租赁协议" -> {
+
+                }
+            }
+        }
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    override fun onTouch(v: View, event: MotionEvent): Boolean {
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                if (v.id == R.id.backLayout) {
+                    v.startAnimation(getScaleAnimation())
+                }
+            }
+            MotionEvent.ACTION_UP -> {
+                v.startAnimation(getEndAnimation())
+                if (v.id == R.id.backLayout) {
+                    finish()
+                }
+            }
+            MotionEvent.ACTION_CANCEL -> {
+                if (v.id == R.id.backLayout) {
+                    v.startAnimation(getEndAnimation())
+                }
+            }
+        }
+        return true
+    }
+}

personalcenter/src/main/java/com/yingyang/personalcenter/help/HelpActivity.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.view.MotionEvent
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
+import com.alibaba.android.arouter.launcher.ARouter
 import com.yingyang.personalcenter.R
 import com.yingyang.personalcenter.databinding.ActivityHelpBinding
 import com.yingyangfly.baselib.ext.getEndAnimation
@@ -26,7 +27,19 @@ class HelpActivity : BaseMVVMActivity<ActivityHelpBinding, HelpViewModel>(),
 
     @SuppressLint("ClickableViewAccessibility")
     override fun initListener() {
-        binding.layoutHome.setOnTouchListener(this)
+        binding {
+            layoutHome.setOnTouchListener(this@HelpActivity)
+            instructionsOneLayout.setOnLayoutClickListener {
+                jumpAgreementActivity("什么是认知障碍数字疗法")
+            }
+            instructionsTwoLayout.setOnLayoutClickListener {
+                jumpAgreementActivity("训练须知")
+            }
+            issuesOneLayout.setOnLayoutClickListener {
+                jumpAgreementActivity("订单服务协议")
+            }
+            issuesTwoLayout.setOnTouchListener(this@HelpActivity)
+        }
     }
 
     override fun initData() {
@@ -43,19 +56,25 @@ class HelpActivity : BaseMVVMActivity<ActivityHelpBinding, HelpViewModel>(),
     override fun onTouch(v: View, event: MotionEvent): Boolean {
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
-                if (v.id == R.id.layoutHome) {
+                if (v.id == R.id.layoutHome || v.id == R.id.issuesTwoLayout
+                ) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
-                if (v.id == R.id.layoutHome) {
-                    JumpUtil.jumpActivity(RouterUrlCommon.home, mContext)
-                    finish()
+                when (v.id) {
+                    R.id.layoutHome -> {
+                        finish()
+                    }
+                    R.id.issuesTwoLayout -> {
+                        jumpAgreementActivity("设备租赁协议")
+                    }
                 }
             }
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.layoutHome) {
+                if (v.id == R.id.layoutHome || v.id == R.id.issuesTwoLayout
+                ) {
                     v.startAnimation(getEndAnimation())
                 }
             }
@@ -63,4 +82,11 @@ class HelpActivity : BaseMVVMActivity<ActivityHelpBinding, HelpViewModel>(),
         return true
     }
 
+    private fun jumpAgreementActivity(title: String) {
+        ARouter.getInstance().build(RouterUrlCommon.agreement)
+            .withString("titile", title)
+            .withTransition(R.anim.leftin, R.anim.leftout)
+            .navigation(mContext)
+    }
+
 }

personalcenter/src/main/java/com/yingyang/personalcenter/widget/HelpItemView.java

@@ -22,6 +22,7 @@ public class HelpItemView extends FrameLayout {
     private AppCompatImageView helpImage;
     private AppCompatTextView tvHelp;
     private AppCompatTextView tvContent;
+    private OnLayoutClickListener onLayoutClickListener;
 
     public HelpItemView(Context context) {
         this(context, null);
@@ -41,6 +42,7 @@ public class HelpItemView extends FrameLayout {
             this.tvContent = child.findViewById(R.id.tvContent);
             TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.HelpItemView);
             boolean isShow = typedArray.getBoolean(R.styleable.HelpItemView_help_image, false);
+            boolean isClick = typedArray.getBoolean(R.styleable.HelpItemView_help_click, true);
             if (isShow) {
                 helpImage.setVisibility(View.VISIBLE);
             } else {
@@ -55,15 +57,26 @@ public class HelpItemView extends FrameLayout {
             typedArray.recycle();
 
             this.helpLayout.setOnClickListener(v -> {
-                if (!TextUtils.isEmpty(content)) {
+                if (isClick) {
                     if (this.tvContent.getVisibility() == View.VISIBLE) {
                         this.tvContent.setVisibility(View.GONE);
                     } else {
                         this.tvContent.setVisibility(View.VISIBLE);
                     }
+                } else {
+                    if (onLayoutClickListener != null) {
+                        onLayoutClickListener.onClick();
+                    }
                 }
             });
         }
+    }
+
+    public void setOnLayoutClickListener(OnLayoutClickListener onLayoutClickListener) {
+        this.onLayoutClickListener = onLayoutClickListener;
+    }
 
+    public interface OnLayoutClickListener {
+        void onClick();
     }
 }

personalcenter/src/main/manifest/AndroidManifest.xml

@@ -28,6 +28,11 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:windowSoftInputMode="adjustResize|adjustPan" />
+        <activity
+            android:name=".agreement.AgreementActivity"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="landscape"
+            android:windowSoftInputMode="adjustResize|adjustPan" />
     </application>
 
 </manifest>

personalcenter/src/main/res/anim/leftin.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="500"
+        android:fromXDelta="100%p"
+        android:toXDelta="0" />
+</set> 
+

personalcenter/src/main/res/anim/leftout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="500"
+        android:fromXDelta="0"
+        android:toXDelta="-100%p" />
+</set> 
+

personalcenter/src/main/res/drawable/bg_common_head_layout.xml

@@ -4,7 +4,7 @@
     android:shape="rectangle"
     tools:ignore="ResourceName">
     <stroke
-        android:width="@dimen/divider_1px"
+        android:width="@dimen/divider_4px"
         android:color="@color/color_80BFDAFF" />
     <corners android:radius="@dimen/divider_39px" />
     <solid android:color="@android:color/white" />

personalcenter/src/main/res/layout/activity_agreement.xml

@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
+
+    <LinearLayout
+        style="@style/layout_properties_specify_width_geight"
+        android:background="@mipmap/icon_uniform_background"
+        android:orientation="vertical">
+
+        <androidx.constraintlayout.widget.ConstraintLayout style="@style/layout_properties_specify_width">
+
+            <LinearLayout
+                android:id="@+id/backLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingStart="@dimen/divider_65px"
+                android:paddingTop="@dimen/divider_35px"
+                android:paddingEnd="@dimen/divider_5px"
+                android:paddingBottom="@dimen/divider_5px"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:layout_width="@dimen/divider_48px"
+                    android:layout_height="@dimen/divider_48px"
+                    android:background="@mipmap/icon_back" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_14px"
+                    android:text="@string/back_pager"
+                    android:textColor="@android:color/white"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/tvTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/divider_68px"
+                android:layout_marginTop="@dimen/divider_40px"
+                android:background="@drawable/bg_common_head_layout"
+                android:gravity="center"
+                android:paddingStart="@dimen/divider_51px"
+                android:paddingTop="@dimen/divider_10px"
+                android:paddingEnd="@dimen/divider_50px"
+                android:paddingBottom="@dimen/divider_10px"
+                android:text="@string/help"
+                android:textColor="@color/color_FF4974FF"
+                android:textSize="@dimen/divider_34px"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.core.widget.NestedScrollView
+            style="@style/layout_properties_specify_width_geight"
+            android:layout_marginStart="@dimen/divider_60px"
+            android:layout_marginTop="@dimen/divider_30px"
+            android:layout_marginEnd="@dimen/divider_60px"
+            android:layout_marginBottom="@dimen/divider_62px"
+            android:background="@drawable/bg_setting_center">
+
+            <LinearLayout
+                style="@style/layout_properties_specify_width"
+                android:orientation="vertical"
+                android:paddingBottom="@dimen/divider_109px">
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/tvContent"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginStart="@dimen/divider_33px"
+                    android:layout_marginTop="@dimen/divider_57px"
+                    android:layout_marginEnd="@dimen/divider_33px"
+                    android:layout_marginBottom="@dimen/divider_33px"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
+</layout>

personalcenter/src/main/res/layout/activity_help.xml

@@ -171,15 +171,19 @@
                     android:textStyle="bold" />
 
                 <com.yingyang.personalcenter.widget.HelpItemView
+                    android:id="@+id/instructionsOneLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_19px"
+                    app:help_click="false"
                     app:help_image="true"
                     app:help_text="1.什么是认知障碍数字疗法？" />
 
                 <com.yingyang.personalcenter.widget.HelpItemView
+                    android:id="@+id/instructionsTwoLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    app:help_click="false"
                     app:help_image="true"
                     app:help_text="2.训练前须知" />
 
@@ -268,21 +272,25 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/divider_44px"
                     android:layout_marginTop="@dimen/divider_40px"
-                    android:text="订单相关问题"
+                    android:text="@string/order_related_issues"
                     android:textColor="@color/color_FF4A76FF"
                     android:textSize="@dimen/divider_28px"
                     android:textStyle="bold" />
 
                 <com.yingyang.personalcenter.widget.HelpItemView
+                    android:id="@+id/issuesOneLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/divider_19px"
+                    app:help_click="false"
                     app:help_image="true"
                     app:help_text="订单服务协议" />
 
                 <com.yingyang.personalcenter.widget.HelpItemView
+                    android:id="@+id/issuesTwoLayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    app:help_click="false"
                     app:help_image="true"
                     app:help_text="设备租赁协议" />
 

personalcenter/src/main/res/values/attrs.xml

@@ -9,6 +9,7 @@
 
     <declare-styleable name="HelpItemView" tools:ignore="ResourceName">
         <attr name="help_image" format="boolean" />
+        <attr name="help_click" format="boolean" />
         <attr name="help_text" format="string" />
         <attr name="help_content" format="string" />
     </declare-styleable>

personalcenter/src/main/res/values/strings.xml

@@ -44,4 +44,8 @@
     <string name="equipment_related_info_answer_nine" tools:ignore="ResourceName">开启省电模式：进入设置 电池，开启省电模式\n尝试后仍未解决您的问题，建议您咨询线上认知训练师（添加上方认知训练师企业微信）我们一定竭力解决您的问题。</string>
     <string name="equipment_related_info_question_ten" tools:ignore="ResourceName">10.触屏不灵敏怎么办？</string>
     <string name="equipment_related_info_answer_ten" tools:ignore="ResourceName">在使用平板过程中出现触屏失灵的现象，针对一下场景请尝试排查\n1.屏幕上有污渍，会影响触屏灵敏度。建议您将屏幕擦拭干净后尝试。使用平板保护膜后出现触屏不灵敏。\n2.异常的环境温度（低于-20%或高于50%）中使用设备。温度异常会造成屏幕显示及触摸功能异常，请您移步至正常环境温度下再使用平板。\n3.强电磁场（微波炉、电磁炉等）环境中使用平板\n电磁场较强的环境会对触屏功能产生影响，请您尽量避免在强磁场区域使用平板。\n尝试后仍未解决您的问题，建议您咨询线上认知训练师（添加上方认知训练师企业微信）我们一定竭力解决您的问题。</string>
+    <string name="order_related_issues" tools:ignore="ResourceName">订单相关问题</string>
+    <string name="agreement_one" tools:ignore="ResourceName">认知数字疗法是数字疗法在认知障碍诊疗领域的创新应用。认知数字疗法由软件程序驱动，为认知障碍患者提供基于循证医学证据的数字化诊疗措施，包括数字化认知评估、预防、治疗和管理等内容。认知数字疗法可为正常人群和因老化、神经系统疾病、精神系统疾病及其他系统性疾病导致的认知障碍人群提供认知筛查、辅助诊断，并针对受损的认知功能提供基于智能算法的辅助干预，完成数据的实时上传和管理，促进医院、社区、家庭、患者有效联动。认知数字疗法能够在一定程度上降低医疗成本，节省诊治费用;提高疾病诊疗效率、增加患者可及性;优化疾病治疗和管理方案、增强患者依从性、提升治疗效果。</string>
+    <string name="agreement_two" tools:ignore="ResourceName">1.根据《中国认知训练专家共识》建议每次训练时间不短与30分钟，每周训练至少四次，持续有规律的联系，可以取得更明显的训练效果。\n2，建议选择较为宽敞安静的室内环境，比如没有人的客厅、卧室、书房等，以免中途被打扰造成训练中断。\n3.事先安排好可能影响训练的私人问题，比如提前告知家人以免被打扰，训练前提前上厕所等4.尽量在放松、舒适的状态下进行训练。若状态不佳可进行休息和调整，不要强行进行训练，否则会影响训练效果和后续任务安排。</string>
+    <string name="agreement_threee" tools:ignore="ResourceName">支付服务协议（以下简称“本协议”）是邯郸鹰扬科技有限公司（以下简称为“我们”或“我公司”）与用户（以下简称“您”）就未来蓝豚居家训练设备租赁支付服务（以下简称为“本服务”）的使用事项所订立的有效合约。您通过网络页面点击确认或以其他方式选择接受本协议，即表示您与我们已达成协议并接受本协议的全部约定内容。如您在18周岁一下，请确保在监护人的陪同和同意下使用本服务、进行支付行为。\n我们可能会根据监管或市场情况对本协议进行变更，并在使用程序平台（以下简称“服务平台”）上公告的方式提前予以公布，还请您随时关注协议变更情况。若您在本协议内容公告变更生效后继续使用本服务的，表示您已充分阅读、理解并接受变更修改后的协议内容，也将遵循变更后修改的协议内容使用本服务；若您不同意变更修改后的协议内容，您应在变更生效前停止使用本服务。</string>
 </resources>