update ksp 流程

src/main/java/com/common/activity/AgreementPolicyActivity.java

 package com.common.activity;
 
 import android.app.Activity;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
@@ -10,6 +11,7 @@ import android.webkit.WebSettings;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
 import android.widget.CheckBox;
+import android.widget.TextView;
 
 
 import org.greenrobot.eventbus.EventBus;
@@ -48,7 +50,7 @@ public class AgreementPolicyActivity extends BaseActivity {
     }
 
 
-    Type agreementType;
+    Type agreementType = Type.AGREEMENT_POLICY;
 
     public static void startForResult(FragmentActivity activity, Type type, int requestCode, EasyActivityResult.OnResultListener listener) {
         Intent intent = new Intent(activity, AgreementPolicyActivity.class);
@@ -83,6 +85,7 @@ public class AgreementPolicyActivity extends BaseActivity {
             agreementType = (Type) getIntent().getSerializableExtra("agreementType");
         }
         EventBus.getDefault().register(this);
+
         mCheckBox = findViewById(R.id.activity_policy_checkbox);
         webView = findViewById(R.id.activity_policy_webview);
         WebSettings settings = webView.getSettings();
@@ -96,35 +99,12 @@ public class AgreementPolicyActivity extends BaseActivity {
             public void onEventClick(View v) {
                 if (v.getId() == R.id.activity_policy_ok_btn) {
                     if (mCheckBox.isChecked()) {
-                        if (agreementType == null) {
                         PreferencesManager.get().setPolicyStatus(true);
+                        PreferencesManager.get().setPolicyKSPStatus(true);
                         TrackEventHelper.logEvent(TrackEvent.Click.AGREE_PRIVACY);
                         setResult(RESULT_OK);
                         finish();
                         return;
-                        }
-                        switch (agreementType) {
-                            case AGREEMENT_POLICY:
-                                PreferencesManager.get().setPolicyStatus(true);
-                                AgreementPolicyActivity.startForResult(AgreementPolicyActivity.this, Type.AGREEMENT_KSP, 0, (requestCode, resultCode, data) -> {
-                                    if (resultCode == RESULT_OK) {
-                                        setResult(Activity.RESULT_OK);
-                                        TrackEventHelper.logEvent(TrackEvent.Click.AGREE_PRIVACY);
-                                    }
-                                    finish();
-                                });
-                                break;
-                            case AGREEMENT_KSP:
-                                PreferencesManager.get().setPolicyKSPStatus(true);
-                                setResult(RESULT_OK);
-                                finish();
-                                break;
-                            case AGREEMENT_HOOK:
-                                PreferencesManager.get().setPolicyStatus(true);
-                                setResult(RESULT_OK);
-                                finish();
-                                break;
-                        }
                     } else {
                         DialogFactory.showMessageDialog(AgreementPolicyActivity.this, getString(R.string.check_the_checkbox));
                     }
@@ -133,24 +113,48 @@ public class AgreementPolicyActivity extends BaseActivity {
             }
         }, R.id.activity_policy_ok_btn);
 
-        String policyUrl;
-        if (agreementType != Type.AGREEMENT_KSP) {
-            policyUrl = Gateway.getAgreementPolicyUrl();
-        } else {
-            setTopBarTitle("FORMULIR KEANGGOTAAN KOPERASI");
-            policyUrl = Gateway.getKSPUrl();
+        //KSP协议
+        if (agreementType == Type.AGREEMENT_KSP) {
+            TextView agreeTv = findViewById(R.id.activity_policy_agreement_tv);
+            String policy = getString(R.string.login_statement_title);
+            String ksp_form = getString(R.string.koperasi_form);
+            String agreeText = String.format(getString(R.string.i_agree_ksp_policy), policy, ksp_form);
+            UIHelper.setTextHighLight(agreeTv, agreeText, LibConfig.MAIN_COLOR, policy, ksp_form);
+
+            agreeTv.setOnClickListener(new OnNoShakeClickListener() {
+                @Override
+                public void onEventClick(View v) {
+                    DialogFactory.createMenuDialog(AgreementPolicyActivity.this, new String[]{policy, ksp_form},
+                            (dialog, which) -> {
+                                dialog.dismiss();
+                                if(which==0){
+                                    setTopBarTitle(policy);
+                                    loadPolicy();
+                                }else{
+                                    setTopBarTitle(ksp_form);
+                                    loadKspPolicy();
+                                }
+                            }).show();
+                }
+            });
         }
 
         //假协议
         if (agreementType == Type.AGREEMENT_HOOK) {
-            webView.loadUrl("file:///android_asset/web/privacy.html?name=" + LibConfig.APP_NAME.replace(" ","%20"));
+            webView.loadUrl("file:///android_asset/web/privacy.html?name=" + LibConfig.APP_NAME.replace(" ", "%20"));
             return;
         }
 
-        if (!TextUtils.isEmpty(policyUrl)) {
-            webView.loadUrl(policyUrl);
+        loadPolicy();
+
     }
 
+    private void loadKspPolicy() {
+        webView.loadUrl(Gateway.getKSPUrl());
+    }
+
+    private void loadPolicy() {
+        webView.loadUrl(Gateway.getAgreementPolicyUrl());
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)

src/main/java/tech/starwin/utils/ui_utils/UIHelper.java

@@ -108,7 +108,7 @@ public class UIHelper {
                 if (TextUtils.isEmpty(((EditText) view).getText().toString().replace(" ", ""))) {
                     return true;
                 }
-            }else if (view instanceof SpanButton){
+            } else if (view instanceof SpanButton) {
                 if (TextUtils.isEmpty(((SpanButton) view).getText().toString().replace(" ", ""))) {
                     return true;
                 }
@@ -191,6 +191,7 @@ public class UIHelper {
      * @param highTexts 高亮文字
      */
     public static void setTextHighLight(TextView textView, String text, @ColorRes int colorId, String... highTexts) {
+        textView.setText(text);
         SpannableStringBuilder builder = new SpannableStringBuilder(text);
         // 遍历要显示的文字
         for (String highText : highTexts) {

src/main/res/values-in/strings.xml

@@ -875,8 +875,9 @@
     <string name="title_loan_info">Rincian Pinjaman</string>
     <string name="show_read_agreement">Mohon baca dan setujui perjanjian pinjaman untuk melanjutkan ke langkah selanjutnya</string>
     <string name="btn_read_agreemment">Perjanjian</string>
-    <string name="login_statement_title">Perjanjian Layanan Registrasi dan Kebijakan Privasi</string>
+    <string name="login_statement_title">Perjanjian Layanan Registrasi</string>
 
+    <string name="koperasi_form">FORMULIR KEANGGOTAAN KOPERASI</string>
 
     <string name="tips4google_service_not_available">Layanan Google Tidak Tersedia</string>
     <string name="button_ok">OK</string>
@@ -970,6 +971,8 @@
     <string name="blue_pay_bank_code">013</string>
     <string name="text_about_us">Dipersembahkan oleh StarWin.Tech</string>
     <string name="i_agree_this_policy">Saya setuju dengan Kebijakan ini</string>
+    <string name="i_agree_ksp_policy">Saya setuju dengan %s Dan menandatangani %s</string>
+
     <string name="read_policy_fully">*Mohon baca sepenuhnya Kebijakan ini</string>
     <string name="check_the_checkbox">Setujui Kebijakan tersebut dengan mencentang kotak centang</string>
     <string name="text_field_identity_info">Informasi Identitas</string>

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

@@ -903,6 +903,7 @@
     <string name="blue_pay_bank_code">013</string>
     <string name="text_about_us">Powered By StarWin.Tech</string>
     <string name="i_agree_this_policy">我同意这项政策</string>
+    <string name="i_agree_ksp_policy">我同意 %s 并签署 %s</string>
     <string name="read_policy_fully">*请完整阅读本政策</string>
     <string name="check_the_checkbox">请勾选复选框以同意政策</string>
     <string name="text_field_identity_info">身份信息</string>
@@ -918,6 +919,8 @@
     <string name="dialog_remove">Menghapus</string>
     <string name="dialog_replace">Unggah Ulang</string>
 
+    <string name="koperasi_form">合作社会员表</string>
+
     <string name="text_whats_app_id">WhatsApp ID</string>
 
     <string name="dialog_take_other_photo_tips">

src/main/res/values/strings.xml

@@ -925,6 +925,7 @@
     <string name="blue_pay_bank_code">013</string>
     <string name="text_about_us">Powered By StarWin.Tech</string>
     <string name="i_agree_this_policy">I agree with this policy</string>
+    <string name="i_agree_ksp_policy">I agree with %s and sign%s</string>
     <string name="read_policy_fully">*Please read this policy fully</string>
     <string name="check_the_checkbox">Please agree the policy by checking the checkbox</string>
     <string name="text_field_identity_info">Identity information</string>
@@ -940,6 +941,8 @@
     <string name="dialog_remove">Menghapus</string>
     <string name="dialog_replace">Unggah Ulang</string>
 
+    <string name="koperasi_form">COOPERATIVE MEMBERSHIP FORM</string>
+
     <string name="text_whats_app_id">WhatsApp ID</string>
 
     <string name="dialog_take_other_photo_tips">