提交分类： 测试版本；

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

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

@@ -91,7 +91,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
         mSchedule.setEndTime(System.currentTimeMillis() + 1000 * 10 * 60);
         mSchedule.setTag(types[0]);
         mSchedule.setRepeat(PreferenceUtils.getString(ct, PreferenceUtils.Constants.DEF_REPEAT_TIME, repeats[0]));
-        mSchedule.setWarnTime(getWarnForText(warnTime,0));
+        mSchedule.setWarnTime(getWarnForText(warnTime, 0));
         mSchedule.setType(getString(R.string.app_name));
     }
 
@@ -186,9 +186,9 @@ public class SchedulerCreateActivity extends BaseNetActivity {
             save();
         }
         if (item.getItemId() == R.id.edit) {
-            if (mSchedule==null||mSchedule.getType().equals(Schedule.TYPE_PHONE)){
+            if (mSchedule == null || mSchedule.getType().equals(Schedule.TYPE_PHONE)) {
                 showToast("手机日程请在系统日历上修改！！！");
-            }else if (mSchedule.getType().equals(Schedule.TYPE_BOOK)){
+            } else if (mSchedule.getType().equals(Schedule.TYPE_BOOK)) {
                 showToast("预约类型请进入小秘书界面操作！！！");
                 new VeriftyDialog.Builder(ct)
                         .setTitle(getString(R.string.app_name))
@@ -196,12 +196,13 @@ public class SchedulerCreateActivity extends BaseNetActivity {
                         .build(new VeriftyDialog.OnDialogClickListener() {
                             @Override
                             public void result(boolean clickSure) {
-                                if (clickSure){
-                                    startActivity(new Intent("com.modular.booking.BookingListActivity"));
+                                if (clickSure) {
+                                    startActivity(new Intent("com.modular.booking.BookingListActivity")
+                                            .putExtra("whichPage", "timeHelper"));
                                 }
                             }
                         });
-            }else{
+            } else {
                 showPopupWindow();
 
             }
@@ -275,11 +276,11 @@ public class SchedulerCreateActivity extends BaseNetActivity {
             String format = mSchedule.getAllDay() == 1 ? DateFormatUtil.YMD : DateFormatUtil.YMD_HM;
             startTimeTv.setText(DateFormatUtil.long2Str(mSchedule.getStartTime(), format));
             endTimeTv.setText(DateFormatUtil.long2Str(mSchedule.getEndTime(), format));
-            if (isChecked){
+            if (isChecked) {
                 mSchedule.setWarnTime(8);
                 mSchedule.setWarnRealTime(mSchedule.getStartTime());
                 warnTimeTv.setText(warns2[1]);
-            }else{
+            } else {
                 mSchedule.setWarnTime(0);
                 mSchedule.setWarnRealTime(mSchedule.getStartTime());
                 warnTimeTv.setText(warns[1]);
@@ -443,7 +444,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
                 warnRealTime = DateFormatUtil.str2Long(DateFormatUtil.long2Str(mSchedule.getStartTime(), DateFormatUtil.YMD) + " 09:00:00", DateFormatUtil.YMD_HMS) - minth * 24 * 60;
             }
         } else {
-            warnTime = getWarnForText(warnStr,warnTime);
+            warnTime = getWarnForText(warnStr, warnTime);
             warnRealTime = mSchedule.getStartTime() - warnTime * minth;
         }
         mSchedule.setWarnRealTime(warnRealTime);
@@ -472,7 +473,7 @@ public class SchedulerCreateActivity extends BaseNetActivity {
         requestHttp(mBuilder, mOnSmartHttpListener);
     }
 
-    private int getWarnForText(String text,int def) {
+    private int getWarnForText(String text, int def) {
         int warnTime = def;
         if (text.equals(warns[1])) {
             warnTime = 0;

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

@@ -136,9 +136,9 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
     }
 
     private Schedule getSchedule(TimeHelperBean timeHelperBean, boolean isUU) {
-        Schedule schedule = new Schedule(isUU);
+        Schedule schedule = new Schedule(timeHelperBean.getFromWhere());
         schedule.setId(timeHelperBean.getScheduleId());
-        schedule.setType(timeHelperBean.getType());
+//        schedule.setType(timeHelperBean.getType());
         schedule.setAllDay(timeHelperBean.getAllDay());
         schedule.setRepeat(timeHelperBean.getRepeat());
         schedule.setTitle(timeHelperBean.getTitle());
@@ -238,7 +238,6 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                                 JSONObject dataObject = dataArray.getJSONObject(i);
                                 if (dataObject != null) {
                                     TimeHelperBean timeHelperBean = new TimeHelperBean();
-                                    timeHelperBean.setFromWhere(Schedule.TYPE_UU);
                                     Object scheduleId = dataObject.get("scheduleId");
                                     if (scheduleId == null) {
                                         timeHelperBean.setScheduleId(-1);
@@ -265,7 +264,13 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                                     timeHelperBean.setWarnRealTime(JSONUtil.getText(dataObject, "warnRealTime"));
                                     timeHelperBean.setAddress(JSONUtil.getText(dataObject, "address"));
                                     timeHelperBean.setStatus(JSONUtil.getInt(dataObject, "status"));
-                                    timeHelperBean.setScheduleType(JSONUtil.getInt(dataObject, "genre"));
+                                    int genre = JSONUtil.getInt(dataObject, "genre");
+                                    timeHelperBean.setScheduleType(genre);
+                                    if (genre == 1) {
+                                        timeHelperBean.setFromWhere(Schedule.TYPE_BOOK);
+                                    } else if (genre == 2) {
+                                        timeHelperBean.setFromWhere(Schedule.TYPE_UU);
+                                    }
 
                                     mTimeHelperBeans.add(timeHelperBean);
 
@@ -305,6 +310,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                                 timeHelperBean.setAddress(schedule.getAddress());
                                 timeHelperBean.setStatus(0);
                                 timeHelperBean.setScheduleType(2);
+                                timeHelperBean.setFromWhere(Schedule.TYPE_PHONE);
 
                                 mTimeHelperBeans.add(timeHelperBean);
                             }