开发启动页隐私政策弹框

CommonLib/Common/src/main/AndroidManifest.xml

@@ -24,6 +24,7 @@
         <service android:name="com.amap.api.location.APSService" />
         <!--高德地图配置 end -->
 
+        <activity android:name=".webview.PublicWebViewActivity" />
     </application>
 
 </manifest>

CommonLib/Common/src/main/java/com/yidian/common/webview/PublicWebViewActivity.kt

+package com.yidian.common.webview
+
+import android.os.Build
+import android.webkit.WebChromeClient
+import android.webkit.WebSettings
+import android.webkit.WebView
+import androidx.activity.viewModels
+import com.yidian.common.R
+import com.yidian.common.databinding.ActivityPublicWebViewBinding
+import com.yidian.common.extensions.initTitleBar
+import com.yidian.common.mvvm.BaseMvvmActivity
+
+class PublicWebViewActivity : BaseMvvmActivity<ActivityPublicWebViewBinding, PublicWebViewModel>() {
+
+  override val layoutId: Int = R.layout.activity_public_web_view
+
+  override val vm: PublicWebViewModel by viewModels()
+
+  override fun initView() {
+    val url = intent?.getStringExtra("url")
+    initTitleBar(binding.toolbar, binding.tvTitle, "声明")
+    initWebView(binding.webView)
+    binding.webView.loadUrl(url)
+  }
+
+  private fun initWebView(webView: WebView) {
+    // webView设置
+    webView.settings.apply {
+      // 允许使用js
+      javaScriptEnabled = true
+      // 支持屏幕缩放
+      setSupportZoom(true)
+      builtInZoomControls = true
+      // 缓存模式，不使用缓存
+      cacheMode = WebSettings.LOAD_NO_CACHE
+      // 支持混合模式
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+        mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
+      }
+    }
+    webView.webChromeClient = object : WebChromeClient() {
+
+      override fun onReceivedTitle(view: WebView?, title: String?) {
+        super.onReceivedTitle(view, title)
+        if (!title.isNullOrBlank()) {
+          initTitleBar(binding.toolbar, binding.tvTitle, title)
+        }
+      }
+    }
+  }
+
+//  override fun onDestroy() {
+//    super.onDestroy()
+//    binding.webView.destroy()
+//  }
+}

CommonLib/Common/src/main/java/com/yidian/common/webview/PublicWebViewModel.kt

+package com.yidian.common.webview
+
+import com.yidian.common.mvvm.BaseViewModel
+
+class PublicWebViewModel : BaseViewModel() {
+}

CommonLib/Common/src/main/res/layout/activity_public_web_view.xml

+<?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">
+
+    <data>
+
+        <variable
+            name="vm"
+            type="com.yidian.common.webview.PublicWebViewModel" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
+            android:minHeight="50dp"
+            android:paddingStart="@dimen/dp15"
+            android:paddingEnd="@dimen/dp15"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:navigationIcon="@drawable/icon_back">
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:textColor="#FF333333"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                tools:text="标题" />
+
+        </androidx.appcompat.widget.Toolbar>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <WebView
+                android:id="@+id/webView"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+
+        </FrameLayout>
+
+    </LinearLayout>
+</layout>
\ No newline at end of file

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerChangeActivity.kt

@@ -182,7 +182,7 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
         override fun onClick(widget: View) {
           val map = HashMap<String, String>()
           map[ProtocolActivity.ProtocolTitleKey] = resources.getString(R.string.user_protocol)
-          map[ProtocolActivity.ProtocolUrlKey] = AppConfig.privacyPolicyStatement
+          map[ProtocolActivity.ProtocolUrlKey] = AppConfig.userProtocol
           XPageManager.push(XRouterPathConstants.PROTOCOL, map)
         }
       }, 28, 33, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)

Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/FlashActivity.kt

@@ -2,16 +2,18 @@ package com.yidian.shenghuoquan.newscontent.ui
 
 import android.app.AlertDialog
 import android.content.Intent
+import android.graphics.Color
+import android.text.*
+import android.text.method.LinkMovementMethod
+import android.text.style.ClickableSpan
 import android.view.View
 import android.widget.TextView
 import com.orhanobut.hawk.Hawk
-import com.yidian.common.BaseInitConfig
-import com.yidian.common.HawkConfig
-import com.yidian.common.XRouterPathConstants
+import com.yidian.common.*
 import com.yidian.common.XRouterPathConstants.Companion.FLASH
-import com.yidian.common.YdBaseApplication
 import com.yidian.common.base.BaseActivity
 import com.yidian.common.services.AppUpgradeService
+import com.yidian.common.webview.PublicWebViewActivity
 import com.yidian.shenghuoquan.newscontent.R
 import com.yidian.shenghuoquan.newscontent.databinding.ActivityFlashBinding
 import com.yidian.shenghuoquan.newscontent.http.ApiService
