Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature_raomeng

# Conflicts:
#	WeiChat/version.properties

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

@@ -3,6 +3,7 @@ package com.uas.appworks.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.graphics.drawable.AnimationDrawable;
+import android.os.Bundle;
 import android.support.v7.widget.AppCompatTextView;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -25,10 +26,13 @@ import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.base.presenter.SimplePresenter;
 import com.core.base.view.SimpleView;
+import com.core.utils.ToastUtil;
 import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.arcmenu.ArcMenu;
 import com.me.network.app.base.HttpParams;
 import com.me.network.app.http.Method;
+import com.modular.booking.activity.business.BBookingDetailActivity;
+import com.modular.booking.model.BookingModel;
 import com.uas.appworks.R;
 import com.uas.appworks.adapter.TimeHelperAdapter;
 import com.uas.appworks.datainquiry.Constants;
@@ -132,9 +136,16 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                 TimeHelperBean timeHelperBean = mTimeHelperBeans.get(position);
 
                 Schedule schedule = getSchedule(timeHelperBean, true);
-                startActivityForResult(new Intent(mContext, SchedulerCreateActivity.class)
-                        .putExtra(Constants.Intents.ENABLE, false)
-                        .putExtra(Constants.Intents.MODEL, schedule), 0x33);
+                try {
+                    toDetailActivty(schedule);
+                } catch (Exception e) {
+                    startActivityForResult(new Intent(mContext, SchedulerCreateActivity.class)
+                            .putExtra(Constants.Intents.ENABLE, false)
+                            .putExtra(Constants.Intents.MODEL, schedule), 0x33);
+                }
+//                startActivityForResult(new Intent(mContext, SchedulerCreateActivity.class)
+//                        .putExtra(Constants.Intents.ENABLE, false)
+//                        .putExtra(Constants.Intents.MODEL, schedule), 0x33);
             }
         });
 
@@ -152,7 +163,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
     private Schedule getSchedule(TimeHelperBean timeHelperBean, boolean 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());
@@ -163,6 +174,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
         schedule.setWarnTime(timeHelperBean.getWarnTime());
         schedule.setWarnRealTime(DateFormatUtil.str2Long(timeHelperBean.getWarnRealTime(), DateFormatUtil.YMD_HMS));
         schedule.setAddress(timeHelperBean.getAddress());
+        schedule.setDetails(timeHelperBean.getDetail());
         schedule.setStatus(timeHelperBean.getStatus() + "");
 
         return schedule;
@@ -329,7 +341,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                                 timeHelperBean.setWarnRealTime(DateFormatUtil.long2Str(schedule.getWarnRealTime(), DateFormatUtil.YMD_HMS));
                                 timeHelperBean.setAddress(schedule.getAddress());
                                 timeHelperBean.setStatus(0);
-//                                timeHelperBean.setDetail(sche);
+                                timeHelperBean.setDetail("");
                                 timeHelperBean.setScheduleType(2);
                                 timeHelperBean.setFromWhere(Schedule.TYPE_PHONE);
 
@@ -428,10 +440,10 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
         mAnimationDrawable.stop();
     }
 
