2.2.3

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.rehome.zhdcoa"
         minSdkVersion 24
         targetSdkVersion 33
-        versionCode 6
+        versionCode 7
-        versionName "2.2.2"
+        versionName "2.2.3"
         multiDexEnabled true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         //每个应用拥有不同的authorities，防止相同的在同一个手机上无法同时安装

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_SMS" />

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

@@ -26,11 +26,11 @@ public class Contans {
 
     public static String IP_INTRANET = "http://10.19.0.72:8081/";
 
-//    public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/";//app外网服务器，对应内网ip:  172.16.25.75
+    public static String BASE_URL_EXTRANET = "http://219.131.195.3:8082/";//app外网服务器，对应内网ip:  172.16.25.75
-//    public static String IP_EXTRANET = "http://219.131.195.3:8081/";
+    public static String IP_EXTRANET = "http://219.131.195.3:8081/";
 
-    public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/";//app公司内网开发服务器
+//    public static String BASE_URL_EXTRANET = "http://192.168.2.215:8082/";//app公司内网开发服务器
-    public static String IP_EXTRANET = "http://192.168.2.215:9005/";
+//    public static String IP_EXTRANET = "http://192.168.2.215:9005/";
 
 
 
@@ -536,6 +536,10 @@ public class Contans {
     public static String DAGER_ENTER_APPLY_ADD_WHP_URL="CBS/WHP/Api/AddHWPSQ.ashx";
     //修改危化品入厂申请
     public static String DAGER_ENTER_APPLY_UPDATE_WHP_URL="CBS/WHP/Api/EidtHWPSQ.ashx";
+    //删除危化品入厂申请
+    public static String DAGER_ENTER_APPLY_DELETE_WHP_URL="CBS/WHP/Api/DelHWPSQ.ashx";
+    //提交危化品入厂申请
+    public static String DAGER_ENTER_APPLY_SUBMIT_WHP_URL="CBS/WHP/Api/TjHWPSQ.ashx";
 
 
 

app/src/main/java/com/rehome/zhdcoa/base/BaseActivity2.java

@@ -165,7 +165,7 @@ public abstract class BaseActivity2 extends AutoLayoutActivity {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
         } else {
-            pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), 0);
+            pendingIntent = PendingIntent.getActivity(this, 0, new Intent(this, getClass()).addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP), PendingIntent.FLAG_UPDATE_CURRENT);
         }
 
 

app/src/main/java/com/rehome/zhdcoa/service/PushService.java

@@ -349,7 +349,7 @@ public class PushService extends IntentService {
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
             pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
         } else {
-            pendingIntent = PendingIntent.getActivity(this, 0, intent, 0);
+            pendingIntent = PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         }
 
         notify = new Notification.Builder(this)

app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryMemberStatistics.java

@@ -148,7 +148,8 @@ public class ActivityFactoryMemberStatistics extends BaseActivity {
 
                 //Log.i("app", "----------------");
                 String result = response.get();
-                //Log.i("app", result);
+                showLog("----------------");
+                showLog(result);
 
 
 

app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroup.java

@@ -148,21 +148,21 @@ public class ActivityFactoryWorkerInfoGroup extends BaseActivity {
                 request.add("type","短期生产");
             }
             if(type_name.equals("每个常维队伍人数")){
-                request.add("type","常维生产");
+                //request.add("type","常维生产");
+                request.add("type","常维人员");
             }
         }
 
