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

WeiChat/src/main/AndroidManifest.xml

@@ -1013,7 +1013,12 @@
             android:name=".ui.erp.activity.secretary.BookingAddActivity"
             android:label="@string/booking_add"
             android:theme="@style/MainBaseTheme"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan" >
+            <intent-filter>
+                <action android:name="com.ui.erp.activity.secretary.BookingAddActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
         <activity
             android:name="com.core.utils.pictureselector.PictureSelectorDemo"
             android:label="PictureSelectorDemo" />

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

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -26,6 +27,7 @@ import com.baidu.mapapi.search.core.PoiInfo;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
+import com.common.data.TextUtil;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.SupportToolBarActivity;
@@ -416,9 +418,15 @@ public class BookingAddActivity extends SupportToolBarActivity implements View.O
                             } else {
                                 invite(phone, "8636ba7f-a1b4-4062-8571-782035101167");
                             }
-                            startActivity(new Intent(BookingAddActivity.this, BookingListActivity.class)
-                                    .putExtra("curDate", startTime)
-                                    .putExtra("whichPage", mWhichPage));
+                            if (!TextUtils.isEmpty(mWhichPage)&&mWhichPage.equals("ScheduleActivity")){
+                                setResult(0x11);
+                                finish();
+                            }else{
+                                startActivity(new Intent(BookingAddActivity.this, BookingListActivity.class)
+                                        .putExtra("curDate", startTime)
+                                        .putExtra("whichPage", mWhichPage));
+                            }
+
                         } else {
                             ToastMessage("预约失败！");
                             bt_commit.setEnabled(true);

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Oct 23 16:15:04 CST 2018
-debugName=934
-versionName=645
-debugCode=934
-versionCode=200
+#Fri Nov 09 17:21:17 CST 2018
+debugName=935
+versionName=647
+debugCode=935
+versionCode=202

app_core/common/src/main/java/com/core/model/Approval.java

@@ -134,8 +134,8 @@ public class Approval {
             String v2 = null;
             if (values.contains(".")) {
                 int fas = values.indexOf(".");
-                v1 = values.substring(0, fas);
-                v2 = values.substring(fas, values.length());
+                v1 = values.substring(0, fas);//整数部分
+                v2 = values.substring(fas, values.length());//小数部分
             } else {
                 v1 = values;
                 v2 = "";
@@ -143,15 +143,30 @@ public class Approval {
             for (int i = v1.length() - 1; i >= 0; i--) {
                 char c = v1.charAt(i);
                 builder.insert(0, c);
-                if (i > 0 && num == 3) {
+                if (i > 0 && num == 3 && c != '.') {
                     num = 0;
                     builder.insert(0, ',');
                 }
-
                 num++;
             }
-            if (v2 != null)
-                builder.append(v2);
+            if (!StringUtil.isEmail(v2)) {
+                int floatcolumn = floatcolumn();//保留小数后几位
+                LogUtil.i("gong",values+"="+floatcolumn);
+                if (floatcolumn == 0) {
+                    if (v2.length() - 1 > 2) {
+                        builder.append(v2.substring(0, 2));
+                    } else {
+                        builder.append(v2);
+                    }
+                } else {
+                    //计算小数点后几位
+                    if (v2.length() > floatcolumn) {
+                        builder.append(v2.substring(0,Math.min( floatcolumn+1,v2.length())));
+                    } else {
+                        builder.append(v2);
+                    }
+                }
+            }
             return builder.toString();
         } catch (Exception e) {
             return getValues();
@@ -325,9 +340,21 @@ public class Approval {
     }
 
     public boolean isNumber() {
-        return isDftypeEQ("N", "floatcolumn8", "SN");
+        return isDftypeEQ("N", "floatcolumn8", "SN") || getDfType().contains("floatcolumn");
     }
 
+    public int floatcolumn() {
+        if (getDfType().contains("floatcolumn")) {
+            String number = getDfType().replace("floatcolumn", "");
+            try {
+                return Integer.valueOf(number);
+            } catch (Exception e) {
+
+            }
+            return 0;
+        }
+        return 0;
+    }
 
     public static class Data {
         public String value = "";

app_core/common/src/main/java/com/core/net/http/ViewUtil.java

@@ -1169,6 +1169,9 @@ public class ViewUtil {
 ////            url=CommonUtil.getAppBaseUrl(MyApplication.getInstance());
 ////        }
         String loginToken = CommonUtil.getSharedPreferences(ct, Constants.CACHE.ACCOUNT_CENTER_TOKEN);
+        LogUtil.i("gong","url="+url+"mobile/login.action");
+        LogUtil.i("gong","token="+loginToken);
+        LogUtil.i("gong","enuu="+enuu);
         HttpRequest.getInstance().sendRequest(url,
                 new HttpParams.Builder()
                         .url("mobile/login.action")

app_core/common/src/main/res/values-zh-rCN/strings.xml

@@ -1561,7 +1561,7 @@
     <string name="str_work_work_approval">我的审批</string>
     <string name="str_work_backlog">待办工作</string>
     <string name="str_work_work_calendar">工作日历</string>
-    <string name="str_work_work_report">工作汇报</string>
+    <string name="str_work_work_report">工作报告</string>
     <string name="str_work_punch_clock">打卡签到</string>
     <string name="str_work_outwork_sign">外勤签到</string>
     <string name="str_work_attendance_statistics">考勤统计</string>

app_core/common/src/main/res/values/strings.xml

@@ -1903,7 +1903,7 @@
     <string name="str_work_work_approval">我的审批</string>
     <string name="str_work_backlog">待办工作</string>
     <string name="str_work_work_calendar">工作日历</string>
-    <string name="str_work_work_report">工作汇报</string>
+    <string name="str_work_work_report">工作报告</string>
     <string name="str_work_punch_clock">打卡签到</string>
     <string name="str_work_outwork_sign">外勤签到</string>
     <string name="str_work_attendance_statistics">考勤统计</string>

app_modular/appmessages/src/main/java/com/modular/appmessages/model/ApprovalRecord.java

@@ -35,7 +35,7 @@ public class ApprovalRecord {
         map.put("id", id);
         map.put("nodeId", nodeId);
         map.put("status", status);
-        map.put("nodeName", nodeName);
+    map.put("nodeName", nodeName);
         map.put("needInputKeys", needInputKeys);
         map.put("showNeedMessage", showNeedMessage);
         map.put("processInstanceId", processInstanceId);

app_modular/appmessages/src/main/java/com/modular/appmessages/presenter/ApprovaPresenter.java

@@ -885,10 +885,12 @@ public class ApprovaPresenter implements OnHttpResultListener {
                         if (renderer.contains("字段需要设置为app显示")) {
                             newValues = renderer;
                         } else {
-                            double val = MathUtil.eval(renderer);
-                            if (val != Double.NEGATIVE_INFINITY && val != Double.POSITIVE_INFINITY) {
-                                newValues = getDecimalFormat(val);
-                            }
+                            newValues=renderer;
+                            //先不格式化
+//                            double val = MathUtil.eval(renderer);
+//                            if (val != Double.NEGATIVE_INFINITY && val != Double.POSITIVE_INFINITY) {
+//                                newValues = getDecimalFormat(val);
+//                            }
                         }
 
                     } catch (Exception e) {

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/OA/erp/activity/MissionActivity.java

@@ -40,7 +40,10 @@ import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
 import com.lidroid.xutils.ViewUtils;
 import com.modular.apputils.utils.PopupWindowHelper;
+import com.uas.applocation.Interface.OnLocationListener;
 import com.uas.applocation.UasLocationHelper;
+import com.uas.applocation.base.UASLocationManager;
+import com.uas.applocation.model.UASLocation;
 import com.uas.applocation.utils.LocationDistanceUtils;
 import com.uas.appworks.OA.erp.adapter.MissionAdapter;
 import com.uas.appworks.OA.erp.model.IMission;
@@ -72,20 +75,23 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
         @Override
         public void onReceive(Context context, Intent intent) {
             if (System.currentTimeMillis() - time < (3 * 60 * 1000)) return;
-            time = System.currentTimeMillis();
-            locationOk = UasLocationHelper.getInstance().getUASLocation().isLocationOk();
-            if (locationOk && adapter != null && !ListUtils.isEmpty(adapter.getModels())) {
-                for (int i = 0; i < adapter.getModels().size(); i++) {
-                    if (adapter.getModels().get(i).getStatus() != 1) {
-                        adapter.getModels().get(i).setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-                        adapter.getModels().get(i).setLocation(UasLocationHelper.getInstance().getUASLocation().getName());
-                        adapter.notifyItemChanged(i);
-                    }
-                }
-            }
+            updateLocation();
         }
     };
 
+    private void updateLocation(){
+        time = System.currentTimeMillis();
+        locationOk = UasLocationHelper.getInstance().getUASLocation().isLocationOk();
+        if (locationOk && adapter != null && !ListUtils.isEmpty(adapter.getModels())) {
+            for (int i = 0; i < adapter.getModels().size(); i++) {
+                if (adapter.getModels().get(i).getStatus() != 1) {
+                    adapter.getModels().get(i).setRecorddate(TimeUtils.f_long_2_str(System.currentTimeMillis()));
+                    adapter.getModels().get(i).setLocation(UasLocationHelper.getInstance().getUASLocation().getName());
+                    adapter.notifyItemChanged(i);
+                }
+            }
+        }
+    }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -96,6 +102,12 @@ public class MissionActivity extends OABaseActivity implements View.OnClickListe
         LocalBroadcastManager.getInstance(ct).registerReceiver(receiver, filter);
         initView();
         initEvent();
+        UasLocationHelper.getInstance().requestLocation(new OnLocationListener() {
+            @Override
+            public void onReceiveLocation(UASLocation mUASLocation) {
+                updateLocation();
+            }
+        });
     }
 
     @Override

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

@@ -3,6 +3,8 @@ package com.uas.appworks.activity;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
@@ -11,7 +13,9 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -22,13 +26,20 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiUAS;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
 import com.core.model.MissionModel;
+import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.WorkHandlerUtil;
+import com.core.utils.sp.UserSp;
+import com.core.widget.view.MyGridView;
 import com.modular.apputils.activity.BaseNetActivity;
+import com.modular.apputils.adapter.EasyBaseAdapter;
 import com.modular.apputils.listener.OnSmartHttpListener;
+import com.modular.apputils.model.EasyBaseModel;
 import com.modular.apputils.network.Parameter;
 import com.modular.apputils.network.Tags;
 import com.modular.apputils.widget.compactcalender.CompactCalendarView;
@@ -36,8 +47,11 @@ 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;
+import com.uas.appworks.OA.erp.activity.AddMeetingActivity;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
 import com.uas.appworks.OA.erp.activity.MeetDetailsActivity;
 import com.uas.appworks.OA.erp.activity.MissionActivity;
@@ -50,8 +64,11 @@ import com.uas.appworks.utils.ScheduleUtils;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TimeZone;
 
 public class ScheduleActivity extends BaseNetActivity {
@@ -67,6 +84,7 @@ public class ScheduleActivity extends BaseNetActivity {
     private String lastMonth;
     private String mCurrentDateStr;
     private ScheduleAdapter mScheduleAdapter;
+    private ArrayList<BookingModel> mShareDatas = new ArrayList<>();
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
@@ -92,8 +110,8 @@ public class ScheduleActivity extends BaseNetActivity {
 
     @Override
     protected void init() throws Exception {
+        initAdd();
         initView();
-
     }
 
     @Override
@@ -101,6 +119,88 @@ public class ScheduleActivity extends BaseNetActivity {
         return CommonUtil.getSchedulerBaseUrl();
     }
 
+
+    private void initAdd() {
+        MyGridView addGridView = findViewById(R.id.addGridView);
+        addGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                switch ((int) l) {
+                    case 0:
+                        startActivityForResult(new Intent("com.ui.erp.activity.secretary.BookingAddActivity")
+                                .putExtra("whichPage", "ScheduleActivity"), 0x11);
+                        break;
+                    case 1:
+                        startActivity(new Intent(mContext, BServicesActivity.class));
+                        break;
+                    case 2:
+                        startActivityForResult(new Intent(ct, SchedulerCreateActivity.class), 0x11);
+                        break;
+                    case 3:
+                        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);
+                            if (!TextUtils.isEmpty(travelCaller) && "FeePlease!CCSQ!new".equals(travelCaller)) {
+                                intent.putExtra("caller", travelCaller);
+                            }
+                        }
+                        intent.setAction("com.modular.form.DataFormDetailActivity");
+                        startActivityForResult(intent, 0x11);
+                        break;
+                    case 6:
+                        startActivityForResult(new Intent(ct, AddMeetingActivity.class)
+                                .putExtra("whichPage", "ScheduleActivity"), 0x11);
+                        break;
+                }
+            }
+        });
+        addGridView.setAdapter(new EasyBaseAdapter(ct, getAddItems()) {
+            @Override
+            public View bindView(View view, int position, EasyBaseModel model) {
+                ViewHolder mViewHolder = null;
+                if (view.getTag() == null) {
+                    mViewHolder = new ViewHolder();
+                    mViewHolder.iconIv = view.findViewById(R.id.iconIv);
+                    mViewHolder.titleTv = view.findViewById(R.id.titleTv);
+                    view.setTag(mViewHolder);
+                } else {
+                    mViewHolder = (ViewHolder) view.getTag();
+                }
+                mViewHolder.iconIv.setImageResource(model.getIconId());
+                mViewHolder.titleTv.setText(model.getTitle());
+                return view;
+            }
+
+            class ViewHolder {
+                private ImageView iconIv;
+                private TextView titleTv;
+            }
+
+            @Override
+            public int getLayoutRes() {
+                return R.layout.item_schedule_add_menu;
+            }
+        });
+    }
+
+    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));
+        models.add(new EasyBaseModel().setTitle("出差申请").setIconId(R.drawable.ic_create_work_out_menu));
+        models.add(new EasyBaseModel().setTitle("会议申请").setIconId(R.drawable.ic_create_meeting_menu));
+        return models;
+    }
+
     private void initView() {
         mCurrentDate = new Date();
         mCurrentDateStr = DateFormatUtil.date2Str(mCurrentDate, "yyyy-MM-dd");
@@ -155,6 +255,57 @@ public class ScheduleActivity extends BaseNetActivity {
         }
     }
 
+    private void loadListData(String month) {
+        if (TextUtils.isEmpty(month)) return;
+        month = month.replace("-", "");
+        String url = com.core.app.Constants.IM_BASE_URL() + "user/appBookingList";
+        Map<String, Object> params = new HashMap<>();
+        params.put("token", UserSp.getInstance(MyApplication.getInstance()).getAccessToken(""));
+        params.put("userid", MyApplication.getInstance().mLoginUser.getUserId());
+        params.put("telephone", UserSp.getInstance(MyApplication.getInstance()).getTelephone(""));
+        params.put("yearmonth", month);
+        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
+        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(ct, "sessionId"));
+        ViewUtil.httpSendRequest(ct, url, params, mHandler, headers, 0x01, null, null, "post");
+    }
+
+    private Handler mHandler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            try {
+                if (msg.what == 0x01) {
+                    String result = msg.getData().getString("result");
+                    JSONArray shareArray = JSON.parseArray(JSON.parseObject(result).getString("sharelist"));
+                    mShareDatas.clear();
+                    if (shareArray != null) {
+                        for (int i = 0; i < shareArray.size(); i++) {
+                            JSONObject object = shareArray.getJSONObject(i);
+                            BookingModel model = new BookingModel();
+                            model.setAb_address(object.getString("ab_address"));
+                            model.setAb_bman(object.getString("ab_bman"));
+                            model.setAb_bmanid(object.getString("ab_bmanid"));
+                            model.setAd_reason(object.getString("ad_reason"));
+                            model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                            model.setAb_content(object.getString("ab_content"));
+                            model.setAb_endtime(object.getString("ab_endtime"));
+                            model.setAb_id(object.getString("ab_id"));
+                            model.setAb_latitude(object.getString("ab_latitude"));
+                            model.setAb_longitude(object.getString("ab_longitude"));
+                            model.setAb_recorddate(object.getString("ab_recorddate"));
+                            model.setAb_recordid(object.getString("ab_recordid"));
+                            model.setAb_recordman(object.getString("ab_recordman"));
+                            model.setAb_sharestatus(object.getString("ab_sharestatus"));
+                            model.setAb_starttime(object.getString("ab_starttime"));
+                            model.setAb_type(object.getString("ab_type"));
+                            model.setKind(object.getString("kind"));
+                            mShareDatas.add(model);
+                        }
+                    }
+                }
+            } catch (Exception e) {
+            }
+        }
+    };
 
     private void loadByMonth(String month) {
         requestHttp(new Parameter.Builder()
@@ -167,6 +318,7 @@ public class ScheduleActivity extends BaseNetActivity {
                         .url("schedule/getByMonthSchedule")
                         .record(LOAD_MONTH)
                 , mOnSmartHttpListener);
+        loadListData(month);
     }
 
     private void loadByDay(String dateStr) {
@@ -199,7 +351,6 @@ public class ScheduleActivity extends BaseNetActivity {
                 dismissProgress();
             } catch (Exception e) {
                 LogUtil.i("gong", "e=" + e.getMessage());
-
             }
 
         }
@@ -222,10 +373,10 @@ public class ScheduleActivity extends BaseNetActivity {
         cal.set(Calendar.MILLISECOND, 0);
         long startTime = cal.getTimeInMillis();
         long endTime = cal.getTimeInMillis() + 24 * 60 * 60 * 1000;
-        List<Schedule> systemSchedule =null;
-        try{
-          systemSchedule = ScheduleUtils.getSystemCalendar(MyApplication.getInstance(), startTime, endTime);
-        }catch (Exception e){
+        List<Schedule> systemSchedule = null;
+        try {
+            systemSchedule = ScheduleUtils.getSystemCalendar(MyApplication.getInstance(), startTime, endTime);
+        } catch (Exception e) {
 
         }
         if (!ListUtils.isEmpty(jsonArray)) {
@@ -258,7 +409,9 @@ public class ScheduleActivity extends BaseNetActivity {
                     }
                 }
             }
-            schedules.addAll(systemSchedule);
+            if (!ListUtils.isEmpty(systemSchedule)) {
+                schedules.addAll(systemSchedule);
+            }
         } else {
             schedules = systemSchedule;
         }
@@ -354,7 +507,7 @@ public class ScheduleActivity extends BaseNetActivity {
                 ((CreateViewHoder) holder).createBookBtn.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        startActivityForResult(new Intent("com.modular.booking.BookingListActivity").putExtra("whichPage","ScheduleActivity"), 0x11);
+                        startActivityForResult(new Intent("com.modular.booking.BookingListActivity").putExtra("whichPage", "ScheduleActivity"), 0x11);
                     }
                 });
             }
