From 1f9a26559060235ef87f757779c382a416586ab1 Mon Sep 17 00:00:00 2001 From: hwf452 Date: Fri, 4 Aug 2023 16:59:22 +0800 Subject: [PATCH] whp submit --- .../java/com/rehome/zhdcoa/AppManager.java | 41 +++++++---- .../zhdcoa/bean/DagerEnterApplyBaseBean.java | 10 +++ .../ui/activity/AddDagerEnterApplyActivity.kt | 72 ++++++++++++++++++- .../ui/activity/ApplyTravelAuditActivity.java | 1 + .../ui/activity/MateLablePrintFragment.java | 18 +++-- .../ui/activity/TrainInfoMoreActivity.kt | 19 +++-- .../rehome/zhdcoa/ui/activity/WjmmActivity.kt | 2 +- 7 files changed, 133 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/com/rehome/zhdcoa/AppManager.java b/app/src/main/java/com/rehome/zhdcoa/AppManager.java index f56c704..3208adc 100644 --- a/app/src/main/java/com/rehome/zhdcoa/AppManager.java +++ b/app/src/main/java/com/rehome/zhdcoa/AppManager.java @@ -39,26 +39,33 @@ public class AppManager { * 获取当前Activity（堆栈中最后一个压入的） */ public Activity currentActivity() { - Activity activity = activityStack.lastElement(); - return activity; + if (activityStack != null) { + Activity activity = activityStack.lastElement(); + return activity; + } + return null; } /** * 结束当前Activity（堆栈中最后一个压入的） */ public void finishActivity() { - Activity activity = activityStack.lastElement(); - finishActivity(activity); + if (activityStack != null) { + Activity activity = activityStack.lastElement(); + finishActivity(activity); + } } /** * 结束指定的Activity */ public void finishActivity(Activity activity) { - if (activity != null) { - activityStack.remove(activity); - activity.finish(); - activity = null; + if (activityStack != null) { + if (activity != null) { + activityStack.remove(activity); + activity.finish(); + activity = null; + } } } @@ -66,9 +73,11 @@ public class AppManager { * 结束指定类名的Activity */ public void finishActivity(Class cls) { - for (Activity activity : activityStack) { - if (activity.getClass().equals(cls)) { - finishActivity(activity); + if (activityStack != null) { + for (Activity activity : activityStack) { + if (activity.getClass().equals(cls)) { + finishActivity(activity); + } } } } @@ -77,12 +86,14 @@ public class AppManager { * 结束所有Activity */ public void finishAllActivity() { - for (int i = 0, size = activityStack.size(); i < size; i++) { - if (null != activityStack.get(i)) { - activityStack.get(i).finish(); + if (activityStack != null) { + for (int i = 0, size = activityStack.size(); i < size; i++) { + if (null != activityStack.get(i)) { + activityStack.get(i).finish(); + } } + activityStack.clear(); } - activityStack.clear(); } /** diff --git a/app/src/main/java/com/rehome/zhdcoa/bean/DagerEnterApplyBaseBean.java b/app/src/main/java/com/rehome/zhdcoa/bean/DagerEnterApplyBaseBean.java index 291d7aa..e49904f 100644 --- a/app/src/main/java/com/rehome/zhdcoa/bean/DagerEnterApplyBaseBean.java +++ b/app/src/main/java/com/rehome/zhdcoa/bean/DagerEnterApplyBaseBean.java @@ -9,6 +9,8 @@ public class DagerEnterApplyBaseBean { private boolean flag; private String msg; + private String id; + public boolean isFlag() { return flag; } @@ -24,4 +26,12 @@ public class DagerEnterApplyBaseBean { public void setMsg(String msg) { this.msg = msg; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt index 8bfa46f..12f2e81 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/AddDagerEnterApplyActivity.kt @@ -3,11 +3,13 @@ package com.rehome.zhdcoa.ui.activity import android.content.Intent import android.os.Build import android.text.TextUtils +import android.util.Log import android.view.View import android.widget.AdapterView import androidx.activity.result.ActivityResultLauncher import androidx.activity.result.contract.ActivityResultContracts import com.google.gson.Gson +import com.rehome.zhdcoa.App import com.rehome.zhdcoa.Contans import com.rehome.zhdcoa.adapter.WhpListAdapter import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding @@ -28,12 +30,15 @@ import com.rehome.zhdcoa.weiget.DateTimeMinutePickDialog import com.rehome.zhdcoa.weiget.SaveOrCommitDialog import com.yolanda.nohttp.NoHttp import com.yolanda.nohttp.RequestMethod +import com.yolanda.nohttp.rest.OnResponseListener +import com.yolanda.nohttp.rest.RequestQueue import com.yolanda.nohttp.rest.Response import retrofit2.Call import java.util.Calendar class AddDagerEnterApplyActivity : BaseActivityOaToolbarViewBinding() { + private lateinit var queueNoHttp: RequestQueue private var isAudit = true private var departmentId: String? = null private var departmentName: String? = null @@ -54,6 +59,7 @@ class AddDagerEnterApplyActivity : override fun getToolbar() = binding.toolbarView.toolbar override fun initView() { + queueNoHttp = NoHttp.newRequestQueue(1) isEdit = intent.getBooleanExtra("isEdit", false) id = intent.getStringExtra("id") launcherResult = createActivityResultLauncher() @@ -89,7 +95,7 @@ class AddDagerEnterApplyActivity : val dialog = DateTimeMinutePickDialog( context, calendar, true ) { outPutDate: String?, outPutDate1: String?, outPutDate2: String? -> - binding.ilSQSJ.content = outPutDate + binding.ilSQSJ.content = outPutDate1 } dialog.show() } @@ -436,7 +442,10 @@ class AddDagerEnterApplyActivity : map["SQRID"] = userInfo!!.manid map["SQRDEPTID"] = userInfo!!.bzbh - request.setDefineRequestBodyForJson(Gson().toJson(map)) + val json = Gson().toJson(map) + showLog(json) + + request.setDefineRequestBodyForJson(json) NohttpUtils.getInstance().add(this, 0, request, object : HttpListener { override fun onSucceed(what: Int, response: Response?) { val result = response?.get() @@ -445,7 +454,7 @@ class AddDagerEnterApplyActivity : GsonUtils.GsonToBean(result, DagerEnterApplyBaseBean::class.java) if (bean != null && bean.isFlag) { showToast("新增危化品成功") - adapter.notifyDataSetChanged() + addWhpListByIDFirst(bean.id) } else { showToast("新增危化品失败") } @@ -489,4 +498,61 @@ class AddDagerEnterApplyActivity : } }, true, true, "提交数据中...") } + + //新增危化品清单 + private fun addWhpListByIDFirst(whpId: String) { + val url: String = Contans.BASE_URL + Contans.DAGER_ENTER_APPLY_ADD_ITEM_LIST_URL + val request = NoHttp.createStringRequest(url, RequestMethod.POST) + + if (App.getInstance().userInfo != null && App.getInstance().userInfo.token != null) { + val token = App.getInstance().userInfo.token + val credential = "Bearer $token" + request.addHeader("Authorization", credential) + Log.i("app", request.url()) +// Log.i("app", credential); +// Log.i("app",new Gson().toJson(request.headers())); + } + + var whpSubmitSuccessCount = 0 + for (i in whpList.indices) { + val item = whpList[i] + item.mainid = whpId + + val json = Gson().toJson(item) + showLog(json) + + request.setDefineRequestBodyForJson(json) + queueNoHttp.add(3, request, object : OnResponseListener { + override fun onStart(what: Int) { + + } + + override fun onSucceed(what: Int, response: Response?) { + if (what == 3) { + whpSubmitSuccessCount++ + val result = response?.get() + showLog(result) + val bean: DagerEnterApplyBaseBean? = + GsonUtils.GsonToBean(result, DagerEnterApplyBaseBean::class.java) + if (bean != null && bean.isFlag) { + if (whpSubmitSuccessCount == whpList.size) { + showToast("新增危化品申请成功") + finish() + } + } else { + showToast("新增危化品清单失败") + } + } + } + + override fun onFailed(what: Int, response: Response?) { + + } + + override fun onFinish(what: Int) { + + } + }) + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java index 1c21a3c..00759ae 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyTravelAuditActivity.java @@ -71,6 +71,7 @@ public class ApplyTravelAuditActivity extends BaseActivity implements View.OnCli llAudit = findViewById(R.id.ll_audit); ilVehicleYCSJ = findViewById(R.id.il_VehicleYCSJ); ilVehicleFHSJ = findViewById(R.id.il_VehicleFHSJ); + btnShlc = findViewById(R.id.btn_shlc); btnShlc.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java index 7c8d3d6..ac5daeb 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MateLablePrintFragment.java @@ -12,6 +12,7 @@ import android.widget.CheckBox; import android.widget.EditText; import android.widget.ListView; import android.widget.TextView; + import com.google.gson.Gson; import com.orhanobut.logger.Logger; import com.rehome.zhdcoa.Contans; @@ -38,6 +39,7 @@ import com.zebra.android.printer.PrinterLanguage; import com.zebra.android.printer.ZebraPrinter; import com.zebra.android.printer.ZebraPrinterFactory; import com.zebra.android.printer.ZebraPrinterLanguageUnknownException; + import java.util.ArrayList; import java.util.List; @@ -417,12 +419,12 @@ public class MateLablePrintFragment extends BaseFragment implements PoInfoadapte } public void disconnect() { - if (dialog != null) { - dialog.dismiss(); - playSound(); - showToast("打印成功"); - } try { + if (dialog != null) { + dialog.dismiss(); + playSound(); + showToast("打印成功"); + } if (zebraPrinterConnection != null) { zebraPrinterConnection.close(); } @@ -449,7 +451,7 @@ public class MateLablePrintFragment extends BaseFragment implements PoInfoadapte } /* - */ + */ private byte[] getConfigLabel(String itnum, String page, String itemnum) { PrinterLanguage printerLanguage = printer.getPrinterControlLanguage(); byte[] configLabel = null; @@ -588,6 +590,8 @@ public class MateLablePrintFragment extends BaseFragment implements PoInfoadapte private void playSound() { Uri sound = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION); Ringtone r = RingtoneManager.getRingtone(context, sound); - r.play(); + if (r != null) { + r.play(); + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt index c00baf5..5e498c0 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt @@ -113,7 +113,11 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding if (filedataBeans[position].isfilesave == "0") { - toastviewbymyself.makeText(context, "当前文件不存在,课件未上传或已经被删除", Toast.LENGTH_LONG) + toastviewbymyself.makeText( + context, + "当前文件不存在,课件未上传或已经被删除", + Toast.LENGTH_LONG + ) .show() } else { if (filedataBeans[position].filetype == ".mp4" || filedataBeans[position].filetype == ".flv") { @@ -298,7 +302,11 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding if (filedataBeans[position].isfilesave == "0") { - toastviewbymyself.makeText(context, "当前文件不存在,课件未上传或已经被删除", Toast.LENGTH_LONG) + toastviewbymyself.makeText( + context, + "当前文件不存在,课件未上传或已经被删除", + Toast.LENGTH_LONG + ) .show() } else { if (filedataBeans[position].filetype == ".mp4" || filedataBeans[position].filetype == ".flv") { @@ -426,7 +434,8 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding() { ) { dialog, _ -> //设置确定按钮 dialog.dismiss() //关闭dialog - finish() AppManager.getAppManager().finishActivity(WjmmGetVerificationCodeActivity::class.java) + finish() } //参数都设置完成了，创建并显示出来 builder.create().show()