请假审批页面、用餐申请审批页面 按钮调整到底部

app/build.gradle

@@ -44,7 +44,8 @@ android {
                 checkReleaseBuilds false
                 abortOnError false
             }
-            minifyEnabled false //开启代码混淆，防止反编译查看源代码
+            minifyEnabled true //开启代码混淆，防止反编译查看源代码
+            shrinkResources true
             debuggable false // 是否debug
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             //修改生成的apk名字
@@ -72,7 +73,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation files('libs/pdf.aar')
     implementation files('libs/ZSDK_API.jar')
-    implementation files('libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar')
+//    implementation files('libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar')
     implementation files('libs/badgeview.jar')
     implementation files('libs/TbsFileSdk_base_arm64_release_1.0.5.6000030.20231109143447.aar')
 
@@ -167,4 +168,13 @@ dependencies {
     implementation libs.androidx.emoji.bundled
     //二维码扫描
     implementation libs.barcode.scanning
+
+//    implementation('org.dom4j:dom4j:2.1.3') {
+//        exclude group: 'pull-parser', module: 'pull-parser'
+//    }
+
+//    configurations {
+//        all*.exclude group: 'org.xmlpull.v1.XmlPullParser'
+//    }
+
 }

app/proguard-rules.pro

@@ -22,9 +22,24 @@
 
 
 
+#-ignorewarnings
+#-libraryjars libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar
+#-keep class org.kobjects.** { *;}
+#-keep class org.ksoap2.** { *;}
+#-keep class org.kxml2.** { *;}
+#-keep class org.xmlpull.v1.** { *;}
+
+#-keep public class org.xmlpull.v1.XmlPullParser
+#-keep public class org.xmlpull.v1.XmlPullParserFactory
+#-keep public class org.kxml2.io.KXmlParser,org.kxml2.io.KXmlSerializer
+#
+#-keep public class android.content.res.XmlResourceParser
+#
+
+#-dontwarn org.xmlpull.v1.**
+
+
 
--keep class org.xmlpull.v1.** { *;}
--dontwarn org.xmlpull.v1.**
 
 
 -keep class com.rehome.zhdcoa.App
@@ -33,9 +48,9 @@
 -keep class com.rehome.zhdcoa.bean.** { *; }
 -keep class com.rehome.zhdcoa.DBModel.** { *; }
 -keep class com.rehome.zhdcoa.entity.** { *; }
--keep class com.rehome.zhdcoa.zxing.camera.** { *; }
+#-keep class com.rehome.zhdcoa.zxing.camera.** { *; }
--keep class com.rehome.zhdcoa.zxing.decoding.** { *; }
+#-keep class com.rehome.zhdcoa.zxing.decoding.** { *; }
--keep class com.rehome.zhdcoa.zxing.view.** { *; }
+#-keep class com.rehome.zhdcoa.zxing.view.** { *; }
 #-keep class com.rehome.zhdcoa.utils.** { *; }
 
 
@@ -164,19 +179,7 @@
 -dontwarn okio.**
 #</retrofit2.x>
 
-#</okhttp3.x>
 
-#<ButterKnife 7.0 以上>
- -keep class butterknife.** { *; }
- -dontwarn butterknife.internal.**
- -keep class **$$ViewBinder { *; }
- -keepclasseswithmembernames class * {
-  @butterknife.* <fields>;
- }
- -keepclasseswithmembernames class * {
- @butterknife.* <methods>;
- }
-#</ButterKnife 7.0 以上>
 
 #<eventbus 3.0>
 -keepattributes *Annotation*
@@ -267,5 +270,19 @@
 -keep class com.yalantis.ucrop** { *; }
 -keep interface com.yalantis.ucrop** { *; }
 
-#-ignorewarnings
+
-#-libraryjars libs/ksoap2-android-assembly-3.6.0-jar-with-dependencies.jar
+
+
+
+-keep class com.zhy.autolayout.** { *; }
+-keep class com.haibin.calendarview.** { *; }
+-keep class org.litepal.** { *; }
+-keep class com.yolanda.nohttp.** { *; }
+-keep class com.github.zhaolewei.** { *; }
+-keep class com.zlw.main.recorderlib.** { *; }
+-keep class fftlib.** { *; }
+-keep class com.lcodecore.tkrefreshlayout.** { *; }
+-keep class com.vincent.videocompressor.** { *; }
+-keep class com.king.zxing.** { *; }
+-keep class com.haozhang.lib.** { *; }
+-keep class com.github.barteksc.pdfviewer.** { *; }

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

