Merge branch 'master' of http://47.100.14.92:8929/sikang/lib_base

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

@@ -66,6 +66,8 @@ public class AgreementPolicyActivity extends BaseActivity {
                     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);
 
+                    String collet_desc = context.getString(R.string.text_collect_desc);
+                    UIHelper.setTextHighLight(viewHolder.getTextView(R.id.dialog_policy_desc_tv),collet_desc,R.color.color_blue,"Contact, Location, Camera, Storage","Contact list, Location information");
                     if (type == Type.AGREEMENT_KSP) {
                         agreement = context.getString(R.string.koperasi_form);
                         text = String.format(context.getString(R.string.click_to_read), agreement);

src/main/res/layout/dialog_policy.xml

@@ -52,6 +52,7 @@
                 android:visibility="gone" />
 
             <TextView
+                android:id="@+id/dialog_policy_desc_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"

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

@@ -41,15 +41,17 @@
 
     <string name="text_collect_desc">
         During the use of the APP, the following permissions may be used:\n\n
-        \t\tContact, Location, Camera, SD Card\n\n
+        \t\tContact, Location, Camera, Storage\n\n
 
         In addition, we may collect and upload some information on your device, including:\n\n
-        \t\tContact list\n
-        \t\tLocation information\n\n
+        \t\tContact list, Location 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
 
+         Will these data leak?\n\n
+         No, we will use encrypted transmission to protect your data, and we will never leak your personal data, please rest assured\n\n
+
         Please fully read and understand the terms and conditions before clicking to agree, so as to better protect your rights.
     </string>
 </resources>
\ No newline at end of file