Skip to content

L
lib_base
Commit 3d83cc54 by sikang
Options

4.8v3

parent 32898fef
Showing with 119 additions and 79 deletions
src/main/java/com/common/activity/AgreementPolicyActivity.java
...@@ -62,18 +62,24 @@ public class AgreementPolicyActivity extends BaseActivity { ...@@ -62,18 +62,24 @@ public class AgreementPolicyActivity extends BaseActivity {
public static void showPolicyDialog(Activity context, Type type, DialogInterface.OnDismissListener dismissListener) { public static void showPolicyDialog(Activity context, Type type, DialogInterface.OnDismissListener dismissListener) {
Dialog dialog = DialogFactory.createCustomDialog(context, R.layout.dialog_policy, Dialog dialog = DialogFactory.createCustomDialog(context, R.layout.dialog_policy,
(dialog1, viewHolder) -> { (dialog1, viewHolder) -> {
String agreement = context.getString(R.string.login_statement_title);
String text = String.format(context.getString(R.string.click_to_read), agreement);
UIHelper.setTextHighLight(viewHolder.getTextView(R.id.dialog_policy_agreement_tv), text, R.color.color_blue, agreement);
if (type == Type.AGREEMENT_KSP) { if (type == Type.AGREEMENT_KSP) {
agreement = context.getString(R.string.koperasi_form);
text = String.format(context.getString(R.string.click_to_read), agreement);
UIHelper.setTextHighLight(viewHolder.getTextView(R.id.dialog_policy_ksp_tv), text, R.color.color_blue, agreement);
viewHolder.getTextView(R.id.dialog_policy_ksp_tv).setVisibility(View.VISIBLE); viewHolder.getTextView(R.id.dialog_policy_ksp_tv).setVisibility(View.VISIBLE);
} }
viewHolder.getCheckBox(R.id.dialog_policy_checkbox).setOnCheckedChangeListener((buttonView, isChecked) -> { viewHolder.getCheckBox(R.id.dialog_policy_checkbox).setOnCheckedChangeListener((buttonView, isChecked) -> {
if(isChecked){ if (isChecked) {
viewHolder.getButton(R.id.dialog_policy_sure_btn).setTextColor(context.getResources().getColor(R.color.color_blue)); viewHolder.getButton(R.id.dialog_policy_sure_btn).setTextColor(context.getResources().getColor(R.color.color_blue));
}else{ } else {
viewHolder.getButton(R.id.dialog_policy_sure_btn).setTextColor(context.getResources().getColor(R.color.qmui_config_color_gray_5)); viewHolder.getButton(R.id.dialog_policy_sure_btn).setTextColor(context.getResources().getColor(R.color.qmui_config_color_gray_5));
} }
}); });
UIHelper.bindClickListener((ViewGroup) viewHolder.getItemView(), UIHelper.bindClickListener((ViewGroup) viewHolder.getItemView(),
new OnNoShakeClickListener() { new OnNoShakeClickListener() {
@Override @Override
...@@ -157,9 +163,9 @@ public class AgreementPolicyActivity extends BaseActivity { ...@@ -157,9 +163,9 @@ public class AgreementPolicyActivity extends BaseActivity {
mCheckBox = findViewById(R.id.activity_policy_checkbox); mCheckBox = findViewById(R.id.activity_policy_checkbox);
Button button = findViewById(R.id.activity_policy_ok_btn); Button button = findViewById(R.id.activity_policy_ok_btn);
mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> { mCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
if(isChecked){ if (isChecked) {
button.setBackgroundResource(R.drawable.shape_mainsolid_round); button.setBackgroundResource(R.drawable.shape_mainsolid_round);
}else{ } else {
button.setBackgroundColor(getResources().getColor(R.color.qmui_config_color_gray_5)); button.setBackgroundColor(getResources().getColor(R.color.qmui_config_color_gray_5));
} }
}); });
......
src/main/java/com/common/activity/ReviewHookActivity.java
...@@ -117,39 +117,39 @@ public class ReviewHookActivity extends BaseActivity { ...@@ -117,39 +117,39 @@ public class ReviewHookActivity extends BaseActivity {
startLogin(); startLogin();
}); });
Dialog ysDialog = DialogFactory.createCustomDialog(this, R.layout.dialog_collect_tip, // Dialog ysDialog = DialogFactory.createCustomDialog(this, R.layout.dialog_collect_tip,
(dialog, viewHolder) -> { // (dialog, viewHolder) -> {
CheckBox checkBox = viewHolder.getCheckBox(R.id.dialog_collect_checkbox); // CheckBox checkBox = viewHolder.getCheckBox(R.id.dialog_collect_checkbox);
checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> { // checkBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
if (isChecked) { // if (isChecked) {
viewHolder.getButton(R.id.dialog_collect_sure_btn).setTextColor(getResources().getColor(R.color.color_blue)); // viewHolder.getButton(R.id.dialog_collect_sure_btn).setTextColor(getResources().getColor(R.color.color_blue));
} else { // } else {
viewHolder.getButton(R.id.dialog_collect_sure_btn).setTextColor(getResources().getColor(R.color.qmui_config_color_gray_5)); // viewHolder.getButton(R.id.dialog_collect_sure_btn).setTextColor(getResources().getColor(R.color.qmui_config_color_gray_5));
} // }
}); // });
//
UIHelper.bindClickListener((ViewGroup) viewHolder.getItemView(), // UIHelper.bindClickListener((ViewGroup) viewHolder.getItemView(),
new OnNoShakeClickListener() { // new OnNoShakeClickListener() {
@Override // @Override
public void onEventClick(View v) { // public void onEventClick(View v) {
if (v.getId() == R.id.dialog_collect_agree_tv) { // if (v.getId() == R.id.dialog_collect_agree_tv) {
checkBox.setChecked(!checkBox.isChecked()); // checkBox.setChecked(!checkBox.isChecked());
} else if (v.getId() == R.id.dialog_collect_cancel_btn) { // } else if (v.getId() == R.id.dialog_collect_cancel_btn) {
finish(); // finish();
} else if (v.getId() == R.id.dialog_collect_sure_btn) { // } else if (v.getId() == R.id.dialog_collect_sure_btn) {
if (checkBox.isChecked()) { // if (checkBox.isChecked()) {
dialog.dismiss(); // dialog.dismiss();
} // }
} // }
} // }
}, // },
R.id.dialog_collect_agree_tv, // R.id.dialog_collect_agree_tv,
R.id.dialog_collect_cancel_btn, // R.id.dialog_collect_cancel_btn,
R.id.dialog_collect_sure_btn); // R.id.dialog_collect_sure_btn);
}); // });
//
ysDialog.setCancelable(false); // ysDialog.setCancelable(false);
ysDialog.show(); // ysDialog.show();
} }
......
src/main/java/tech/starwin/utils/context_utils/AppLanguageUtils.java
...@@ -19,7 +19,7 @@ public class AppLanguageUtils { ...@@ -19,7 +19,7 @@ public class AppLanguageUtils {
public static void setLanguage(Context context, String language) { public static void setLanguage(Context context, String language) {
if("auto".equals(language)){ if(DeviceInfo.isReviewMachine() || "auto".equals(language)){
return; return;
} }
Resources resources = context.getApplicationContext().getResources(); Resources resources = context.getApplicationContext().getResources();
...@@ -56,7 +56,7 @@ public class AppLanguageUtils { ...@@ -56,7 +56,7 @@ public class AppLanguageUtils {
public static Context attachBaseContext(Context context, String language) { public static Context attachBaseContext(Context context, String language) {
if("auto".equals(language)){ if(DeviceInfo.isReviewMachine() || "auto".equals(language)){
return context; return context;
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
......
src/main/res/layout/dialog_policy.xml
...@@ -2,57 +2,72 @@ ...@@ -2,57 +2,72 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="280dp" android:layout_width="280dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="50dp"
android:background="@color/white" android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
android:padding="20dp"> android:padding="20dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="280dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/btn_read_agreemment" android:text="@string/btn_read_agreemment"
android:textSize="20dp" android:textSize="20dp"
android:textStyle="bold" /> android:textStyle="bold" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="280dp"
android:layout_height="1dp" android:layout_height="1dp"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="15dp"
android:background="@color/color_line" /> android:background="@color/color_line" />
<TextView <ScrollView
android:layout_width="wrap_content" android:layout_width="280dp"
android:layout_height="wrap_content" android:scrollbars="none"
android:layout_marginTop="10dp" android:layout_height="420dp">
android:text="@string/policy_title" />
<TextView <LinearLayout
android:id="@+id/dialog_policy_agreement_tv" android:layout_width="280dp"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:orientation="vertical">
android:layout_marginTop="10dp"
android:text="@string/login_statement_title"
android:textColor="@color/color_blue" />
<TextView <TextView
android:id="@+id/dialog_policy_ksp_tv" android:layout_width="wrap_content"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_height="wrap_content" android:layout_marginTop="10dp"
android:layout_marginTop="10dp" android:text="@string/policy_title" />
android:visibility="gone"
android:text="@string/koperasi_form" <TextView
android:textColor="@color/color_blue" /> android:id="@+id/dialog_policy_agreement_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
/>
<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" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/text_collect_desc" />
</LinearLayout>
</ScrollView>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="1dp"
android:layout_marginTop="10dp" android:background="@color/color_line" />
android:text="@string/policy_desc" />
<LinearLayout <LinearLayout
android:layout_marginTop="15dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:orientation="horizontal"> android:orientation="horizontal">
<CheckBox <CheckBox
...@@ -70,13 +85,12 @@ ...@@ -70,13 +85,12 @@
android:text="@string/i_agree_this_policy" /> android:text="@string/i_agree_this_policy" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_marginTop="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="right"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginTop="5dp"
android:gravity="right"
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button
......
src/main/res/values-en/strings.xml
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
<string name="text_i_agree">I agree %s</string> <string name="text_i_agree">I agree %s</string>
<string name="check_the_checkbox">Please check the box at the bottom to agree to the policy.</string>
<string name="login_statement_title">Registration and Privacy Service Agreement</string> <string name="login_statement_title">Registration and Privacy Service Agreement</string>
<string name="text_sure">OK</string> <string name="text_sure">OK</string>
...@@ -29,23 +31,25 @@ ...@@ -29,23 +31,25 @@
<string name="text_statement">Statement</string> <string name="text_statement">Statement</string>
<string name="btn_read_agreemment">Agreement</string> <string name="btn_read_agreemment">Agreement</string>
<string name="click_to_read">Click to read the %s</string>
<string name="authorize_collect">I allow these permissions and data to be used</string> <string name="authorize_collect">I allow these permissions and data to be used</string>
<string name="policy_title">Dear users, thank you for trusting and using our app! We have a privacy policy in accordance with the relevant laws, please read the following terms before you register.</string> <string name="policy_title">Dear users, thank you for trusting and using our app! We have a privacy policy in accordance with the relevant laws, please read the following terms before you register.</string>
<string name="policy_desc">Please read and fully read and understand the terms and conditions before clicking to agree, so as to better protect your rights.</string> <string name="policy_desc">Please fully read and understand the terms and conditions before clicking to agree, so as to better protect your rights.</string>
<string name="i_agree_this_policy">I agree with this policy</string> <string name="i_agree_this_policy">I agree to the above policy and allow the app to use these permissions and data</string>
<string name="text_collect_tip"> <string name="text_collect_desc">
During the use of the APP, the following permissions may be used:\n\n During the use of the APP, the following permissions may be used:\n\n
\t\tContact, Location, Camera, SD Card\n\n\n \t\tContact, Location, Camera, SD Card\n\n
In addition, we may collect and upload some information on your device, including:\n\n In addition, we may collect and upload some information on your device, including:\n\n
\t\tContact list\n \t\tContact list\n
\t\tLocation information\n\n\n \t\tLocation information\n\n
How will we use these permissions and data? \n \n How will we use these permissions and data? \n \n
\t\tWe collect your contact list and location information for anti-fraud, we analyze your contacts to assess whether you are our target user, so as to provide you with better service.\n\n\n \t\tWe collect your contact list and location information for anti-fraud, we analyze your contacts to assess whether you are our target user, so as to provide you with better service.\n\n
We need your consent to use these permissions and data. Please tick "I allow these permissions and data to be used" and click "OK" to continue using the app.\n\n Please fully read and understand the terms and conditions before clicking to agree, so as to better protect your rights.
</string> </string>
</resources> </resources>
\ No newline at end of file
src/main/res/values/strings.xml
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<string name="loan_duration">Durasi Pinjaman</string> <string name="loan_duration">Durasi Pinjaman</string>
<string name="click_to_read">Klik untuk membaca %s</string>
<string name="text_me_my_loan">Pinjaman Saya</string> <string name="text_me_my_loan">Pinjaman Saya</string>
<string name="text_me_security_setting">Pengaturan Keamanan</string> <string name="text_me_security_setting">Pengaturan Keamanan</string>
<string name="text_me_customer_service_hotline">Hubungi Kami</string> <string name="text_me_customer_service_hotline">Hubungi Kami</string>
...@@ -102,7 +104,7 @@ ...@@ -102,7 +104,7 @@
<string name="text_loan_amount">Jumlah Pinjaman</string> <string name="text_loan_amount">Jumlah Pinjaman</string>
<string name="text_repayment_time">Jatuh Tempo</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_title">Yth Seluruh Pengguna kami, terima kasih sudah mempercayai dan menggunakan! 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="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="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="text_receiving_bank">Nama Bank Penerima</string>
...@@ -1136,6 +1138,19 @@ ...@@ -1136,6 +1138,19 @@
Informasi buku alamat digunakan secara internal oleh sistem. Kami memiliki hak untuk berbagi dengan mitra pihak ketiga untuk melindungi hak-hak kami ketika kegiatan penipuan seperti terlambat terjadi. Informasi buku alamat digunakan secara internal oleh sistem. Kami memiliki hak untuk berbagi dengan mitra pihak ketiga untuk melindungi hak-hak kami ketika kegiatan penipuan seperti terlambat terjadi.
</string> </string>
<string name="text_collect_desc">
Harap konfirmasi bahwa kami berwenang untuk mengumpulkan informasi berikut, jika tidak, Anda tidak akan dapat terus menggunakan layanan kami.\n\n
Jenis informasi apa yang kami kumpulkan? \n\n
\t\tDaftar kontak, Kamera, lokasi, penyimpanan \n\n
Bagaimana kami menggunakan informasi ini?\n\n
\t\tKami menggunakan informasi daftar kontak yang dikumpulkan untuk layanan anti-penipuan dan layanan kontrol risiko untuk menentukan apakah pengguna adalah target pengguna kami, sehingga memastikan bahwa kami dapat memberikan layanan yang lebih baik kepada target pengguna.\n\n\n
Harap baca persyaratan di atas dengan cermat sebelum mengklik untuk menyetujui.
</string>
<string name="need_allow_permission">Untuk tahap selanjutnya, kami membutuhkan persetujuan Anda dalam pemberian izin. Apakah Anda ingin melanjutkan pemberian izin?</string> <string name="need_allow_permission">Untuk tahap selanjutnya, kami membutuhkan persetujuan Anda dalam pemberian izin. Apakah Anda ingin melanjutkan pemberian izin?</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment