'2023年3月30日11:30:50'

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/"; //文件服务
     public static final String URL_DOWNLOAD_FILE = "http://192.168.100.63:8087/user-export-excel/";//通行流水下载路径前缀

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

@@ -69,7 +69,7 @@ public class CommonDealSuccessActivity extends AppActivity {
 
         }else if (from.equals("8")){
             setTitle("储值卡转记账卡");
-            binding.btnHome.setText("去签约");
+            binding.btnHome.setText(FunHelper.isEmpty(id) ? "返回" : "去签约");
             binding.tvHint.setText("当前换卡申请已完成，请点击按钮完成记账卡签约");
 
         }else if (from.equals("9")){

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

@@ -135,8 +135,8 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
 
             @Override
             public void afterTextChanged(Editable s) {
-                method(s.toString(), list1);
-                method(s.toString(), list2);
+//                method(s.toString(), list1);
+//                method(s.toString(), list2);
             }
         });
         adapter.replaceData(list1);
@@ -220,7 +220,7 @@ public class FragmentHomeTow extends TitleBarFragment<MainActivity> {
                 startActivity(DevicePendingActivity.class);
                 break;
             case "储值卡转记账卡":
-                //遵循UI设计图  但是不符合现在业务
+                //遵循UI设计图  但是不符合现在业务-
                 //startActivity(ValueToBookkeepingCardActivity.class);
                 jumpToPage(PetCardToAccountCardStep1Activity.class);
                 break;

app/src/main/res/layout/activity_replace_etc_step5.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     style="@style/MatchMatch.Vertical"
     android:background="@color/background_color">
 
@@ -98,6 +99,7 @@
                 <LinearLayout
                     android:id="@+id/LLMailInfo"
                     android:visibility="gone"
+                    tools:visibility="visible"
                     style="@style/MatchWrap.Vertical">
 
                     <LinearLayout
@@ -364,6 +366,7 @@
                 <LinearLayout
                     android:id="@+id/LLOnLine"
                     android:visibility="gone"
+                    tools:visibility="visible"
                     android:layout_marginBottom="@dimen/dp_5"
                     style="@style/MatchWrap.Vertical">
 
@@ -489,6 +492,7 @@
                 android:paddingRight="@dimen/dp_20"
                 android:paddingBottom="@dimen/dp_15"
                 android:visibility="gone"
+                tools:visibility="visible"
                 app:background_normal="@color/white"
                 app:corner_radius="@dimen/dp_10">