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 9f5b19e..a9dfc15 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 @@ -43,8 +43,8 @@ import okhttp3.MediaType; public class BaseActivity extends AppCompatActivity { public static final int CAMERA_PHOTO = 1; - // 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.11.40.120: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/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java index 8a11455..f904616 100644 --- a/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java +++ b/app/src/main/java/com/example/jingyuan_mes/entity/check/CheckResultDetal.java @@ -253,7 +253,7 @@ public class CheckResultDetal extends BaseObservable { public void textChanged(Editable s){ double result=Double.parseDouble(s.toString()); checkProjectResult=result; - if (result>downDiff && result< upperDiff){ + if (result>=downDiff && result<= upperDiff){ setCheckProjectStatus("1"); }else {