-        //Log.i("app", type_name);
+        showLog(type_name);
-        //Log.i("app", Contans.BASE_URL_AI_3D_SERVER + Contans.REGULAR_MAINTENANCE_STAFF_STATISTICS);
 
         NoProgresshttpUtils.getInstance().add(0, request, new HttpListener<String>() {
 
             @Override
             public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
 
-                //Log.i("app", "----------------");
                 String result = response.get();
-                //Log.i("app", result);
+                showLog("----------------");
+                showLog(result);
 
                 WorkerInfoGroupBean bean = GsonToBean(result, WorkerInfoGroupBean.class);
                 if(bean!=null&&bean.getData()!=null){

app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoGroupMember.java

@@ -159,9 +159,9 @@ public class ActivityFactoryWorkerInfoGroupMember extends BaseActivity {
             @Override
             public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
 
-                //Log.i("app", "----------------");
                 String result = response.get();
-                //Log.i("app", result);
+                showLog("----------------");
+                showLog(result);
 
                 WorkerInfoGroupMemberBean bean = GsonToBean(result, WorkerInfoGroupMemberBean.class);
                 if(bean!=null&&bean.getData()!=null){

app/src/main/java/com/rehome/zhdcoa/ui/activity/ActivityFactoryWorkerInfoStatistics.java

@@ -153,9 +153,9 @@ public class ActivityFactoryWorkerInfoStatistics extends BaseActivity {
             @Override
             public void onSucceed(int what, com.yolanda.nohttp.rest.Response<String> response) {
 
-                //Log.i("app", "----------------");
                 String result = response.get();
-                //Log.i("app", result);
+                showLog("----------------");
+                showLog(result);
 
 
 

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

@@ -45,9 +45,6 @@ class AddDagerEnterApplyActivity :
     private var isEdit = false;
     private var id: String? = null;
     private val whpList: MutableList<WhpListItemBean> = mutableListOf()
-//    private val whpDeleteList: MutableList<WhpListItemBean> = mutableListOf()
-//    private val whpChangeList: MutableList<WhpListItemBean> = mutableListOf()
-
     private lateinit var adapter: WhpListAdapter
 
     private val userInfos: ArrayList<StaffInfoBean.StaffInfo> = ArrayList()
@@ -122,23 +119,13 @@ class AddDagerEnterApplyActivity :
 
     //创建一个ActivityResultLauncher，添加一条危化品清单数据
     private fun saveOrCommitApply(isSubmit: Boolean) {
-        if (isSubmit) {
+        //仅保存
-            //保存并提交
+        if (isEdit) {
-            if (isEdit) {
+            //编辑
-                //编辑,新增一条危化品清单
+            updateWhpByFirst(isSubmit)
-                //addWhpListByID(item)
-            } else {
-
-            }
         } else {
-            //仅保存
+            //新增
-            if (isEdit) {
+            addWhpByFirst(isSubmit)
-                //编辑
-                updateWhpByFirst()
-            } else {
-                //新增
-                addWhpByFirst()
-            }
         }
     }
 
@@ -429,7 +416,7 @@ class AddDagerEnterApplyActivity :
     }
 
     //新增危化品入厂申请
-    private fun addWhpByFirst() {
+    private fun addWhpByFirst(isSubmit: Boolean) {
         val url: String = Contans.BASE_URL + Contans.DAGER_ENTER_APPLY_ADD_WHP_URL
         val request = NoHttp.createStringRequest(url, RequestMethod.POST)
 
@@ -453,8 +440,8 @@ class AddDagerEnterApplyActivity :
                 val bean: DagerEnterApplyBaseBean? =
                     GsonUtils.GsonToBean(result, DagerEnterApplyBaseBean::class.java)
                 if (bean != null && bean.isFlag) {
-                    showToast("新增危化品成功")
+                    //showToast("新增危化品成功")
-                    addWhpListByIDFirst(bean.id)
+                    addWhpListByIDFirst(bean.id, isSubmit)
                 } else {
                     showToast("新增危化品失败")
                 }
@@ -467,7 +454,7 @@ class AddDagerEnterApplyActivity :
     }
 
     //修改危化品入厂申请
-    private fun updateWhpByFirst() {
+    private fun updateWhpByFirst(isSubmit: Boolean) {
         val url: String = Contans.BASE_URL + Contans.DAGER_ENTER_APPLY_UPDATE_WHP_URL
         val request = NoHttp.createStringRequest(url, RequestMethod.POST)
 
@@ -488,6 +475,9 @@ class AddDagerEnterApplyActivity :
                 if (bean != null && bean.isFlag) {
                     showToast("修改危化品成功")
                     adapter.notifyDataSetChanged()
+                    if (isSubmit) {
+                        submitWhpById(bean.id)
+                    }
                 } else {
                     showToast("修改危化品失败")
                 }
@@ -500,18 +490,8 @@ class AddDagerEnterApplyActivity :
     }
 
     //新增危化品清单
-    private fun addWhpListByIDFirst(whpId: String) {
+    private fun addWhpListByIDFirst(whpId: String, isSubmit: Boolean) {
         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) {
@@ -521,6 +501,14 @@ class AddDagerEnterApplyActivity :
             val json = Gson().toJson(item)
             showLog(json)
 
+            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())
+            }
+
             request.setDefineRequestBodyForJson(json)
             queueNoHttp.add<String>(3, request, object : OnResponseListener<String> {
                 override fun onStart(what: Int) {
@@ -536,8 +524,12 @@ class AddDagerEnterApplyActivity :
                             GsonUtils.GsonToBean(result, DagerEnterApplyBaseBean::class.java)
                         if (bean != null && bean.isFlag) {
                             if (whpSubmitSuccessCount == whpList.size) {
-                                showToast("新增危化品申请成功")
+                                if (isSubmit) {
-                                finish()
+                                    submitWhpById(whpId)
+                                }else{
+                                    showToast("保存危化品申请成功")
+                                    finish()
+                                }
                             }
                         } else {
                             showToast("新增危化品清单失败")
@@ -555,4 +547,33 @@ class AddDagerEnterApplyActivity :
             })
         }
     }
+
+    //提交危化品入厂申请
+    private fun submitWhpById(whpId: String) {
+        val url: String = Contans.BASE_URL + Contans.DAGER_ENTER_APPLY_SUBMIT_WHP_URL
+        val request = NoHttp.createStringRequest(url, RequestMethod.POST)
+
+        val map: MutableMap<String, String> = mutableMapOf()
+        map["ID"] = whpId
+
+        request.setDefineRequestBodyForJson(Gson().toJson(map))
+        NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
+            override fun onSucceed(what: Int, response: Response<String?>?) {
+                val result = response?.get()
+                showLog(result)
+                val bean: DagerEnterApplyBaseBean? =
+                    GsonUtils.GsonToBean(result, DagerEnterApplyBaseBean::class.java)
+                if (bean != null && bean.isFlag) {
+                    showToast("提交危化品入厂申请成功")
+                    finish()
+                } else {
+                    showToast("提交危化品入厂申请失败")
+                }
+            }
+
+            override fun onFailed(what: Int, response: Response<String?>?) {
+
+            }
+        }, true, true, "提交数据中...")
+    }
 }

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

@@ -625,7 +625,7 @@ class ApplyAboutMeActivity : BaseActivityOaToolbarViewBinding<ActivityApplyAbout
                             startActivity(intent)
                         }
                         "CBS_WHP_SQ" -> {
-                            //危化品入厂申请详情
+                            //危化品入厂申请审核详情页面
                             val intent = Intent(this, DagerEnterApplyDetailActivity::class.java)
                             intent.putExtra("id", datas[position].listid)
                             intent.putExtra("DepartmentNameId", datas[position].departmentnameid)

app/src/main/java/com/rehome/zhdcoa/ui/activity/ApplyLeaveActivity.java

@@ -3,6 +3,7 @@ package com.rehome.zhdcoa.ui.activity;
 import android.content.Intent;
 import android.util.Log;
 import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ListView;
 
 import com.google.gson.Gson;
@@ -127,7 +128,6 @@ public class ApplyLeaveActivity extends BaseActivity {
     private void setAdapter() {
         adapter = new LeaveListAdapter(context, datas);
         lv.setAdapter(adapter);
-
         lv.setOnItemClickListener((parent, view, position, id) -> {
             final ChangeShiftBean.RowsBean changeShift = datas.get(position);
             Log.i("app", new Gson().toJson(changeShift));

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

@@ -8,14 +8,18 @@ import android.text.TextWatcher
 import android.util.Log
 import android.view.View
 import android.widget.AdapterView
+import com.google.gson.Gson
 import com.rehome.zhdcoa.App
 import com.rehome.zhdcoa.Contans
 import com.rehome.zhdcoa.adapter.DagerEnterApplyAdapter
 import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
+import com.rehome.zhdcoa.bean.DagerEnterApplyBaseBean
 import com.rehome.zhdcoa.bean.DagerEnterApplyBean
 import com.rehome.zhdcoa.databinding.ActivityDagerEnterApplyBinding
 import com.rehome.zhdcoa.utils.*
+import com.rehome.zhdcoa.weiget.CommitDialog
 import com.rehome.zhdcoa.weiget.DateTimePickDialog
+import com.rehome.zhdcoa.weiget.SaveOrCommitDialog
 import com.yolanda.nohttp.NoHttp
 import com.yolanda.nohttp.RequestMethod
 import com.yolanda.nohttp.rest.Response
@@ -144,6 +148,29 @@ class DagerEnterApplyActivity : BaseActivityOaToolbarViewBinding<ActivityDagerEn
                     startActivity(intent)
                 }
             }
+        binding.lv.onItemLongClickListener =
+            AdapterView.OnItemLongClickListener { parent, view, position, id ->
+                val item = datas[position]
+                if( item.istj==0){
+                    //已保存，未提交，弹框提示是否要删除
+                    //弹框提示 确认要删除危化品申请吗
+                    val dialog = CommitDialog(
+                        context,
+                        object : CommitDialog.CommitDialogListener {
+                            override fun confirm() {
+                                updateWhpByFirst(item.id)
+                            }
+
+                            override fun cancel() {
+
+                            }
+
+                        })
+                    dialog.setTvMsg("您确认要删除当前这条危化品申请吗")
+                    dialog.show()
+                }
+                true
+            }
     }
 
     /**
@@ -171,4 +198,33 @@ class DagerEnterApplyActivity : BaseActivityOaToolbarViewBinding<ActivityDagerEn
         super.onResume()
         getListData()
     }
+
+    //删除危化品入厂申请
+    private fun updateWhpByFirst(whpId: String) {
+        val url: String = Contans.BASE_URL + Contans.DAGER_ENTER_APPLY_DELETE_WHP_URL
+        val request = NoHttp.createStringRequest(url, RequestMethod.POST)
+
+        val map: MutableMap<String, String> = mutableMapOf()
+        map["ID"] = whpId
+
+        request.setDefineRequestBodyForJson(Gson().toJson(map))
+        NohttpUtils.getInstance().add(this, 0, request, object : HttpListener<String?> {
+            override fun onSucceed(what: Int, response: Response<String?>?) {
+                val result = response?.get()
+                showLog(result)
+                val bean: DagerEnterApplyBaseBean? =
+                    GsonUtils.GsonToBean(result, DagerEnterApplyBaseBean::class.java)
+                if (bean != null && bean.isFlag) {
+                    showToast("删除危化品成功")
+                    getListData()
+                } else {
+                    showToast("删除危化品失败")
+                }
+            }
+
+            override fun onFailed(what: Int, response: Response<String?>?) {
+
+            }
+        }, true, true, "提交数据中...")
+    }
 }

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

@@ -15,6 +15,7 @@ import android.widget.RadioGroup
 import android.widget.Toast
 import com.google.gson.Gson
 import com.rehome.zhdcoa.App
+import com.rehome.zhdcoa.BuildConfig
 import com.rehome.zhdcoa.Contans
 import com.rehome.zhdcoa.R
 import com.rehome.zhdcoa.base.BaseActivityOaToolbarViewBinding
@@ -146,10 +147,11 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
             binding.etPassword.setText(password)
         }
 
+        if (BuildConfig.LOG_ERROR) {
 
 //        管理员
-//        binding.etUsername.setText("ZHPS_Admin")
+        binding.etUsername.setText("ZHPS_Admin")
-//        binding.etPassword.setText("Rehome.zhps@2020")
+        binding.etPassword.setText("Rehome.zhps@2020")
 //
 //        binding.etUsername.setText("310665")
 //        binding.etPassword.setText("ABcd.123")
@@ -162,29 +164,31 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //        //马
 //        binding.etUsername.setText("310482")
 //        binding.etPassword.setText("Maying0509?")
-
-
 //
 //        //程宇翔
 //        binding.etUsername.setText("310673")
 //        binding.etPassword.setText("Abcd@1234")
-        //李耿
+            //李耿
 //        binding.etUsername.setText("310261")
 //        binding.etPassword.setText("!Lig770731")
-        //陈嘉
+            //陈嘉
 //        binding.etUsername.setText("310408")
 //        binding.etPassword.setText("zhpCJ1981+")
-        //郑大兴
+            //郑大兴
 //        binding.etUsername.setText("310300")
 //        binding.etPassword.setText("Zdx@333333")
-        //孙世虎
+            //孙世虎
 //        binding.etUsername.setText("310264")
 //        binding.etPassword.setText("Sun@310264")
-        //燔烨
+//        //燔烨
 //        binding.etUsername.setText("310699")
 //        binding.etPassword.setText("2p5y99YG&")
-        //binding.etPassword.setText("ZHps@2468")
+            //binding.etPassword.setText("ZHps@2468")
+            //陈坚标
+//        binding.etUsername.setText("310063")
+//        binding.etPassword.setText("ZHPs@040909")
 
+        }
 
         binding.textWjmm.setOnClickListener(View.OnClickListener {
             val intent = Intent(

app/src/main/java/com/rehome/zhdcoa/ui/activity/WztpScActivity.java

@@ -735,7 +735,6 @@ public class WztpScActivity extends BaseActivity2 {
                 int oldSize = mAdapter.getData().size();
                 mAdapter.notifyItemRangeRemoved(0, isMaxSize ? oldSize + 1 : oldSize);
                 mAdapter.getData().clear();
-
                 mAdapter.getData().addAll(result);
                 mAdapter.notifyItemRangeInserted(0, result.size());
             }
@@ -827,7 +826,6 @@ public class WztpScActivity extends BaseActivity2 {
 
             }
         });
-
     }
 
     private void uploadVideo() {
@@ -874,7 +872,6 @@ public class WztpScActivity extends BaseActivity2 {
 
             }
         });
-
     }
 
     private void compressVideo() {

app/src/main/java/com/rehome/zhdcoa/ui/fragment/HomeFragment.java

@@ -53,6 +53,7 @@ import com.rehome.zhdcoa.ui.activity.DJExamOnlineActivity;
 import com.rehome.zhdcoa.ui.activity.DJPXinfoMoreActivity;
 import com.rehome.zhdcoa.ui.activity.DJPeixunActivity;
 import com.rehome.zhdcoa.ui.activity.DJPxKjglActivity;
+import com.rehome.zhdcoa.ui.activity.DagerEnterApplyDetailActivity;
 import com.rehome.zhdcoa.ui.activity.ExamOnlineActivity;
 import com.rehome.zhdcoa.ui.activity.LrqylsryinfoActivity;
 import com.rehome.zhdcoa.ui.activity.LsgkinfoActivity;
@@ -78,12 +79,14 @@ import com.xuexiang.xui.widget.textview.supertextview.SuperTextView;
 import com.yolanda.nohttp.NoHttp;
 import com.yolanda.nohttp.RequestMethod;
 import com.yolanda.nohttp.rest.Request;
+
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+
 import retrofit2.Call;
 import retrofit2.Response;
 
@@ -104,7 +107,6 @@ public class HomeFragment extends BaseFragment {
     SuperTextView stvMessagedbsx;
 
 
-
     private List<AboutMeListBean.RowsBean> AboutMeListdatas;
     private List<AttendanceCheckBean.RowsBean> Attendancedatas;
     private List<GridItem> items;
@@ -200,9 +202,9 @@ public class HomeFragment extends BaseFragment {
                 if (bean != null) {
                     if (bean.getTotal().equals("0")) {//无数据的时候
                         stvMessage.setRightString("暂无待办");
-                        if(AboutMeListdatas==null){
+                        if (AboutMeListdatas == null) {
                             AboutMeListdatas = new ArrayList<>();
-                        }else{
+                        } else {
                             AboutMeListdatas.clear();
                         }
                         mineDataAdapter.refresh(AboutMeListdatas);
@@ -269,7 +271,7 @@ public class HomeFragment extends BaseFragment {
     @Override
     public void onStart() {
         super.onStart();
-        Log.i("app","onStart()");
+        Log.i("app", "onStart()");
         initData();
     }
 
@@ -336,6 +338,7 @@ public class HomeFragment extends BaseFragment {
         adapter1 = new GridView1Adapter(getContext(), items1);
         gv1.setAdapter(adapter1);
         gv1.setOnItemClickListener((parent, view, position, id) -> {
+            showLog("待办事项1");
             String tag = items1.get(position).getTag();
             Intent intent = null;
             switch (tag) {
@@ -448,6 +451,7 @@ public class HomeFragment extends BaseFragment {
             startActivity(intent);
         });
         mineDataAdapter.setOnItemClickListener((itemView, item, position) -> {
+            showLog("待办事项2");
             switch (AboutMeListdatas.get(position).getListcode()) {
                 case "ApplyVehicle":   //用车申请
                     if (AboutMeListdatas.get(position).getIstj().equals("0")) {
@@ -683,6 +687,14 @@ public class HomeFragment extends BaseFragment {
                     startActivity(intent);
                     break;
                 }
+                case "CBS_WHP_SQ": {
+                    Intent intent = new Intent(getActivity(), DagerEnterApplyDetailActivity.class);
+                    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                    intent.putExtra("id", AboutMeListdatas.get(position).getListid());
+                    intent.putExtra("DepartmentNameId", AboutMeListdatas.get(position).getDepartmentnameid());
+                    startActivity(intent);
+                    break;
+                }
             }
         });
     }

app/src/main/java/com/rehome/zhdcoa/utils/HttpUtils.java

@@ -131,6 +131,7 @@ public class HttpUtils {
 
     private static OkHttpClient getGzipOkHttpClient() {
         OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
+        httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptor());
         httpClientBuilder.addInterceptor(new GzipRequestInterceptor1());
         httpClientBuilder.connectTimeout(6, TimeUnit.SECONDS);
         httpClientBuilder.writeTimeout(60, TimeUnit.SECONDS);
@@ -140,6 +141,7 @@ public class HttpUtils {
 
     private static OkHttpClient getAuthenticatorOkHttpClient(String token) {
         OkHttpClient.Builder httpClientBuilder = new OkHttpClient.Builder();
+        httpClientBuilder.addNetworkInterceptor(new TokenHeaderInterceptor());
         httpClientBuilder.addInterceptor(new LoggingInterceptor());
         httpClientBuilder.connectTimeout(6, TimeUnit.SECONDS);
         httpClientBuilder.writeTimeout(60, TimeUnit.SECONDS);

app/src/main/java/com/rehome/zhdcoa/utils/NoProgresshttpUtils.java

@@ -1,21 +1,24 @@
 package com.rehome.zhdcoa.utils;
 
 
-
 import android.app.Activity;
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.gson.Gson;
 import com.rehome.zhdcoa.App;
+import com.rehome.zhdcoa.BuildConfig;
 import com.rehome.zhdcoa.R;
 import com.yolanda.nohttp.NoHttp;
 import com.yolanda.nohttp.download.DownloadQueue;
 import com.yolanda.nohttp.rest.Request;
 import com.yolanda.nohttp.rest.RequestQueue;
+
 import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.security.cert.CertificateFactory;
+
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManagerFactory;
@@ -64,17 +67,27 @@ public class NoProgresshttpUtils {
 
 
     public <T> void add(int what, Request<T> request, HttpListener<T> callback) {
-        if(App.getInstance().getUserInfo()!=null&&App.getInstance().getUserInfo().getToken()!=null){
+        if (App.getInstance().getUserInfo() != null && App.getInstance().getUserInfo().getToken() != null) {
             String token = App.getInstance().getUserInfo().getToken();
             String credential = "Bearer " + token;
             request.addHeader("Authorization", credential);
-            Log.i("app", request.url());
+            showLog(request.url());
-//            Log.i("app", credential);
+//            showLog(credential);
-//            Log.i("app",new Gson().toJson(request.headers()));
+//            showLog(new Gson().toJson(request.headers()));
         }
         mQueue.add(what, request, new HttpResponseListenerNoProgress<T>(request, callback));
     }
 
+    public void showLog(String logText) {
+        if (BuildConfig.LOG_ERROR) {
+            if (TextUtils.isEmpty(logText)) {
+                Log.i("app", "logText is null");
+            } else {
+                Log.i("app", logText);
+            }
+        }
+    }
+
     /**
      * 取消这个sign这个标记的所有请求
      *
@@ -98,7 +111,7 @@ public class NoProgresshttpUtils {
         mQueue.stop();
     }
 
-    public static SSLSocketFactory getSSLSocketFactory(Context context){
+    public static SSLSocketFactory getSSLSocketFactory(Context context) {
         try {
             CertificateFactory certificateFactory = CertificateFactory.getInstance("X.509");
             KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());

app/src/main/java/com/rehome/zhdcoa/utils/NohttpUtils.java

@@ -1,10 +1,12 @@
 package com.rehome.zhdcoa.utils;
 
 import android.app.Activity;
+import android.text.TextUtils;
 import android.util.Log;
 
 import com.google.gson.Gson;
 import com.rehome.zhdcoa.App;
+import com.rehome.zhdcoa.BuildConfig;
 import com.yolanda.nohttp.NoHttp;
 import com.yolanda.nohttp.download.DownloadQueue;
 import com.yolanda.nohttp.rest.Request;
@@ -69,9 +71,9 @@ public class NohttpUtils {
             String token = App.getInstance().getUserInfo().getToken();
             String credential = "Bearer " + token;
             request.addHeader("Authorization", credential);
-            Log.i("app", request.url());
+            showLog(request.url());
-//            Log.i("app", credential);
+//            showLog(credential);
-//            Log.i("app",new Gson().toJson(request.headers()));
+//            showLog(new Gson().toJson(request.headers()));
         }
         mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, canCanel, isLoading, msg));
     }
@@ -82,9 +84,9 @@ public class NohttpUtils {
             String token = App.getInstance().getUserInfo().getToken();
             String credential = "Bearer " + token;
             request.addHeader("Authorization", credential);
-            Log.i("app", request.url());
+            showLog(request.url());
-//            Log.i("app", credential);
+//            showLog(credential);
-//            Log.i("app",new Gson().toJson(request.headers()));
+//            showLog(new Gson().toJson(request.headers()));
         }
         mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, true, true, "加载中..."));
     }
@@ -94,13 +96,23 @@ public class NohttpUtils {
             String token = App.getInstance().getUserInfo().getToken();
             String credential = "Bearer " + token;
             request.addHeader("Authorization", credential);
-            Log.i("app", request.url());
+            showLog(request.url());
-//            Log.i("app", credential);
+//            showLog(credential);
-//            Log.i("app",new Gson().toJson(request.headers()));
+//            showLog(new Gson().toJson(request.headers()));
         }
         mQueue.add(what, request, new HttpResponseListener<T>(mActivity, request, callback, true, true, progressTitle));
     }
 
+    public void showLog(String logText) {
+        if (BuildConfig.LOG_ERROR) {
+            if(TextUtils.isEmpty(logText)){
+                Log.i("app", "logText is null");
+            }else{
+                Log.i("app", logText);
+            }
+        }
+    }
+
     /**
      * 取消这个sign这个标记的所有请求
      *