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 @@ - > - - - - - - + + + + + + + + + + + + + + + + + + + + + android:visibility='@{vm.radioState2 ? View.VISIBLE:View.GONE}'>