修改日程相关内容

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Oct 31 09:40:44 CST 2018
+#Fri Nov 09 17:21:17 CST 2018
 debugName=935
-versionName=646
+versionName=647
 debugCode=935
-versionCode=201
+versionCode=202

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -201,6 +202,9 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
 
 
     private void initView() {
+        if (getIntent()!=null){
+            whichPage=getIntent().getStringExtra("whichPage");
+        }
         start_tv = (TextView) findViewById(R.id.start_tv);
         create_ric_sv = (SwitchView) findViewById(R.id.create_ric_sv);
         end_tv = (TextView) findViewById(R.id.end_tv);
@@ -281,14 +285,20 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
 
     private boolean submiting = false;
 
+    private String whichPage="";
     private void endOfActivity() {
 //        Intent intent = new Intent();
 //        intent.putExtra("data", "data");
 //        setResult(0x14, intent);
 //        finish();
 //        progressDialog.dismiss();
-        startActivity(new Intent(ct, MeetingActivity.class));
-        finish();
+        if (!TextUtils.isEmpty(whichPage)&&whichPage.equals("ScheduleActivity")){
+            setResult(0x11);
+            finish();
+        }else{
+            startActivity(new Intent(ct, MeetingActivity.class));
+            finish();
+        }
     }
 
     //判断是否可以进行创建

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

@@ -47,6 +47,7 @@ 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.activity.services.BServicesActivity;
 import com.modular.booking.activity.shares.BBSharesListActivity;
 import com.modular.booking.model.BookingModel;
 import com.modular.booking.model.SBListModel;
@@ -130,15 +131,18 @@ public class ScheduleActivity extends BaseNetActivity {
                                 .putExtra("whichPage", "ScheduleActivity"), 0x11);
                         break;
                     case 1:
-                        startActivityForResult(new Intent(ct, SchedulerCreateActivity.class), 0x11);
+                        startActivity(new Intent(mContext, BServicesActivity.class));
                         break;
                     case 2:
-                        startActivityForResult(new Intent(ct, BBSharesListActivity.class).putParcelableArrayListExtra("model", mShareDatas), 0x11);
+                        startActivityForResult(new Intent(ct, SchedulerCreateActivity.class), 0x11);
                         break;
                     case 3:
-                        startActivityForResult(new Intent(ct, MissionActivity.class), 0x11);
+                        startActivityForResult(new Intent(ct, BBSharesListActivity.class).putParcelableArrayListExtra("model", mShareDatas), 0x11);
                         break;
                     case 4:
+                        startActivityForResult(new Intent(ct, MissionActivity.class), 0x11);
+                        break;
+                    case 5:
                         Intent intent = new Intent("com.modular.form.TravelDataFormDetailActivity");
                         if (ApiUtils.getApiModel() instanceof ApiUAS) {
                             String travelCaller = CommonUtil.getSharedPreferences(ct, com.core.app.Constants.WORK_TRAVEL_CALLER_CACHE);
@@ -149,8 +153,9 @@ public class ScheduleActivity extends BaseNetActivity {
                         intent.setAction("com.modular.form.DataFormDetailActivity");
                         startActivityForResult(intent, 0x11);
                         break;
-                    case 5:
-                        startActivityForResult(new Intent(ct, AddMeetingActivity.class), 0x11);
+                    case 6:
+                        startActivityForResult(new Intent(ct, AddMeetingActivity.class)
+                                .putExtra("whichPage", "ScheduleActivity"), 0x11);
                         break;
                 }
             }
@@ -187,6 +192,7 @@ public class ScheduleActivity extends BaseNetActivity {
     private List<EasyBaseModel> getAddItems() {
         List<EasyBaseModel> models = new ArrayList<>();
         models.add(new EasyBaseModel().setTitle("个人预约").setIconId(R.drawable.booking_personal));
+        models.add(new EasyBaseModel().setTitle("服务预约").setIconId(R.drawable.booking_service));
         models.add(new EasyBaseModel().setTitle("新建日程").setIconId(R.drawable.ic_create_scheduler_menu));
         models.add(new EasyBaseModel().setTitle("预约共享").setIconId(R.drawable.booking_share));
         models.add(new EasyBaseModel().setTitle("外勤计划").setIconId(R.drawable.ic_create_mission_menu));