18:01考勤单据，费用报销，erp迁移完成，平台部分暂时用隐式

WeiChat/src/main/AndroidManifest.xml

@@ -168,32 +168,57 @@
         <activity android:name=".ui.erp.activity.NoticeMenuActivity" />
         <activity android:name=".ui.erp.activity.LogsDisplayActivty" />
         <activity android:name=".ui.erp.activity.ApproveDisplayActivity" />
-        <activity android:name=".ui.erp.activity.SaleDetailActivity" />
-        <activity android:name=".ui.erp.activity.LeaveActivity" />
-        <activity android:name=".ui.erp.activity.ExtraLeaveActivity" />
+        <activity android:name=".ui.erp.activity.SaleDetailActivity">
+            <intent-filter>
+                <action android:name="com.modular.plat.SaleDetailActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".ui.erp.activity.LeaveActivity" >
+            <intent-filter>
+                <action android:name="com.modular.plat.LeaveActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".ui.erp.activity.ExtraLeaveActivity">
+            <intent-filter>
+                <action android:name="com.modular.plat.ExtraLeaveActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.WorkExtraActivity"
             android:label="@string/oaovertime_apply"
-            android:windowSoftInputMode="adjustPan" />
+            android:windowSoftInputMode="adjustPan">
+            <intent-filter>
+                <action android:name="com.modular.plat.WorkExtraActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.TravelActivity"
-            android:label="@string/oatravel_apply" />
-        <activity android:name=".ui.erp.activity.SaleSelectActivity" />
+            android:label="@string/oatravel_apply" >
+            <intent-filter>
+                <action android:name="com.modular.plat.TravelActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".ui.erp.activity.SaleSelectActivity"/>
         <activity android:name=".ui.message.SelectActivity">
             <intent-filter>
-                <action android:name="com.modular.message.SelectActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.modular.message.SelectActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity android:name=".ui.erp.activity.SaleChartActivity" />
-        <activity android:name=".ui.erp.activity.QueryActivity" />
-        <activity android:name=".ui.erp.activity.ErpMenActivity" />
-        <activity android:name=".ui.erp.activity.DbfindListActivity" />
-        <activity android:name=".ui.erp.activity.DbfindList2Activity" />
+        <activity android:name=".ui.erp.activity.QueryActivity"/>
+        <activity android:name=".ui.erp.activity.ErpMenActivity"/>
+        <activity android:name=".ui.erp.activity.DbfindListActivity"/>
+        <activity android:name=".ui.erp.activity.DbfindList2Activity"/>
         <activity android:name=".ui.circle.view.CardInfoActivity">
             <intent-filter>
-                <action android:name="com.modular.view.CardInfoActivity" />
-                <category android:name="android.intent.category.DEFAULT" />
+                <action android:name="com.modular.view.CardInfoActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
         <activity

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

@@ -21,31 +21,31 @@ import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.SelectBean;
+import com.core.net.http.ViewUtil;
+import com.core.selectcalendar.SelectCalendarActivity;
+import com.core.utils.FlexJsonUtil;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.utils.TimeUtils;
+import com.core.widget.view.Activity.SelectActivity;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.core.model.SelectBean;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
-import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveUpdateEntity;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.RecognizerDialogUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -26,16 +26,23 @@ import com.alibaba.fastjson.JSONObject;
 import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.selectcalendar.SelectCalendarActivity;
+import com.core.utils.FlexJsonUtil;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.utils.TimeUtils;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelAddEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelAddItems;
@@ -43,20 +50,13 @@ import com.xzjmyk.pm.activity.ui.erp.model.TravelEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelItems;
 import com.xzjmyk.pm.activity.ui.erp.model.TravelUpdateEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.UpdateTravelAddItems;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.TravelPageActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.RecognizerDialogUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -28,16 +28,23 @@ import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
+import com.core.selectcalendar.SelectCalendarActivity;
+import com.core.utils.FlexJsonUtil;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.utils.TimeUtils;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraAddWork;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraAddWorkItems;
@@ -45,20 +52,13 @@ import com.xzjmyk.pm.activity.ui.erp.model.ExtraUpdateWork;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraWork;
 import com.xzjmyk.pm.activity.ui.erp.model.ExtraWorkItems;
 import com.xzjmyk.pm.activity.ui.erp.model.UpdateExtraAddWorkItems;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.utils.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomProgressDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.WorkPageActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.RecognizerDialogUtil;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiUtils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java

