王鹏鹏 2 лет назад
Родитель
Сommit
e7884b2454

+ 4 - 2
.idea/misc.xml

@@ -78,10 +78,12 @@
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/drawable/bg_common_head_layout.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/drawable/bg_personal_center.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/drawable/bg_setting_center.xml" value="0.219" />
-        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_equipment_services.xml" value="0.22826086956521738" />
-        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_help.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_equipment_services.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_help.xml" value="0.16455696202531644" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_personal_center.xml" value="0.8800000000000001" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/activity_setting.xml" value="0.136" />
+        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/item_diagnosis.xml" value="0.1" />
+        <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/layout_help_item.xml" value="0.1" />
         <entry key="..\:/workspace/hcp-pad/personalcenter/src/main/res/layout/layout_setting_item.xml" value="1.0" />
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_item_push.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/push/src/main/res/drawable/bg_push.xml" value="0.219" />

+ 5 - 0
baselib/src/main/java/com/yingyangfly/baselib/router/RouterUrlCommon.kt

@@ -100,4 +100,9 @@ object RouterUrlCommon {
      */
     const val home = "/home/home"
 
+    /**
+     * 帮助中心
+     */
+    const val help = "/help/center"
+
 }

+ 1 - 1
home/src/main/java/com/yingyangfly/home/activity/HomeActivity.kt

@@ -89,7 +89,7 @@ class HomeActivity : BaseMVVMActivity<ActivityHomeBinding, HomeViewModel>() {
             }
             //使用帮助
             layoutHelp.setOnSingleClickListener {
-                "该功能正在开发中,敬请期待".toast()
+                JumpUtil.jumpActivity(RouterUrlCommon.help, mContext)
             }
             //消息通知
             layoutNotify.setOnSingleClickListener {

+ 29 - 2
personalcenter/src/main/java/com/yingyang/personalcenter/help/HelpActivity.kt

@@ -1,7 +1,34 @@
 package com.yingyang.personalcenter.help
 
-import androidx.appcompat.app.AppCompatActivity
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.yingyang.personalcenter.databinding.ActivityHelpBinding
+import com.yingyangfly.baselib.base.BaseActivity
+import com.yingyangfly.baselib.ext.setOnSingleClickListener
+import com.yingyangfly.baselib.router.RouterUrlCommon
+import com.yingyangfly.baselib.utils.JumpUtil
 
-class HelpActivity : AppCompatActivity() {
+/**
+ * 帮助中心
+ */
+@Route(path = RouterUrlCommon.help)
+class HelpActivity : BaseActivity<ActivityHelpBinding>() {
+
+    override fun initViews() {
+
+    }
+
+    override fun initListener() {
+        binding {
+            //返回首页
+            layoutHome.setOnSingleClickListener {
+                JumpUtil.jumpActivity(RouterUrlCommon.home, mContext)
+                finish()
+            }
+        }
+    }
+
+    override fun initData() {
+
+    }
 
 }

+ 49 - 0
personalcenter/src/main/java/com/yingyang/personalcenter/widget/HelpItemView.java

@@ -0,0 +1,49 @@
+package com.yingyang.personalcenter.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatTextView;
+
+import com.yingyang.personalcenter.R;
+
+/**
+ * @author edz
+ */
+public class HelpItemView extends FrameLayout {
+
+    private AppCompatImageView helpImage;
+    private AppCompatTextView tvHelp;
+
+    public HelpItemView(Context context) {
+        this(context, null);
+    }
+
+    public HelpItemView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public HelpItemView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        if (this.getChildCount() == 0) {
+            View child = View.inflate(context, R.layout.layout_help_item, null);
+            this.helpImage = child.findViewById(R.id.helpImage);
+            this.tvHelp = child.findViewById(R.id.tvHelp);
+            TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.HelpItemView);
+            boolean isShow = typedArray.getBoolean(R.styleable.HelpItemView_help_image, false);
+            if (isShow) {
+                helpImage.setVisibility(View.VISIBLE);
+            } else {
+                helpImage.setVisibility(View.GONE);
+            }
+            tvHelp.setText(typedArray.getString(R.styleable.HelpItemView_help_text));
+            this.addView(child);
+            typedArray.recycle();
+        }
+
+    }
+}

+ 1 - 1
personalcenter/src/main/res/drawable/bg_setting_center.xml

@@ -5,7 +5,7 @@
     tools:ignore="ResourceName">
     <stroke
         android:width="@dimen/divider_12px"
