From cd03058083e69a6b1bb1ecfd4c7f103cdef43829 Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 25 Sep 2024 11:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=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/CheckActivity.java | 7 +++ .../beijing_daxing/CheckListActivity.java | 57 ++++++++++++------- .../beijing_daxing/base/BaseActivity.java | 3 +- .../beijing_daxing/base/MyApplication.java | 26 ++++----- .../main/res/layout/activity_check_list.xml | 10 ++-- app/src/main/res/layout/item_check_list.xml | 9 +-- 6 files changed, 69 insertions(+), 43 deletions(-) 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 2224e5e..297dd80 100644 --- a/app/src/main/java/com/example/beijing_daxing/CheckActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/CheckActivity.java @@ -50,6 +50,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP private TakePictureDialog takeDialog; private long id; private long inspectionId; + private int backIndex; @Override protected void onCreate(Bundle savedInstanceState) { @@ -76,6 +77,7 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP });*/ Intent intent = getIntent(); id = intent.getLongExtra("id", 0); + backIndex = intent.getIntExtra("backIndex", 0); inspectionId = intent.getLongExtra("inspectionId", 0); String code = intent.getStringExtra("code"); initRequest(code); @@ -146,12 +148,17 @@ public class CheckActivity extends BaseActivity implements AdapterClickCall, InP .params("tableId", id) .params("json", gson.toJson(list)) .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); Toast.makeText(CheckActivity.this, "提交成功", Toast.LENGTH_SHORT).show(); + Intent resultIntent = new Intent(); + resultIntent.putExtra("backIndex", backIndex); + files.forEach(File::delete); + setResult(RESULT_OK, resultIntent); finish(); } }); 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 6ebdeb5..bbc24cf 100644 --- a/app/src/main/java/com/example/beijing_daxing/CheckListActivity.java +++ b/app/src/main/java/com/example/beijing_daxing/CheckListActivity.java @@ -31,20 +31,21 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall private CheckListAdapter adapter; private List list; private ObservableBoolean createState; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); ActivityCheckListBinding binding = DataBindingUtil.setContentView(this, R.layout.activity_check_list); - adapter = new CheckListAdapter(this,this); + adapter = new CheckListAdapter(this, this); binding.setAdapter(adapter); - createState=new ObservableBoolean(); + createState = new ObservableBoolean(); createState.set(false); binding.setState(createState); initRequest(); } private void initRequest() { - OkGo.post(url+"/inspection/selectTask") + OkGo.post(url + "/inspection/selectTask") .params("user", SharedPreferencesUtils.getstring("user", "")) .execute(new MyRecultCall(dialog, this) { @SuppressLint("NotifyDataSetChanged") @@ -52,12 +53,13 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall public void onSuccess(Response response) { super.onSuccess(response); MyResult body = response.body(); - if (body.getCode()==0){ + if (body.getCode() == 0) { createState.set(false); - list=gson.fromJson(body.getData().toString(),new TypeToken>(){}.getType()); + list = gson.fromJson(body.getData().toString(), new TypeToken>() { + }.getType()); adapter.setList(list); adapter.notifyDataSetChanged(); - }else { + } else { createState.set(true); } @@ -74,27 +76,42 @@ public class CheckListActivity extends BaseActivity implements AdapterClickCall OkGo.post(url + "/xj/createTask") .params("user", SharedPreferencesUtils.getstring("user", "")) .execute(new MyRecultCall(dialog, this) { - @Override - public void onSuccess(Response response) { - super.onSuccess(response); - var body = response.body(); - if (body.getCode() == 0) { - initRequest(); - return; - } - Toast.makeText(CheckListActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); - } - }); + @Override + public void onSuccess(Response response) { + super.onSuccess(response); + var body = response.body(); + if (body.getCode() == 0) { + initRequest(); + return; + } + Toast.makeText(CheckListActivity.this, body.getMsg(), Toast.LENGTH_SHORT).show(); + } + }); } @Override public void clickItem(int index) { - Intent intent=new Intent(this,CheckActivity.class); + Intent intent = new Intent(this, CheckActivity.class); CheckTaskInfo checkTaskInfo = list.get(index); intent.putExtra("id", checkTaskInfo.getId()); intent.putExtra("inspectionId", checkTaskInfo.getInspectionId()); - intent.putExtra("code",checkTaskInfo.getLocationCode()); - startActivity(intent); + intent.putExtra("code", checkTaskInfo.getLocationCode()); + intent.putExtra("backIndex", index); + startActivityForResult(intent, 1); + } + + @SuppressLint("NotifyDataSetChanged") + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + + if (requestCode == 1 && data != null) { + int index = data.getIntExtra("backIndex", 0); + Log.e("TAG", "onActivityResult:" + index); + list.get(index).setTaskState("完成"); + adapter.notifyDataSetChanged(); + } + } } \ No newline at end of file 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 1b9ce3d..1ccfcc3 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 @@ -175,7 +175,8 @@ public abstract class BaseActivity extends AppCompatActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (resultCode == RESULT_OK) { + + if (requestCode == CAMERA_PHOTO && resultCode == RESULT_OK) { Bitmap bitmap = null; try { Log.e("TAG", "onActivityResult:" + img_uri.getPath()); diff --git a/app/src/main/java/com/example/beijing_daxing/base/MyApplication.java b/app/src/main/java/com/example/beijing_daxing/base/MyApplication.java index 3a9daf8..fc40979 100644 --- a/app/src/main/java/com/example/beijing_daxing/base/MyApplication.java +++ b/app/src/main/java/com/example/beijing_daxing/base/MyApplication.java @@ -39,7 +39,7 @@ import okhttp3.OkHttpClient; public class MyApplication extends Application { MyApplication application; - // public static UHFRManager uhfLongerManager; + public static UHFRManager uhfLongerManager; @Override public void onCreate() { @@ -60,18 +60,18 @@ public class MyApplication extends Application { .init(this); } - // public static UHFRManager getUhfLongerManager() { - // if (uhfLongerManager==null){ - // try { - // uhfLongerManager = UHFRManager.getInstance(); - // uhfLongerManager.setPower(33,33); - // } catch (Exception e) { - // e.printStackTrace(); - // } - // } - // - // return uhfLongerManager; - // } + public static UHFRManager getUhfLongerManager() { + if (uhfLongerManager==null){ + try { + uhfLongerManager = UHFRManager.getInstance(); + uhfLongerManager.setPower(33,33); + } catch (Exception e) { + e.printStackTrace(); + } + } + + return uhfLongerManager; + } // OKGO 初始化 private void okGoBase() { OkHttpClient.Builder builder = new OkHttpClient.Builder(); diff --git a/app/src/main/res/layout/activity_check_list.xml b/app/src/main/res/layout/activity_check_list.xml index 8a03dc5..39437dc 100644 --- a/app/src/main/res/layout/activity_check_list.xml +++ b/app/src/main/res/layout/activity_check_list.xml @@ -49,9 +49,9 @@ @@ -63,9 +63,9 @@ @@ -90,7 +90,7 @@ style="@style/item_text_style" android:layout_width="63dp" android:layout_height="match_parent" - android:textColor="#E71717" /> + android:text="操作" /> diff --git a/app/src/main/res/layout/item_check_list.xml b/app/src/main/res/layout/item_check_list.xml index 8505f98..bdb5876 100644 --- a/app/src/main/res/layout/item_check_list.xml +++ b/app/src/main/res/layout/item_check_list.xml @@ -32,9 +32,8 @@ @@ -45,9 +44,9 @@ @@ -76,6 +75,8 @@ android:layout_width="63dp" android:layout_height="match_parent" android:src="@mipmap/ic_start" + + android:visibility='@{vm.taskState.equals("待完成")?View.VISIBLE:View.GONE}' android:padding="5dp"/> \ No newline at end of file