update policy page

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

 package com.common.activity;
 
 import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.support.v4.app.FragmentActivity;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.webkit.WebSettings;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
@@ -23,6 +26,7 @@ import tech.starwin.R;
 
 import com.common.base.BaseActivity;
 
+import tech.starwin.base.RecyclerViewHolder;
 import tech.starwin.constants.ActionEnum;
 import tech.starwin.impl.OnEventClickListener;
 import tech.starwin.impl.OnNoShakeClickListener;
@@ -49,6 +53,47 @@ public class AgreementPolicyActivity extends BaseActivity {
         AGREEMENT_HOOK
     }
 
+    /**
+     * 2019/9/6  协议展示改为Dialog
+     */
+    public static void showPolicyDialog(Activity context, Type type, DialogInterface.OnDismissListener dismissListener) {
+        Dialog dialog = DialogFactory.createCustomDialog(context, R.layout.dialog_policy,
+                (dialog1, viewHolder) -> {
+                    if (type == Type.AGREEMENT_KSP) {
+                        viewHolder.getTextView(R.id.dialog_policy_ksp_tv).setVisibility(View.VISIBLE);
+                    }
+                    UIHelper.bindClickListener((ViewGroup) viewHolder.getItemView(),
+                            new OnNoShakeClickListener() {
+                                @Override
+                                public void onEventClick(View v) {
+                                    if (v.getId() == R.id.dialog_policy_agreement_tv) {
+                                        String agreement = type != Type.AGREEMENT_HOOK ? Gateway.getAgreementPolicyUrl() : "file:///android_asset/web/privacy.html?name=" + LibConfig.APP_NAME.replace(" ", "%20");
+                                        WebActivity.start(context, context.getString(R.string.login_statement_title), agreement);
+                                    } else if (v.getId() == R.id.dialog_policy_ksp_tv) {
+                                        WebActivity.start(context, context.getString(R.string.koperasi_form), Gateway.getKSPUrl());
+                                    } else if (v.getId() == R.id.dialog_policy_cancel_btn) {
+                                        context.finish();
+                                    } else if (v.getId() == R.id.dialog_policy_sure_btn) {
+                                        if (!viewHolder.getCheckBox(R.id.dialog_policy_checkbox).isChecked()) {
+                                            DialogFactory.showMessageDialog(context, context.getString(R.string.check_the_checkbox));
+                                            return;
+                                        }
+                                        PreferencesManager.get().setPolicyStatus(true);
+                                        PreferencesManager.get().setPolicyKSPStatus(true);
+                                        TrackEventHelper.logEvent(TrackEvent.Click.AGREE_PRIVACY);
+                                        dialog1.dismiss();
+                                    }
+                                }
+                            }, R.id.dialog_policy_agreement_tv,
+                            R.id.dialog_policy_ksp_tv,
+                            R.id.dialog_policy_cancel_btn,
+                            R.id.dialog_policy_sure_btn);
+                });
+        dialog.setOnDismissListener(dismissListener);
+        dialog.setCancelable(false);
+        dialog.show();
+    }
+
 
     Type agreementType = Type.AGREEMENT_POLICY;
 
