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

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

@@ -32,6 +32,7 @@ import com.modular.apputils.network.Tags;
 import com.modular.apputils.widget.compactcalender.CompactCalendarView;
 import com.modular.apputils.widget.compactcalender.Lunar;
 import com.modular.apputils.widget.compactcalender.domain.Event;
+import com.modular.booking.activity.business.BBookingDetailActivity;
 import com.modular.booking.activity.services.BServiceAddActivity;
 import com.modular.booking.model.BookingModel;
 import com.modular.booking.model.SBListModel;
@@ -357,22 +358,15 @@ public class ScheduleActivity extends BaseNetActivity {
                 startActivity(new Intent("com.modular.booking.BookingDetailActivity")
                         .putExtras(bundle));
             } else if ("商务预约".equals(mSchedule.getType())) {
-                BookingModel mBookingModel = getBookingModelByString(mSchedule.getDetails());
-                if (mBookingModel==null){
+                Bundle bundle = new Bundle();
+                BookingModel model = getBookingModelByString(mSchedule.getDetails());
+                if (model==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()));
+                bundle.putParcelable("model", model);
+                startActivity(new Intent(ct, BBookingDetailActivity.class)
+                        .putExtras(bundle));
             } else {
                 startActivityForResult(new Intent(ct, SchedulerCreateActivity.class)
                         .putExtra(Constants.Intents.ENABLE, false)