提交分类： 测试版本；

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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingAddActivity.java

@@ -61,8 +61,8 @@ import java.util.regex.Pattern;
  * @desc:小秘书新增界面
  * @author：Arison on 2017/6/22
  */
-public class BookingAddActivity extends SupportToolBarActivity implements  View.OnClickListener {
-    
+public class BookingAddActivity extends SupportToolBarActivity implements View.OnClickListener {
+
     private TextView tvBookObject;
     private RelativeLayout companyAddRl;
     private RelativeLayout rlObject;
@@ -83,23 +83,24 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
     private NScrollerGridView gv_topic;
     List<DataState> dataStates;
     GridDataAdapter adapter;
-    private String[] mTypes ;
+    private String[] mTypes;
     private String phone;
+    private String mWhichPage;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_book_add);
         setTitle(getString(R.string.booking_add));
-        tvBookObject =findViewById(R.id.tv_book_object);
-        companyAddRl =findViewById(R.id.company_add_rl);
-        tvBookTimes =findViewById(R.id.tv_book_times);
+        tvBookObject = findViewById(R.id.tv_book_object);
+        companyAddRl = findViewById(R.id.company_add_rl);
+        tvBookTimes = findViewById(R.id.tv_book_times);
         remarkRl = findViewById(R.id.remark_rl);
-        rlObject =findViewById(R.id.rl_object);
+        rlObject = findViewById(R.id.rl_object);
 
         topic_rl = findViewById(R.id.topic_rl);
-        tvBookAddress =findViewById(R.id.tv_book_address);
-        et_book_content =findViewById(R.id.et_book_content);
+        tvBookAddress = findViewById(R.id.tv_book_address);
+        et_book_content = findViewById(R.id.et_book_content);
 
         tv_book_topic = findViewById(R.id.tv_book_topic);
         gv_topic = findViewById(R.id.gv_topic);
@@ -113,6 +114,7 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
         topic_rl.setOnClickListener(this);
         if (getIntent() != null && getIntent().getExtras() != null) {
             model = getIntent().getExtras().getParcelable("model");
+            mWhichPage = getIntent().getStringExtra("whichPage");
             if (model != null) {
                 tvBookObject.setText(model.getAb_bman());
                 tvBookTimes.setText(model.getAb_starttime().substring(0, 10) + " " + model.getAb_starttime().substring(11, 16) + "-"
@@ -152,7 +154,6 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
         });
     }
 
-  
 
     @Override
     public void onClick(View view) {
@@ -212,7 +213,9 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
                 break;
         }
     }
+
     private PopupWindow popupWindow;
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (data == null) return;
@@ -227,7 +230,7 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
                     popupWindow.dismiss();
                     popupWindow = null;
                 }
-                SelectAimModel chcheAimModel=new SelectAimModel();
+                SelectAimModel chcheAimModel = new SelectAimModel();
                 chcheAimModel.setLatLng(poi.location);
                 chcheAimModel.setName(poi.address);
                 chcheAimModel.setAddress(poi.name);
