From 7f87a1b050fa1b5aa8551b204d4dae881dfaf2d1 Mon Sep 17 00:00:00 2001
From: lijia <john_095130@163.com>
Date: Thu, 15 Aug 2024 08:45:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=94=B5=E8=AF=9D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=8C=E8=BF=90=E8=B4=B9=E9=87=91=E9=A2=9D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/release/output-metadata.json                            | 6 +++---
 .../java/com/oneclouds/cargo/ui/home/OrderListActivity.java | 2 +-
 app/src/main/java/com/oneclouds/cargo/ui/my/MyFragment.java | 4 ++--
 .../main/java/com/oneclouds/cargo/ui/my/SetupActivity.java  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index aca089b..2f3f626 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 28,
-      "versionName": "3.0.8",
-      "outputFile": "dhhy-cargo-0425_09-46-3.0.8.apk"
+      "versionCode": 30,
+      "versionName": "3.1.0",
+      "outputFile": "dhhy-cargo-0814_15-58-3.1.0.apk"
     }
   ]
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/home/OrderListActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/home/OrderListActivity.java
index 490236c..2565907 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/home/OrderListActivity.java
+++ b/app/src/main/java/com/oneclouds/cargo/ui/home/OrderListActivity.java
@@ -58,7 +58,7 @@ public class OrderListActivity extends BaseAppCompatActivity {
     public void initView(Object obj) {
         super.initView(obj);
         RelativeLayout re=findViewById(R.id.order_list_top);
-        user.getData().setFreight("");
+//        user.getData().setFreight("");
         GetObjectName.ZIModel(re,user.getData(),con);
         list.add(new OrderList1Fragment());
         list.add(new OrderList2Fragment());
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/my/MyFragment.java b/app/src/main/java/com/oneclouds/cargo/ui/my/MyFragment.java
index b353d32..32f0635 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/my/MyFragment.java
+++ b/app/src/main/java/com/oneclouds/cargo/ui/my/MyFragment.java
@@ -167,8 +167,8 @@ public class MyFragment extends BaseFragment {
                 serviceMobile=ConfigParts.getConfigParts(con).getData().getServiceMobile();
                 serviceMobile=StringUtil.isNull(serviceMobile,"");
             }
-            String[] title={"平台客服:"+serviceMobile,"银行客服:95528","技术咨询:13460042961"};
-            String[] value={serviceMobile,"95528","13460042961"};
+            String[] title={"平台客服:"+serviceMobile};
+            String[] value={serviceMobile};
             new XPopup.Builder(con)
                     .isDarkTheme(false)
                     .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
diff --git a/app/src/main/java/com/oneclouds/cargo/ui/my/SetupActivity.java b/app/src/main/java/com/oneclouds/cargo/ui/my/SetupActivity.java
index 14c96cb..679244f 100644
--- a/app/src/main/java/com/oneclouds/cargo/ui/my/SetupActivity.java
+++ b/app/src/main/java/com/oneclouds/cargo/ui/my/SetupActivity.java
@@ -120,8 +120,8 @@ public class SetupActivity extends BaseActivity {
             startActivity(in);
         });
         r6.setOnClickListener(v12 -> {
-            String[] title={"平台客服:"+kefu,"银行客服:02195528","技术咨询:13460042961"};
-            String[] value={kefu,"02195528","13460042961"};
+            String[] title={"平台客服:"+kefu};
+            String[] value={kefu};
             new XPopup.Builder(con)
                     .isDarkTheme(false)
                     .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个