提交分类： 测试版本；

提交内容：  时间助手bug解决
当前版本：  正式版本6.4.4
是否冲突：  否

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -953,31 +953,33 @@ public class MainActivity extends BaseActivity implements ImStatusListener, NetW
                     }
                 }
 
-                for (int i = 0; i < systemSchedule.size(); i++) {
-                    Schedule schedule = systemSchedule.get(i);
-                    TimeHelperBean timeHelperBean = new TimeHelperBean();
-                    timeHelperBean.setScheduleId(schedule.getId());
-                    timeHelperBean.setImid(0);
-                    timeHelperBean.setType(schedule.getType());
-                    timeHelperBean.setAllDay(schedule.getAllDay());
-                    timeHelperBean.setRepeat(schedule.getRepeat());
-                    timeHelperBean.setTitle(schedule.getTitle());
-                    timeHelperBean.setTag(schedule.getTag());
-                    timeHelperBean.setRemarks(schedule.getRemarks());
-
-                    String startTime = DateFormatUtil.long2Str(schedule.getStartTime(), DateFormatUtil.YMD_HMS);
-                    timeHelperBean.setStartTime(startTime);
-
-                    timeHelperBean.setEndTime(DateFormatUtil.long2Str(schedule.getEndTime(), DateFormatUtil.YMD_HMS));
-                    timeHelperBean.setWarnTime(schedule.getWarnTime());
-                    timeHelperBean.setWarnRealTime(DateFormatUtil.long2Str(schedule.getWarnRealTime(), DateFormatUtil.YMD_HMS));
-                    timeHelperBean.setAddress(schedule.getAddress());
-                    timeHelperBean.setStatus(0);
-                    timeHelperBean.setDetail("");
-                    timeHelperBean.setScheduleType(2);
-                    timeHelperBean.setFromWhere(Schedule.TYPE_PHONE);
-
-                    timeHelperBeans.add(timeHelperBean);
+                if (systemSchedule!=null){
+                    for (int i = 0; i < systemSchedule.size(); i++) {
+                        Schedule schedule = systemSchedule.get(i);
+                        TimeHelperBean timeHelperBean = new TimeHelperBean();
+                        timeHelperBean.setScheduleId(schedule.getId());
+                        timeHelperBean.setImid(0);
+                        timeHelperBean.setType(schedule.getType());
+                        timeHelperBean.setAllDay(schedule.getAllDay());
+                        timeHelperBean.setRepeat(schedule.getRepeat());
+                        timeHelperBean.setTitle(schedule.getTitle());
+                        timeHelperBean.setTag(schedule.getTag());
+                        timeHelperBean.setRemarks(schedule.getRemarks());
+
+                        String startTime = DateFormatUtil.long2Str(schedule.getStartTime(), DateFormatUtil.YMD_HMS);
+                        timeHelperBean.setStartTime(startTime);
+
+                        timeHelperBean.setEndTime(DateFormatUtil.long2Str(schedule.getEndTime(), DateFormatUtil.YMD_HMS));
+                        timeHelperBean.setWarnTime(schedule.getWarnTime());
+                        timeHelperBean.setWarnRealTime(DateFormatUtil.long2Str(schedule.getWarnRealTime(), DateFormatUtil.YMD_HMS));
+                        timeHelperBean.setAddress(schedule.getAddress());
+                        timeHelperBean.setStatus(0);
+                        timeHelperBean.setDetail("");
+                        timeHelperBean.setScheduleType(2);
+                        timeHelperBean.setFromWhere(Schedule.TYPE_PHONE);
+
+                        timeHelperBeans.add(timeHelperBean);
+                    }
                 }
                 Collections.sort(timeHelperBeans);
 

app_modular/appworks/src/main/java/com/uas/appworks/activity/TimeHelperActivity.java

@@ -364,35 +364,37 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                                 }
                             }
 
