Merge remote-tracking branch 'origin/master'

# Conflicts:
#	BusinessCommon/src/main/res/values/strings.xml

BusinessCommon/src/main/res/values-en/strings.xml

@@ -212,6 +212,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="unset_target_time">Time has not been set.</string>
     <string name="empty_notice">Empty Notice</string>
     <string name="network_error">network error</string>
+    <string name="help">Help</string>
 
 
 </resources>

BusinessCommon/src/main/res/values-fr/strings.xml

@@ -253,4 +253,5 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="sovs_vide">SOVS VIDE</string>
     <string name="auto_clean">Nettoyage</string>
     <string name="network_error">Vous devez vous connecter au Wifi pour accéder aux nouvelles recettes</string>
+    <string name="help">Help</string>
 </resources>

BusinessCommon/src/main/res/values-ja/strings.xml

@@ -149,4 +149,5 @@
     <string name="press_the_button">Press the button</string>
     <string name="empty_notice">Empty Notice</string>
     <string name="network_error">network error</string>
+    <string name="help">Help</string>
 </resources>

BusinessCommon/src/main/res/values-zh-rCN/strings.xml

@@ -149,4 +149,5 @@
     <string name="press_the_button">Press the button</string>
     <string name="empty_notice">Empty Notice</string>
     <string name="network_error">network error</string>
+    <string name="help">Help</string>
 </resources>

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

@@ -263,6 +263,7 @@ Nanfang plus client is an online information platform developed and operated by
     <string name="network_error">network error</string>
     <string name="apk_version_latest">The app version is already up to date.</string>
     <string name="installing">Installing...</string>
+    <string name="help">Help</string>
 
 
 </resources>

BusinessMain/src/main/java/com/develop/main/ui/HomeActivity.kt

@@ -115,8 +115,9 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
                 addFragment(R.id.fragment_container, modesFragment)
             }
         }
