From bfe33e5a2aaeb49a2f4e88b3fe4d6b4f52f85d93 Mon Sep 17 00:00:00 2001
From: wanghao <wangh@mesnac.com>
Date: Mon, 18 Nov 2024 17:30:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=A4=96=E5=8D=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jingyuan_mes/base/BaseActivity.java       |  5 +--
 .../layout/activity_device_repair_info.xml    | 43 ++++++++++---------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java b/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java
index bbf0026..3fba1c5 100644
--- a/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java
+++ b/app/src/main/java/com/example/jingyuan_mes/base/BaseActivity.java
@@ -44,9 +44,8 @@ import okhttp3.MediaType;
 public class BaseActivity extends AppCompatActivity {
 
     public static final int CAMERA_PHOTO = 1;
-    // public static String url = "http://192.168.100.199:7018/dev-api";//测试
-    public static String url = "http://175.27.215.92:7018/prod-api";
-    // public static String url = "http://10.11.40.120:7018/dev-api";
+    public static String url = "http://175.27.215.92:7018/prod-api";//服务器
+    // public static String url = "http://10.10.3.32:7018/dev-api";
     public ProgressDialog dialog;
     public Gson gson;
     public MediaType JSON = MediaType.parse("application/json; charset=utf-8");
diff --git a/app/src/main/res/layout/activity_device_repair_info.xml b/app/src/main/res/layout/activity_device_repair_info.xml
index 24113fc..f91ba86 100644
--- a/app/src/main/res/layout/activity_device_repair_info.xml
+++ b/app/src/main/res/layout/activity_device_repair_info.xml
@@ -287,26 +287,26 @@
 
             </LinearLayout>
 
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="44dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="4dp"
-                android:visibility='@{visState ? View.GONE:View.VISIBLE}'>>
-
-                <TextView
-                    style="@style/text_title"
-                    android:layout_width="90dp"
-                    android:layout_height="match_parent"
-                    android:text="外协单位:" />
-
-                <TextView
-                    style="@style/text_info"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="@{vm.outsrcName}" />
-
-            </LinearLayout>
+<!--            <LinearLayout-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="44dp"-->
+<!--                android:layout_marginTop="8dp"-->
+<!--                android:layout_marginEnd="4dp"-->
+<!--                android:visibility='@{visState ? View.GONE:View.VISIBLE}'>>-->
+
+<!--                <TextView-->
+<!--                    style="@style/text_title"-->
+<!--                    android:layout_width="90dp"-->
+<!--                    android:layout_height="match_parent"-->
+<!--                    android:text="外协单位:" />-->
+
+<!--                <TextView-->
+<!--                    style="@style/text_info"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="match_parent"-->
+<!--                    android:text="@{vm.outsrcName}" />-->
+
+<!--            </LinearLayout>-->
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -314,7 +314,7 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="4dp"
                 android:background="@drawable/text_bg"
-                android:visibility='@{visState &amp; vm.radioState2 ? View.VISIBLE:View.GONE}'>
+                android:visibility='@{vm.radioState2 ? View.VISIBLE:View.GONE}'>
 
                 <TextView
                     style="@style/text_title"
@@ -330,6 +330,7 @@
                     android:onItemSelected="@{vm.selectOutSourcingID}"
                     android:spinnerMode="dropdown"
                     android:selection="@{vm.outsrcIdIndex}"
+                    android:enabled="@{visState}"
                     android:textAlignment="center" />
 <!--              -->
             </LinearLayout>