From 2fb4d31109323e8897035740928cfc57f27979a9 Mon Sep 17 00:00:00 2001 From: wanghao Date: Fri, 8 Nov 2024 13:51:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=B7=A1=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/beijing_daxing/BFActivity.java | 2 +- .../example/beijing_daxing/CheckActivity.java | 62 +++++++++++------- .../beijing_daxing/CheckListActivity.java | 59 ++++++++++++++--- .../beijing_daxing/HomePageActivity.java | 4 +- .../adapter/CheckListAdapter.java | 15 +++-- .../beijing_daxing/base/BaseActivity.java | 15 +++-- app/src/main/res/drawable/state_j_bg.xml | 5 ++ app/src/main/res/layout/activity_check.xml | 15 +++++ app/src/main/res/layout/item_check_list.xml | 7 +- app/src/main/res/mipmap-xhdpi/ic_jump.png | Bin 0 -> 9432 bytes app/src/main/res/values/array.xml | 1 + 11 files changed, 133 insertions(+), 52 deletions(-) create mode 100644 app/src/main/res/drawable/state_j_bg.xml create mode 100644 app/src/main/res/mipmap-xhdpi/ic_jump.png diff --git a/app/src/main/java/com/example/beijing_daxing/BFActivity.java b/app/src/main/java/com/example/beijing_daxing/BFActivity.java index 9c57dc8..7a0bb5c 100644 --- a/app/src/main/java/com/example/beijing_daxing/BFActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/BFActivity.java @@ -89,7 +89,7 @@ public class BFActivity extends BaseActivity implements TakePictureDialog.dialog } public void bfTackPhoto(View view) { - takePhoto(); + takePhoto(false,""); } public void bfShowPhoto(View view) { 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 2da1555..ee401ad 100644 --- a/app/src/main/java/com/example/beijing_daxing/CheckActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/CheckActivity.java @@ -43,6 +43,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP private ActivityCheckBinding binding; private CheckAdapter adapter; private List list; + private List list1; private List selectList; private ObservableBoolean state; private ObservableBoolean checkState; @@ -51,7 +52,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP private long id; private long inspectionId; private int backIndex; - + private String code; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -76,10 +77,11 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP } });*/ Intent intent = getIntent(); - id = intent.getLongExtra("id", 0); + id = intent.getLongExtra("id", 0); backIndex = intent.getIntExtra("backIndex", 0); inspectionId = intent.getLongExtra("inspectionId", 0); - String code = intent.getStringExtra("code"); + + code = intent.getStringExtra("code"); initRequest(code); inputDialog = new InPutDialog(this); inputDialog.setInPutDialogCall(this); @@ -99,12 +101,13 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP if (body.getCode() == 0) { list = gson.fromJson(body.getData().toString(), new TypeToken>() { }.getType()); - if (list == null || list.isEmpty()) { + /* if (list == null || list.isEmpty()) { Toast.makeText(CheckActivity.this, "没有维护巡检区域", Toast.LENGTH_SHORT).show(); return; - } - adapter.setList(list); - adapter.notifyDataSetChanged(); + }*/ + list1 = new ArrayList<>(); + adapter.setList(list1); + // adapter.notifyDataSetChanged(); return; } Toast.makeText(CheckActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); @@ -121,17 +124,29 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP public void sanRfid(List epcs) { epcs.forEach(t -> { var epc = Tools.Bytes2HexString(t.EpcId, t.EpcId.length); - if (tagList.contains(t)) { + try { + if (!epc.substring(0,8).equals("53574C44")) return; + }catch (Exception e){ return; } - tagList.add(epc); - var stock = new Stock(); - stock.setEpcCode(HexAscii.hex2Str(epc)); - var index = list.indexOf(stock); - if (index != -1) { - list.get(index).setState("正常"); + if (tagList.contains(epc)) { + return; } + tagList.add(epc); + String s = HexAscii.hex2Str(epc); + var stock = new Stock(); + stock.setEpcCode(s); + stock.setLocationCode(code); + stock.setState("正常"); + list1.add(stock); + + // var stock = new Stock(); + // stock.setEpcCode(HexAscii.hex2Str(epc)); + // var index = list.indexOf(stock); + // if (index != -1) { + // list.get(index).setState("正常"); + // } }); adapter.notifyDataSetChanged(); @@ -139,18 +154,17 @@ 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) { + // var type = list.stream().anyMatch(t -> t.getState().equals("未检")); + // if (type) { + if (list.size()>list1.size()) { Toast.makeText(this, "未检完全部轮挡，不允许提交", Toast.LENGTH_SHORT).show(); return; } - OkGo.post(url + "/xj/submit").tag(this) - .params("tableId", id) - .params("json", gson.toJson(list)) - .params("inspectionId",inspectionId) - .params("user", SharedPreferencesUtils.getstring("user","")) - .addFileParams("files",files) - .execute(new MyRecultCall(dialog, this) { + OkGo.post(url + "/xj/submit").tag(this).params("tableId", id) + .params("json", gson.toJson(list1)) + .params("inspectionId", inspectionId) + .params("user", SharedPreferencesUtils.getstring("user", "")) + .addFileParams("files", files).execute(new MyRecultCall(dialog, this) { @Override public void onSuccess(Response response) { super.onSuccess(response); @@ -227,7 +241,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP // 拍照 public void check_tackPhoto(View view) { - takePhoto(); + takePhoto(true, code); } // 显示拍的照片 diff --git a/app/src/main/java/com/example/beijing_daxing/CheckListActivity.java b/app/src/main/java/com/example/beijing_daxing/CheckListActivity.java index 95716e1..1537302 100644 --- a/app/src/main/java/com/example/beijing_daxing/CheckListActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/CheckListActivity.java @@ -21,6 +21,7 @@ import com.example.beijing_daxing.base.MyResult; import com.example.beijing_daxing.been.CheckTaskInfo; import com.example.beijing_daxing.been.Stock; import com.example.beijing_daxing.databinding.ActivityCheckListBinding; +import com.example.beijing_daxing.dialog.InPutDialog; import com.example.beijing_daxing.uitls.SharedPreferencesUtils; import com.google.gson.reflect.TypeToken; import com.lzy.okgo.OkGo; @@ -29,11 +30,13 @@ import com.uhf.api.cls.Reader; import java.util.List; -public class CheckListActivity extends BaseActivity implements AdapterClickCall { +public class CheckListActivity extends BaseActivity implements CheckListAdapter.AdapterClickCall, InPutDialog.InPutDialogCall { private CheckListAdapter adapter; private List list; private ObservableBoolean createState; private String[] stateList; + private InPutDialog inputDialog; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -43,18 +46,28 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall createState = new ObservableBoolean(); createState.set(false); binding.setState(createState); - stateList = getResources().getStringArray(R.array.checkState); - binding.checkListState.setOnItemClickListener((parent, view, position, id) -> { - initRequest(stateList[position]); + inputDialog = new InPutDialog(this); + inputDialog.setInPutDialogCall(this); + stateList = getResources().getStringArray(R.array.checkState); + binding.checkListState.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + String state = stateList[position]; + Log.e("TAG", "onItemSelected:" + state); + initRequest(state); + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } }); } - public void onItemClick(AdapterView parent, View view, int position, long id) { - } private void initRequest(String state) { OkGo.post(url + "/inspection/selectTask") - .params("state", SharedPreferencesUtils.getstring("user", "")) + .params("state", state) .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @Override @@ -76,7 +89,6 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall } - public void check_start(View view) { OkGo.post(url + "/xj/createTask") .params("user", SharedPreferencesUtils.getstring("user", "")) @@ -97,7 +109,6 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall @Override public void clickItem(int index) { Intent intent = new Intent(this, CheckActivity.class); - CheckTaskInfo checkTaskInfo = list.get(index); intent.putExtra("id", checkTaskInfo.getId()); intent.putExtra("inspectionId", checkTaskInfo.getInspectionId()); @@ -105,6 +116,12 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall intent.putExtra("backIndex", index); startActivityForResult(intent, 1); } +private int skipIndex; + @Override + public void clickItemSkip(int index) { + skipIndex=index; + inputDialog.show(); + } @SuppressLint("NotifyDataSetChanged") @Override @@ -114,9 +131,31 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall if (requestCode == 1 && data != null) { int index = data.getIntExtra("backIndex", 0); Log.e("TAG", "onActivityResult:" + index); - list.get(index).setTaskState("完成"); + list.get(index).setTaskState("已完成"); adapter.notifyDataSetChanged(); } } + + @Override + public void inPutDialogReculi(String name) { + CheckTaskInfo checkTaskInfo = list.get(skipIndex); + OkGo.post(url + "/inspection/skipTask") + .params("remark", name) + .params("tableId", checkTaskInfo.getId()) + .execute(new MyRecultCall(dialog, this) { + @SuppressLint("NotifyDataSetChanged") + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + MyResult body = response.body(); + if (body.getCode() == 0) { + checkTaskInfo.setTaskState("跳过"); + adapter.notifyDataSetChanged(); + } + + } + }); + inputDialog.dismiss(); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java b/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java index 7475639..79add9f 100644 --- a/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/HomePageActivity.java @@ -75,11 +75,11 @@ public class HomePageActivity extends AppCompatActivity { List list = new ArrayList<>(); list.add(new HomeIcon(R.mipmap.home_in1, "轮挡入库", InActivity.class)); list.add(new HomeIcon(R.mipmap.home_out1, "轮挡领用出库", OutActivity.class)); - list.add(new HomeIcon(R.mipmap.home_store_check, "仓库盘点", StoreCheckActivity.class)); + // list.add(new HomeIcon(R.mipmap.home_store_check, "仓库盘点", StoreCheckActivity.class)); list.add(new HomeIcon(R.mipmap.home_check, "轮挡巡检", CheckListActivity.class)); list.add(new HomeIcon(R.mipmap.home_bf, "轮挡报废", BFActivity.class)); list.add(new HomeIcon(R.mipmap.home_in, "废品入库", FpInActivity.class)); - list.add(new HomeIcon(R.mipmap.home_out, "废品出库", FpOutActivity.class)); + // list.add(new HomeIcon(R.mipmap.home_out, "废品出库", FpOutActivity.class)); list.add(new HomeIcon(R.mipmap.home_out, "功率设置", SetingPowerActivity.class)); var intent = getIntent(); try { diff --git a/app/src/main/java/com/example/beijing_daxing/adapter/CheckListAdapter.java b/app/src/main/java/com/example/beijing_daxing/adapter/CheckListAdapter.java index e2269d6..39df9d6 100644 --- a/app/src/main/java/com/example/beijing_daxing/adapter/CheckListAdapter.java +++ b/app/src/main/java/com/example/beijing_daxing/adapter/CheckListAdapter.java @@ -9,15 +9,10 @@ import android.widget.TextView; import androidx.databinding.BindingAdapter; import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.RecyclerView; - import com.example.beijing_daxing.BR; import com.example.beijing_daxing.R; -import com.example.beijing_daxing.base.AdapterClickCall; import com.example.beijing_daxing.been.CheckTaskInfo; -import com.example.beijing_daxing.been.Stock; -import com.example.beijing_daxing.databinding.ItemCheckBinding; import com.example.beijing_daxing.databinding.ItemCheckListBinding; - import java.util.List; /** @@ -50,6 +45,7 @@ public class CheckListAdapter extends RecyclerView.Adapter call.clickItem(position)); + binding.checkListSkip.setOnClickListener(v -> call.clickItemSkip(position)); binding.executePendingBindings(); } @@ -78,8 +74,15 @@ public class CheckListAdapter extends RecyclerView.Adapter + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check.xml b/app/src/main/res/layout/activity_check.xml index 4d89e99..1013fbd 100644 --- a/app/src/main/res/layout/activity_check.xml +++ b/app/src/main/res/layout/activity_check.xml @@ -158,7 +158,22 @@ android:background="@color/white" android:padding="5dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + + + @@ -70,12 +70,11 @@ android:background="@color/white" /> diff --git a/app/src/main/res/mipmap-xhdpi/ic_jump.png b/app/src/main/res/mipmap-xhdpi/ic_jump.png new file mode 100644 index 0000000000000000000000000000000000000000..3471764eceb24420267b01c506e6f91b759cbb9f GIT binary patch literal 9432 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 906948e..3b9a239 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -25,6 +25,7 @@ 全部 待完成 已完成 + 跳过 \ No newline at end of file