1.增加字典缓存

2.仓房信息改为字典id

app/src/main/java/com/unis/sxzcl/ui/home/HomeFragment.java

@@ -133,30 +133,11 @@ public class HomeFragment extends BaseFragment<FragmentHomeBinding> {
     private void getData() {
 
         // 获取字典缓存
-        BasicModel.get().getDepotDic(new DataCallback<String>() {
-            @Override
-            public void onSuccess(String data) {
-
-            }
-        });
-        BasicModel.get().getDepartmentDic(new DataCallback<String>() {
-            @Override
-            public void onSuccess(String data) {
-
-            }
-        });
-        BasicModel.get().getHouseDic(new DataCallback<String>() {
-            @Override
-            public void onSuccess(String data) {
-
-            }
-        });
-        BasicModel.get().getPersonDic(new DataCallback<String>() {
-            @Override
-            public void onSuccess(String data) {
-
-            }
-        });
+        BasicModel.get().getDepotDic();
+        BasicModel.get().getDepartmentDic();
+        BasicModel.get().getHouseDic();
+        BasicModel.get().getPersonDic();
+        BasicModel.get().getEnumDic();
 
         // 查询统计信息
         getStatus();

app/src/main/java/com/unis/sxzcl/ui/house/HouseDetailFragment.java

@@ -7,7 +7,7 @@ import android.view.ViewGroup;
 import com.unis.model.BasicModel;
 import com.unis.model.DataCallback;
 import com.unis.model.HouseModel;
-import com.unis.model.bean.DictBean;
+import com.unis.model.bean.EnumBean;
 import com.unis.model.bean.HouseBean;
 import com.unis.sxzcl.base.BaseListFragment;
 import com.unis.sxzcl.base.base_detail.BaseDetail;
@@ -98,9 +98,14 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
                 if (data != null) {
                     mHouse = data;
                     List<BaseDetailBean> list = new ArrayList<>();
-                    list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_FOOD_TYPE, data.getGrainVarieties()).setDownIcon(true));
-                    list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_HOUSE_STATUS, data.getStorageStatus()).setDownIcon(true));
-                    list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_STORAGE, data.getWarehouseStatus()).setDownIcon(true));
+                    list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_FOOD_TYPE,
+                            BasicModel.get().getEnumName(data.getGrainVarieties())).setDownIcon(true));
+
+                    list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_HOUSE_STATUS,
+                            BasicModel.get().getEnumName(data.getStorageStatus())).setDownIcon(true));
+
+                    list.add(new BaseDetailBean(BaseDetail.TITLE_CONTENT, T_STORAGE,
+                            BasicModel.get().getEnumName(data.getWarehouseStatus())).setDownIcon(true));
                     mAdapter.setList(list);
                 }
                 loadComplete();
