修复不能运行问题

变更包依赖路径

WeiChat/src/main/AndroidManifest.xml

@@ -599,7 +599,7 @@
             android:theme="@style/OAThemeOutOffice"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" >
             <intent-filter>
-                <action android:name="com,modualr.appworks.OutofficeActivity"/>
+                <action android:name="com.modualr.appworks.OutofficeActivity"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -50,9 +50,10 @@ import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.utils.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.uas.appme.other.activity.BasicInfoActivity;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.PauseOnScrollListener;
+import com.uas.appme.other.activity.BasicInfoActivity;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.PublicMessageAdapter;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;

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

@@ -34,6 +34,7 @@ import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
@@ -48,7 +49,6 @@ import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.xzjmyk.pm.activity.util.im.RecordUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.TagGroup;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import java.io.File;
 import java.io.FileInputStream;

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

@@ -47,7 +47,7 @@ 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.LeavePageActivity;
 import com.core.utils.RecognizerDialogUtil;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiUtils;
 

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

@@ -45,7 +45,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.LeaveUpdateEntity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.FormDetailActivity;
 import com.xzjmyk.pm.activity.ui.platform.pageforms.LeavePageActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -56,7 +56,7 @@ 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.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -58,7 +58,7 @@ 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.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

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

@@ -27,7 +27,7 @@ import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.core.utils.timeutils.wheel.DatePicker;
 
 import org.json.JSONException;
 import org.json.JSONObject;

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

@@ -45,24 +45,24 @@ import com.core.model.OAConfig;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.net.location.BdLocationHelper;
+import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
+import com.core.utils.helper.PopupWindowHelper;
+import com.core.widget.MyListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView;
+import com.uas.appworks.OA.erp.activity.MissionActivity;
 import com.uas.appworks.OA.erp.model.EmployeesModel;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.DbfindList2Activity;
-import com.uas.appworks.OA.erp.activity.MissionActivity;
 import com.xzjmyk.pm.activity.ui.erp.adapter.StickyListAdapter;
 import com.xzjmyk.pm.activity.ui.erp.model.list.SimpleData;
-import com.xzjmyk.pm.activity.util.baidu.OnGetDrivingRouteResult;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.helper.PopupWindowHelper;
-import com.core.widget.MyListView;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 import com.xzjmyk.pm.activity.view.steps.StepsView;
-import com.uas.appcontact.ui.widget.stickylistheaders.StickyListHeadersListView;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -35,7 +35,7 @@ import com.core.widget.view.ListViewInScroller;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.core.utils.timeutils.wheel.DatePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -53,7 +53,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.view.MyMarkerView;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.core.utils.timeutils.wheel.DatePicker;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;

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

@@ -18,8 +18,8 @@ import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
-import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
+import com.core.utils.timeutils.wheel.DatePicker;
+import com.core.utils.timeutils.wheel.OptionPicker;
 
 import java.util.Calendar;
 import java.util.HashMap;

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

@@ -29,7 +29,7 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.core.utils.timeutils.wheel.DatePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -34,8 +34,8 @@ import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.xzjmyk.pm.activity.view.wheel.OptionPicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.OptionPicker;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;

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

@@ -60,7 +60,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectRemarkActivity;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import org.jivesoftware.smack.util.StringUtils;
 

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

@@ -17,19 +17,19 @@ import com.andreabaccega.widget.FormEditText;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
-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.core.model.SelectBean;
 import com.core.app.Constants;
+import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
-import com.core.widget.view.Activity.SelectActivity;
+import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
+import com.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.widget.view.Activity.SelectActivity;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -18,7 +18,7 @@ import com.common.data.CalendarUtil;
 import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.SchemeConditionBean;
-import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -18,7 +18,7 @@ import com.common.data.CalendarUtil;
 import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.ReportConditionBean;
-import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;

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

@@ -27,7 +27,7 @@ import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.GregorianCalendar;
 import java.util.HashMap;

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

@@ -43,7 +43,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 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;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -38,7 +38,7 @@ import com.core.utils.ToastUtil;
 import com.core.utils.helper.PopupWindowHelper;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.widget.MyListView;
-import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -24,7 +24,7 @@ import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.view.RecycleViewDivider;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
-import com.xzjmyk.pm.activity.view.wheel.TimePicker;
+import com.core.utils.timeutils.wheel.TimePicker;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -59,6 +59,7 @@ 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.MissionActivity;
 import com.uas.appworks.OA.erp.activity.WorkActivity;
 import com.uas.appworks.OA.erp.activity.WorkDailyAddActivity;
 import com.uas.appworks.OA.erp.activity.form.DataFormDetailActivity;

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