@@ -52,6 +52,7 @@ public class Contans {
 
     //app外网服务器，对应内网ip:  172.16.25.75
     public static String BASE_URL_EXTRANET = "https://219.131.195.3:7082/";
+    //public static String BASE_URL_EXTRANET = "https://172.16.25.75:7082/";
     //App巡检，点检外网服务器
     public static String IP_EXTRANET = "https://219.131.195.3:7081/";
 

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

@@ -41,7 +41,7 @@ import java.util.List;
 import retrofit2.Call;
 import retrofit2.Response;
 
-public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnClickListener, GetAuditPermissionUtils.GetAuditPermissionUtilsListener {
+public class ApplyDinnerAuditActivity extends BaseActivity implements GetAuditPermissionUtils.GetAuditPermissionUtilsListener {
 
     InputLayout ilDinnerApplyp;
     InputLayout ilDDinnerPeopleNum;
@@ -54,7 +54,10 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
     CbRbLayout cbIdea;
     InputLayout ilIdea;
     LinearLayout llAudit;
-    Button btn_shlc;
+    //Button btn_shlc;
+    LinearLayout ll_shlc;
+    LinearLayout ll_audit_kq;
+
 
     private ApplyListBean.ApplyList applyList;
     private Intent intent;
@@ -78,14 +81,60 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
         cbIdea = findViewById(R.id.cb_idea);
         ilIdea = findViewById(R.id.il_idea);
         llAudit = findViewById(R.id.ll_audit);
-        btn_shlc = findViewById(R.id.btn_shlc);
+        //btn_shlc = findViewById(R.id.btn_shlc);
-        btn_shlc.setOnClickListener(new View.OnClickListener() {
+        ll_shlc = findViewById(R.id.ll_shlc);
+        ll_audit_kq = findViewById(R.id.ll_audit_kq);
+
+        llAudit.setVisibility(View.GONE);
+        ll_audit_kq.setVisibility(View.GONE);
+
+
+
+//        btn_shlc.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                AuditFlowDialog dialog = new AuditFlowDialog(context, datas);
+//                dialog.show();
+//            }
+//        });
+
+        ll_shlc.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 AuditFlowDialog dialog = new AuditFlowDialog(context, datas);
                 dialog.show();
             }
         });
+
+        ll_audit_kq.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (isAudit) {
+                    if (!cbIdea.getRb1Check()) {
+                        if (TextUtils.isEmpty(ilIdea.getContent())) {
+                            toastviewbymyself.makeText(context, "意见不能为空", Toast.LENGTH_LONG).show();
+                            return;
+                        }
+                    }
+
+                    new AuditDialog(context, "", new AuditDialog.AuditDialogListener() {
+                        @Override
+                        public void confirm() {
+                            setAudit();
+                        }
+
+                        @Override
+                        public void cancel() {
+
+                        }
+                    }).show();
+
+                } else {
+                    showLog("没有审核权限");
+                    toastviewbymyself.makeText(context, "没有审核权限", Toast.LENGTH_LONG).show();
+                }
+            }
+        });
     }
 
     @Override