@@ -44,12 +46,13 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
    * 检查隐私协议是否同意
    */
   private fun checkPrivacyIsAgreed() {
-    val isAgree = Hawk.get(HawkConfig.ProtocolIsAgree, false)
-    if (isAgree) {
-      toLoginOrHome()
-    } else {
-      showPrivacyDialog()
-    }
+//    val isAgree = Hawk.get(HawkConfig.ProtocolIsAgree, false)
+//    if (isAgree) {
+//      toLoginOrHome()
+//    } else {
+//      showPrivacyDialog()
+//    }
+    showPrivacyDialog()
   }
 
   /**
@@ -79,12 +82,15 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
   private fun showPrivacyDialog() {
     val builder = AlertDialog.Builder(this, R.style.NoTitleDialog)
     val updateDialog = View.inflate(this, R.layout.dialog_privacy, null)
-    val tvContent = updateDialog.findViewById<TextView>(R.id.tv_update_content)
+    val tvContent = updateDialog.findViewById<TextView>(R.id.tv_privacy_tips)
     val btnCancel = updateDialog.findViewById<TextView>(R.id.tv_cancel)
     val btnEnsure = updateDialog.findViewById<TextView>(R.id.tv_sure)
     builder.setView(updateDialog)
     builder.setCancelable(false)
     builder.create()
+
+    // 提示内容
+    initUserProtocol(tvContent)
     // 取消按钮
     btnCancel.setOnClickListener {
       dismissPrivacyDialog()
@@ -100,6 +106,41 @@ class FlashActivity : BaseActivity<ActivityFlashBinding>(), IGetLifeAccountListC
     builder.show()
   }
 
+  private fun initUserProtocol(textView: TextView) {
+    val span = SpannableString(resources.getString(R.string.privacy_tips))
+    span.setSpan(object : ClickableSpan() {
+      override fun updateDrawState(ds: TextPaint) {
+        super.updateDrawState(ds)
+        ds.color = Color.parseColor("#1852F1");
+        ds.isUnderlineText = false;// 去掉下划线
+      }
+
+      override fun onClick(widget: View) {
+        val intent = Intent(this@FlashActivity, PublicWebViewActivity::class.java)
+        intent.putExtra("url", AppConfig.userProtocol)
+        startActivity(intent)
+      }
+    }, 19, 25, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    span.setSpan(object : ClickableSpan() {
+      override fun updateDrawState(ds: TextPaint) {
+        super.updateDrawState(ds)
+        ds.color = Color.parseColor("#1852F1");
+        ds.isUnderlineText = false;// 去掉下划线
+        ds.clearShadowLayer();//清除阴影
+      }
+
+      override fun onClick(widget: View) {
+        val intent = Intent(this@FlashActivity, PublicWebViewActivity::class.java)
+        intent.putExtra("url", AppConfig.privacyPolicyStatement)
+        startActivity(intent)
+      }
+    }, 26, 32, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+    textView.setLinkTextColor(Color.TRANSPARENT)
+    textView.setHintTextColor(resources.getColor(R.color.transparent)) //设置点击后的颜色为透明，否则会一直出现高亮
+    textView.append(span)
+    textView.movementMethod = LinkMovementMethod.getInstance() //开始响应点击事件
+  }
+
   /**
    * 关闭弹框
    */

Components/newscontent/src/main/res/layout/dialog_privacy.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:background="@color/transparent"
     android:gravity="center"
     android:orientation="vertical">
 
     <LinearLayout
-        android:layout_width="275dp"
-        android:layout_height="109dp"
-        android:background="@drawable/icon_life_account_select"
-        android:orientation="vertical"
-        android:paddingStart="15dp"
-        android:paddingTop="15dp"
-        android:paddingEnd="15dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
-            android:text="隐私协议声明"
-            android:textColor="@color/color_333333"
-            android:textSize="14sp"
-            android:textStyle="bold" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="275dp"
+        android:layout_width="280dp"
         android:layout_height="wrap_content"
         android:background="@drawable/shape_person_bg"
-        android:orientation="vertical"
-        android:paddingStart="15dp"
-        android:paddingEnd="15dp"
-        android:paddingBottom="15dp">
+        android:orientation="vertical">
 
         <TextView
+            android:id="@+id/tv_privacy_tips"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="新版本说明："
-            android:textColor="#292626"
+            android:padding="@dimen/dp20"
+            tools:text="@string/privacy_tips"
+            android:textColor="#000000"
             android:textSize="14sp" />
 
-        <TextView
-            android:id="@+id/tv_update_content"
+        <View
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="1.优化首页按钮、地址导航标题地址导航\n2.首页按钮导航标题地址导航"
-            android:textColor="@color/color_333333"
-            android:textSize="14sp" />
+            android:layout_height="1px"
+            android:background="#979797" />
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp10"
-            android:gravity="center"
+            android:layout_height="@dimen/dp48"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/tv_cancel"
-                android:layout_width="105dp"
-                android:layout_height="27dp"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
                 android:gravity="center"
-                android:text="取消"
-                android:textColor="#03A9F4"
-                android:textSize="12sp" />
+                android:text="暂不使用"
+                android:textColor="@color/color_333333"
+                android:textSize="16sp" />
+
+            <View
+                android:layout_width="1px"
+                android:layout_height="match_parent"
+                android:background="#979797" />
 
             <TextView
                 android:id="@+id/tv_sure"
-                android:layout_width="105dp"
-                android:layout_height="27dp"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
                 android:gravity="center"
                 android:text="同意"
-                android:textColor="#03A9F4"
-                android:textSize="12sp" />
-        </LinearLayout>
+                android:textColor="#1852F1"
+                android:textSize="16sp" />
 
+        </LinearLayout>
 
     </LinearLayout>
 

Components/newscontent/src/main/res/values/strings.xml

@@ -104,6 +104,7 @@
     <string name="agree">我同意</string>
     <string name="privacy_policy">《隐私政策》</string>
     <string name="user_agreement">《用户协议》</string>
+    <string name="privacy_tips">欢迎您使用生活圈商家版！您可以通过阅读《用户协议》与《隐私政策》帮助您了解我们收集、使用、存储和共享个人信息的情况，以及您所享有的相关权利。</string>
     <string name="auth_finish">完成认证</string>
     <string name="enterprise_qualification">企业资质</string>
     <string name="enterprise_manager">经营者</string>

www @ 91a83eef

-Subproject commit 8b28605769210f30bfd671011c0effb9c4bade42
+Subproject commit 91a83eef2caab22ebd8bd063ec2aab43a22cf6ba