From ca394e01729b109e39ba6de5b0a2f483ed3c4e23 Mon Sep 17 00:00:00 2001 From: LiuSiXiang-007 <2535147127@qq.com> Date: Fri, 26 Jan 2024 17:43:14 +0800 Subject: [PATCH] =?UTF-8?q?:lipstick:=20=E5=9C=A8=E7=BA=BF=E6=96=87?= =?UTF-8?q?=E6=A1=A3-=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE+=E9=9A=90?= =?UTF-8?q?=E7=A7=81=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 8 +++ .../push/ui/activity/DocumentActivity.java | 55 +++++++++++++++++++ .../kanglai/push/ui/vm/DocumentViewModel.java | 31 +++++++++++ .../kanglai/push/ui/vm/LoginViewModel.java | 17 +++++- app/src/main/res/layout/activity_document.xml | 22 ++++++++ app/src/main/res/layout/activity_login.xml | 2 + 6 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java create mode 100644 app/src/main/java/com/kanglai/push/ui/vm/DocumentViewModel.java create mode 100644 app/src/main/res/layout/activity_document.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index caed283..f858c85 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -25,6 +25,9 @@ + + + @@ -175,6 +178,11 @@ android:name=".ui.activity.LoginSurveyActivity" android:launchMode="standard" android:screenOrientation="portrait" /> + + \ No newline at end of file diff --git a/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java b/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java new file mode 100644 index 0000000..5549950 --- /dev/null +++ b/app/src/main/java/com/kanglai/push/ui/activity/DocumentActivity.java @@ -0,0 +1,55 @@ +package com.kanglai.push.ui.activity; + +import android.os.Bundle; +import android.os.PersistableBundle; +import android.webkit.WebView; + +import androidx.annotation.Nullable; +import androidx.databinding.library.baseAdapters.BR; + +import com.blankj.utilcode.util.StringUtils; +import com.dolphin.core.base.BaseActivity; +import com.kanglai.push.R; +import com.kanglai.push.databinding.ActivityDocumentBinding; +import com.kanglai.push.ui.vm.DocumentViewModel; + +/** + * 隐私政策 / 用户协议 + * + * @Author: liusixiang007 + * @since: 2024/1/23 + */ +public class DocumentActivity extends BaseActivity { + + public WebView mWebView; // 网页 + + @Override + public int setContentView(Bundle savedInstanceState) { + return R.layout.activity_document; + } + + @Override + public int setVariableId() { + return BR.viewModel; + } + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + super.mViewModel.mActivity = this; + mWebView = findViewById(R.id.web_document); + + String type = getIntent().getStringExtra("DOCUMENT_TYPE"); + if (!StringUtils.isTrimEmpty(type)){ + mViewModel.judgeTit(type); + if ("0".equals(type)) mWebView.loadUrl("https://www.kanglailab.com/about.html"); + else mWebView.loadUrl("https://wx.mail.qq.com/list/readtemplate?name=app_intro.html#/agreement/appPolicy"); + + mWebView.requestFocus(); // 获取焦点 + mWebView.getSettings().setJavaScriptEnabled(true); // 加载js清单 + mWebView.getSettings().setSupportZoom(false); // 是否支持缩放 + mWebView.getSettings().setDefaultFontSize(12); // 文字大小 + } + } + +} diff --git a/app/src/main/java/com/kanglai/push/ui/vm/DocumentViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/DocumentViewModel.java new file mode 100644 index 0000000..4a3e8b4 --- /dev/null +++ b/app/src/main/java/com/kanglai/push/ui/vm/DocumentViewModel.java @@ -0,0 +1,31 @@ +package com.kanglai.push.ui.vm; + +import android.app.Application; + +import androidx.annotation.NonNull; +import androidx.lifecycle.LifecycleOwner; + +import com.blankj.utilcode.util.StringUtils; + +/** + * 在线文档 -用户协议/隐私政策 + * @Author: liusixiang007 + * @since: 2024/1/23 + */ +public class DocumentViewModel extends ToolbarViewModel { + + public DocumentViewModel(@NonNull Application application) { + super(application); + } + + @Override + public void onCreate(@NonNull LifecycleOwner owner) { + super.onCreate(owner); + // 根据传入内容 展示 用户协议/隐私政策 + } + + + public void judgeTit(String type) { + super.setTitleText("0".equals(type) ? "用户协议" : "隐私政策" ); + } +} diff --git a/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java b/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java index 242def3..1c0e073 100644 --- a/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java +++ b/app/src/main/java/com/kanglai/push/ui/vm/LoginViewModel.java @@ -2,6 +2,7 @@ package com.kanglai.push.ui.vm; import android.app.Application; import android.graphics.Color; +import android.os.Bundle; import android.util.Pair; import android.view.View; @@ -31,13 +32,13 @@ import com.kanglai.push.di.component.DaggerServiceComponent; import com.kanglai.push.entity.TokenEnhancer; import com.kanglai.push.entity.User; import com.kanglai.push.service.LoginService; +import com.kanglai.push.ui.activity.DocumentActivity; import com.kanglai.push.ui.activity.LoginActivity; import com.kanglai.push.ui.activity.LoginSurveyActivity; import com.kanglai.push.ui.activity.TabBarActivity; import com.kanglai.push.util.CountDownTimerUtils; import com.kongzue.dialogx.dialogs.WaitDialog; import com.tencent.mmkv.MMKV; -import com.umeng.message.PushAgent; import javax.inject.Inject; @@ -125,6 +126,20 @@ public class LoginViewModel extends BaseViewModel { }else loginState02(); }); + /** 用户协议 */ + public BindingCommand documentClickCommand = new BindingCommand(() ->{ + Bundle bundle = new Bundle(); + bundle.putString("DOCUMENT_TYPE", "0"); + startActivity(DocumentActivity.class, bundle); + }); + + /** 隐私政策 */ + public BindingCommand documentsClickCommand = new BindingCommand(() ->{ + Bundle bundle = new Bundle(); + bundle.putString("DOCUMENT_TYPE", "1"); + startActivity(DocumentActivity.class, bundle); + }); + public void loginState01() { // 可登录状态 mActivity.loginBtn.setBackgroundResource(R.drawable.icon_btn_green_bg); mActivity.loginBtn.setTextColor(Color.parseColor("#F2FFFFFF")); diff --git a/app/src/main/res/layout/activity_document.xml b/app/src/main/res/layout/activity_document.xml new file mode 100644 index 0000000..b4d955c --- /dev/null +++ b/app/src/main/res/layout/activity_document.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 173b102..5c5b3ac 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -142,6 +142,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/>