@@ -96,7 +145,12 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
     @Override
     public void initView() {
         findView();
-        initToolbar("用餐审核", "审核", this);
+        initToolbar("用餐审核", "", new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
     }
 
     /**
@@ -285,47 +339,63 @@ public class ApplyDinnerAuditActivity extends BaseActivity implements View.OnCli
         showView(dinnerBean);
 
 
-        if (rowsBean.getAuditState().equals("1")) {
+//        if (rowsBean.getAuditState().equals("1")) {
-
+//
-            initToolbar(rowsBean.getAuditName(), "", this);
+//            initToolbar(rowsBean.getAuditName(), "", this);
-
+//
-        } else if (rowsBean.getAuditState().equals("0")) {
+//        } else if (rowsBean.getAuditState().equals("0")) {
+//
+//            initToolbar(rowsBean.getAuditName(), "", this);
+//        }
 
-            initToolbar(rowsBean.getAuditName(), "", this);
+        String auditStatus=rowsBean.getAuditState();
+        showLog("---------auditStatus-------");
+        showLog(auditStatus);
+        if(auditStatus!=null){
+            //0无权限，1己审核，2有权限
+            //有审核权限 2
+            if (!auditStatus.equals("2")) {
+                //无审核权限
+                llAudit.setVisibility(View.GONE);
+                ll_audit_kq.setVisibility(View.GONE);
+            }else{
+                //有审核权限
+                llAudit.setVisibility(View.VISIBLE);
+                ll_audit_kq.setVisibility(View.VISIBLE);
+            }
         }
-
 
         setToolbarTitle(rowsBean.getAuditName());
         rangeID = bean.getRows().get(0).getRange();
         datas.addAll(rowsBean.getStepSHList());
     }
 
-    @Override
+//    @Override
-    public void onClick(View v) {
+//    public void onClick(View v) {
-        if (isAudit) {
+//        if (isAudit) {
-
+//
-            if (!cbIdea.getRb1Check()) {
+//            if (!cbIdea.getRb1Check()) {
-                if (TextUtils.isEmpty(ilIdea.getContent())) {
+//                if (TextUtils.isEmpty(ilIdea.getContent())) {
-                    toastviewbymyself.makeText(context, "意见不能为空", Toast.LENGTH_LONG).show();
+//                    toastviewbymyself.makeText(context, "意见不能为空", Toast.LENGTH_LONG).show();
-                    return;
+//                    return;
-                }
+//                }
-            }
+//            }
-
+//
-            new AuditDialog(context, "", new AuditDialog.AuditDialogListener() {
+//            new AuditDialog(context, "", new AuditDialog.AuditDialogListener() {
-                @Override
+//                @Override
-                public void confirm() {
+//                public void confirm() {
-                    setAudit();
+//                    setAudit();
-                }
+//                }
-
+//
-                @Override
+//                @Override
-                public void cancel() {
+//                public void cancel() {
-
+//
-                }
+//                }
-            }).show();
+//            }).show();
-
+//
-        } else {
+//        } else {
-//                    showToast("没有审核权限");
+//            showLog("没有审核权限");
-            toastviewbymyself.makeText(context, "没有审核权限", Toast.LENGTH_LONG).show();
+//            toastviewbymyself.makeText(context, "没有审核权限", Toast.LENGTH_LONG).show();
-        }
+//        }
-    }
+//    }
 }

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

@@ -45,7 +45,7 @@ import okhttp3.RequestBody;
 import retrofit2.Call;
 import retrofit2.Response;
 
-public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClickListener {
+public class ApplyLeaveAuditActivity extends BaseActivity {
 
     InputLayout ilApplyName;
     InputLayout ilStartTime;
@@ -65,9 +65,12 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic
     CbRbLayout cbIdea;
     InputLayout ilIdea;
     LinearLayout llAudit;
-    Button btnShlc;
+    //Button btnShlc;
     InputLayout ilClfs;
 
+    LinearLayout ll_shlc;
+    LinearLayout ll_audit_kq;
+
     private LeaveHintBean.RowsBean leaveHint = null;
 
     private ChangeShiftBean.RowsBean changeShift = null;
@@ -99,28 +102,32 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic
         cbIdea = findViewById(R.id.cb_idea);
         ilIdea = findViewById(R.id.il_idea);
         llAudit = findViewById(R.id.ll_audit);
-        btnShlc = findViewById(R.id.btn_shlc);
+        //btnShlc = findViewById(R.id.btn_shlc);
         ilClfs = findViewById(R.id.il_clfs);
-        btnShlc.setOnClickListener(new View.OnClickListener() {
+
+        ll_shlc = findViewById(R.id.ll_shlc);
+        ll_audit_kq = findViewById(R.id.ll_audit_kq);
+
+        llAudit.setVisibility(View.GONE);
+        ll_audit_kq.setVisibility(View.GONE);
+
+//        btnShlc.setOnClickListener(new View.OnClickListener() {
+//            @Override
+//            public void onClick(View v) {
+//                AuditFlowDialog dialog = new AuditFlowDialog(context, datas);
+//                dialog.show();
+//            }
+//        });
+
+        ll_shlc.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 AuditFlowDialog dialog = new AuditFlowDialog(context, datas);
                 dialog.show();
             }
         });
-    }
-
-    @Override
-    public int getLayoutId() {
-        return R.layout.activity_apply_leave_audit;
-    }
-
-    @Override
-    public void initView() {
-        findView();
-        initToolbar("请假审核", "审核", this);
-    }
 
+        ll_audit_kq.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (auditStatus != null && auditStatus.equals("0")) {
@@ -149,6 +156,25 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic
                 });
                 dialog.show();
             }
+        });
+    }
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_apply_leave_audit;
+    }
+
+    @Override
+    public void initView() {
+        findView();
+        initToolbar("请假审核", "", new View.OnClickListener(){
+
+            @Override
+            public void onClick(View v) {
+
+            }
+        });
+    }
 
     @Override
     public void initData() {
@@ -168,10 +194,12 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic
         if (changeShift.getMan_id() != null) {
 
             manid = changeShift.getMan_id();
+            showLog(manid);
 
         } else {
 
             manid = userInfo.getManid();
+            showLog(manid);
         }
 
 
@@ -311,19 +339,37 @@ public class ApplyLeaveAuditActivity extends BaseActivity implements View.OnClic
                     if (!bean.getTotal().equals("0")) {
                         auditStatus = bean.getRows().get(0).getAuditState();
 
+                        showLog("---------auditStatus-------");
+                        showLog(auditStatus);
+                        //0无权限，1己审核，2有权限
+                        //有审核权限 2
                         if (!auditStatus.equals("2")) {
+                            //无审核权限
                             llAudit.setVisibility(View.GONE);
-                        }
+                            ll_audit_kq.setVisibility(View.GONE);
-
+                        }else{
-                        if (auditStatus.equals("1")) {
+                            //有审核权限
-
+                            llAudit.setVisibility(View.VISIBLE);
-                            initToolbar(bean.getRows().get(0).getAuditName(), "", ApplyLeaveAuditActivity.this);
+                            ll_audit_kq.setVisibility(View.VISIBLE);
-
+                        }
-                        } else if (auditStatus.equals("0")) {
+
-
+//                        if (auditStatus.equals("1")) {
-                            initToolbar(bean.getRows().get(0).getAuditName(), "", ApplyLeaveAuditActivity.this);
+//                            //
-                        }
+//                            initToolbar(bean.getRows().get(0).getAuditName(), "", new View.OnClickListener() {
-
+//                                @Override
+//                                public void onClick(View v) {
+//
+//                                }
+//                            });
+//                        } else if (auditStatus.equals("0")) {
+//                            //无审核权限
+//                            initToolbar(bean.getRows().get(0).getAuditName(), "", new View.OnClickListener() {
+//                                @Override
+//                                public void onClick(View v) {
+//
+//                                }
+//                            });
+//                        }
 
                         setToolbarTitle(bean.getRows().get(0).getAuditName());
                         rangeID = bean.getRows().get(0).getRange();

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

@@ -75,6 +75,8 @@ public class AscFragment extends BaseFragment {
     private void findView() {
         lv = view.findViewById(R.id.lv);
         tvNodata = view.findViewById(R.id.tv_nodata);
+        tvNodata.setVisibility(View.VISIBLE);
+        lv.setVisibility(View.GONE);
         btnSc = view.findViewById(R.id.btn_sc);
         btnDel = view.findViewById(R.id.btn_delete);
         btnSc.setOnClickListener(new View.OnClickListener() {
@@ -116,8 +118,7 @@ public class AscFragment extends BaseFragment {
         });
     }
 
-    public AscFragment() {
+    public AscFragment() {}
-    }
 
     public static AscFragment newInstance(String param1, String param2) {
         AscFragment fragment = new AscFragment();
@@ -131,9 +132,14 @@ public class AscFragment extends BaseFragment {
         findView();
         dialog = new WaitDialog(context, "上传中...");
         dialog.setCancelable(false);
-    }
-
 
+        queue = NoHttp.newRequestQueue(1);
+        map = new HashMap<>();
+        ajhjhs = new ArrayList<>();
+        ajhscs = new ArrayList<>();
+        jhids = new ArrayList<>();
+        initListView();
+    }
 
     @Override
     public int getLayoutId() {
@@ -143,11 +149,6 @@ public class AscFragment extends BaseFragment {
     @Override
     public void initData() {
 
-        queue = NoHttp.newRequestQueue(1);
-        map = new HashMap<>();
-        ajhjhs = new ArrayList<>();
-        ajhscs = new ArrayList<>();
-        jhids = new ArrayList<>();
     }
 
     @Override
@@ -158,12 +159,12 @@ public class AscFragment extends BaseFragment {
         }
     }
 
+
     //视图显示时才查询数据库数据
     private void visible() {
+        cb.setChecked(false);
         getDataInSQL();
-        if (adapter == null) {
+        if(adapter!=null){
-            setListData();
-        } else {
             adapter.notifyDataSetChanged();
         }
     }
@@ -197,7 +198,7 @@ public class AscFragment extends BaseFragment {
     }
 
     //设置列表adapter
-    private void setListData() {
+    private void initListView() {
 
         headView = View.inflate(context, R.layout.xzjh_item, null);
         TextView tv = headView.findViewById(R.id.tv_jhlx);
@@ -252,6 +253,13 @@ public class AscFragment extends BaseFragment {
         lv.addHeaderView(headView, null, false);
         lv.setEmptyView(tvNodata);
         lv.setAdapter(adapter);
+        if(ajhscs!=null&& !ajhscs.isEmpty()){
+            tvNodata.setVisibility(View.GONE);
+            lv.setVisibility(View.VISIBLE);
+        }else{
+            tvNodata.setVisibility(View.VISIBLE);
+            lv.setVisibility(View.GONE);
+        }
     }
 
     private void uploadData() {

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

@@ -51,7 +51,7 @@ public class AxzFragment extends BaseFragment {
 
     private void findView() {
         lv = view.findViewById(R.id.lv);
-        tvNodata = view.findViewById(R.id.rb1);
+        tvNodata = view.findViewById(R.id.tv_nodata);
         btnXz = view.findViewById(R.id.btn_xz);
         btnDel = view.findViewById(R.id.btn_delete);
         btnXz.setOnClickListener(new View.OnClickListener() {
@@ -66,7 +66,7 @@ public class AxzFragment extends BaseFragment {
                     }
                 }
 
-                if (downjh.size() != 0) {
+                if (!downjh.isEmpty()) {
                     dialog = new WaitDialog(getActivity(), "下载计划中...");
                     dialog.show();
                     for (String jh : downjh) {
@@ -140,6 +140,9 @@ public class AxzFragment extends BaseFragment {
         head.setVisibility(View.VISIBLE);
         TextView textView = headView.findViewById(R.id.tv_jhlx);
         textView.setText("到期时间");
+        lv.setVisibility(View.GONE);
+        tvNodata.setVisibility(View.VISIBLE);
+
         cb = headView.findViewById(R.id.cb);
         cb.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -158,10 +161,6 @@ public class AxzFragment extends BaseFragment {
                 }
             }
         });
-    }
-
-    public void initData() {
-
 
         queue = NoHttp.newRequestQueue(1);
 
@@ -171,21 +170,55 @@ public class AxzFragment extends BaseFragment {
 
         dialog = new WaitDialog(context, "下载计划中...");
         dialog.setCancelable(false);
+        initListView();
+    }
 
+    public void initData() {
+        visible();
+    }
+
+    //获取数据库数据
+    private void getDataInSQL() {
+        ajhjh.clear();
         //如果数据库中有数据
         if (DataSupport.count("Ajhjh") != 0) {
             ajhjh.addAll(DataSupport.where("download = ?", 0 + "").find(Ajhjh.class));
-            setListData();
+            lv.setVisibility(View.VISIBLE);
+            tvNodata.setVisibility(View.GONE);
+            //showToast("读取数据库有数据");
             //showToast("读取数据库数据");
         } else {
+            lv.setVisibility(View.GONE);
+            tvNodata.setVisibility(View.VISIBLE);
             requestData();
+            //showToast("读取数据库无数据");
             //showToast("请求接口数据");
         }
     }
 
+    @Override
+    public void setUserVisibleHint(boolean isVisibleToUser) {
+        super.setUserVisibleHint(isVisibleToUser);
+        if (getUserVisibleHint()) {
+
+        }
+    }
+
+    //视图显示时才查询数据库数据
+    private void visible() {
+        cb.setChecked(false);
+        getDataInSQL();
+        if(adapter!=null){
+            adapter.notifyDataSetChanged();
+        }
+    }
+
+    //https://mobile.zhp.geg.com.cn:7081/AJH/AJH_XZJH.ashx?BZMC=150101
+    //https://mobile.zhp.geg.com.cn:7081/AJH/AJH_XZJH.ashx?BZMC=12108080102
+
     private void requestData() {
         Request<String> request = NoHttp.createStringRequest(Contans.IP + Contans.AJHJHLIST);
-        request.add("BZMC", UiUtlis.encoder((String) SPUtils.get(context, Contans.BZBH, "")));
+        request.add("BZMC", UiUtlis.encoder((String) SPUtils.get(context, Contans.SCBZBH, "")));
         if(App.getInstance().getUserInfo()!=null&&App.getInstance().getUserInfo().getToken()!=null){
             String token = App.getInstance().getUserInfo().getToken();
             String credential = "Bearer " + token;
@@ -252,9 +285,11 @@ public class AxzFragment extends BaseFragment {
                             ajhjh.clear();
                             ajhjh.addAll(info.getRows());
                             DataSupport.saveAll(ajhjh);
-                            setListData();
+                            lv.setVisibility(View.VISIBLE);
-                        } else {
+                            tvNodata.setVisibility(View.GONE);
-                            //showToast("暂无数据");
+                            if(adapter!=null){
+                                adapter.notifyDataSetChanged();
+                            }
                         }
                     } else {
                         showToast(UiUtlis.getString(context, R.string.data_error));
@@ -310,7 +345,7 @@ public class AxzFragment extends BaseFragment {
         }
     };
 
-    private void setListData() {
+    private void initListView() {
 
         adapter = new AjhXzjhAdapter(context, ajhjh, new AjhXzjhAdapter.CallBack() {
             @Override

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

@@ -245,8 +245,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
 //            binding.etPassword.setText("sfd02910291Z+")
 //            binding.etUsername.setText("310465")
 //            binding.etPassword.setText("Liu524042*")
-//            binding.etUsername.setText("310291")
+//            binding.etUsername.setText("310126")
-//            binding.etPassword.setText("sfd02910291Z+")
+//            binding.etPassword.setText("Ymin1113@")
 
         }
 
@@ -368,6 +368,8 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                         if (userInfo.statusMsg == "success") {
                             showLog("--------userHeadUrl----------")
                             showLog(userInfo.userHeadUrl)
+                            showLog(userInfo.token)
+
                             //登录成功
                             val usernameLogin: String = binding.etUsername.text.toString().trim()
                             if (userInfo.manid != null && usernameLogin != null && userInfo.manid.equals(
@@ -421,19 +423,24 @@ class LoginActivity : BaseActivityOaToolbarViewBinding<ActivityLoginBinding>() {
                                     Contans.BZMC,
                                     if (userInfo.bzmc == null) "" else userInfo.bzmc
                                 )
+                                showLog("--------bzmc---------")
+                                showLog(userInfo.bzmc)
                                 SPUtils.put(
                                     context,
                                     Contans.SCBZBH,
                                     if (userInfo.scbzbh == null) "" else userInfo.scbzbh
                                 )
+                                showLog("--------scbzbh---------")
+                                showLog(userInfo.scbzbh)
                                 SPUtils.put(
                                     context,
                                     Contans.ISSCBM,
                                     if (userInfo.isScBm == null) "" else userInfo.isScBm
                                 )
 
-                                showLog("-----------")
+                                showLog("------login-----")
                                 showLog(userInfo.bzmc)
+                                showLog("------token-----")
                                 showLog(userInfo.token)
 //                        if (userInfo.isScBm == null) {
 //                            Log.i("app", "userInfo.isScBm is null")

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

@@ -438,6 +438,8 @@ class MainActivity : BaseActivityOaToolbarViewBinding<ActivityMainBinding>() {
                             } else {
                                 appURL = Contans.BASE_URL + appURL
                             }
+                            showLog("------appURL-----")
+                            showLog(appURL)
                             if (appVersionName != getVersionName()) {
                                 downloadAndInstall(
                                     appURL,

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

@@ -66,17 +66,17 @@ public class ApplyListUtils {
     //private final Api api;
     public UserInfoBean.UserInfo userInfo;
 
-    private final List<ApplyListBean.ApplyList> datas;
+    private List<ApplyListBean.ApplyList> datas;
-    private final List<ApplyListReceiveBean.RowsBean> receiveDatas;
+    private List<ApplyListReceiveBean.RowsBean> receiveDatas;
-    private final List<ApplyListConferenceBean.RowsBean> conferenceDatas;
+    private List<ApplyListConferenceBean.RowsBean> conferenceDatas;
-    private final List<ApplyOrdinaryVisitBean.RowsBean> ordinaryVisiDatas;
+    private List<ApplyOrdinaryVisitBean.RowsBean> ordinaryVisiDatas;
-    private final List<ApplyTravelListBean.RowsBean> travelListDatas;
+    private List<ApplyTravelListBean.RowsBean> travelListDatas;
-    private final List<ApplyListVehicleBean.RowsBean> vehicleDatas;
+    private List<ApplyListVehicleBean.RowsBean> vehicleDatas;
-    private final List<ApplyListOtherTaskBean.RowsBean> otherTaskDatas;
+    private List<ApplyListOtherTaskBean.RowsBean> otherTaskDatas;
-    private final List<ApplyListTakeOutBean.RowsBean> takeOutDatas;
+    private List<ApplyListTakeOutBean.RowsBean> takeOutDatas;
-    private final List<GetRadioListBean.RowsBean> getRadioDates;
+    private List<GetRadioListBean.RowsBean> getRadioDates;
-    private final List<MyadviceBean.RowsBean> myadviceDatas;
+    private List<MyadviceBean.RowsBean> myadviceDatas;
-    private final List<BfwwBean.RowsBean> bfwwDatas;
+    private List<BfwwBean.RowsBean> bfwwDatas;
     private ApplyListAdapter adapter;
     private ApplyReceiveAdapter receiveAdapter;
     private ApplyConferenceAdapter conferenceAdapter;
@@ -117,7 +117,7 @@ public class ApplyListUtils {
     private void init() {
 
         userInfo = App.getInstance().getUserInfo();
-        final String listcode = builder.params.get("listcode");
+        String listcode = builder.params.get("listcode");
         String proposerid = builder.params.get("proposerid");
         String times = builder.params.get("times");
         String timee = builder.params.get("timee");
@@ -133,6 +133,8 @@ public class ApplyListUtils {
         request.add("departmentnameid",departmentnameid);
 
 
+        showLog("---------listcode--------");
+        showLog(listcode);
 
         if (listcode.equals(Contans.LISTCODE.RECEIVEVISIT)) {
             //获取接待来访详情列表
@@ -207,6 +209,7 @@ public class ApplyListUtils {
                         ApplyListBean baseResult = GsonUtils.GsonToBean(result,ApplyListBean.class);
                         if (baseResult != null) {
                             if (!baseResult.getTotal().equals("0")) {
+                                showLog(String.valueOf(baseResult.getRows().size()));
                                 datas.clear();
                                 datas.addAll(baseResult.getRows());
                                 setListAdapter(listcode);
@@ -219,6 +222,7 @@ public class ApplyListUtils {
                         ApplyListBean baseResult = GsonUtils.GsonToBean(result,ApplyListBean.class);
                         if (baseResult != null) {
                             if (!baseResult.getTotal().equals("0")) {
+                                showLog(String.valueOf(baseResult.getRows().size()));
                                 datas.clear();
                                 datas.addAll(baseResult.getRows());
                                 setListAdapter(listcode);
@@ -238,6 +242,7 @@ public class ApplyListUtils {
                             ApplyListReceiveBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListReceiveBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     receiveDatas.clear();
                                     receiveDatas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -249,6 +254,8 @@ public class ApplyListUtils {
                             ApplyListConferenceBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListConferenceBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog("--------->>>-------");
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     conferenceDatas.clear();
                                     conferenceDatas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -260,6 +267,7 @@ public class ApplyListUtils {
                             ApplyOrdinaryVisitBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyOrdinaryVisitBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     ordinaryVisiDatas.clear();
                                     ordinaryVisiDatas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -271,6 +279,7 @@ public class ApplyListUtils {
                             ApplyTravelListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyTravelListBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     travelListDatas.clear();
                                     travelListDatas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -282,6 +291,7 @@ public class ApplyListUtils {
                             ApplyListVehicleBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListVehicleBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     vehicleDatas.clear();
                                     vehicleDatas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -293,6 +303,7 @@ public class ApplyListUtils {
                             ApplyListOtherTaskBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListOtherTaskBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     otherTaskDatas.clear();
                                     otherTaskDatas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -304,6 +315,7 @@ public class ApplyListUtils {
                             ApplyListTakeOutBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListTakeOutBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     takeOutDatas.clear();
                                     takeOutDatas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -315,6 +327,7 @@ public class ApplyListUtils {
                             ApplyListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     datas.clear();
                                     datas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -326,6 +339,7 @@ public class ApplyListUtils {
                             ApplyListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     datas.clear();
                                     datas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -337,6 +351,7 @@ public class ApplyListUtils {
                             MyadviceBean myadviceBean = GsonUtils.GsonToBean(jsonDecode,MyadviceBean.class);
                             if (myadviceBean != null) {
                                 if (!myadviceBean.getTotal().equals("0")) {
+                                    showLog(String.valueOf(myadviceBean.getRows().size()));
                                     myadviceDatas.clear();
                                     myadviceDatas.addAll(myadviceBean.getRows());
                                     setListAdapter(listcode);
@@ -349,6 +364,7 @@ public class ApplyListUtils {
                             ApplyListBean baseResult = GsonUtils.GsonToBean(jsonDecode,ApplyListBean.class);
                             if (baseResult != null) {
                                 if (!baseResult.getTotal().equals("0")) {
+                                    showLog(String.valueOf(baseResult.getRows().size()));
                                     datas.clear();
                                     datas.addAll(baseResult.getRows());
                                     setListAdapter(listcode);
@@ -688,7 +704,7 @@ public class ApplyListUtils {
      */
     private void setListAdapter(String listCode) {
 
-        if (listCode == Contans.LISTCODE.RECEIVEVISIT) {
+        if(listCode.equals(Contans.LISTCODE.RECEIVEVISIT)) {
 
             if (receiveAdapter == null) {
                 receiveAdapter = new ApplyReceiveAdapter(builder.context, receiveDatas);
@@ -705,7 +721,7 @@ public class ApplyListUtils {
                 receiveAdapter.notifyDataSetChanged();
             }
 
-        } else if (listCode == Contans.LISTCODE.APPLYCONFERENCE) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYCONFERENCE)) {
             if (conferenceAdapter == null) {
                 conferenceAdapter = new ApplyConferenceAdapter(builder.context, conferenceDatas);
                 builder.listView.setAdapter(conferenceAdapter);
@@ -720,7 +736,7 @@ public class ApplyListUtils {
             } else {
                 conferenceAdapter.notifyDataSetChanged();
             }
-        } else if (listCode == Contans.LISTCODE.ORDINARYVISIT) {
+        } else if (listCode.equals(Contans.LISTCODE.ORDINARYVISIT)) {
             if (ordinaryVisitAdapter == null) {
                 ordinaryVisitAdapter = new ApplyOrdinaryVisitAdapter(builder.context, ordinaryVisiDatas);
                 builder.listView.setAdapter(ordinaryVisitAdapter);
@@ -735,7 +751,7 @@ public class ApplyListUtils {
             } else {
                 ordinaryVisitAdapter.notifyDataSetChanged();
             }
-        } else if (listCode == Contans.LISTCODE.APPLYTRAVEL) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYTRAVEL)) {
 
             if (travelAdapter == null) {
                 travelAdapter = new ApplyTravelAdapter(builder.context, travelListDatas);
@@ -753,7 +769,7 @@ public class ApplyListUtils {
                 travelAdapter.notifyDataSetChanged();
             }
 
-        } else if (listCode == Contans.LISTCODE.APPLYVEHICLE) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYVEHICLE)) {
             if (vehicleAdapter == null) {
                 vehicleAdapter = new ApplyVehicleAdapter(builder.context, vehicleDatas);
                 builder.listView.setAdapter(vehicleAdapter);
@@ -767,7 +783,7 @@ public class ApplyListUtils {
             } else {
                 vehicleAdapter.notifyDataSetChanged();
             }
-        } else if (listCode == Contans.LISTCODE.OTHERTASK) {
+        } else if (listCode.equals(Contans.LISTCODE.OTHERTASK)) {
             if (otherTaskAdapter == null) {
                 otherTaskAdapter = new ApplyOtherTaskAdapter(builder.context, otherTaskDatas);
                 builder.listView.setAdapter(otherTaskAdapter);
@@ -781,7 +797,7 @@ public class ApplyListUtils {
             } else {
                 otherTaskAdapter.notifyDataSetChanged();
             }
-        } else if (listCode == Contans.LISTCODE.APPLYORDER) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYORDER)) {
             if (takeOutadapter == null) {
                 takeOutadapter = new ApplyTakeOutAdapter(builder.context, takeOutDatas);
                 builder.listView.setAdapter(takeOutadapter);
@@ -795,7 +811,7 @@ public class ApplyListUtils {
             } else {
                 takeOutadapter.notifyDataSetChanged();
             }
-        } else if (listCode == Contans.LISTCODE.APPLYDINNER) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYDINNER)) {
 
             if (applyDinnerListAdapter == null) {
                 applyDinnerListAdapter = new ApplyDinnerListAdapter(builder.context, datas);
@@ -814,7 +830,7 @@ public class ApplyListUtils {
             }
 
 
-        } else if (listCode == Contans.LISTCODE.APPLYSUPPLIES) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYSUPPLIES)) {
             if (adapter == null) {
                 adapter = new ApplyListAdapter(builder.context, datas);
                 builder.listView.setAdapter(adapter);
@@ -831,7 +847,7 @@ public class ApplyListUtils {
                 adapter.notifyDataSetChanged();
             }
 
-        } else if (listCode == Contans.LISTCODE.APPLYFACILITIES) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYFACILITIES)) {
 
             if (adapter == null) {
                 adapter = new ApplyListAdapter(builder.context, datas);
@@ -850,7 +866,7 @@ public class ApplyListUtils {
             }
 
 
-        } else if (listCode == Contans.LISTCODE.APPLYSUGGESTION) {
+        } else if (listCode.equals(Contans.LISTCODE.APPLYSUGGESTION)) {
 
             if (myadviceAdapter == null) {
 

app/src/main/res/layout/activity_apply_dinner_audit.xml

@@ -63,15 +63,60 @@
                 android:divider="#00ff" />
 
             <include layout="@layout/layout_audit"/>
-            <Button
+<!--            <Button-->
-                android:id="@+id/btn_shlc"
+<!--                android:id="@+id/btn_shlc"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="70px"-->
+<!--                android:layout_margin="10dp"-->
+<!--                android:layout_weight="1"-->
+<!--                android:background="@drawable/btn_blue"-->
+<!--                android:text="查看审批流程"-->
+<!--                android:textColor="@color/white" />-->
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="70px"
+                android:layout_height="40dp"
                 android:layout_margin="10dp"
+                android:background="@color/colorPrimary"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:id="@+id/ll_shlc"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
                     android:layout_weight="1"
-                android:background="@drawable/btn_blue"
+                    android:background="@color/colorPrimary"
-                android:text="查看审批流程"
+                    android:orientation="vertical">
-                android:textColor="@color/white" />
+                    <TextView
+                        android:id="@+id/tv_shlc"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:textSize="16sp"
+                        android:text="查看审批流程"/>
+
+                </LinearLayout>
+                <View
+                    android:layout_width="5dp"
+                    android:layout_height="match_parent"
+                    android:background="#ffffff" />
+                <LinearLayout
+                    android:id="@+id/ll_audit_kq"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:visibility="visible"
+                    android:layout_weight="1"
+                    android:background="@color/colorPrimary"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/tv_audit_kq"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:textSize="16sp"
+                        android:text="审核"/>
+                </LinearLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout/activity_apply_leave_audit.xml

@@ -105,15 +105,51 @@
 
             <include layout="@layout/layout_audit" />
 
-            <Button
+            <LinearLayout
-                android:id="@+id/btn_shlc"
                 android:layout_width="match_parent"
-                android:layout_height="70px"
+                android:layout_height="40dp"
                 android:layout_margin="10dp"
+                android:background="@color/colorPrimary"
+                android:orientation="horizontal">
+                <LinearLayout
+                    android:id="@+id/ll_shlc"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
                     android:layout_weight="1"
-                android:background="@drawable/btn_blue"
+                    android:background="@color/colorPrimary"
-                android:text="查看审批流程"
+                    android:orientation="vertical">
-                android:textColor="@color/white" />
+                    <TextView
+                        android:id="@+id/tv_shlc"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:textSize="16sp"
+                        android:text="查看审批流程"/>
+
+                </LinearLayout>
+                <View
+                    android:layout_width="5dp"
+                    android:layout_height="match_parent"
+                    android:background="#ffffff" />
+                <LinearLayout
+                    android:id="@+id/ll_audit_kq"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:visibility="visible"
+                    android:layout_weight="1"
+                    android:background="@color/colorPrimary"
+                    android:orientation="vertical">
+                    <TextView
+                        android:id="@+id/tv_audit_kq"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:textColor="@color/white"
+                        android:gravity="center"
+                        android:textSize="16sp"
+                        android:text="审核"/>
+                </LinearLayout>
+            </LinearLayout>
 
         </LinearLayout>
     </ScrollView>

app/src/main/res/layout/fragment_axz.xml

@@ -2,8 +2,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
+    android:orientation="vertical">
-    >
 
     <FrameLayout
         android:layout_width="match_parent"