· 修复没有版本信息时闪退的问题

 · 修改功能列表UI
 · 编写全面流程页面demo

app/src/main/java/com/unis/sxzcl/MyApp.java

@@ -4,6 +4,8 @@ import android.content.Context;
 
 import androidx.multidex.MultiDex;
 
+import com.lzy.okgo.OkGo;
+import com.lzy.okgo.model.HttpHeaders;
 import com.xyxsbj.mylibrary.BaseApp;
 
 
@@ -35,6 +37,15 @@ public class MyApp extends BaseApp {
     public void onCreate() {
         super.onCreate();
         MultiDex.install(this);
+
+        //初始化全局请求头
+        HttpHeaders headers = new HttpHeaders();
+        // app类型
+        headers.put("App", "Android");
+        // app版本
+        headers.put("AppVersion", BuildConfig.VERSION_NAME);
+        OkGo.getInstance().init(this)
+                .addCommonHeaders(headers);                       //全局公共参数
     }
 
     @Override
@@ -44,6 +55,4 @@ public class MyApp extends BaseApp {
     }
 
 
-
-
 }

app/src/main/java/com/unis/sxzcl/ui/aeration/AerationDetailFragment.java

@@ -14,7 +14,6 @@ import com.unis.model.DepotModel;
 import com.unis.model.HouseModel;
 import com.unis.model.ProcessModel;
 import com.unis.model.UserModel;
-import com.unis.model.bean.user.UserBean;
 import com.unis.model.bean.aeration.AerationBean;
 import com.unis.model.bean.detail.DetailApproveBean;
 import com.unis.model.bean.detail.DetailItemBean;
@@ -23,6 +22,7 @@ import com.unis.model.bean.process.ProcessDetailBean;
 import com.unis.model.bean.process.ProcessItemBean;
 import com.unis.model.bean.process.ProcessListBean;
 import com.unis.model.bean.process.ProcessStepBean;
+import com.unis.model.bean.user.UserBean;
 import com.unis.model.event.AerationEvent;
 import com.unis.sxzcl.R;
 import com.unis.sxzcl.base.BaseListFragment;
@@ -76,6 +76,7 @@ public class AerationDetailFragment extends BaseListFragment<FragmentAerationDet
         mBean = getGson().fromJson(data, AerationBean.class);
 
         if (mBean != null) {
+            mPageType  = "edit";
             // 不是申请人 只能查看
             String uid = UserModel.get().getUser().getUid().toString();
             if (!uid.equals(mBean.getApplyPeople())) {

app/src/main/java/com/unis/sxzcl/ui/allround/AllRoundFragment.java

@@ -0,0 +1,31 @@
+package com.unis.sxzcl.ui.allround;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.unis.sxzcl.base.BaseFragment;
+import com.unis.sxzcl.databinding.FragmentAllroundBinding;
+
+/**
+ * 全面流程Fragment
+ * 创建人: mQ
+ * 创建时间: 2021/1/26 14:28
+ */
+public class AllRoundFragment extends BaseFragment<FragmentAllroundBinding> {
+
+
+    @Override
+    protected FragmentAllroundBinding getViewBinding(LayoutInflater inflater, ViewGroup container) {
+        return FragmentAllroundBinding.inflate(inflater, container, false);
+    }
+
+    @Override
+    protected void init() {
+
+    }
+
+    @Override
+    protected void onFirstShow() {
+
+    }
+}

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkModuleAdapter.java

@@ -154,12 +154,15 @@ public class WorkModuleAdapter extends BaseNodeAdapter implements LoadMoreModule
 
             case WorkbenchModel.TYPE_YJCG:
                 // 药剂采购
+                currentFragmentId = R.id.allRoundFragment;
                 break;
             case WorkbenchModel.TYPE_YJBG:
                 // 药剂保管
+                currentFragmentId = R.id.allRoundFragment;
                 break;
             case WorkbenchModel.TYPE_YJLY:
                 // 药剂领用
+                currentFragmentId = R.id.allRoundFragment;
                 break;
 
             case WorkbenchModel.TYPE_SSGL:

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkModuleFragment.java

@@ -57,9 +57,7 @@ public class WorkModuleFragment extends BaseListFragment<FragmentWorkModuleBindi
         });
 
         //下拉刷新
