update policy

build.gradle

@@ -18,6 +18,12 @@ android {
         buildConfigField('String', 'ACCOUNT_KIT_CLIENT_TOKEN', "\"${account_kit_client_token}\"")
 
         try {
+            buildConfigField 'Boolean', 'NEED_CONTACT', "${contact}"
+        } catch (Exception e) {
+            buildConfigField 'Boolean', 'NEED_CONTACT', "true"
+        }
+        
+        try {
             buildConfigField 'Boolean', 'HIBERNATION', "${hibernation}"
         } catch (Exception e) {
             buildConfigField 'Boolean', 'HIBERNATION', "false"

script/script_help.sh

@@ -272,9 +272,11 @@ then
     fi
 
 elif (($commod == '26')) || (($commod == '266'));then
-    params=""
-    if (($commod == '266'));then
-        params="?name=${app_name// /%20}";fi
+    params="?name=${app_name// /%20}&list=12345"
+    if [ ${contact} != 'true' ];then
+        params="?name=${app_name// /%20}&list=2345";fi
+
+
     echo " "
     echo "${corp_id}  ${app_name} "
     echo "包名：${app_id}"

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

@@ -2,11 +2,9 @@ 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;
@@ -15,22 +13,22 @@ import android.webkit.WebStorage;
 import android.webkit.WebView;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.TextView;
 
+import com.common.base.BaseActivity;
+import com.common.toolbox.app_utils.DeviceInfo;
+import com.common.toolbox.tracker.TrackEvent;
+import com.common.widget.TopBar;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 
+import java.io.Serializable;
+
+import tech.starwin.BuildConfig;
 import tech.starwin.LibConfig;
 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;
 import tech.starwin.network.Gateway;
 import tech.starwin.utils.PreferencesManager;
@@ -39,12 +37,6 @@ import tech.starwin.utils.context_utils.EasyActivityResult;
 import tech.starwin.utils.ui_utils.DialogFactory;
 import tech.starwin.utils.ui_utils.UIHelper;
 
-import com.common.toolbox.app_utils.DeviceInfo;
-import com.common.toolbox.tracker.TrackEvent;
-import com.common.widget.TopBar;
-
-import java.io.Serializable;
-
 /**
  * Created by SiKang on 2018/11/19.
  * 注册协议及隐私政策
@@ -57,6 +49,14 @@ public class AgreementPolicyActivity extends BaseActivity {
     }
 
     /**
+     * 注册协议和隐私政策
+     */
+    public static String getLocalPolicy() {
+        String permissions = BuildConfig.NEED_CONTACT ? "12345" : "2345";
+        return "file:///android_asset/web/privacy.html?name=" + LibConfig.APP_NAME.replace(" ", "%20") + "&list=" + permissions;
+    }
+
+    /**
      * 2019/9/6  协议展示改为Dialog
      */
     public static void showPolicyDialog(Activity context, Type type, DialogInterface.OnDismissListener dismissListener) {
@@ -89,13 +89,13 @@ public class AgreementPolicyActivity extends BaseActivity {
                                     if (v.getId() == R.id.dialog_policy_agreement_tv) {
                                         String agreement = Gateway.getAgreementPolicyUrl();
                                         if (DeviceInfo.isReviewMachine(context)) {
-                                            agreement = "file:///android_asset/web/privacy.html?name=" + LibConfig.APP_NAME.replace(" ", "%20");
+                                            agreement = getLocalPolicy();
                                         }
                                         WebActivity.start(context, context.getString(R.string.login_statement_title), agreement);
                                     } else if (v.getId() == R.id.dialog_policy_ksp_tv) {
                                         String kspUrl = Gateway.getKSPUrl();
                                         if (DeviceInfo.isReviewMachine(context)) {
-                                            kspUrl = "file:///android_asset/web/privacyKsp.html?name=" + LibConfig.APP_NAME.replace(" ", "%20");
+                                            kspUrl = "file:///android_asset/web/privacyKsp.html";
                                         }
                                         WebActivity.start(context, context.getString(R.string.koperasi_form), kspUrl);
                                     } else if (v.getId() == R.id.dialog_policy_agree_tv) {
@@ -226,7 +226,7 @@ public class AgreementPolicyActivity extends BaseActivity {
 
         //本地协议
         if (agreementType == Type.AGREEMENT_HOOK) {
-            webView.loadUrl("file:///android_asset/web/privacy.html?name=" + LibConfig.APP_NAME.replace(" ", "%20"));
+            webView.loadUrl(getLocalPolicy());
             return;
         }
 

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

@@ -250,7 +250,7 @@ public class ReviewHookActivity extends BaseActivity {
                         } else if (i == R.id.activity_review_hotline_btn) {
                             DialogFactory.showMessageDialog(ReviewHookActivity.this, LibConfig.HOTLINE);
                         } else if (i == R.id.activity_review_policy_btn) {
-                            String agreement = "file:///android_asset/web/privacy.html?name=" + LibConfig.APP_NAME.replace(" ", "%20");
+                            String agreement = AgreementPolicyActivity.getLocalPolicy();
                             WebActivity.start(ReviewHookActivity.this, getString(R.string.login_statement_title), agreement);
                         } else {
                             startLogin();

src/main/java/tech/starwin/network/Gateway.java

 package tech.starwin.network;
 
 
+import com.common.bean.GatewayInfoBean;
+
 import java.util.Arrays;
 import java.util.List;
 
+import tech.starwin.BuildConfig;
 import tech.starwin.LibConfig;
-
-import com.common.bean.GatewayInfoBean;
-
 import tech.starwin.utils.LoginManager;
 import tech.starwin.utils.PreferencesManager;
 
@@ -47,9 +47,14 @@ public class Gateway {
      * 注册协议和隐私政策
      */
     public static String getAgreementPolicyUrl() {
-        return gatewayInfo.privacy.get(0) + "?name=" + LibConfig.APP_NAME.replace(" ","%20");
+        String permissions = BuildConfig.NEED_CONTACT ? "12345" : "2345";
+        return gatewayInfo.privacy.get(0) + "?name=" +
+                LibConfig.APP_NAME.replace(" ", "%20") +
+                "&list=" + permissions;
     }
 
+
+
     /**
      * KSP成员协议
      */