@@ -23,6 +23,7 @@ import com.core.model.EmployeesEntity;
 import com.core.model.OAConfig;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
+import com.core.selectcalendar.SelectCalendarActivity;
 import com.core.utils.CommonInterface;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
@@ -39,7 +40,6 @@ import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
 import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -57,7 +57,9 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
 import com.uas.appworks.OA.erp.activity.WorkDailyAddActivity;
+import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
@@ -65,7 +67,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.VisitReportAddActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OAAdapter;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
@@ -75,7 +76,7 @@ import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskDetailB2BActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.util.oa.OAHttpUtil;
-import com.xzjmyk.pm.activity.view.OACalendarView;
+import com.core.selectcalendar.OACalendarView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAMainActivity.java

@@ -31,11 +31,11 @@ import com.handmark.pulltorefresh.library.PullToRefreshScrollView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appworks.OA.erp.activity.WorkDailyAddActivity;
+import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.PlatLeaveAddActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TravelActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WorkExtraActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OAAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.OAPresenter;

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

@@ -33,17 +33,17 @@ import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.StringJsonObjectRequest;
+import com.core.selectcalendar.SelectCalendarActivity;
+import com.core.widget.NScrollerGridView;
+import com.core.widget.view.Activity.SearchLocationActivity;
+import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SearchPoiParam;
 import com.core.xmpp.model.AddAttentionResult;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appcontact.model.contacts.ContactsModel;
 import com.uas.appcontact.ui.activity.ContactsActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
-import com.core.widget.view.Activity.SearchLocationActivity;
-import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
-import com.core.widget.NScrollerGridView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import java.util.ArrayList;

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

@@ -38,7 +38,7 @@ import com.common.data.ListUtils;
 import com.core.widget.CustomerScrollView;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
-import com.xzjmyk.pm.activity.view.OACalendarView;
+import com.core.selectcalendar.OACalendarView;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -7,7 +7,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.common.LogUtil;
-import com.xzjmyk.pm.activity.view.OACalendarView;
+import com.core.selectcalendar.OACalendarView;
 
 import java.util.Calendar;
 import java.util.Date;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/AttendanceFragment.java

@@ -17,23 +17,23 @@ import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.core.model.WorkModel;
-import com.xzjmyk.pm.activity.ui.erp.view.oacalender.CalenderView;
-import com.core.utils.TimeUtils;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.WorkHandlerUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
+import com.core.utils.TimeUtils;
+import com.core.utils.WorkHandlerUtil;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.EasyFragment;
+import com.xzjmyk.pm.activity.ui.erp.view.oacalender.CalenderView;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/CalendarDateFragmet.java

@@ -9,9 +9,9 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.common.data.DateFormatUtil;
+import com.core.selectcalendar.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
-import com.xzjmyk.pm.activity.view.OACalendarView;
+import com.core.selectcalendar.OACalendarView;
 
 import java.util.Date;
 import java.util.Set;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/UpdateCostFormModel.java

@@ -1,5 +1,7 @@
 package com.xzjmyk.pm.activity.ui.erp.model.oa;
 