-        initRefreshView(mBinding.refreshLayout, () -> {
-            onRefresh();
-        });
+        initRefreshView(mBinding.refreshLayout, this::onRefresh);
 
         mAdapter = new WorkModuleAdapter();
         mAdapter.setCallback((item, fragmentId) -> {
@@ -126,6 +124,8 @@ public class WorkModuleFragment extends BaseListFragment<FragmentWorkModuleBindi
             }
             mBinding.barCompany.setText(bean.depotName);
         }
+
+        // 刷新功能列表
         onRefresh();
     }
 
@@ -133,14 +133,15 @@ public class WorkModuleFragment extends BaseListFragment<FragmentWorkModuleBindi
     @Override
     protected void onShowFragment() {
         super.onShowFragment();
-        // 作业功能列表时 未选库弹出提示
-        MultiDepotBean selectDepot = DepotModel.get().getSelectDepot();
-        if (selectDepot == null) {
+        // 页面显示时 未选库弹出提示
+        if (DepotModel.get().getSelectDepot() == null) {
             showSelectDepotDialog();
         }
     }
 
-    // 弹出选择粮库对话框
+    /**
+     * 粮库选择提示框
+     */
     public void showSelectDepotDialog() {
         if (mSelectDepotDialog == null)
             mSelectDepotDialog = new SystemDialog(getContext())
@@ -155,22 +156,27 @@ public class WorkModuleFragment extends BaseListFragment<FragmentWorkModuleBindi
         mSelectDepotDialog.show();
     }
 
+
+    /**
+     * 获取功能列表
+     */
     public void onRefreshData() {
 
-        MultiDepotBean selectDepot = DepotModel.get().getSelectDepot();
-        if (selectDepot == null) {
+        // 未选库时 提示用户
+        if (DepotModel.get().getSelectDepot() == null) {
             showSelectDepotDialog();
             loadEnd();
             return;
         }
 
+        // 获取功能列表
         mAdapter.setList(WorkbenchModel.get().getModuleList());
         loadComplete();
     }
 
 
     /**
-     * 监听选库的事件 刷新作业功能
+     * 监听粮库选中事件 刷新功能列表
      *
      * @param bean
      */

app/src/main/java/com/unis/sxzcl/ui/work_module/WorkbenchModel.java

@@ -92,11 +92,11 @@ public class WorkbenchModel {
 //                new WorkModuleBean(TYPE_XZGL, R.drawable.ic_model_xzgl)
         )));
 
-//        list.add(new WorkModuleBean(TYPE_YJGL, Arrays.asList(
-//                new WorkModuleBean(TYPE_YJCG, R.drawable.ic_model_yjcg),
-//                new WorkModuleBean(TYPE_YJBG, R.drawable.ic_model_yjbg),
-//                new WorkModuleBean(TYPE_YJLY, R.drawable.ic_model_yjly)
-//        )));
+        list.add(new WorkModuleBean(TYPE_YJGL, Arrays.asList(
+                new WorkModuleBean(TYPE_YJCG, R.drawable.ic_model_yjcg),
+                new WorkModuleBean(TYPE_YJBG, R.drawable.ic_model_yjbg),
+                new WorkModuleBean(TYPE_YJLY, R.drawable.ic_model_yjly)
+        )));
 
 //        list.add(new WorkModuleBean(TYPE_SSSB, Arrays.asList(
 //                new WorkModuleBean(TYPE_SSGL, R.drawable.ic_model_ssgl),

app/src/main/java/com/unis/sxzcl/util/VersionCheckTool.java

