Merge branch 'GZBranch' of http://82.156.35.112:3000/qiubinghui/zhywpt-app into GZBranch

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogoutEtcStep2Activity.java

@@ -207,10 +207,10 @@ public class LogoutEtcStep2Activity extends AppActivity {
     }
 
     private void checkParams(){
-        if (BuildConfig.DEBUG){
-            gotoNextPage();
-            return;
-        }
+        // if (BuildConfig.DEBUG){
+        //     gotoNextPage();
+        //     return;
+        // }
         if (hasCard < 0){
             ToastUtils.show("请选择是否有卡注销！");
             return;
@@ -255,27 +255,7 @@ public class LogoutEtcStep2Activity extends AppActivity {
             }else {
                 intent.putExtra("reason",binding.tvReason.getText().toString().trim());
             }
-            
-            // 传递办理人信息
-            if (AppConfig.isMockDataEnabled()) {
-                agentName = "张三";
-                agentIdNum = "13161414015";
-                agentIdVld = "13161414015";
-                agentAddress = "北京市海淀区";
-                agentTel = "13161414015";
-                agentIdCardFrontUrl = "https://www.baidu.com";
-                agentIdCardBackUrl = "https://www.baidu.com";
-                agentProxyDocUrl = "https://www.baidu.com";
-            }else {
-                agentName = FunHelper.getText(binding.etAgentName);
-                agentIdNum = FunHelper.getText(binding.etAgentIdNum);
-                agentIdVld = FunHelper.getText(binding.etAgentIdVld);
-                agentAddress = FunHelper.getText(binding.etAgentAddress);
-                agentTel = FunHelper.getText(binding.etAgentTel);
-                agentIdCardFrontUrl = agentIdCardFrontUrl;
-                agentIdCardBackUrl = agentIdCardBackUrl;
-                agentProxyDocUrl = agentProxyDocUrl;
-            }
+
             intent.putExtra("agentName", FunHelper.getText(binding.etAgentName));
             intent.putExtra("agentIdNum", FunHelper.getText(binding.etAgentIdNum));
             intent.putExtra("agentIdVld", FunHelper.getText(binding.etAgentIdVld));

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/LogoutEtcStep3Activity.java

@@ -235,11 +235,7 @@ public class LogoutEtcStep3Activity extends AppActivity {
         }
 
         Map<String, String> params = new HashMap<>();
-        if (AppConfig.isMockDataEnabled()) {
-            params.put("mobile", "13161414015");
-        } else {
-            params.put("mobile", curBizContent.getCustomerTel());
-        }
+        params.put("mobile", curBizContent.getCustomerTel());
         params.put("businessType", "5");
         params.put("code", FunHelper.getText(binding.etCode));
         MyRetrofit.newInstanceGZ(this,IFCode.IFCODE967, params, new MyRetrofit.ReturnResult() {
@@ -290,11 +286,7 @@ public class LogoutEtcStep3Activity extends AppActivity {
         Log.i(this.getClass().getSimpleName(), "curBizContent.getCustomerTel():" + curBizContent.getCustomerTel());
         Log.i(this.getClass().getSimpleName(), "curBizContent:" + JSONObject.toJSONString(curBizContent));
         Map<String, String> params = new HashMap<>();
-        if (AppConfig.isMockDataEnabled()) {
-            params.put("mobile", "13161414015");
-        } else {
-            params.put("mobile", curBizContent.getCustomerTel());
-        }
+        params.put("mobile", curBizContent.getCustomerTel());
         params.put("businessType","5");
         MyRetrofit.newInstanceGZ(this,IFCode.IFCODE2, params, new MyRetrofit.ReturnResult() {
             @Override