+import com.uas.appworks.OA.erp.model.CostFormModel;
+
 /**
  * Created by FANGlh on 2017/6/15.
  * function:

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java

@@ -14,19 +14,19 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.thread.ThreadUtil;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormFieldActivity;
 import com.core.dao.DBManager;
 import com.core.model.EmployeesEntity;
+import com.core.net.http.http.OAHttpHelper;
+import com.core.net.http.http.OnHttpResultListener;
+import com.core.net.http.http.Request;
+import com.core.utils.ToastUtil;
+import com.uas.appworks.OA.erp.activity.form.DataFormFieldActivity;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.form.Data;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.ApprovalRecord;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IApproval;
-import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.net.http.http.OAHttpHelper;
-import com.core.net.http.http.OnHttpResultListener;
-import com.core.net.http.http.Request;
 
 import java.util.ArrayList;
 import java.util.HashMap;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/platform/task/TaskAddErpActivity.java

@@ -22,6 +22,8 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.OAConfig;
 import com.core.net.http.ViewUtil;
+import com.core.selectcalendar.SelectCalendarActivity;
+import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.xmpp.utils.AppConstant;
 import com.iflytek.cloud.RecognizerResult;
@@ -33,10 +35,8 @@ import com.uas.appworks.OA.erp.model.SelectCollisionTurnBean;
 import com.uas.appworks.OA.erp.model.SelectEmUser;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.xzjmyk.pm.activity.ui.erp.activity.form.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.TagGroup;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 

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

@@ -13,7 +13,7 @@
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
-    <com.xzjmyk.pm.activity.ui.erp.view.oacalender.CalenderView
+    <com.core.selectcalendar.CalenderView
         android:id="@+id/calender"
         android:layout_width="match_parent"
         android:layout_height="210dp" />

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

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.view.OACalendarView
+    <com.core.selectcalendar.OACalendarView
         android:id="@+id/calender"
         android:layout_width="wrap_content"
         android:layout_height="230dp" />

app_core/common/src/main/res/layout/fragment_attendance.xml

@@ -13,7 +13,7 @@
         android:textColor="@color/text_main"
         android:textSize="@dimen/text_main" />
 
-    <com.xzjmyk.pm.activity.ui.erp.view.oacalender.CalenderView
+    <com.core.selectcalendar.CalenderView
         android:id="@+id/calender"
         android:layout_width="match_parent"
         android:layout_height="210dp" />

app_core/common/src/main/res/layout/item_calendar.xml

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.xzjmyk.pm.activity.view.OACalendarView
+    <com.core.selectcalendar.OACalendarView
         android:id="@+id/calender"
         android:layout_width="wrap_content"
         android:layout_height="230dp" />

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/widget/stickylistheaders/WrapperViewList.java

@@ -7,6 +7,7 @@ import android.os.Build;
 import android.view.View;
 import android.widget.AbsListView;
 
+import com.core.widget.view.ListViewInScroller;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;

app_modular/appworks/build.gradle

@@ -10,6 +10,7 @@ android {
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
     }
+    useLibrary 'org.apache.http.legacy'
     buildTypes {
         release {
             minifyEnabled false

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

@@ -160,9 +160,9 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
         super.onCreate(savedInstanceState);
         setContentView(R.layout.act_sale_select_list);
         ViewUtils.inject(this);
+        initIDs();
         mEmptyLayout = new EmptyLayout(this, mlistview.getRefreshableView());
         mEmptyLayout.setEmptyButtonClickListener(mErrorClickListener);
-        initIDs();
         initView();
         LogUtil.d("onCreate()");
         initData();
@@ -410,24 +410,19 @@ public class FormListSelectActivity extends BaseActivity implements View.OnClick
                 Intent it_detail = null;
                 if ("SignMain".equals(from)) {
                     if ("Ask4Leave".equals(caller)) {
-                        it_detail = new Intent(FormListSelectActivity.this,
-                                LeaveActivity.class);
+                        it_detail = new Intent("com.modular.plat.LeaveActivity");
                     }
                     if ("SpeAttendance".equals(caller)) {
-                        it_detail = new Intent(FormListSelectActivity.this,
-                                ExtraLeaveActivity.class);
+                        it_detail = new Intent("com.modular.plat.ExtraLeaveActivity");
                     }
                     if ("FeePlease!CCSQ".equals(caller) || "FeePlease!CCSQ!new".equals(caller)) {
-                        it_detail = new Intent(FormListSelectActivity.this,
-                                TravelActivity.class);
+                        it_detail = new Intent("com.modular.plat.TravelActivity");
                     }
                     if ("Workovertime".equals(caller) || "ExtraWork$".equals(caller)) {
-                        it_detail = new Intent(FormListSelectActivity.this,
-                                WorkExtraActivity.class);
+                        it_detail = new Intent("com.modular.plat.WorkExtraActivity");
                     }
                 } else {
-                    it_detail = new Intent(FormListSelectActivity.this,
-                            SaleDetailActivity.class);
+                    it_detail = new Intent("com.modular.plat.SaleDetailActivity");
                 }
                 it_detail.putExtra("formCondition", keyField + "=" + keyId);
                 it_detail.putExtra("gridCondition", pfField + "=" + keyId);