@@ -120,13 +125,13 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
      * 获取粮食品种信息 弹出下拉选项
      */
     private void getFootType(String title) {
-        BasicModel.get().getFoodTypeList(new DataCallback<List<DictBean>>() {
+        BasicModel.get().getFoodTypeList(new DataCallback<List<EnumBean>>() {
             @Override
-            public void onSuccess(List<DictBean> data) {
+            public void onSuccess(List<EnumBean> data) {
                 List<MultipleBean> list = new ArrayList<>();
                 for (int i = 0; i < data.size(); i++) {
-                    DictBean item = data.get(i);
-                    list.add(new MultipleBean(item.name, i + ""));
+                    EnumBean item = data.get(i);
+                    list.add(new MultipleBean(item.getEnumName(), item.getEnumId()));
                 }
                 showBottomDialog(title, mFoodTypeIndex, list);
             }
@@ -137,15 +142,15 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
      * 获取仓房状态 弹出下拉选项
      */
     private void getHouseStatus(String title) {
-        BasicModel.get().getHouseStatusList(new DataCallback<List<DictBean>>() {
+        BasicModel.get().getHouseStatusList(new DataCallback<List<EnumBean>>() {
             @Override
-            public void onSuccess(List<DictBean> data) {
+            public void onSuccess(List<EnumBean> data) {
                 if (!isActive()) return;
 
                 List<MultipleBean> list = new ArrayList<>();
                 for (int i = 0; i < data.size(); i++) {
-                    DictBean item = data.get(i);
-                    list.add(new MultipleBean(item.name, i + ""));
+                    EnumBean item = data.get(i);
+                    list.add(new MultipleBean(item.getEnumName(), item.getEnumId()));
                 }
                 showBottomDialog(title, mHouseStatusIndex, list);
             }
@@ -157,16 +162,16 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
      */
     private void getStorage(String title) {
 
-        BasicModel.get().getStorageList(new DataCallback<List<DictBean>>() {
+        BasicModel.get().getStorageList(new DataCallback<List<EnumBean>>() {
             @Override
-            public void onSuccess(List<DictBean> data) {
+            public void onSuccess(List<EnumBean> data) {
                 if (!isActive()) return;
                 String content = mAdapter.getData().get(0).getContent();
                 List<MultipleBean> list = new ArrayList<>();
                 for (int i = 0; i < data.size(); i++) {
-                    DictBean item = data.get(i);
-                    list.add(new MultipleBean(item.name, i + ""));
-                    if (content != null && content.equals(item.name))
+                    EnumBean item = data.get(i);
+                    list.add(new MultipleBean(item.getEnumName(), item.getEnumId()));
+                    if (content != null && content.equals(item.getEnumName()))
                         mStorageIndex = i;
                 }
                 showBottomDialog(title, mStorageIndex, list);
@@ -186,26 +191,27 @@ public class HouseDetailFragment extends BaseListFragment<FragmentBaseListBindin
                         }
                         int index = Integer.parseInt(b1.getExtras());
                         String name = b1.getName();
+                        String id = b1.getExtras();
                         switch (mMultipleListDialog.getTitle()) {
                             case T_FOOD_TYPE:
                                 mAdapter.getData().get(0).setContent(name);
                                 mAdapter.notifyItemChanged(0);
                                 mFoodTypeIndex = index;
-                                mHouse.setGrainVarieties(name);
+                                mHouse.setGrainVarieties(id);
                                 update();
                                 break;
                             case T_HOUSE_STATUS:
                                 mAdapter.getData().get(1).setContent(name);
                                 mAdapter.notifyItemChanged(1);
                                 mHouseStatusIndex = index;
-                                mHouse.setStorageStatus(name);
+                                mHouse.setStorageStatus(id);
                                 update();
                                 break;
                             case T_STORAGE:
                                 mAdapter.getData().get(2).setContent(name);
                                 mAdapter.notifyItemChanged(2);
                                 mStorageIndex = index;
-                                mHouse.setWarehouseStatus(name);
+                                mHouse.setWarehouseStatus(id);
                                 update();
                                 break;
                         }

app/src/main/java/com/unis/sxzcl/ui/house/HouseListFragment.java

@@ -10,8 +10,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.unis.model.BasicModel;
-import com.unis.model.DataCallback;
 import com.unis.model.bean.DictBean;
 import com.unis.model.bean.HouseBean;
 import com.unis.sxzcl.R;
@@ -149,46 +147,46 @@ public class HouseListFragment extends BaseListFragment<FragmentHouseListBinding
 //        });
 
         //仓房状态
-        BasicModel.get().getHouseStatusList(new DataCallback<List<DictBean>>() {
-            @Override
-            public void onSuccess(List<DictBean> data) {
-                if (!isActive())return;
-
-                mHouseStatusList = data;
-                mHouseStatusMenu.addData("全部");
-                for (DictBean item : data) {
-                    mHouseStatusMenu.addData(item.name);
-                }
-            }
-        });
-
-        //储存状态
-        BasicModel.get().getStorageList(new DataCallback<List<DictBean>>() {
-            @Override
-            public void onSuccess(List<DictBean> data) {
-                if (!isActive())return;
-
-                mStorageList = data;
-                mStorageMenu.addData("全部");
-                for (DictBean item : data) {
-                    mStorageMenu.addData(item.name);
-                }
-            }
-        });
-
-        //粮食品种
-        BasicModel.get().getFoodTypeList(new DataCallback<List<DictBean>>() {
-            @Override
-            public void onSuccess(List<DictBean> data) {
-                if (!isActive())return;
-
-                mFoodTypeList = data;
-                mFoodTypeMenu.addData("全部");
-                for (DictBean item : data) {
-                    mFoodTypeMenu.addData(item.name);
-                }
-            }
-        });
+//        BasicModel.get().getHouseStatusList(new DataCallback<List<DictBean>>() {
+//            @Override
+//            public void onSuccess(List<DictBean> data) {
+//                if (!isActive())return;
+//
+//                mHouseStatusList = data;
+//                mHouseStatusMenu.addData("全部");
+//                for (DictBean item : data) {
+//                    mHouseStatusMenu.addData(item.name);
+//                }
+//            }
+//        });
+//
+//        //储存状态
+//        BasicModel.get().getStorageList(new DataCallback<List<DictBean>>() {
+//            @Override
+//            public void onSuccess(List<DictBean> data) {
+//                if (!isActive())return;
+//
+//                mStorageList = data;
+//                mStorageMenu.addData("全部");
+//                for (DictBean item : data) {
+//                    mStorageMenu.addData(item.name);
+//                }
+//            }
+//        });
+//
+//        //粮食品种
+//        BasicModel.get().getFoodTypeList(new DataCallback<List<DictBean>>() {
+//            @Override
+//            public void onSuccess(List<DictBean> data) {
+//                if (!isActive())return;
+//
+//                mFoodTypeList = data;
+//                mFoodTypeMenu.addData("全部");
+//                for (DictBean item : data) {
+//                    mFoodTypeMenu.addData(item.name);
+//                }
+//            }
+//        });
     }
 
 

app/src/main/java/com/unis/sxzcl/ui/todo/TodoFinishListAdapter.java

@@ -143,7 +143,7 @@ public class TodoFinishListAdapter extends BaseQuickAdapter<AerationBean, BaseVi
             return;
         }
         long planDate = DateTool.getStamp(planTime, DateTool.YTDTD_DATE);
-        LogTool.d("业务计划时间:"+planDate);
+        LogTool.d("业务计划时间:" + planDate);
         // 没有完成时间 计算倒计时和或超时时间
         if (workTime == null) {
             long currentDate = DateTool.getCurrenTimeStamp();
@@ -164,7 +164,7 @@ public class TodoFinishListAdapter extends BaseQuickAdapter<AerationBean, BaseVi
             }
         } else {
             long workDate = DateTool.getStamp(workTime, DateTool.YTDTD_DATE);
-            LogTool.d("业务完成时间:"+workDate);
+            LogTool.d("业务完成时间:" + workDate);
             if (workDate > planDate) {
                 //超时
                 // 显示逾期

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

@@ -5,10 +5,11 @@ import com.google.gson.reflect.TypeToken;
 import com.lzy.okgo.OkGo;
 import com.lzy.okgo.model.Response;
 import com.lzy.okgo.request.GetRequest;
-import com.unis.model.bean.DictBean;
+import com.unis.model.bean.EnumBean;
 import com.xyxsbj.mylibrary.tool.SPTool;
 
 import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,14 +42,11 @@ public class BasicModel {
 
 
     private Map<String, String> depotMap;
-    private Map<String, String> houseMap;
-    private Map<String, String> departmentMap;
-    private Map<String, String> personMap;
 
     /**
      * 获取库字典
      */
-    public void getDepotDic(final DataCallback<String> callback) {
+    public void getDepotDic() {
         final GetRequest<String> request = OkGo.get(UrlPath.depot_dictionary);
         request.execute(new MyStringCallback() {
             @Override
@@ -57,13 +55,10 @@ public class BasicModel {
                 depotMap = new Gson().fromJson(json, new TypeToken<Map<String, String>>() {
                 }.getType());
                 SPTool.saveString(Constant.KEY_DEPOT_MAP, json);
-                callback.onSuccess(null);
             }
 
             @Override
             public void onError(Response<String> response) {
-                super.onError(response);
-                callback.onSuccess(null);
             }
         });
     }
@@ -82,10 +77,13 @@ public class BasicModel {
         return "";
     }
 
+
+    private Map<String, String> houseMap;
+
     /**
      * 获取仓房字典
      */
-    public void getHouseDic(final DataCallback<String> callback) {
+    public void getHouseDic() {
         final GetRequest<String> request = OkGo.get(UrlPath.house_dictionary);
         request.execute(new MyStringCallback() {
             @Override
@@ -94,14 +92,10 @@ public class BasicModel {
                 houseMap = new Gson().fromJson(json, new TypeToken<Map<String, String>>() {
                 }.getType());
                 SPTool.saveString(Constant.KEY_HOUSE_MAP, json);
-
-                callback.onSuccess(null);
             }
 
             @Override
             public void onError(Response<String> response) {
-                super.onError(response);
-                callback.onSuccess(null);
             }
         });
     }
@@ -120,10 +114,12 @@ public class BasicModel {
         return "";
     }
 
+    private Map<String, String> departmentMap;
+
     /**
      * 获取部门字典
      */
-    public void getDepartmentDic(final DataCallback<String> callback) {
+    public void getDepartmentDic() {
         final GetRequest<String> request = OkGo.get(UrlPath.department_dictionary);
         request.execute(new MyStringCallback() {
             @Override
@@ -132,13 +128,10 @@ public class BasicModel {
                 departmentMap = new Gson().fromJson(json, new TypeToken<Map<String, String>>() {
                 }.getType());
                 SPTool.saveString(Constant.KEY_DEPARTMENT_MAP, json);
-                callback.onSuccess(null);
             }
 
             @Override
             public void onError(Response<String> response) {
-                super.onError(response);
-                callback.onSuccess(null);
             }
         });
     }
@@ -157,11 +150,12 @@ public class BasicModel {
         return "";
     }
 
+    private Map<String, String> personMap;
 
     /**
      * 获取人员字典
      */
-    public void getPersonDic(final DataCallback<String> callback) {
+    public void getPersonDic() {
 //        String depotId = UserModel.get().getUser().getDepotId();
         GetRequest<String> request = OkGo.get(UrlPath.person_dictionary);
 //        request.params("depotId", depotId);
@@ -174,13 +168,10 @@ public class BasicModel {
                         new TypeToken<Map<String, String>>() {
                         }.getType());
                 SPTool.saveString(Constant.KEY_PERSON_MAP, json);
-                callback.onSuccess(null);
             }
 
             @Override
             public void onError(Response<String> response) {
-                super.onError(response);
-                callback.onSuccess(null);
             }
         });
     }
@@ -200,43 +191,117 @@ public class BasicModel {
             return "";
     }
 
+
+    private Map<String, List<EnumBean>> enumList;
+    private Map<String, String> enumAll;
+
     /**
-     * 仓房状态列表
+     * 获取枚举字典
+     */
+    public void getEnumDic() {
+
+        GetRequest<String> request = OkGo.get(UrlPath.enum_all);
+        request.execute(new MyStringCallback() {
+            @Override
+            protected void onSuccessResult(Response<String> response) throws JSONException {
+                Gson gson = new Gson();
+                String json = getDataJson(response);
+
+                JSONObject object = new JSONObject(json);
+                JSONObject parentMap = object.optJSONObject("parentMap");
+                if (parentMap != null) {
+                    enumList = gson.fromJson(parentMap.toString(), new TypeToken<Map<String, List<EnumBean>>>() {
+                    }.getType());
+                    SPTool.saveString(Constant.KEY_ENUM_LIST, parentMap.toString());
+                }
+
+                JSONObject enumMap = object.optJSONObject("enumMap");
+                if (enumMap != null) {
+                    enumAll = gson.fromJson(enumMap.toString(), new TypeToken<Map<String, String>>() {
+                    }.getType());
+                    SPTool.saveString(Constant.KEY_ENUM_ALL, enumMap.toString());
+                }
+
+            }
+
+            @Override
+            public void onError(Response<String> response) {
+            }
+        });
+    }
+
+    /**
+     * 根据id查询字典名称
+     *
+     * @param id
      */
-    public void getHouseStatusList(DataCallback<List<DictBean>> callBack) {
-        // TODO: 2020/11/27 仓房状态列表模拟数据
-        String[] status = new String[]{"空仓", "半仓", "满仓"};
-        List<DictBean> list = new ArrayList<>();
-        for (int i = 0; i < status.length; i++) {
-            list.add(new DictBean(i, status[i]));
+    public String getEnumName(String id) {
+        if (enumAll == null) {
+            String json = SPTool.getString(Constant.KEY_ENUM_ALL, "");
+            enumAll = new Gson().fromJson(json, new TypeToken<Map<String, String>>() {
+            }.getType());
         }
-        callBack.onSuccess(list);
+        if (enumAll != null)
+            return enumAll.get(id);
+        else
+            return "";
     }
 
     /**
-     * 储存状态列表
+     * 根据id查询字典列表
+     *
+     * @param id
      */
-    public void getStorageList(DataCallback<List<DictBean>> callBack) {
-        // TODO: 2020/11/27 储存状态列表模拟数据
-        String[] status = new String[]{"出库", "入库", "通风", "熏蒸", "内环流控温"};
-        List<DictBean> list = new ArrayList<>();
-        for (int i = 0; i < status.length; i++) {
-            list.add(new DictBean(i, status[i]));
+    public List<EnumBean> getEnumList(String id) {
+        if (enumList == null) {
+            String json = SPTool.getString(Constant.KEY_ENUM_LIST, "");
+            enumList = new Gson().fromJson(json, new TypeToken<Map<String, List<EnumBean>>>() {
+            }.getType());
         }
-        callBack.onSuccess(list);
+        if (enumList != null)
+            return enumList.get(id);
+        else
+            return new ArrayList<>();
+    }
+
+    /**
+     * 仓房状态列表
+     */
+    public void getHouseStatusList(DataCallback<List<EnumBean>> callBack) {
+//        String[] status = new String[]{"空仓", "半仓", "满仓"};
+//        List<DictBean> list = new ArrayList<>();
+//        for (int i = 0; i < status.length; i++) {
+//            list.add(new DictBean(i, status[i]));
+//        }
+
+        List<EnumBean> enumList = getEnumList("3");
+        callBack.onSuccess(enumList);
+    }
+
+    /**
+     * 储存状态列表
+     */
+    public void getStorageList(DataCallback<List<EnumBean>> callBack) {
+//        String[] status = new String[]{"出库", "入库", "通风", "熏蒸", "内环流控温"};
+//        List<DictBean> list = new ArrayList<>();
+//        for (int i = 0; i < status.length; i++) {
+//            list.add(new DictBean(i, status[i]));
+//        }
+        List<EnumBean> enumList = getEnumList("4");
+        callBack.onSuccess(enumList);
     }
 
     /**
      * 粮食品种列表
      */
-    public void getFoodTypeList(DataCallback<List<DictBean>> callBack) {
-        // TODO: 2020/11/27 粮食品种列表模拟数据
-        String[] status = new String[]{"小麦", "玉米", "豆油"};
-        List<DictBean> list = new ArrayList<>();
-        for (int i = 0; i < status.length; i++) {
-            list.add(new DictBean(i, status[i]));
-        }
-        callBack.onSuccess(list);
+    public void getFoodTypeList(DataCallback<List<EnumBean>> callBack) {
+//        String[] status = new String[]{"小麦", "玉米", "豆油"};
+//        List<DictBean> list = new ArrayList<>();
+//        for (int i = 0; i < status.length; i++) {
+//            list.add(new DictBean(i, status[i]));
+//        }
+        List<EnumBean> enumList = getEnumList("2");
+        callBack.onSuccess(enumList);
     }
 
 

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

@@ -48,8 +48,12 @@ public class Constant {
     public static final String KEY_HOUSE_MAP = "house_map";
     // 部门字典
     public static final String KEY_DEPARTMENT_MAP = "department_map";
-    // 人员列表
+    // 人员字典
     public static final String KEY_PERSON_MAP = "person_map";
+    // 枚举下拉列表字典
+    public static final String KEY_ENUM_LIST = "enum_list";
+    // 枚举字典
+    public static final String KEY_ENUM_ALL = "enum_all";
 
 
     // 所选库

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

@@ -25,6 +25,9 @@ public class UrlPath {
     //版本信息
     public static final String version_info = host + "/apk/version_info.json";
 
+    // 枚举
+    public static final String enum_all = host + "/api/csc-szls-system-manage/basicsEnum/authority/getAll";
+
 
     /****************** 登录 ******************/
     // 登录

model/src/main/java/com/unis/model/bean/EnumBean.java

@@ -0,0 +1,46 @@
+package com.unis.model.bean;
+
+/**
+ * 包名: com.unis.model.bean
+ * 类名: EnumBean
+ * 作用描述:
+ * 创建人: mQ
+ * 创建时间: 2021/1/6 19:59
+ * 更新人:
+ * 更新时间: 2021/1/6 19:59
+ * 更新说明:
+ * 版本号: 1.0
+ */
+public class EnumBean {
+
+    // id
+    private String enumId;
+    // 名称
+    private String enumName;
+    // 所属父id
+    private String parentId;
+
+    public String getEnumId() {
+        return enumId;
+    }
+
+    public void setEnumId(String enumId) {
+        this.enumId = enumId;
+    }
+
+    public String getEnumName() {
+        return enumName;
+    }
+
+    public void setEnumName(String enumName) {
+        this.enumName = enumName;
+    }
+
+    public String getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+}

mylibrary/src/main/java/com/xyxsbj/mylibrary/tool/DateTool.java

@@ -342,9 +342,13 @@ public class DateTool {
         return null;
     }
 
-    public static String getTimeDiffer(long differ) {
-
-        // 时间差文字
+    /**
+     *  传入相差的结果
+     * @param diff
+     * @return
+     */
+    public static String getTimeDiffer(long diff) {
+        // 时间差文本
         String result = "";
 
         // 初始化所有类型的毫秒值
@@ -354,57 +358,50 @@ public class DateTool {
         long hour_ms = 60 * min_ms;     // 1小时的毫秒
         long day_ms = 24 * hour_ms;     // 1天的毫秒
         long week_ms = 7 * day_ms;      // 1周的毫秒
-        long month_ms = 31 * day_ms;    // 1月的毫秒
-        long year_ms = 12 * month_ms;   // 1年的毫秒
+        long month_ms = 30 * day_ms;    // 1月的毫秒
+        long year_ms = 365 * day_ms;    // 1年的毫秒
 
         // 有多少年
-        long count = differ / year_ms;
+        long count = diff / year_ms;
         if (count > 0) {
-            differ = differ - (count * year_ms);
+            diff = diff - (count * year_ms);
             result += count + "年";
         }
-
         // 有多少月
-        count = differ / month_ms;
+        count = diff / month_ms;
         if (count > 0) {
-            differ = differ - (count * month_ms);
+            diff = diff - (count * month_ms);
             result += count + "月";
         }
-
         // 有几周
-        count = differ / week_ms;
+        count = diff / week_ms;
         if (count > 0) {
-            differ = differ - (count * week_ms);
+            diff = diff - (count * week_ms);
             result += count + "周";
         }
-
         // 有几天
-        count = differ / day_ms;
+        count = diff / day_ms;
         if (count > 0) {
-            differ = differ - (count * day_ms);
+            diff = diff - (count * day_ms);
             result += count + "天";
         }
-
         // 有几小时
-        count = differ / hour_ms;
+        count = diff / hour_ms;
         if (count > 0) {
-            differ = differ - (count * hour_ms);
+            diff = diff - (count * hour_ms);
             result += count + "时";
         }
-
         // 有几分钟
-        count = differ / min_ms;
+        count = diff / min_ms;
         if (count > 0) {
-            differ = differ - (count * min_ms);
+            diff = diff - (count * min_ms);
             result += count + "分";
         }
-
 //        long resM = differ / m;
 //        if (resM > 0) {
 //            differ = differ - (resM * m);
 //            sb.append(resM).append("秒");
 //        }
-
         return result;
     }