1.修改用户帮助页面协议UI

.idea/misc.xml

@@ -610,6 +610,7 @@
         <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_lease_agreement.xml" value="0.23697916666666666" />
         <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" />
         <entry key="..\:/workspace/hcp-pads/personalcenter/src/main/res/layout/activity_version_record.xml" value="0.23697916666666666" />

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

@@ -115,6 +115,11 @@ object RouterUrlCommon {
      */
     const val agreement = "/agreement/agreement"
 
+    /**
+     * 租赁协议
+     */
+    const val leaseAgreement = "/lease/agreement"
+
     /**
      * 版本记录
      */

personalcenter/src/main/AndroidManifest.xml

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

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

@@ -1,7 +1,6 @@
 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
@@ -12,7 +11,6 @@ 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
 
 /**
  * 用户协议页面
@@ -54,10 +52,6 @@ class AgreementActivity : BaseActivity<ActivityAgreementBinding>(),
                 "订单服务协议" -> {
                     binding.tvContent.text = resources.getString(R.string.agreement_threee)
                 }
-
-                "设备租赁协议" -> {
-
-                }
             }
         }
     }

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

@@ -0,0 +1,26 @@
+package com.yingyang.personalcenter.agreement
+
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.personalcenter.databinding.ActivityLeaseAgreementBinding
+import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.router.RouterUrlCommon
+
+/**
+ * 租赁协议
+ */
+@Route(path = RouterUrlCommon.leaseAgreement)
+class LeaseAgreementActivity : BaseActivity<ActivityLeaseAgreementBinding>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+
+    }
+
+    override fun initData() {
+
+    }
+
+}

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

@@ -38,7 +38,9 @@ class HelpActivity : BaseMVVMActivity<ActivityHelpBinding, HelpViewModel>(),
             issuesOneLayout.setOnLayoutClickListener {
                 jumpAgreementActivity("订单服务协议")
             }
-            issuesTwoLayout.setOnTouchListener(this@HelpActivity)
+            issuesTwoLayout.setOnLayoutClickListener {
+                JumpUtil.jumpActivity(RouterUrlCommon.leaseAgreement, mContext)
+            }
         }
     }
 
@@ -56,25 +58,18 @@ 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 || v.id == R.id.issuesTwoLayout
-                ) {
+                if (v.id == R.id.layoutHome) {
                     v.startAnimation(getScaleAnimation())
                 }
             }
             MotionEvent.ACTION_UP -> {
                 v.startAnimation(getEndAnimation())
-                when (v.id) {
-                    R.id.layoutHome -> {
-                        finish()
-                    }
-                    R.id.issuesTwoLayout -> {
-                        jumpAgreementActivity("设备租赁协议")
-                    }
+                if (v.id == R.id.layoutHome) {
+                    finish()
                 }
             }
             MotionEvent.ACTION_CANCEL -> {
-                if (v.id == R.id.layoutHome || v.id == R.id.issuesTwoLayout
-                ) {
+                if (v.id == R.id.layoutHome) {
                     v.startAnimation(getEndAnimation())
                 }
             }

personalcenter/src/main/java/com/yingyang/personalcenter/version/VersionRecordActivity.kt

@@ -7,7 +7,9 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.yingyang.personalcenter.R
 import com.yingyang.personalcenter.adapter.VersionAdater
 import com.yingyang.personalcenter.databinding.ActivityVersionRecordBinding
-import com.yingyangfly.baselib.ext.*
+import com.yingyangfly.baselib.ext.getEndAnimation
+import com.yingyangfly.baselib.ext.getScaleAnimation
+import com.yingyangfly.baselib.ext.toast
 import com.yingyangfly.baselib.mvvm.BaseMVVMActivity
 import com.yingyangfly.baselib.router.RouterUrlCommon
 

personalcenter/src/main/manifest/AndroidManifest.xml

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

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

@@ -51,7 +51,6 @@
                 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"

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

@@ -292,7 +292,7 @@
                     android:layout_height="wrap_content"
                     app:help_click="false"
                     app:help_image="true"
-                    app:help_text="设备租赁协议" />
+                    app:help_text="@string/equipment_lease_agreement" />
 
 
             </LinearLayout>

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

@@ -0,0 +1,90 @@
+<?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/equipment_lease_agreement"
+                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:text="@string/agreement_threee"
+                    android:textColor="@color/color_FF333333"
+                    android:textSize="@dimen/divider_24px" />
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
+</layout>

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

@@ -48,4 +48,5 @@
     <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>
+    <string name="equipment_lease_agreement" tools:ignore="ResourceName">设备租赁协议</string>
 </resources>