@@ -96,7 +96,8 @@ public class VersionCheckTool {
             @Override
             public void onError(String error) {
                 super.onError(error);
-                mError.onError(error);
+                if (mError != null)
+                    mError.onError(error);
             }
         });
     }

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

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@null">
+
+            <com.unis.sxzcl.widget.BaseTitleBar
+                android:id="@+id/bar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:barTitle="全面流程"
+                app:layout_scrollFlags="scroll|enterAlways" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="200dp"
+                android:background="@color/colorBlue"
+                android:gravity="center"
+                android:text="流程节点"
+                android:textColor="@color/colorWhite"
+                android:textSize="?attr/textSizeXXX" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="700dp"
+                    android:background="@color/colorGreen"
+                    android:gravity="center"
+                    android:text="节点内容"
+                    android:textColor="@color/colorWhite"
+                    android:textSize="?attr/textSizeXXX" />
+
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+</LinearLayout>

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

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="8dp"
     android:background="@color/colorWhite"
     android:foreground="?android:selectableItemBackground"
     android:orientation="vertical">
@@ -15,15 +16,21 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
+        <View
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="8dp"
+            android:background="@drawable/accent_circle_bg" />
+
         <TextView
             android:id="@+id/tv_name"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="16dp"
             android:layout_weight="1"
             android:text="标题"
-            android:textColor="@color/colorText33"
-            android:textSize="?attr/textSizeXXX" />
+            android:textColor="@color/colorTheme"
+            android:textSize="?attr/textSizeXXX"/>
 
         <ImageView
             android:id="@+id/iv_flag"

app/src/main/res/navigation/nav_graph.xml

@@ -128,6 +128,9 @@
         <action
             android:id="@+id/action_workModuleFragment_to_aerationListFragment"
             app:destination="@id/aerationListFragment" />
+        <action
+            android:id="@+id/action_workModuleFragment_to_allRoundFragment"
+            app:destination="@id/allRoundFragment" />
     </fragment>
     <fragment
         android:id="@+id/exampleFragment"
@@ -193,6 +196,10 @@
             android:id="@+id/action_versionFragment_to_versionRecordFragment"
             app:destination="@id/versionRecordFragment" />
     </fragment>
+    <fragment
+        android:id="@+id/allRoundFragment"
+        android:name="com.unis.sxzcl.ui.allround.AllRoundFragment"
+        android:label="全面流程" />
 
 
 </navigation>

model/src/main/java/com/unis/model/UrlPath.java

@@ -15,7 +15,8 @@ public class UrlPath {
 
     //服务器地址
 //    public static final String host = "http://10.10.1.25:9066/";
-    public static final String host = "http://101.36.160.140:21021"; // 02服务器
+//    public static final String host = "http://101.36.160.140:21021"; // 02服务器
+    public static final String host = "http://101.36.160.140:21061"; // 02服务器
 
     //图片地址
     public static final String image_host = host + "/api/csc-szls-system-manage/minio/preViewPicture/";
@@ -81,7 +82,7 @@ public class UrlPath {
     /****************** 粮情检查 ******************/
     // 粮情检查记录
     public static final String grain_check_list = host + "/api/csc-szls-business/grainConditionRecord/authority/getPage";
-    // 粮情检查字典
+    // 粮情检查选项字典
     public static final String grain_check_dictionary = host + "/api/csc-szls-business/grainManageDictionary/authority/getPage";
     // 粮情检查新增
     public static final String grain_check_add = host + "/api/csc-szls-business/grainConditionRecord/authority_button/add";

model/src/main/java/com/unis/model/VersionModel.java

@@ -59,7 +59,7 @@ public class VersionModel {
                     @Override
                     public void onError(Response<String> response) {
                         super.onError(response);
-                        callBack.onError(getErrorMsg(response));
+                        callBack.onError(null);
                     }
                 });
     }

model/src/main/java/com/unis/model/bean/detail/DetailItemType.java

@@ -2,6 +2,9 @@ package com.unis.model.bean.detail;
 
 import androidx.annotation.IntDef;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 /**
  * 包名: com.unis.sxzcl.ui.grain_check
  * 类名: DetailItemType
@@ -18,6 +21,7 @@ import androidx.annotation.IntDef;
         DetailItemType.input,
         DetailItemType.approve,
 })
+@Retention(value = RetentionPolicy.SOURCE)
 public @interface DetailItemType {
 
     /******** 选项样式类型 *******/