-        android:color="#DBEEF9FF" />
+        android:color="@android:color/white" />
     <corners android:radius="@dimen/divider_26px" />
     <solid android:color="@android:color/white" />
 </shape>

+ 287 - 5
personalcenter/src/main/res/layout/activity_help.xml

@@ -1,16 +1,298 @@
 <?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">
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="ResourceName">
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_center">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:background="@drawable/bg_center"
+            android:orientation="vertical">
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:id="@+id/layoutHome"
+                    android:layout_width="@dimen/divider_195px"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <ImageView
+                        android:layout_width="@dimen/divider_48px"
+                        android:layout_height="@dimen/divider_43px"
+                        android:layout_marginStart="@dimen/divider_65px"
+                        android:layout_marginTop="@dimen/divider_35px"
+                        android:background="@mipmap/bg_home" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_14px"
+                        android:layout_marginTop="@dimen/divider_38px"
+                        android:text="@string/home_pager"
+                        android:textColor="@android:color/white"
+                        android:textSize="@dimen/divider_28px"
+                        android:textStyle="bold" />
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/tvTitle"
+                    android:layout_width="@dimen/divider_237px"
+                    android:layout_height="@dimen/divider_68px"
+                    android:layout_marginTop="@dimen/divider_40px"
+                    android:background="@drawable/bg_common_head_layout"
+                    android:gravity="center"
+                    android:text="@string/help"
+                    android:textColor="@color/color_FF4974FF"
+                    android:textSize="@dimen/divider_34px"
+                    android:textStyle="bold"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginStart="@dimen/divider_60px"
+                android:layout_marginTop="@dimen/divider_57px"
+                android:layout_marginEnd="@dimen/divider_60px"
+                android:layout_marginBottom="@dimen/divider_62px"
+                android:background="@drawable/bg_setting_center"
+                android:orientation="vertical"
+                android:paddingBottom="@dimen/divider_109px">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/tvTrainingGuidance"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_44px"
+                            android:layout_marginTop="@dimen/divider_48px"
+                            android:text="训练指导"
+                            android:textColor="@color/color_FF4A76FF"
+                            android:textSize="@dimen/divider_28px"
+                            android:textStyle="bold" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_44px"
+                            android:layout_marginTop="@dimen/divider_18px"
+                            android:text="温馨提示:如果训练时遇到问题,请联系线上认知训练师为您解答。"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_28px" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_44px"
+                            android:layout_marginTop="@dimen/divider_18px"
+                            android:text="服务电话:XXX-XXXXXXX"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_28px" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_44px"
+                            android:layout_marginTop="@dimen/divider_18px"
+                            android:text="服务时间:工作日8:30-18:00"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_28px" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="@dimen/divider_44px"
+                            android:layout_marginTop="@dimen/divider_18px"
+                            android:text="企业微信:扫描右侧二维码,添加线上认知训练师企业微信。"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_28px" />
+
+                    </LinearLayout>
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/divider_39px"
+                        android:layout_marginTop="@dimen/divider_25px"
+                        android:layout_marginEnd="@dimen/divider_45px"
+                        android:gravity="center_horizontal"
+                        android:orientation="vertical">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="@dimen/divider_218px"
+                            android:layout_height="@dimen/divider_218px"
+                            android:background="@mipmap/icon_qr_code" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/divider_9px"
+                            android:text="线上认知训练师"
+                            android:textColor="@color/color_FF333333"
+                            android:textSize="@dimen/divider_24px"
+                            android:textStyle="bold" />
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_1px"
+                    android:layout_marginStart="@dimen/divider_43px"
+                    android:layout_marginTop="@dimen/divider_36px"
+                    android:layout_marginEnd="@dimen/divider_32px"
+                    android:background="@color/color_FFB4B4B4" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_44px"
+                    android:layout_marginTop="@dimen/divider_40px"
+                    android:text="首次使用说明"
+                    android:textColor="@color/color_FF4A76FF"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    android:layout_marginTop="@dimen/divider_19px"
+                    app:help_image="true"
+                    app:help_text="1.什么是认知障碍数字疗法?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="true"
+                    app:help_text="2.训练前须知" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_44px"
+                    android:layout_marginTop="@dimen/divider_40px"
+                    android:text="设备相关"
+                    android:textColor="@color/color_FF4A76FF"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    android:layout_marginTop="@dimen/divider_19px"
+                    app:help_image="false"
+                    app:help_text="1.平板出现死机如何解决?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="2.平板出现黑屏怎么办?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="1.平板出现死机如何解决?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="3.平板出现卡顿、闪退怎么办?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="4.如何连接Wi-Fi?如何联网?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="5.移动数据上网速度慢怎么办?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="6.如何调节音量大小?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="7.如何切换声音震动及响铃?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="8.扬声器/耳机音量太低听不到声音怎么办?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="9.平板电脑太费电怎么办?" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="false"
+                    app:help_text="710.触屏不灵敏怎么办?" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/divider_44px"
+                    android:layout_marginTop="@dimen/divider_40px"
+                    android:text="订单相关问题"
+                    android:textColor="@color/color_FF4A76FF"
+                    android:textSize="@dimen/divider_28px"
+                    android:textStyle="bold" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    android:layout_marginTop="@dimen/divider_19px"
+                    app:help_image="true"
+                    app:help_text="订单服务协议" />
+
+                <com.yingyang.personalcenter.widget.HelpItemView
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/divider_84px"
+                    app:help_image="true"
+                    app:help_text="设备租赁协议" />
+
+
+            </LinearLayout>
+        </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </layout>

