【ID868776255】App数据隐私合规整改--补充英文翻译，及协议内跳转逻辑。

http://tapd.oa.com/NEW_IOT/prong/stories/view/1020393192868776255?

Change-Id: I3a543a446d7782065dbb290f1252568ec6a35c4c

Author: SundoggyNew

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/OpensourceLicenseActivity.kt

@@ -30,7 +30,7 @@ class OpensourceLicenseActivity : BaseActivity(), MyCustomCallBack {
         var urlSet = Arrays.asList(CommonField.OPENSOURCE_LICENSE_URL_EN, CommonField.OPENSOURCE_LICENSE_URL_ZH,
             CommonField.PRIVACY_POLICY_URL_CN_EN, CommonField.PRIVACY_POLICY_URL_US_ZH, CommonField.PRIVACY_POLICY_URL_US_EN,
             CommonField.SERVICE_AGREEMENT_URL_CN_EN, CommonField.SERVICE_AGREEMENT_URL_US_ZH, CommonField.SERVICE_AGREEMENT_URL_US_EN,
-            CommonField.DELET_ACCOUNT_POLICY_EN)
+            CommonField.DELET_ACCOUNT_POLICY_EN, CommonField.THIRD_SDK_URL_US_ZH, CommonField.THIRD_SDK_URL_US_EN)
 
         fun startWebWithExtra(context: Context, title: String, url: String) {
             val intent = Intent(context, OpensourceLicenseActivity::class.java)

app/src/main/java/com/tencent/iot/explorer/link/kitlink/activity/WebActivity.kt

@@ -2,11 +2,11 @@ package com.tencent.iot.explorer.link.kitlink.activity
 
 import android.view.View
 import android.view.ViewGroup
-import android.webkit.WebChromeClient
-import android.webkit.WebSettings
-import android.webkit.WebViewClient
+import android.webkit.*
 import com.tencent.iot.explorer.link.R
 import com.tencent.iot.explorer.link.kitlink.consts.CommonField
+import com.tencent.iot.explorer.link.kitlink.consts.CommonField.THIRD_SDK_URL_US_EN
+import com.tencent.iot.explorer.link.kitlink.consts.CommonField.THIRD_SDK_URL_US_ZH
 import kotlinx.android.synthetic.main.activity_web.*
 import kotlinx.android.synthetic.main.menu_back_layout.*
 
@@ -50,7 +50,20 @@ class WebActivity : BaseActivity() {
         wv_web.settings.useWideViewPort = true
         wv_web.settings.loadWithOverviewMode = true
         wv_web.settings.layoutAlgorithm = WebSettings.LayoutAlgorithm.TEXT_AUTOSIZING
-        wv_web.webViewClient = WebViewClient()
+        val mWebViewClient = object : WebViewClient(){
+            override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+                if (request?.url.toString().contains(THIRD_SDK_URL_US_ZH)) {
+                    OpensourceLicenseActivity.startWebWithExtra(this@WebActivity, getString(R.string.rule_content_list), THIRD_SDK_URL_US_ZH)
+                    return true
+                } else if (request?.url.toString().contains(THIRD_SDK_URL_US_EN)) {
+                    OpensourceLicenseActivity.startWebWithExtra(this@WebActivity, getString(R.string.rule_content_list), THIRD_SDK_URL_US_EN)
+                    return true
+                } else {
+                    return super.shouldOverrideUrlLoading(view, request)
+                }
+            }
+        }
+        wv_web.webViewClient = mWebViewClient
         wv_web.webChromeClient = WebChromeClient()
         wv_web.visibility = View.VISIBLE
         sv_help.visibility = View.GONE

app/src/main/res/values-en-rUS/strings.xml

@@ -26,7 +26,7 @@
     <string name="modify_fail">Failed to edit</string>
     <string name="save">Save</string>
     <string name="refuse">Reject</string>
-    <string name="always_agree">始终允许</string>
+    <string name="always_agree">Allow</string>
     <string name="invite">Accept</string>
     <string name="exit">Exit</string>
     <string name="agree">Agree</string>