-        binding.favouriteLayout.background_drawable = com.develop.common.R.drawable.home_menu_corners
-        if (isNightTheme()){
+        binding.favouriteLayout.background_drawable =
+            com.develop.common.R.drawable.home_menu_corners
+        if (isNightTheme()) {
             binding.tvFavourite.textSize = dp20
             binding.tvSetting.textSize = dp20
             binding.tvHistory.textSize = dp20
@@ -218,6 +219,11 @@ class HomeActivity : CommonBVMActivity<ActivityHomeBinding, HomeViewModel>() {
             binding.contentView.closeDrawers()
         }
 
+        binding.helpLayout.setOnClickListener {
+            navigateTo(Screens.Setting.HELP)
+            binding.contentView.closeDrawers()
+        }
+
         viewModel.apply {
             homeOrBackLiveData.observe(this@HomeActivity) {
                 binding.functionTopBar.setHomeOrBack(it)

BusinessMain/src/main/res/layout/activity_home.xml

@@ -35,7 +35,7 @@
             android:layout_width="@dimen/convert_140px"
             android:layout_height="@dimen/convert_140px"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/convert_100px"
+            android:layout_marginTop="@dimen/convert_80px"
             android:src="@drawable/ic_user" />
 
         <LinearLayout
@@ -123,7 +123,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/policy_layout"
+            android:id="@+id/help_layout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/convert_60px"
             android:layout_below="@id/setting_layout"
@@ -134,6 +134,34 @@
             android:gravity="center_vertical"
             android:orientation="horizontal">
 
+            <ImageView
+                android:layout_width="@dimen/convert_42px"
+                android:layout_height="@dimen/convert_42px"
+                android:layout_marginStart="@dimen/convert_60px"
+                android:background="@drawable/ic_help" />
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_help"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/convert_29px"
+                android:text="@string/help"
+                android:textColor="@color/home_menu_title"
+                android:textSize="@dimen/convert_30px" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/policy_layout"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/convert_60px"
+            android:layout_below="@id/help_layout"
+            android:layout_marginStart="@dimen/convert_40px"
+            android:layout_marginTop="@dimen/convert_24px"
+            android:layout_marginEnd="@dimen/convert_40px"
+            android:background="@drawable/home_menu_corners"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
             <ImageView
                 android:layout_width="@dimen/convert_42px"
                 android:layout_height="@dimen/convert_42px"

BusinessSetting/src/main/AndroidManifest.xml

@@ -50,6 +50,9 @@
             android:name=".ui.AboutActivity"
             android:launchMode="singleTask"
             android:screenOrientation="landscape" />
+        <activity android:name=".ui.HelpDocsActivity"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"/>
     </application>
 
 </manifest>

BusinessSetting/src/main/java/com/develop/setting/ui/HelpDocsActivity.kt

@@ -3,6 +3,7 @@ package com.develop.setting.ui
 import android.os.Bundle
 import android.webkit.WebView
 import android.webkit.WebViewClient
+import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.common.router.Screens
@@ -12,7 +13,6 @@ import com.develop.setting.R
 class HelpDocsActivity : AppCompatActivity() {
 
 
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_help_docs)
@@ -27,5 +27,8 @@ class HelpDocsActivity : AppCompatActivity() {
         }
         webView.loadUrl("https://www.baidu.com");
 
+        findViewById<ImageView>(R.id.iv_close).setOnClickListener {
+            finish()
+        }
     }
 }

BusinessSetting/src/main/java/com/develop/setting/ui/PrivacyPolicyActivity.kt

@@ -3,6 +3,8 @@ package com.develop.setting.ui
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import android.webkit.WebView
+import android.webkit.WebViewClient
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.develop.base.ext.background_drawable
 import com.develop.base.ext.navigateTo
@@ -13,10 +15,10 @@ import com.develop.common.router.Screens
 import com.develop.common.tag.POLICY_FROM_MAIN_SETTING
 import com.develop.common.utils.TimeDownUtil
 import com.develop.setting.databinding.ActivityPrivacePolicyBinding
-import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import kotlin.math.roundToInt
 
+
 @Route(path = Screens.Setting.POLICY)
 class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>() {
     private var timeDownUtil: TimeDownUtil? = null
@@ -52,6 +54,16 @@ class PrivacyPolicyActivity : BaseBindingActivity<ActivityPrivacePolicyBinding>(
             }
         }
 
+        binding.webview.settings.javaScriptEnabled = true
+        binding.webview.webViewClient = object : WebViewClient() {
+            override fun shouldOverrideUrlLoading(view: WebView, url: String): Boolean {
+                // 在WebView中加载链接
+                view.loadUrl(url)
+                return true
+            }
+        }
+        binding.webview.loadUrl("http://www.baidu.com")
+
     }
 
     private fun countForPolicyTime() {

BusinessSetting/src/main/res/layout/activity_help_docs.xml

@@ -1,12 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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:context=".ui.HelpDocsActivity">
+
+    <ImageView
+        android:id="@+id/iv_close"
+        android:layout_width="@dimen/convert_53px"
+        android:layout_height="@dimen/convert_53px"
+        android:layout_marginStart="@dimen/convert_21px"
+        android:layout_marginTop="@dimen/convert_10px"
+        android:padding="@dimen/convert_15px"
+        android:src="@drawable/ic_close" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/convert_28px"
+        android:textColor="@color/common_title"
+        android:textSize="@dimen/convert_36px" />
+
     <WebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        android:layout_height="match_parent"
+        android:layout_below="@id/tv_title" />
+</RelativeLayout>

BusinessSetting/src/main/res/layout/activity_privace_policy.xml

@@ -92,23 +92,10 @@
         android:layout_toEndOf="@id/iv_banner"
         android:background="@drawable/policy_content_stoke">
 
-        <androidx.core.widget.NestedScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scrollbars="vertical">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/convert_44px"
-                android:layout_marginTop="@dimen/convert_30px"
-                android:layout_marginEnd="@dimen/convert_44px"
-                android:lineHeight="@dimen/convert_48px"
-                android:text="@string/privacy_policy_content"
-                android:textColor="@color/policy_content"
-                android:textSize="@dimen/convert_28px" />
-
-        </androidx.core.widget.NestedScrollView>
+       <WebView
+           android:id="@+id/webview"
+           android:layout_width="match_parent"
+           android:layout_height="match_parent"/>
     </RelativeLayout>