diff --git a/app/build.gradle b/app/build.gradle index 7f06bc2..75b07df 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "com.example.beijing_daxing" minSdk 24 targetSdk 33 - versionCode 1 - versionName "1.0" + versionCode 2 + versionName "1.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/com/example/beijing_daxing/CheckActivity.java b/app/src/main/java/com/example/beijing_daxing/CheckActivity.java index ee401ad..ef73bcf 100644 --- a/app/src/main/java/com/example/beijing_daxing/CheckActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/CheckActivity.java @@ -105,6 +105,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP Toast.makeText(CheckActivity.this, "没有维护巡检区域", Toast.LENGTH_SHORT).show(); return; }*/ + binding.setListNumber(list.size()+""); list1 = new ArrayList<>(); adapter.setList(list1); // adapter.notifyDataSetChanged(); @@ -118,7 +119,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP private List tagList; private int subIndex = -1; - // 扫描到返回数据 + // 扫描 @SuppressLint("NotifyDataSetChanged") @Override public void sanRfid(List epcs) { @@ -149,6 +150,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP // } }); adapter.notifyDataSetChanged(); + binding.setSanNumber(list1.size()+""); } @@ -156,6 +158,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP public void check_submit(View view) { // var type = list.stream().anyMatch(t -> t.getState().equals("未检")); // if (type) { + // 数量必须相同 if (list.size()>list1.size()) { Toast.makeText(this, "未检完全部轮挡，不允许提交", Toast.LENGTH_SHORT).show(); return; diff --git a/app/src/main/java/com/example/beijing_daxing/InActivity.java b/app/src/main/java/com/example/beijing_daxing/InActivity.java index 57f8c81..5e701be 100644 --- a/app/src/main/java/com/example/beijing_daxing/InActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/InActivity.java @@ -68,10 +68,15 @@ public class InActivity extends BaseActivity implements AdapterClickCall { epcs.stream().forEach(t -> { var epc = Tools.Bytes2HexString(t.EpcId,t.EpcId.length); Log.e("TAG", "sanRfid:" + epc); - if (!epc.substring(0,8).equals("53574C44")) return; - if (tagList.contains(epc)) return; - tagList.add(epc); - epcList.add(HexAscii.hex2Str(epc)); + try { + if (!epc.substring(0,8).equals("53574C44")) return; + if (tagList.contains(epc)) return; + tagList.add(epc); + epcList.add(HexAscii.hex2Str(epc)); + }catch (Exception e){ + + } + }); vm.setSanLength(epcList.size()); adapter.notifyDataSetChanged(); diff --git a/app/src/main/java/com/example/beijing_daxing/SetingPowerActivity.java b/app/src/main/java/com/example/beijing_daxing/SetingPowerActivity.java index 0c78366..db67197 100644 --- a/app/src/main/java/com/example/beijing_daxing/SetingPowerActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/SetingPowerActivity.java @@ -20,12 +20,12 @@ public class SetingPowerActivity extends AppCompatActivity { super.onCreate(savedInstanceState); ActivitySetingPowerBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_seting_power); powerData = new PowerData(); - powerData.setPowerIn( SharedPreferencesUtils.getInt("powerIn",0)); - powerData.setPowerOut( SharedPreferencesUtils.getInt("powerOut",0)); + powerData.setPowerIn( SharedPreferencesUtils.getInt("powerIn",33)); + powerData.setPowerOut( SharedPreferencesUtils.getInt("powerOut",17)); powerData.setPowerStockCheck( SharedPreferencesUtils.getInt("powerStoreCheck",0)); - powerData.setPowerCheck( SharedPreferencesUtils.getInt("powerCheck",0)); - powerData.setPowerScrap( SharedPreferencesUtils.getInt("powerScrap",0)); - powerData.setPowerScrapIn( SharedPreferencesUtils.getInt("powerScrapIn",0)); + powerData.setPowerCheck( SharedPreferencesUtils.getInt("powerCheck",33)); + powerData.setPowerScrap( SharedPreferencesUtils.getInt("powerScrap",17)); + powerData.setPowerScrapIn( SharedPreferencesUtils.getInt("powerScrapIn",17)); powerData.setPowerScrapOut( SharedPreferencesUtils.getInt("powerScrapOut",0)); binding.setVm(powerData); diff --git a/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java b/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java index e404ca0..c970b9a 100644 --- a/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/base/BaseActivity.java @@ -46,8 +46,8 @@ import java.util.List; import okhttp3.MediaType; public class BaseActivity extends AppCompatActivity { - public static String url = "http://192.168.137.1:8090/api"; - // public static String url = "http://119.45.202.115:8090/api"; + // public static String url = "http://192.168.137.1:8090/api"; + public static String url = "http://119.45.202.115:8090/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_check.xml b/app/src/main/res/layout/activity_check.xml index 1013fbd..1aae5f8 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -17,6 +17,13 @@ name="checkState" type="androidx.databinding.ObservableBoolean" /> + + + @@ -36,9 +43,9 @@ + android:paddingRight="5dp"> + + android:textColor="@color/blue" /> + + + + - + + + + + + - - + + + + + + + - + + + + - + + + + + + - - + + + + + + +