'2023年3月24日21:48:10'

app/debug/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.huntersun.vkyes.etcopencard",
+  "variantName": "processDebugResources",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 10,
+      "versionName": "1.0.4",
+      "outputFile": "KyushuETC1.0_v1.0.4_debug.apk"
+    }
+  ]
+}

app/src/main/AndroidManifest.xml

@@ -563,14 +563,15 @@
             android:name=".project.ui.activity.after.PetCardToAccountCardStep5Activity"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
-<<<<<<< HEAD
+
         <activity
             android:name=".project.ui.activity.my.RemoveLicensePlateOccupation"
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
         <activity
             android:name=".project.ui.activity.my.SuccessfulApplication"
-=======
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait" />
 
         <!--设备升级-->
         <activity
@@ -581,7 +582,6 @@
         <!--卡Pin码解锁-->
         <activity
             android:name=".project.ui.activity.after.CardUnlockPinActivity"
->>>>>>> 608485d102c8918ccb12ac6df40307a7260bccc2
             android:launchMode="singleTop"
             android:screenOrientation="portrait" />
     </application>

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java

@@ -49,8 +49,8 @@ public class MyRetrofit {
      * 回显地址：222.85.144.89:19002/xxxxxx
      */
 //    private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
-    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
-//    private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址
+//    private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/"; //接口地址
+    private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/"; //VPN访问请求地址
 
     private final String FileUrl = "http://222.85.144.89:19003/ifzt/api/"; //文件服务
     private final String appId = "admin001";

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

@@ -198,8 +198,10 @@ public class IdentityInformationUploadActivity extends AppActivity {
                 fatherBean.bizContent.setUserNegImgUrl(imgUrl2); //反面图片地址
                 fatherBean.bizContent.setTel(binding.text2.getText() + ""); //开户人手机号码
                 fatherBean.bizContent.setAddress(binding.text4.getText() + ""); //开户人地址
+
                 fatherBean.bizContent.setAgentIdType("101"); //经办人证件类型
                 fatherBean.bizContent.setAgentIdNum(binding.text7.getText() + ""); //经办人证件号码
+                fatherBean.bizContent.setAgentName(binding.text6.getText() + ""); //经办人姓名
                 fatherBean.bizContent.setAgentPosImgUrl(imgUrl3); //经办人正面图片地址
                 fatherBean.bizContent.setAgentNegImgUrl(imgUrl4); //经办人反面图片地址
                 fatherBean.bizContent.setProxyUrl(imgUrl5); //委托书图片地址

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

@@ -145,6 +145,7 @@ public class VehicleInformationActivity extends AppActivity {
                 fatherBean.bizContent.setMaintenaceMass(binding.text6.getText() + ""); //整备质量
                 fatherBean.bizContent.setVehicleDimensions(binding.text7.getText() + ""); //车辆尺寸
                 fatherBean.bizContent.setIssueDate(binding.text14.getText() + ""); //发证日期
+                fatherBean.bizContent.setOwnerName(binding.text3.getText() + ""); // 所有人 getOwnerName
                 //货车专属
                 fatherBean.bizContent.setPermittedWeight(binding.text11.getText() + ""); //核定载质量
                 fatherBean.bizContent.setPermittedTowWeight(TextUtils.isEmpty(binding.text12.getText() + "")

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeTow.java

@@ -192,16 +192,13 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
                         case "卡签续期":
                             jumpToPage(RenewCardObuActivity.class);
                             break;
-<<<<<<< HEAD
                         case "解除车牌占用":
                             jumpToPage(RemoveLicensePlateOccupation.class);
-=======
                         case "设备升级":
                             jumpToPage(EquipmentUpgradeActivity.class);
                             break;
                         case "卡Pin码解锁":
                             jumpToPage(CardUnlockPinActivity.class);
->>>>>>> 608485d102c8918ccb12ac6df40307a7260bccc2
                             break;
                         default:
                             new Utils().showMessDialog(getActivity(), "功能正在开发中...");