-/*    private void toDetailActivty(TimeHelperBean timeHelperBean) throws Exception {
-        if ("个人预约".equals(timeHelperBean.getType())) {
+    private void toDetailActivty(Schedule mSchedule) throws Exception {
+        if ("个人预约".equals(mSchedule.getType())) {
             Bundle bundle = new Bundle();
-            BookingModel model = getBookingModelByString(timeHelperBean.getDetails());
+            BookingModel model = getBookingModelByString(mSchedule.getDetails());
             if (model == null) {
                 ToastUtil.showToast(ct, R.string.error_message);
                 return;
@@ -439,32 +451,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
             bundle.putParcelable("model", model);
             startActivity(new Intent("com.modular.booking.BookingDetailActivity")
                     .putExtras(bundle));
-        } else if ("商务预约".equals(timeHelperBean.getType())) {
-            BookingModel mBookingModel = getBookingModelByString(timeHelperBean.getDetails());
-            if (mBookingModel == null) {
-                ToastUtil.showToast(ct, R.string.error_message);
-                return;
-            }
-            SBListModel model = new SBListModel();
-            model.setId(Integer.valueOf(mBookingModel.getAb_id()));
-            model.setAddress(mBookingModel.getAb_address());
-            model.setType(mBookingModel.getAb_content());//行业关键代码
-            model.setIndustrycode(mBookingModel.getAb_content());
-            model.setEndtime(mBookingModel.getAb_endtime());
-            model.setName(mBookingModel.getAb_bman());
-            startActivity(new Intent(ct, BServiceAddActivity.class)
-                    .putExtra("model", model)
-                    .putExtra("isEdited", false)
-                    .putExtra("dataService", mBookingModel.getData_service()));
-        } else {
-            startActivityForResult(new Intent(ct, SchedulerCreateActivity.class)
-                    .putExtra(Constants.Intents.ENABLE, false)
-                    .putExtra(Constants.Intents.MODEL, timeHelperBean), 0x11);
-        }
-    }
-
-    private void toDetailActivty(Schedule mSchedule) throws Exception {
-        if ("个人预约".equals(mSchedule.getType())) {
+        } else if ("商务预约".equals(mSchedule.getType())) {
             Bundle bundle = new Bundle();
             BookingModel model = getBookingModelByString(mSchedule.getDetails());
             if (model == null) {
@@ -472,29 +459,12 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                 return;
             }
             bundle.putParcelable("model", model);
-            startActivity(new Intent("com.modular.booking.BookingDetailActivity")
+            startActivity(new Intent(mContext, BBookingDetailActivity.class)
                     .putExtras(bundle));
-        } else if ("商务预约".equals(mSchedule.getType())) {
-            BookingModel mBookingModel = getBookingModelByString(mSchedule.getDetails());
-            if (mBookingModel == null) {
-                ToastUtil.showToast(ct, R.string.error_message);
-                return;
-            }
-            SBListModel model = new SBListModel();
-            model.setId(Integer.valueOf(mBookingModel.getAb_id()));
-            model.setAddress(mBookingModel.getAb_address());
-            model.setType(mBookingModel.getAb_content());//行业关键代码
-            model.setIndustrycode(mBookingModel.getAb_content());
-            model.setEndtime(mBookingModel.getAb_endtime());
-            model.setName(mBookingModel.getAb_bman());
-            startActivity(new Intent(ct, BServiceAddActivity.class)
-                    .putExtra("model", model)
-                    .putExtra("isEdited", false)
-                    .putExtra("dataService", mBookingModel.getData_service()));
         } else {
             startActivityForResult(new Intent(ct, SchedulerCreateActivity.class)
                     .putExtra(Constants.Intents.ENABLE, false)
-                    .putExtra(Constants.Intents.MODEL, mSchedule), 0x11);
+                    .putExtra(Constants.Intents.MODEL, mSchedule), 0x33);
         }
     }
 
@@ -523,7 +493,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
             return model;
         }
         return null;
-    }*/
+    }
 
     private void showDateDialog(String year, String month, String day) {
         OASigninPicker picker = new OASigninPicker((Activity) mContext, 2000, 2030);

app_modular/appworks/src/main/java/com/uas/appworks/model/bean/TimeHelperBean.java

@@ -1,5 +1,7 @@
 package com.uas.appworks.model.bean;
 
+import android.os.Parcel;
+import android.os.Parcelable;
 import android.support.annotation.NonNull;
 
 import com.common.data.DateFormatUtil;
@@ -10,7 +12,7 @@ import com.uas.appworks.model.Schedule;
  * @describe
  * @date 2018/8/23 11:26
  */
-public class TimeHelperBean implements Comparable<TimeHelperBean> {
+public class TimeHelperBean implements Comparable<TimeHelperBean>, Parcelable {
     public static final int TYPE_TIME_HELPER_ORDER = 1;
     public static final int TYPE_TIME_HELPER_SCHEDULE = 2;
     public static final int TYPE_TIME_HELPER_MEETING = 3;
@@ -51,6 +53,68 @@ public class TimeHelperBean implements Comparable<TimeHelperBean> {
     private int status;
     private int scheduleType;
 
+    public TimeHelperBean() {
+
+    }
+
+    protected TimeHelperBean(Parcel in) {
+        fromWhere = in.readString();
+        scheduleId = in.readInt();
+        imid = in.readInt();
+        type = in.readString();
+        allDay = in.readInt();
+        repeat = in.readString();
+        title = in.readString();
+        tag = in.readString();
+        remarks = in.readString();
+        startTime = in.readString();
+        endTime = in.readString();
+        warnTime = in.readInt();
+        warnRealTime = in.readString();
+        address = in.readString();
+        detail = in.readString();
+        status = in.readInt();
+        scheduleType = in.readInt();
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(fromWhere);
+        dest.writeInt(scheduleId);
+        dest.writeInt(imid);
+        dest.writeString(type);
+        dest.writeInt(allDay);
+        dest.writeString(repeat);
+        dest.writeString(title);
+        dest.writeString(tag);
+        dest.writeString(remarks);
+        dest.writeString(startTime);
+        dest.writeString(endTime);
+        dest.writeInt(warnTime);
+        dest.writeString(warnRealTime);
+        dest.writeString(address);
+        dest.writeString(detail);
+        dest.writeInt(status);
+        dest.writeInt(scheduleType);
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public static final Creator<TimeHelperBean> CREATOR = new Creator<TimeHelperBean>() {
+        @Override
+        public TimeHelperBean createFromParcel(Parcel in) {
+            return new TimeHelperBean(in);
+        }
+
+        @Override
+        public TimeHelperBean[] newArray(int size) {
+            return new TimeHelperBean[size];
+        }
+    };
+
     public String getFromWhere() {
         return fromWhere;
     }