@@ -399,10 +552,10 @@ public class ScheduleActivity extends BaseNetActivity {
                 startActivity(new Intent(ct, MeetDetailsActivity.class)
                         .putExtra("data", meetEntity));
             } else if ("外勤".equals(mSchedule.getType())) {
-                MissionModel mission=  WorkHandlerUtil.handlerEntity(false, JSON.parseObject(mSchedule.getDetails()));
+                MissionModel mission = WorkHandlerUtil.handlerEntity(false, JSON.parseObject(mSchedule.getDetails()));
                 mission.setStatus(5);
                 startActivity(new Intent(ct, MissionActivity.class).putExtra("model", mission)
-                .putExtra("showSubmit",false));
+                        .putExtra("showSubmit", false));
             } else if ("出差".equals(mSchedule.getType())) {
                 if (JSONUtil.validateJSONObject(mSchedule.getDetails())) {
                     JSONObject object = JSON.parseObject(mSchedule.getDetails());
@@ -414,7 +567,7 @@ public class ScheduleActivity extends BaseNetActivity {
                             .putExtra("caller", caller)
                             .putExtra("title", "出差单")
                             .putExtra("keyValue", keyId)
-                            .putExtra("status", TextUtils.isEmpty(status)?"已提交":status));
+                            .putExtra("status", TextUtils.isEmpty(status) ? "已提交" : status));
                 }
             } else {
                 startActivityForResult(new Intent(ct, SchedulerCreateActivity.class)
@@ -485,7 +638,7 @@ public class ScheduleActivity extends BaseNetActivity {
 
         @Override
         public int getItemCount() {
-            return ListUtils.getSize(mSchedules) + 1;
+            return ListUtils.getSize(mSchedules);
         }
 
         class ViewHoder extends RecyclerView.ViewHolder {
@@ -509,7 +662,7 @@ public class ScheduleActivity extends BaseNetActivity {
         }
 
         class CreateViewHoder extends RecyclerView.ViewHolder {
-            Button createBtn,createBookBtn;
+            Button createBtn, createBookBtn;
 
             public CreateViewHoder(View itemView) {
                 super(itemView);
@@ -522,7 +675,7 @@ public class ScheduleActivity extends BaseNetActivity {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == 0x11 && resultCode == 0x11) {
+        if (requestCode == 0x11) {
             loadByMonth(lastMonth);
             String dayStr = TextUtils.isEmpty(monthTv.getText()) ? DateFormatUtil.long2Str(DateFormatUtil.YMD) : monthTv.getText().toString();
             loadByDay(dayStr);

app_modular/appworks/src/main/res/layout/activity_schedule.xml

@@ -4,8 +4,16 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/white"
     tools:context=".activity.ScheduleActivity">
 
+    <com.core.widget.view.MyGridView
+        android:id="@+id/addGridView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/background"
+        android:numColumns="4"/>
+
 
     <TextView
         android:id="@+id/monthTv"
@@ -15,6 +23,7 @@
         android:text="2018-08"
         android:textColor="#FF000000"
         android:textSize="15sp"
+        app:layout_constraintTop_toBottomOf="@id/addGridView"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent" />
 
@@ -46,8 +55,8 @@
 
     <com.modular.apputils.widget.compactcalender.CompactCalendarView xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/compactcalendar_view"
-        android:layout_width="fill_parent"
-        android:layout_height="250dp"
+        android:layout_width="match_parent"
+        android:layout_height="220dp"
         app:compactCalendarBackgroundColor="@color/white"
         app:compactCalendarCurrentDayBackgroundColor="#206390"
         app:compactCalendarCurrentDayIndicatorStyle="fill_large_indicator"
@@ -56,9 +65,9 @@
         app:compactCalendarEventIndicatorStyle="small_indicator"
         app:compactCalendarOtherMonthDaysTextColor="#534c4c"
         app:compactCalendarShouldSelectFirstDayOfMonthOnScroll="true"
-        app:compactCalendarTargetHeight="250dp"
+        app:compactCalendarTargetHeight="220dp"
         app:compactCalendarTextColor="#181818"
-        app:compactCalendarTextSize="15dp"
+        app:compactCalendarTextSize="13dp"
         app:layout_constraintTop_toBottomOf="@id/monthTv" />
 
     <View
@@ -68,31 +77,14 @@
         android:background="#F3F3F3"
         app:layout_constraintTop_toBottomOf="@id/compactcalendar_view" />
 
-    <Button
-        android:visibility="gone"
-        android:id="@+id/createBtn"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/info"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:layout_marginTop="20dp"
-        android:background="@drawable/bg_bule_btn"
-        android:padding="@dimen/padding"
-        android:text="@string/oacreat_calender"
-        android:textColor="@color/white"
-        android:textSize="@dimen/text_main"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent" />
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/mRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:background="@color/white"
-        app:layout_constraintBottom_toTopOf="@id/createBtn"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@id/gapView" />
 </android.support.constraint.ConstraintLayout>

app_modular/appworks/src/main/res/layout/item_schedule_add_menu.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="@dimen/padding">
+
+    <ImageView
+        android:id="@+id/iconIv"
+        android:layout_width="35dp"
+        android:src="@drawable/ic_b2b_add"
+        android:layout_height="35dp" />
+
+    <TextView
+        android:id="@+id/titleTv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/paddingApp"
+        android:text="外勤计划"
+        android:textColor="#FF6C6C6C"
+        android:textSize="12sp" />
+</LinearLayout>

app_modular/appworks/src/main/res/values-en/strings.xml

@@ -31,7 +31,7 @@
     <string name="save_to_entry_status_failed">保存为在录入状态失败！</string>
     <string name="weekly_report_detail">周报详情</string>
     <string name="monthly_report_detail">月报详情</string>
-    <string name="str_work_report">工作汇报</string>
+    <string name="str_work_report">工作报告</string>
     <string name="word_overrun_one_thousand">字数超限1000了喔!</string>
     <string name="module_start_using">已启用的功能模块</string>
     <string name="module_not_start_using">未启用的功能模块</string>

app_modular/appworks/src/main/res/values-zh-rCN/strings.xml

@@ -31,7 +31,7 @@
     <string name="save_to_entry_status_failed">保存为在录入状态失败！</string>
     <string name="weekly_report_detail">周报详情</string>
     <string name="monthly_report_detail">月报详情</string>
-    <string name="str_work_report">工作汇报</string>
+    <string name="str_work_report">工作报告</string>
     <string name="word_overrun_one_thousand">字数超限1000了喔!</string>
     <string name="module_start_using">已启用的功能模块</string>
     <string name="module_not_start_using">未启用的功能模块</string>

app_modular/appworks/src/main/res/values-zh-rTW/strings.xml

@@ -31,7 +31,7 @@
     <string name="save_to_entry_status_failed">保存为在录入状态失败！</string>
     <string name="weekly_report_detail">周报详情</string>
     <string name="monthly_report_detail">月报详情</string>
-    <string name="str_work_report">工作汇报</string>
+    <string name="str_work_report">工作报告</string>
     <string name="word_overrun_one_thousand">字数超限1000了喔!</string>
     <string name="module_start_using">已启用的功能模块</string>
     <string name="module_not_start_using">未启用的功能模块</string>

app_modular/appworks/src/main/res/values/strings.xml

@@ -38,7 +38,7 @@
     <string name="report_resubmit_result">工作%1$s报重新提交%2$s</string>
     <string name="report_delete_result">工作%1$s报删除%2$s</string>
     <string name="report_unsubmit_result">工作%1$s报反提交%2$s</string>
-    <string name="str_work_report">工作汇报</string>
+    <string name="str_work_report">工作报告</string>
     <string name="word_overrun_one_thousand">字数超限1000了喔!</string>
     <string name="module_start_using">已启用的功能模块</string>
     <string name="module_not_start_using">未启用的功能模块</string>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         maven { url "https://jcenter.bintray.com" }
         maven { url "https://jitpack.io" }
         mavenCentral()
-    
+
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.2'
@@ -18,14 +18,11 @@ buildscript {
 
 allprojects {
     repositories {
+        maven { url 'https://maven.google.com' }
         jcenter()
         mavenCentral()
         maven { url "https://jitpack.io" }
-        maven {
-            url 'https://maven.google.com'
-        }
-        
-  
+
     }
 }
 

version.gradle

@@ -41,7 +41,7 @@ ext {
             analyticsVersion                    : 'latest.integration',
             tagGroupVersion                     : '1.4@aar',
             jodatimeVersion                     : '2.9.4',
-            gifVersion                          : '1.2.8',
+            gifVersion                          : '1.2.15',
             recyclerLib                         : 'v1.0',
             vlayoutVersion                      : '1.2.1',
             BaseRecyclerViewAdapterHelperVersion: '2.9.30',