@@ -414,7 +417,8 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
                                 invite(phone, "8636ba7f-a1b4-4062-8571-782035101167");
                             }
                             startActivity(new Intent(BookingAddActivity.this, BookingListActivity.class)
-                                    .putExtra("curDate", startTime));
+                                    .putExtra("curDate", startTime)
+                                    .putExtra("whichPage", mWhichPage));
                         } else {
                             ToastMessage("预约失败！");
                             bt_commit.setEnabled(true);
@@ -549,7 +553,7 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
         final String name = CommonUtil.getName();
         final String phone = user.trim().replaceAll(" ", "");
         if (!StringUtil.isMobileNumber(phone)) {
-           // showToast(, R.color.load_submit);
+            // showToast(, R.color.load_submit);
             showToast("选择人员电话号码为空或是格式不正确");
             return;
         }
@@ -557,7 +561,7 @@ public class BookingAddActivity extends SupportToolBarActivity implements  View.
                 Request.Method.POST, "http://message.ubtob.com/sms/send", new Response.ErrorListener() {
             @Override
             public void onErrorResponse(VolleyError arg0) {
-              // dimssLoading();
+                // dimssLoading();
             }
         }, new StringJsonObjectRequest.Listener<AddAttentionResult>() {
             @Override

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/secretary/BookingListActivity.java

@@ -42,6 +42,7 @@ import com.modular.booking.activity.shares.MuiltSelectShareActivity;
 import com.modular.booking.adapter.BookAdapter;
 import com.modular.booking.model.BookingModel;
 import com.modular.booking.model.SBListModel;
+import com.uas.appworks.activity.TimeHelperActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
@@ -260,10 +261,12 @@ public class BookingListActivity extends SupportToolBarActivity implements View.
     public void onClick(View v) {
         switch (v.getId()) {
             case R.id.mBookPersonal:
-                startActivity(new Intent(mContext, BookingAddActivity.class));
+                startActivity(new Intent(mContext, BookingAddActivity.class)
+                        .putExtra("whichPage", mWhichPage));
                 break;
             case R.id.mBookBusiness:
-                startActivity(new Intent(mContext, BBookingAddActivity.class));
+                startActivity(new Intent(mContext, BBookingAddActivity.class)
+                        .putExtra("whichPage", mWhichPage));
                 break;
             case R.id.mBookService:
                 startActivity(new Intent(mContext, BServicesActivity.class));
@@ -614,6 +617,12 @@ public class BookingListActivity extends SupportToolBarActivity implements View.
             overridePendingTransition(R.anim.anim_activity_out, R.anim.anim_activity_in);
             finish();
             return super.onKeyDown(keyCode, event);
+        } else if (keyCode == KeyEvent.KEYCODE_BACK && "timeHelper".equals(mWhichPage)) {
+            Intent it = new Intent(BookingListActivity.this, TimeHelperActivity.class);
+            startActivity(it);
+            overridePendingTransition(R.anim.anim_activity_out, R.anim.anim_activity_in);
+            finish();
+            return super.onKeyDown(keyCode, event);
         } else {
             return super.onKeyDown(keyCode, event);
         }

app_core/common/src/main/java/com/core/widget/arcmenu/ArcLayout.java

@@ -62,7 +62,7 @@ public class ArcLayout extends ViewGroup {
 
     private float mToDegrees = DEFAULT_TO_DEGREES;
 
-    private static final int MIN_RADIUS = 160;
+    private static final int MIN_RADIUS = 180;
 
     /* the distance between the layout's center and any child's center */
     private int mRadius;

app_modular/appbooking/src/main/java/com/modular/booking/activity/business/BBookingAddActivity.java

@@ -85,6 +85,7 @@ public class BBookingAddActivity extends SupportToolBarActivity implements View.
     GridDataAdapter adapter;
     private String phone;
     private String[] mTypes;
+    private String mWhichPage;
 
 
     @Override
@@ -137,6 +138,7 @@ public class BBookingAddActivity extends SupportToolBarActivity implements View.
 
         if (getIntent() != null && getIntent().getExtras() != null) {
             model = getIntent().getExtras().getParcelable("model");
+            mWhichPage = getIntent().getStringExtra("whichPage");
             if (model != null) {
                 tvBookObject.setText(model.getAb_bman());
                 tvBookTimes.setText(model.getAb_starttime().substring(0, 10) + " " + model.getAb_starttime().substring(11, 16) + "-"
@@ -418,6 +420,7 @@ public class BBookingAddActivity extends SupportToolBarActivity implements View.
                         }
                         Intent intent = new Intent("com.modular.booking.BookingListActivity");
                         intent.putExtra("curDate", startTime);
+                        intent.putExtra("whichPage", mWhichPage);
                         startActivity(intent);
                     }
                 }

app_modular/appworks/src/main/AndroidManifest.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.uas.appworks">
+<manifest package="com.uas.appworks"
+          xmlns:android="http://schemas.android.com/apk/res/android">
+
     <uses-permission android:name="android.permission.READ_CALENDAR" />
     <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+
     <application
         android:allowBackup="true"
         android:label="@string/app_name"
@@ -466,11 +468,14 @@
         <activity android:name=".activity.RegisterDetailActivity" />
         <activity android:name=".activity.EnterpriseInviteStatisticsActivity" />
         <activity android:name=".activity.ScheduleSearchActivity" />
-        <activity android:name=".activity.ScheduleSettingActivity"
-            android:label="@string/scheduler_setting"/>
-        <activity android:name=".activity.SchedulerCreateActivity"
-            android:label="@string/create_scheduler"/>
-        <activity android:name=".activity.ScheduleActivity"
+        <activity
+            android:name=".activity.ScheduleSettingActivity"
+            android:label="@string/scheduler_setting" />
+        <activity
+            android:name=".activity.SchedulerCreateActivity"
+            android:label="@string/create_scheduler" />
+        <activity
+            android:name=".activity.ScheduleActivity"
             android:label="@string/my_scheduler">
             <intent-filter>
                 <action android:name="com.modular.work.ScheduleActivity" />
@@ -480,7 +485,9 @@
         </activity>
 
         <!--时间助手-->
-        <activity android:name=".activity.TimeHelperActivity">
+        <activity
+            android:name=".activity.TimeHelperActivity"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="com.modular.work.TimeHelperActivity" />
                 <category android:name="android.intent.category.DEFAULT" />

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

@@ -45,7 +45,7 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
 
     private ArcMenu mArcMenu;
     private static final int[] ITEM_DRAWABLES = {
-            R.drawable.ic_timehelper_metting,
+//            R.drawable.ic_timehelper_metting,
             R.drawable.ic_timehelper_order,
             R.drawable.ic_timehelper_schedule};
     private RecyclerView mRecyclerView;
@@ -163,16 +163,16 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                 public void onClick(View v) {
                     mGrayView.setVisibility(View.GONE);
                     switch (position) {
+//                        case 0:
+//                            startActivityForResult(
+//                                    new Intent("com.modular.oa.AddMeetingActivity"), 0x01);
+//                            break;
                         case 0:
-                            startActivityForResult(
-                                    new Intent("com.modular.oa.AddMeetingActivity"), 0x01);
-                            break;
-                        case 1:
                             startActivityForResult(
                                     new Intent("com.modular.booking.BookingListActivity")
                                             .putExtra("whichPage", "timeHelper"), 0x02);
                             break;
-                        case 2:
+                        case 1:
                             startActivityForResult(new Intent(ct, SchedulerCreateActivity.class)
                                     .putExtra(Constants.Intents.ENABLE, true), 0x03);
                             break;