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

# Conflicts:
#	app_modular/appworks/src/main/java/com/uas/appworks/activity/SchedulerCreateActivity.java

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);
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/WorkMenuParentAdapter.java

@@ -250,7 +250,9 @@ public class WorkMenuParentAdapter extends BaseAdapter {
                     String accountToken = CommonUtil.getAccountToken(context);
                     String enuu = CommonUtil.getEnuu(context);
                     String url = Constants.ACCOUNT_CENTER_HOST +
-                            "agency?token=" + accountToken + "&appId=mall&spaceUU=" + enuu + "&returnURL=https://www.usoftmall.com/";
+                            "agency?token=" + accountToken + "&appId=mall&spaceUU=" + enuu
+                            + "&returnURL=https://www.usoftmall.com/"
+                            + "&baseUrl=https://www.usoftmall.com/newLogin/other";
                     intent.putExtra("url", url);
                     intent.putExtra("p", context.getString(R.string.work_business_find));
                     intent.putExtra("cookie", true);

WeiChat/src/main/res/layout/fragment_work.xml

@@ -34,9 +34,9 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="46dp"
-            android:text="继续下拉进入时间助手"
+            android:text="下拉进入时间助手"
             android:textColor="@color/white"
-            android:textSize="14sp"
+            android:textSize="14dp"
             android:visibility="gone" />
     </RelativeLayout>
 

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri Aug 31 16:09:34 CST 2018
+#Mon Sep 03 15:54:18 CST 2018
 debugName=579
-versionName=651
+versionName=652
 debugCode=579
-versionCode=193
+versionCode=194

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

@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.core.app.MyApplication;
 import com.core.base.activity.BaseMVPActivity;
 import com.core.base.presenter.SimplePresenter;
@@ -30,10 +31,14 @@ import com.uas.appworks.adapter.TimeHelperAdapter;
 import com.uas.appworks.datainquiry.Constants;
 import com.uas.appworks.model.Schedule;
 import com.uas.appworks.model.bean.TimeHelperBean;
+import com.uas.appworks.utils.ScheduleUtils;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 
 /**
  * @author RaoMeng
@@ -45,7 +50,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;
@@ -120,22 +125,9 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
         mTimeHelperAdapter.setOnTimeClickListener(new TimeHelperAdapter.OnTimeClickListener() {
             @Override
             public void onTimeClick(int position) {
-                Schedule schedule = new Schedule(true);
                 TimeHelperBean timeHelperBean = mTimeHelperBeans.get(position);
-                schedule.setId(timeHelperBean.getScheduleId());
-                schedule.setType(timeHelperBean.getType());
-                schedule.setAllDay(timeHelperBean.getAllDay());
-                schedule.setRepeat(timeHelperBean.getRepeat());
-                schedule.setTitle(timeHelperBean.getTitle());
-                schedule.setTag(timeHelperBean.getTag());
-                schedule.setRemarks(timeHelperBean.getRemarks());
-                schedule.setStartTime(DateFormatUtil.str2Long(timeHelperBean.getStartTime(), DateFormatUtil.YMD_HMS));
-                schedule.setEndTime(DateFormatUtil.str2Long(timeHelperBean.getEndTime(), DateFormatUtil.YMD_HMS));
-                schedule.setWarnTime(timeHelperBean.getWarnTime());
-                schedule.setWarnRealTime(DateFormatUtil.str2Long(timeHelperBean.getWarnRealTime(), DateFormatUtil.YMD_HMS));
-                schedule.setAddress(timeHelperBean.getAddress());
-                schedule.setStatus(timeHelperBean.getStatus() + "");
 
+                Schedule schedule = getSchedule(timeHelperBean, true);
                 startActivityForResult(new Intent(mContext, SchedulerCreateActivity.class)
                         .putExtra(Constants.Intents.ENABLE, false)
                         .putExtra(Constants.Intents.MODEL, schedule), 0x33);
@@ -143,6 +135,25 @@ 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.setAllDay(timeHelperBean.getAllDay());
+        schedule.setRepeat(timeHelperBean.getRepeat());
+        schedule.setTitle(timeHelperBean.getTitle());
+        schedule.setTag(timeHelperBean.getTag());
+        schedule.setRemarks(timeHelperBean.getRemarks());
+        schedule.setStartTime(DateFormatUtil.str2Long(timeHelperBean.getStartTime(), DateFormatUtil.YMD_HMS));
+        schedule.setEndTime(DateFormatUtil.str2Long(timeHelperBean.getEndTime(), DateFormatUtil.YMD_HMS));
+        schedule.setWarnTime(timeHelperBean.getWarnTime());
+        schedule.setWarnRealTime(DateFormatUtil.str2Long(timeHelperBean.getWarnRealTime(), DateFormatUtil.YMD_HMS));
+        schedule.setAddress(timeHelperBean.getAddress());
+        schedule.setStatus(timeHelperBean.getStatus() + "");
+
+        return schedule;
+    }
+
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
         super.onWindowFocusChanged(hasFocus);
@@ -163,16 +174,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;
@@ -211,11 +222,28 @@ public class TimeHelperActivity extends BaseMVPActivity<SimplePresenter> impleme
                         if (dataArray != null && dataArray.size() > 0) {
                             long currentTimeMillis = System.currentTimeMillis();
                             int progress = -1;
+
+                            Calendar cal = Calendar.getInstance();
+                            cal.setTimeZone(TimeZone.getTimeZone("UTC+8"));
+                            cal.setTime(new Date());
+                            cal.set(Calendar.HOUR, 0);
+                            cal.set(Calendar.SECOND, 1);
+                            cal.set(Calendar.MINUTE, 0);
+                            cal.set(Calendar.MILLISECOND, 0);
+                            long startcal = cal.getTimeInMillis();
+                            long endcal = cal.getTimeInMillis() + 24 * 60 * 60 * 1000;
+                            List<Schedule> systemSchedule = ScheduleUtils.getSystemCalendar(MyApplication.getInstance(), startcal, endcal);
+
                             for (int i = 0; i < dataArray.size(); i++) {
                                 JSONObject dataObject = dataArray.getJSONObject(i);
                                 if (dataObject != null) {
                                     TimeHelperBean timeHelperBean = new TimeHelperBean();
-                                    timeHelperBean.setScheduleId(JSONUtil.getInt(dataObject, "scheduleId"));
+                                    Object scheduleId = dataObject.get("scheduleId");
+                                    if (scheduleId == null) {
+                                        timeHelperBean.setScheduleId(-1);
+                                    } else {
+                                        timeHelperBean.setScheduleId(JSONUtil.getInt(dataObject, "scheduleId"));
+                                    }
                                     timeHelperBean.setImid(JSONUtil.getInt(dataObject, "imid"));
                                     timeHelperBean.setType(JSONUtil.getText(dataObject, "type"));
                                     timeHelperBean.setAllDay(JSONUtil.getInt(dataObject, "allDay"));
@@ -236,10 +264,55 @@ 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);
+
+                                    if (!ListUtils.isEmpty(systemSchedule)) {
+                                        for (Schedule e : systemSchedule) {
+                                            if (e.getId() == timeHelperBean.getScheduleId()) {
+                                                systemSchedule.remove(e);
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+
+                            for (int i = 0; i < systemSchedule.size(); i++) {
+                                Schedule schedule = systemSchedule.get(i);
+                                TimeHelperBean timeHelperBean = new TimeHelperBean();
+                                timeHelperBean.setScheduleId(schedule.getId());
+                                timeHelperBean.setImid(0);
+                                timeHelperBean.setType(schedule.getType());
+                                timeHelperBean.setAllDay(schedule.getAllDay());
+                                timeHelperBean.setRepeat(schedule.getRepeat());
+                                timeHelperBean.setTitle(schedule.getTitle());
+                                timeHelperBean.setTag(schedule.getTag());
+                                timeHelperBean.setRemarks(schedule.getRemarks());
+
+                                String startTime = DateFormatUtil.long2Str(schedule.getStartTime(), DateFormatUtil.YMD_HMS);
+                                timeHelperBean.setStartTime(startTime);
+                                long startLong = schedule.getStartTime();
+                                if (currentTimeMillis > startLong) {
+                                    progress++;
                                 }
+
+                                timeHelperBean.setEndTime(DateFormatUtil.long2Str(schedule.getEndTime(), DateFormatUtil.YMD_HMS));
+                                timeHelperBean.setWarnTime(schedule.getWarnTime());
+                                timeHelperBean.setWarnRealTime(DateFormatUtil.long2Str(schedule.getWarnRealTime(), DateFormatUtil.YMD_HMS));
+                                timeHelperBean.setAddress(schedule.getAddress());
+                                timeHelperBean.setStatus(0);
+                                timeHelperBean.setScheduleType(2);
+                                timeHelperBean.setFromWhere(Schedule.TYPE_PHONE);
+
+                                mTimeHelperBeans.add(timeHelperBean);
                             }
                             Collections.sort(mTimeHelperBeans);
 

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

@@ -3,6 +3,7 @@ package com.uas.appworks.model.bean;
 import android.support.annotation.NonNull;
 
 import com.common.data.DateFormatUtil;
+import com.uas.appworks.model.Schedule;
 
 /**
  * @author RaoMeng
@@ -32,6 +33,7 @@ public class TimeHelperBean implements Comparable<TimeHelperBean> {
      * status : 1
      */
 
+    private String fromWhere = Schedule.TYPE_UU;
     private int scheduleId;
     private int imid;
     private String type;
@@ -48,6 +50,14 @@ public class TimeHelperBean implements Comparable<TimeHelperBean> {
     private int status;
     private int scheduleType;
 
+    public String getFromWhere() {
+        return fromWhere;
+    }
+
+    public void setFromWhere(String fromWhere) {
+        this.fromWhere = fromWhere;
+    }
+
     public int getScheduleId() {
         return scheduleId;
     }