@@ -127,10 +172,10 @@ public class AgreementPolicyActivity extends BaseActivity {
                     DialogFactory.createMenuDialog(AgreementPolicyActivity.this, new String[]{policy, ksp_form},
                             (dialog, which) -> {
                                 dialog.dismiss();
-                                if(which==0){
+                                if (which == 0) {
                                     setTopBarTitle(policy);
                                     loadPolicy();
-                                }else{
+                                } else {
                                     setTopBarTitle(ksp_form);
                                     loadKspPolicy();
                                 }

src/main/java/tech/starwin/base/RecyclerViewHolder.java

@@ -3,6 +3,7 @@ package tech.starwin.base;
 import android.support.v7.widget.RecyclerView;
 import android.util.SparseArray;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
@@ -70,5 +71,8 @@ public class RecyclerViewHolder extends RecyclerView.ViewHolder {
         getTextView(viewId).setText(String.format(formatStr, text));
     }
 
+    public View getItemView() {
+        return itemView;
+    }
 }
 

src/main/java/tech/starwin/utils/context_utils/PermissionsHelper.java

@@ -115,7 +115,7 @@ public class PermissionsHelper {
      * 检查权限
      */
     public static void checkPermission(FragmentActivity activity, String[] permissions, final OnPermissionListener listener) {
-        getPermission(new RxPermissions(activity), permissions, listener);
+        getPermission(new RxPermissions(activity),permissions , listener);
     }
 
     public static void checkPermission(Fragment fragment, String[] permissions, final OnPermissionListener listener) {

src/main/res/layout/dialog_policy.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="280dp"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/btn_read_agreemment"
+        android:textSize="20dp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="15dp"
+        android:background="@color/color_line" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/policy_title" />
+
+    <TextView
+        android:id="@+id/dialog_policy_agreement_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/login_statement_title"
+        android:textColor="@color/color_blue" />
+
+    <TextView
+        android:id="@+id/dialog_policy_ksp_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:visibility="gone"
+        android:text="@string/koperasi_form"
+        android:textColor="@color/color_blue" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="@string/policy_desc" />
+
+    <LinearLayout
+        android:layout_marginTop="15dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <CheckBox
+            android:id="@+id/dialog_policy_checkbox"
+            android:layout_width="26dp"
+            android:layout_height="26dp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginLeft="5dp"
+            android:tag="read_policy"
+            android:text="@string/i_agree_this_policy" />
+    </LinearLayout>
+
+
+    <LinearLayout
+        android:layout_marginTop="5dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="right"
+        android:layout_gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/dialog_policy_cancel_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:text="@string/text_cancel"
+            android:textColor="@color/color_blue" />
+
+        <Button
+            android:id="@+id/dialog_policy_sure_btn"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            android:text="@string/text_sure"
+            android:textColor="@color/color_blue" />
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

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

@@ -46,6 +46,9 @@
     <string name="text_repayment_time">thời gian hết hạn</string>
 
 
+    <string name="policy_title">Kính gửi người dùng, cảm ơn bạn đã tin tưởng và sử dụng!</string>
+    <string name="policy_desc">Chúng tôi có chính sách bảo mật theo luật pháp liên quan. Vui lòng đọc và hiểu đầy đủ các điều khoản và điều kiện trước khi nhấp để đồng ý, để bạn có thể hiểu các quyền của mình.</string>
+
 
     <string name="default_country_code">VN</string>
     <string name="loading">Đang tải&#8230;</string>

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

@@ -101,6 +101,9 @@
     <string name="text_loan_amount">Jumlah Pinjaman</string>
     <string name="text_repayment_time">Jatuh Tempo</string>
 
+    <string name="policy_title">Yth Seluruh Pengguna kami, terima kasih sudah mempercayai dan menggunakan!</string>
+    <string name="policy_desc">kami memiliki kebijakan privasi yang sesuai dengan UU yang berlaku, Mohon untuk dibaca dan dipahami syarat dan ketentuan sebelum meng klik untuk menyetujui.sehingga anda dapat memahami kebijakan dan hak yang anda miliki</string>
+
 
     <string name="text_receiving_bank">Nama Bank Penerima</string>
     <string name="editText_bank_number">Nomor Rekening Penerima</string>
@@ -875,7 +878,7 @@
     <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</string>
+    <string name="login_statement_title">Perjanjian Layanan Registrasi dan Kebijakan Privasi</string>
 
     <string name="koperasi_form">FORMULIR KEANGGOTAAN KOPERASI</string>
 
@@ -970,7 +973,7 @@
     <string name="private_permission_keep">Kami akan menjaga dan mentaati kebijakan privasi Pengguna</string>
     <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_this_policy">Saya menyetujui perjanjian di atas</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>

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

@@ -902,7 +902,7 @@
     <string name="private_permission_keep">我们将坚持保护客户的隐私政策</string>
     <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_this_policy">我同意上述协议</string>
     <string name="i_agree_ksp_policy">我同意 %s 并签署 %s</string>
     <string name="read_policy_fully">*请完整阅读本政策</string>
     <string name="check_the_checkbox">请勾选复选框以同意政策</string>

src/main/res/values/colors.xml

@@ -11,6 +11,9 @@
     <color name="white_alpha30">#4DFFFFFF</color>
     <color name="white_alpha10">#1AFFFFFF</color>
 
+    <color name="color_line">#e5e5e5</color>
+    <color name="color_blue">#248bff</color>
+
     <color name="black_alpha50">#80000000</color>
     <color name="black_alpha30">#4D000000</color>
     <color name="black_alpha10">#1A000000</color>

src/main/res/values/strings.xml

@@ -82,6 +82,9 @@
         Setelah pembayaran berhasil, mohon menunggu 5-10 menit untuk kami bisa memberikan pemberitahuan Pelunasan Pinjaman. Jika Anda menghadapi kendala, mohon segera menghubungi kami melalui WhatsApp: +8681383163427.
     </string>
 
+    <string name="policy_title">Kính gửi người dùng, cảm ơn bạn đã tin tưởng và sử dụng!</string>
+    <string name="policy_desc">Chúng tôi có chính sách bảo mật theo luật pháp liên quan. Vui lòng đọc và hiểu đầy đủ các điều khoản và điều kiện trước khi nhấp để đồng ý, để bạn có thể hiểu các quyền của mình.</string>
+
     <string name="text_title_personal_info">Personal information</string>
     <string name="text_field_personal_info">Personal information</string>
     <string name="text_field_personal_info_2">Personal\ninformation</string>
@@ -924,7 +927,7 @@
     <string name="private_permission_keep">we will maintain and adhere to the customer\'s privacy policy</string>
     <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_this_policy">I agree to the agreement above</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>