whp submit

app/src/main/java/com/rehome/zhdcoa/AppManager.java

@@ -39,26 +39,33 @@ public class AppManager {
      * 获取当前Activity（堆栈中最后一个压入的）
      */
     public Activity currentActivity() {
-        Activity activity = activityStack.lastElement();
+        if (activityStack != null) {
-        return activity;
+            Activity activity = activityStack.lastElement();
+            return activity;
+        }
+        return null;
     }
 
     /**
      * 结束当前Activity（堆栈中最后一个压入的）
      */
     public void finishActivity() {
-        Activity activity = activityStack.lastElement();
+        if (activityStack != null) {
-        finishActivity(activity);
+            Activity activity = activityStack.lastElement();
+            finishActivity(activity);
+        }
     }
 
     /**
      * 结束指定的Activity
      */
     public void finishActivity(Activity activity) {
-        if (activity != null) {
+        if (activityStack != null) {
-            activityStack.remove(activity);
+            if (activity != null) {
-            activity.finish();
+                activityStack.remove(activity);
-            activity = null;
+                activity.finish();
+                activity = null;
+            }
         }
     }
 
@@ -66,9 +73,11 @@ public class AppManager {
      * 结束指定类名的Activity
      */
     public void finishActivity(Class<?> cls) {
-        for (Activity activity : activityStack) {
+        if (activityStack != null) {
-            if (activity.getClass().equals(cls)) {
+            for (Activity activity : activityStack) {
-                finishActivity(activity);
+                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 (activityStack != null) {
-            if (null != activityStack.get(i)) {
+            for (int i = 0, size = activityStack.size(); i < size; i++) {
-                activityStack.get(i).finish();
+                if (null != activityStack.get(i)) {
+                    activityStack.get(i).finish();
+                }
             }
+            activityStack.clear();
         }
-        activityStack.clear();
     }
 
     /**

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;
+    }
 }

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<ActivityAddDagerEnterApplyBinding>() {
+    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<String?> {
             override fun onSucceed(what: Int, response: Response<String?>?) {
                 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<String>(3, request, object : OnResponseListener<String> {
+                override fun onStart(what: Int) {
+
+                }
+
+                override fun onSucceed(what: Int, response: Response<String>?) {
+                    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<String>?) {
+
+                }
+
+                override fun onFinish(what: Int) {
+
+                }
+            })
+        }
+    }
 }

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) {

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();
+        }
     }
 }

app/src/main/java/com/rehome/zhdcoa/ui/activity/TrainInfoMoreActivity.kt

@@ -113,7 +113,11 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding<ActivityTrainInfo
                 this, dialogDatas
             ) { str, position ->
                 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<ActivityTrainInfo
                 context, dialogDatas
             ) { str, position ->
                 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<ActivityTrainInfo
                             binding.tvFbr.text =
                                 if (bean.results[0].fbr != null) bean.results[0].fbr else ""
                             binding.kcmcXf.text = bean.results[0].kcsf + "分"
-                            binding.yxqTx.text = bean.results[0].times + "至" + bean.results[0].timee
+                            binding.yxqTx.text =
+                                bean.results[0].times + "至" + bean.results[0].timee
                             if (bean.results[0].ysssc == null || bean.results[0].ysssc == "") {
                                 binding.yxxscTx.text = "00:00"
                             } else {
@@ -462,7 +471,9 @@ class TrainInfoMoreActivity : BaseActivityOaToolbarViewBinding<ActivityTrainInfo
     private fun initDHRDialogDatas() {
         dialogDatas.clear()
         for (dataBean in filedataBeans) {
-            dialogDatas.add(dataBean.kjname)
+            if (dataBean.kjname != null) {
+                dialogDatas.add(dataBean.kjname)
+            }
         }
     }
 

app/src/main/java/com/rehome/zhdcoa/ui/activity/WjmmActivity.kt

@@ -68,8 +68,8 @@ class WjmmActivity : BaseActivityOaToolbarViewBinding<ActivityWjmmBinding>() {
                     ) { dialog, _ ->
                         //设置确定按钮
                         dialog.dismiss() //关闭dialog
-                        finish()
                         AppManager.getAppManager().finishActivity(WjmmGetVerificationCodeActivity::class.java)
+                        finish()
                     }
                     //参数都设置完成了，创建并显示出来
                     builder.create().show()