+ 1 - 0
personalcenter/src/main/res/layout/activity_personal_center.xml

@@ -58,6 +58,7 @@
                 android:text="@string/personal_center"
                 android:textColor="@color/color_FF4974FF"
                 android:textSize="@dimen/divider_34px"
+                android:textStyle="bold"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />

+ 40 - 0
personalcenter/src/main/res/layout/layout_help_item.xml

@@ -0,0 +1,40 @@
+<?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"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:ignore="ResourceName">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tvHelp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/divider_47px"
+        android:textColor="@color/color_FF333333"
+        android:textSize="@dimen/divider_28px"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/helpImage"
+        android:layout_width="@dimen/divider_16px"
+        android:layout_height="@dimen/divider_29px"
+        android:layout_marginEnd="@dimen/divider_50px"
+        android:background="@mipmap/icon_route"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/divider_2px"
+        android:layout_marginStart="@dimen/divider_44px"
+        android:layout_marginEnd="@dimen/divider_31px"
+        android:background="@color/color_FFB4B4B4"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

BIN
personalcenter/src/main/res/mipmap-xxhdpi/icon_qr_code.png


+ 4 - 1
personalcenter/src/main/res/values/attrs.xml

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

+ 1 - 0
personalcenter/src/main/res/values/colors.xml

@@ -6,4 +6,5 @@
     <color name="color_ff4571ff" tools:ignore="ResourceName">#ff4571ff</color>
     <color name="color_ff8fafff" tools:ignore="ResourceName">#ff8fafff</color>
     <color name="color_FFF0F0F0" tools:ignore="ResourceName">#FFF0F0F0</color>
+    <color name="color_FFB4B4B4" tools:ignore="ResourceName">#FFB4B4B4</color>
 </resources>

+ 3 - 0
personalcenter/src/main/res/values/dimens.xml

@@ -6,6 +6,7 @@
     <dimen name="divider_270px" tools:ignore="ResourceName">270px</dimen>
     <dimen name="divider_237px" tools:ignore="ResourceName">237px</dimen>
     <dimen name="divider_230px" tools:ignore="ResourceName">230px</dimen>
+    <dimen name="divider_218px" tools:ignore="ResourceName">218px</dimen>
     <dimen name="divider_202px" tools:ignore="ResourceName">202px</dimen>
     <dimen name="divider_195px" tools:ignore="ResourceName">195px</dimen>
     <dimen name="divider_180px" tools:ignore="ResourceName">180px</dimen>
@@ -34,6 +35,8 @@
     <dimen name="divider_101px" tools:ignore="ResourceName">101px</dimen>
     <dimen name="divider_100px" tools:ignore="ResourceName">100px</dimen>
     <dimen name="divider_97px" tools:ignore="ResourceName">97px</dimen>
+    <dimen name="divider_93px" tools:ignore="ResourceName">93px</dimen>
+    <dimen name="divider_84px" tools:ignore="ResourceName">84px</dimen>
     <dimen name="divider_80px" tools:ignore="ResourceName">80px</dimen>
     <dimen name="divider_79px" tools:ignore="ResourceName">79px</dimen>
     <dimen name="divider_78px" tools:ignore="ResourceName">78px</dimen>

+ 1 - 0
personalcenter/src/main/res/values/strings.xml

@@ -13,4 +13,5 @@
     <string name="mobile_network" tools:ignore="ResourceName">移动网络</string>
     <string name="brightness" tools:ignore="ResourceName">显示与亮度</string>
     <string name="sound" tools:ignore="ResourceName">声音</string>
+    <string name="help" tools:ignore="ResourceName">使用帮助</string>
 </resources>