@@ -204,7 +204,7 @@ public class OAMainActivity extends OABaseActivity implements View.OnClickListen
             case R.id.mission_tv:
                 boolean isAutoMission = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
                 if (isAutoMission) {
-                    intent = new Intent(activity, MissionActivity.class);
+//                    intent = new Intent(activity, MissionActivity.class);
                     intent.putExtra("flag", 1);
                 } else {
                     intent = new Intent(activity, OutofficeActivity.class);

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

@@ -35,7 +35,7 @@ import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.core.utils.TimeUtils;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
+import com.core.utils.timeutils.wheel.OASigninPicker;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;

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

@@ -22,6 +22,7 @@ import com.core.utils.CommonInterface;
 import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.OA.erp.activity.MissionActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;

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

@@ -23,7 +23,7 @@ import com.core.model.EmployeesEntity;
 import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.core.utils.timeutils.wheel.DatePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -29,7 +29,7 @@
 //import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 //import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 //import com.xzjmyk.pm.activity.util.CalendarUtils;
-//import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+//import com.core.utils.timeutils.wheel.DatePicker;
 //
 //import java.io.File;
 //import java.util.List;

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

@@ -14,6 +14,12 @@ import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
+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.core.utils.timeutils.wheel.OASigninPicker;
+import com.core.widget.MyListView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
@@ -21,13 +27,6 @@ import com.xzjmyk.pm.activity.bean.oa.AttenddancesBean;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.TeamsAttShowActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.core.net.http.http.OAHttpHelper;
-import com.core.net.http.http.OnHttpResultListener;
-import com.core.net.http.http.Request;
-import com.core.widget.MyListView;
-import com.xzjmyk.pm.activity.view.wheel.OASigninPicker;
 
 import java.util.Date;
 import java.util.HashMap;

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

@@ -9,7 +9,7 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.view.wheel.DatePicker;
+import com.core.utils.timeutils.wheel.DatePicker;
 
 import java.util.Calendar;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/find/FindFragment.java

@@ -9,8 +9,9 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.widget.RadioGroup;
 
-import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
+import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 
 public class FindFragment extends EasyFragment {
 	private static final String TAG_NEWEST = "newest";

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

@@ -49,7 +49,7 @@ import com.xzjmyk.pm.activity.util.im.RecordUtil;
 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;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -38,7 +38,7 @@ import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectCollisionActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.TagGroup;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.Calendar;
 import java.util.HashMap;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/AutoErpSigninUitl.java

@@ -26,6 +26,8 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
+import com.core.constant.AppConstant;
+import com.core.dao.MessageDao;
 import com.core.dao.UserDao;
 import com.core.model.MissionModel;
 import com.core.model.OAConfig;
@@ -36,13 +38,13 @@ import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
 import com.core.net.location.BdLocationHelper;
 import com.core.utils.CommonInterface;
+import com.core.utils.NotificationManage;
 import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
 import com.core.utils.WorkHandlerUtil;
 import com.uas.appworks.OA.erp.activity.MissionActivity;
 import com.uas.appworks.OA.erp.activity.WorkActivity;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.db.dao.MessageDao;
 import com.xzjmyk.pm.activity.db.dao.MissionDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.xzjmyk.pm.activity.ui.MainActivity;
@@ -54,8 +56,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.core.constant.AppConstant.CHANGE_WORK_TASK;
 import static com.core.net.http.ViewUtil.ct;
-import static com.xzjmyk.pm.activity.util.oa.AutoErpService.CHANGE_WORK_TASK;
 import static com.xzjmyk.pm.activity.util.oa.CommonUtil.getSharedPreferences;
 
 /**
@@ -520,8 +522,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
             } else if (what == SIGNIN_MISSION) {
                 try {
                     Intent intent = new Intent();
-                    intent.putExtra(AutoErpService.CHANGE_MISSION_TASK, true);
-                    intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
+                    intent.putExtra(AppConstant.CHANGE_MISSION_TASK, true);
+                    intent.setAction(AppConstant.CHANGE_MISSION_TASK);
                     MsgBroadcast.sendLocalBroadcast(intent);
                     if (!StringUtil.isEmpty(message))
                      CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), message);
@@ -794,8 +796,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                             @Override
                             public void run() {
                                 Intent intent = new Intent();
-                                intent.putExtra(AutoErpService.CHANGE_MISSION_TASK, true);
-                                intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
+                                intent.putExtra(AppConstant.CHANGE_MISSION_TASK, true);
+                                intent.setAction(AppConstant.CHANGE_MISSION_TASK);
                                 MsgBroadcast.sendLocalBroadcast(intent);
                             }
                         });
@@ -834,8 +836,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                                 @Override
                                 public void run() {
                                     Intent intent = new Intent();
-                                    intent.putExtra(AutoErpService.CHANGE_MISSION_TASK, true);
-                                    intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
+                                    intent.putExtra(AppConstant.CHANGE_MISSION_TASK, true);
+                                    intent.setAction(AppConstant.CHANGE_MISSION_TASK);
                                     MsgBroadcast.sendLocalBroadcast(intent);
                                     LogUtil.i("发送广播成功");
                                 }
@@ -878,8 +880,8 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
 
     private void endOfMission() {
         Intent intent = new Intent();
-        intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
-        intent.putExtra(AutoErpService.CHANGE_MISSION_TASK, false);
+        intent.setAction(AppConstant.CHANGE_MISSION_TASK);
+        intent.putExtra(AppConstant.CHANGE_MISSION_TASK, false);
         MsgBroadcast.sendLocalBroadcast(intent);
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/CommonUtil.java

@@ -75,7 +75,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.WebViewLoadActivity;
 import com.core.dao.DBManager;
 import com.core.model.B2BMsg;
 import com.xzjmyk.pm.activity.ui.erp.view.DateTimePickerDialog;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.utils.timeutils.wheel.DateTimePicker;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.xmpp.listener.ChatMessageListener;

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/oa/DepositNoticeUtil.java

@@ -22,14 +22,16 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
+import com.core.constant.AppConstant;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
+import com.core.utils.NotificationManage;
+import com.core.utils.OnGetDrivingRouteResult;
 import com.core.utils.TimeUtils;
 import com.uas.appme.pedometer.utils.TimeUtil;
 import com.xzjmyk.pm.activity.ui.erp.activity.secretary.BookingListActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
 import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-import com.xzjmyk.pm.activity.util.baidu.OnGetDrivingRouteResult;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -75,8 +77,8 @@ public class DepositNoticeUtil {
                                 mSureBookModel.addAll(JSON.parseArray(array.toString(), SureBookModel.class));
                                 getsureBookData();
                                 Intent intent = new Intent();
-                                intent.putExtra(AutoErpService.DEPOSIT_NOTICE_TASK, true);
-                                intent.setAction(AutoErpService.DEPOSIT_NOTICE_TASK);
+                                intent.putExtra(AppConstant.DEPOSIT_NOTICE_TASK, true);
+                                intent.setAction(AppConstant.DEPOSIT_NOTICE_TASK);
                                 MsgBroadcast.sendLocalBroadcast(intent);
                                 Log.i("0x01result", intent.toString());
                             }

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/utils/AutoErpSigninUitl.java

@@ -28,6 +28,7 @@ import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.broadcast.MsgBroadcast;
 import com.core.constant.AppConstant;
+import com.core.dao.MessageDao;
 import com.core.dao.UserDao;
 import com.core.dao.work.WorkModelDao;
 import com.core.model.MissionModel;
@@ -419,7 +420,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                         boolean saveOk = MessageDao.getInstance().instartSignin(getString(R.string.auto_work_signin_alert),
                                 StringUtil.isEmpty(subtitle) ? getString(R.string.uu_auto_work_signined_up) : subtitle);
                         if (saveOk) {
-                            Intent intent = new Intent(MessagePresenter.AUTO_SIGIN_ALART);
+                            Intent intent = new Intent(OAConfig.AUTO_SIGIN_ALART);
                             LocalBroadcastManager.getInstance(MyApplication.getInstance()).sendBroadcast(intent);
                         }
                     }
@@ -638,7 +639,7 @@ public class AutoErpSigninUitl implements OnHttpResultListener {
                 int deTime = PreferenceUtils.getInt(AppConfig.AUTO_MISSION_TIME, 10);
                 if ((minTime + deTime * 60) < time) {
                     notificationManage.sendNotification(MyApplication.getInstance(),
-                            R.string.success_signin_down_can_back, MainActivity.class);
+                            R.string.success_signin_down_can_back, WorkActivity.class);
                 } else {
                     Log.i("gongpengming", "时间不符合");
                     if (saveOk)