注销 - step 2 - 整理代码及身份证信息模拟(to be continued)

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

@@ -100,7 +100,7 @@ public class LogoutEtcStep2Activity extends AppActivity {
         if (!FunHelper.isEmpty(curBizContent.getCardId()) && !FunHelper.isEmpty(curBizContent.getObuId())){
             curType = 3;
         }else{
-            toast("暂不支持单卡单签注销");
+            ToastUtils.show("暂不支持单卡单签注销");
             return;
         }
 
@@ -210,12 +210,12 @@ public class LogoutEtcStep2Activity extends AppActivity {
             return;
         }
         if (hasCard < 0){
-            toast("请选择是否有卡注销！");
+            ToastUtils.show("请选择是否有卡注销！");
             return;
         }
 
         if (hasOBU < 0){
-            toast("请选择是否有设备注销！");
+            ToastUtils.show("请选择是否有设备注销！");
             return;
         }
         if (isSky(imgUrl1,"行驶证主页",binding.image1)||
@@ -224,12 +224,12 @@ public class LogoutEtcStep2Activity extends AppActivity {
         }
         if ("其他".equals(binding.tvReason.getText().toString())){
             if (binding.etReason.getText().toString().isEmpty()){
-                toast("请输入原因");
+                ToastUtils.show("请输入原因");
                 return;
             }
         }else{
             if (binding.tvReason.getText().toString().isEmpty()){
-                toast("请选择注销原因");
+                ToastUtils.show("请选择注销原因");
             }else {
                 gotoNextPage();
             }
@@ -255,6 +255,25 @@ public class LogoutEtcStep2Activity extends AppActivity {
             }
             
             // 传递办理人信息
+            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));
@@ -314,10 +333,14 @@ public class LogoutEtcStep2Activity extends AppActivity {
             }else {
                 type = CameraActivity.CONTENT_TYPE_BANK_BACK;
             }
+
+            LogUtils.i(this.getClass().getSimpleName(), "上传图片: " + type);
+            LogUtils.i(this.getClass().getSimpleName(), "上传图片: " + file1);
             FileUtils.getInstance(this).uploadGeneralImageNew(true, type, file1, null, new FileUtils.OnUploadCallback() {
                 @Override
                 public void onSuccess(ResultBean.ProductInfo bizContent) {
                     String url = ImgConfig.ImgIPChange( bizContent.data.ossFilePath);
+                    LogUtils.i(this.getClass().getSimpleName(), "上传图片成功: " + url);
                     if (!TextUtils.isEmpty(url)) {
                         if (view == binding.image1) {
                             imgUrl1 = url;