-                            for (int i = 0; i < systemSchedule.size(); i++) {
-                                Schedule schedule = systemSchedule.get(i);
-                                TimeHelperBean timeHelperBean = new TimeHelperBean();
-                                timeHelperBean.setScheduleId(schedule.getId());
-                                timeHelperBean.setImid(0);
-                                timeHelperBean.setType(schedule.getType());
-                                timeHelperBean.setAllDay(schedule.getAllDay());
-                                timeHelperBean.setRepeat(schedule.getRepeat());
-                                timeHelperBean.setTitle(schedule.getTitle());
-                                timeHelperBean.setTag(schedule.getTag());
-                                timeHelperBean.setRemarks(schedule.getRemarks());
-
-                                String startTime = DateFormatUtil.long2Str(schedule.getStartTime(), DateFormatUtil.YMD_HMS);
-                                timeHelperBean.setStartTime(startTime);
-                                long startLong = schedule.getStartTime();
-                                if (currentTimeMillis > startLong) {
-                                    progress++;
-                                }
+                            if (systemSchedule != null){
+                                for (int i = 0; i < systemSchedule.size(); i++) {
+                                    Schedule schedule = systemSchedule.get(i);
+                                    TimeHelperBean timeHelperBean = new TimeHelperBean();
+                                    timeHelperBean.setScheduleId(schedule.getId());
+                                    timeHelperBean.setImid(0);
+                                    timeHelperBean.setType(schedule.getType());
+                                    timeHelperBean.setAllDay(schedule.getAllDay());
+                                    timeHelperBean.setRepeat(schedule.getRepeat());
+                                    timeHelperBean.setTitle(schedule.getTitle());
+                                    timeHelperBean.setTag(schedule.getTag());
+                                    timeHelperBean.setRemarks(schedule.getRemarks());
+
+                                    String startTime = DateFormatUtil.long2Str(schedule.getStartTime(), DateFormatUtil.YMD_HMS);
+                                    timeHelperBean.setStartTime(startTime);
+                                    long startLong = schedule.getStartTime();
+                                    if (currentTimeMillis > startLong) {
+                                        progress++;
+                                    }
 
-                                timeHelperBean.setEndTime(DateFormatUtil.long2Str(schedule.getEndTime(), DateFormatUtil.YMD_HMS));
-                                timeHelperBean.setWarnTime(schedule.getWarnTime());
-                                timeHelperBean.setWarnRealTime(DateFormatUtil.long2Str(schedule.getWarnRealTime(), DateFormatUtil.YMD_HMS));
-                                timeHelperBean.setAddress(schedule.getAddress());
-                                timeHelperBean.setStatus(0);
-                                timeHelperBean.setDetail("");
-                                timeHelperBean.setScheduleType(2);
-                                timeHelperBean.setFromWhere(Schedule.TYPE_PHONE);
+                                    timeHelperBean.setEndTime(DateFormatUtil.long2Str(schedule.getEndTime(), DateFormatUtil.YMD_HMS));
+                                    timeHelperBean.setWarnTime(schedule.getWarnTime());
+                                    timeHelperBean.setWarnRealTime(DateFormatUtil.long2Str(schedule.getWarnRealTime(), DateFormatUtil.YMD_HMS));
+                                    timeHelperBean.setAddress(schedule.getAddress());
+                                    timeHelperBean.setStatus(0);
+                                    timeHelperBean.setDetail("");
+                                    timeHelperBean.setScheduleType(2);
+                                    timeHelperBean.setFromWhere(Schedule.TYPE_PHONE);
 
-                                mTimeHelperBeans.add(timeHelperBean);
+                                    mTimeHelperBeans.add(timeHelperBean);
+                                }
                             }
                             Collections.sort(mTimeHelperBeans);
 
@@ -413,7 +415,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                     break;
             }
         } catch (Exception e) {
-
+            LogUtil.prinlnLongMsg("getbyday", e.toString());
         }
     }
 

app_modular/appworks/src/main/java/com/uas/appworks/fragment/BusinessMineListFragment.java

@@ -121,7 +121,7 @@ public class BusinessMineListFragment extends MvpBaseFragment<BusinessMineListCo
 
     @Override
     public void showLoading(String loadStr) {
-        if (mRefreshLayout != null && !mRefreshLayout.isRefreshing() && mRefreshLayout.isLoading()) {
+        if (mRefreshLayout != null && !(mRefreshLayout.isRefreshing() || mRefreshLayout.isLoading())) {
             progressDialog.show();
         }
     }