合并两个分支的代码

WeiChat/src/main/AndroidManifest.xml

@@ -249,9 +249,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".ui.erp.activity.DetailTaskActivity"
-            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
         <activity android:name=".ui.erp.activity.WebViewLoadActivity" />
         <activity android:name=".ui.erp.activity.NewsDetailActivity" />
         <activity android:name=".ui.erp.activity.NewsTwoActivity" />
@@ -567,13 +564,7 @@
         <activity android:name=".ui.erp.activity.crm.ClientActivity" />
         <activity android:name=".ApplySubscribeActivity" />
         <!-- android:theme="@style/Theme.AppCompat.NoActionBar" /> -->
-        <activity
-            android:name=".ui.erp.activity.oa.AddMeetingActivity"
-            android:label="@string/new_meet"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait"
-            android:theme="@style/OAThemeMeet"
-            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
+
         <activity
             android:name=".ui.erp.activity.crm.BusinessActivity"
             android:theme="@style/CrmThemeBlue" />
@@ -608,14 +599,16 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.erp.activity.oa.MeetDetailsActivity"
-            android:label="@string/meet_detail"
-            android:theme="@style/OAThemeMeet" />
+
         <activity
             android:name=".ui.erp.activity.oa.OARegisterActivity"
             android:label="@string/meet_signin"
-            android:theme="@style/OAThemeMeet" />
+            android:theme="@style/OAThemeMeet" >
+            <intent-filter>
+                <action android:name="com.modular.metting.appworks.OARegisterActivity"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
         <activity
             android:name=".ui.erp.activity.crm.CustomerAddActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -668,10 +661,7 @@
             android:name=".ui.erp.activity.oa.AlarmaActivity"
             android:label="@string/signin_setting"
             android:theme="@style/OAThemeSignin" />
-        <activity
-            android:name=".ui.erp.activity.oa.MeetingActivity"
-            android:label="@string/meet_manage"
-            android:theme="@style/OAThemeMeet" />
+
         <activity
             android:name=".ui.message.SubscripSetActivity"
             android:label="申请订阅" />
@@ -688,10 +678,7 @@
             android:name=".ui.erp.activity.crm.ContactManAddActivity"
             android:configChanges="orientation|keyboardHidden"
             android:windowSoftInputMode="adjustUnspecified|stateHidden" />
-        <activity
-            android:name=".ui.erp.activity.oa.SaveMeetActivity"
-            android:label="@string/meet_details"
-            android:theme="@style/OAThemeMeet" />
+      =
         <activity
             android:name=".ui.erp.activity.oa.UserSelectActivity"
             android:label="@string/select_user" />
@@ -699,10 +686,7 @@
             android:name=".ui.erp.activity.crm.BusinessStateActivity"
             android:launchMode="singleTask"
             android:theme="@style/CrmThemeBlue" />
-        <activity
-            android:name=".ui.erp.activity.oa.AddMeetTaskActivity"
-            android:label="@string/meet_task"
-            android:theme="@style/OAThemeMeet" />
+
         <activity
             android:name=".ui.erp.activity.oa.OutLogListActivity"
             android:label="@string/my_mission"
@@ -947,7 +931,7 @@
         android:name="com.me.appworks.OA.erp.activity.HolidaysActivity"
         android:label="@string/holidays"/>
         <activity
-            android:name=".ui.erp.activity.oa.StatisticsActivity"
+            android:name="com.uas.appworks.OA.erp.activity.StatisticsActivity"
             android:label="@string/work_statistics" />
         <activity
             android:name=".ui.erp.activity.oa.SelectDepartmentActivity"
@@ -972,9 +956,7 @@
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".ui.erp.activity.oa.TeamsAttShowActivity"
-            android:label="@string/sign_teams_rank" />
+
 
         <!-- 消息红点模块 -->
         <activity android:name=".ui.erp.activity.oa.WaittingWorksActivity" />
@@ -1099,7 +1081,6 @@
         </activity>
 
         <activity android:name=".ui.account.RegisterSelectActivity" />
-        <activity android:name="com.core.selectcalendar.SelectCalendarActivity" />
         <activity android:name=".ui.me.TemperatureActivity" />
 
         <!--数据统计，报表查询-->
@@ -1114,6 +1095,8 @@
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.erp.activity.datainquiry.activity.ReportStatisticsMoreMenuActivity" />
         <activity android:name=".ui.erp.activity.datainquiry.activity.PDFDownloadActivity" />
+
+        <activity android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity" />
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PersonalQzoneAdapter.java

@@ -37,7 +37,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.dao.CircleMessageDao;
 import com.core.xmpp.dao.FriendDao;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.xmpp.utils.HtmlUtils;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.uas.appworks.OA.erp.activity.WorkDailyAddActivity;
@@ -54,7 +54,7 @@ import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
 import com.xzjmyk.pm.activity.ui.circle.PMsgDetailActivity;
 import com.xzjmyk.pm.activity.ui.circle.showCEView;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -37,7 +37,7 @@ import com.core.utils.helper.AvatarHelper;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.dao.CircleMessageDao;
 import com.core.xmpp.dao.FriendDao;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.xmpp.utils.HtmlUtils;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
@@ -53,7 +53,7 @@ import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
 import com.xzjmyk.pm.activity.ui.circle.PMsgDetailActivity;
 import com.xzjmyk.pm.activity.ui.circle.showCEView;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/UserClickableSpan.java

@@ -9,7 +9,7 @@ import android.text.style.ClickableSpan;
 import android.util.Log;
 import android.view.View;
 
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.R;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/voicerecognition/JsonParser.java

@@ -1,103 +0,0 @@
-package com.xzjmyk.pm.activity.audio.voicerecognition;
-import android.text.TextUtils;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-/**
- * Created by FANGlh on 2017/1/11.
- * function: 对云端返回的Json结果进行解析
- */
-public class JsonParser {
-
-	/**
-	 * 听写结果的Json格式解析
-	 * @param json
-	 * @return
-	 */
-	public static String parseIatResult(String json) {
-		if(TextUtils.isEmpty(json))
-			return "";
-
-		StringBuffer ret = new StringBuffer();
-		try {
-			JSONTokener tokener = new JSONTokener(json);
-			JSONObject joResult = new JSONObject(tokener);
-
-			JSONArray words = joResult.getJSONArray("ws");
-			for (int i = 0; i < words.length(); i++) {
-				// 听写结果词，默认使用第一个结果
-				JSONArray items = words.getJSONObject(i).getJSONArray("cw");
-				JSONObject obj = items.getJSONObject(0);
-				ret.append(obj.getString("w"));
-//				如果需要多候选结果，解析数组其他字段
-//				for(int j = 0; j < items.length(); j++)
-//				{
-//					JSONObject obj = items.getJSONObject(j);
-//					ret.append(obj.getString("w"));
-//				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return ret.toString();
-	}
-
-	/**
-	 * 识别结果的Json格式解析
-	 * @param json
-	 * @return
-	 */
-	public static String parseGrammarResult(String json) {
-		StringBuffer ret = new StringBuffer();
-		try {
-			JSONTokener tokener = new JSONTokener(json);
-			JSONObject joResult = new JSONObject(tokener);
-
-			JSONArray words = joResult.getJSONArray("ws");
-			for (int i = 0; i < words.length(); i++) {
-				JSONArray items = words.getJSONObject(i).getJSONArray("cw");
-				for(int j = 0; j < items.length(); j++)
-				{
-					JSONObject obj = items.getJSONObject(j);
-					if(obj.getString("w").contains("nomatch"))
-					{
-						ret.append("没有匹配结果.");
-						return ret.toString();
-					}
-					ret.append("【结果】" + obj.getString("w"));
-					ret.append("【置信度】" + obj.getInt("sc"));
-					ret.append("\n");
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			ret.append("没有匹配结果.");
-		}
-		return ret.toString();
-	}
-
-	/**
-	 * 语义结果的Json格式解析
-	 * @param json
-	 * @return
-	 */
-	public static String parseUnderstandResult(String json) {
-		StringBuffer ret = new StringBuffer();
-		try {
-			JSONTokener tokener = new JSONTokener(json);
-			JSONObject joResult = new JSONObject(tokener);
-
-			ret.append("【应答码】" + joResult.getString("rc") + "\n");
-			ret.append("【转写结果】" + joResult.getString("text") + "\n");
-			ret.append("【服务名称】" + joResult.getString("service") + "\n");
-			ret.append("【操作名称】" + joResult.getString("operation") + "\n");
-			ret.append("【完整结果】" + json);
-		} catch (Exception e) {
-			e.printStackTrace();
-			ret.append("没有匹配结果.");
-		}
-		return ret.toString();
-	}
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/voicerecognition/MyRecognizerDialogLister.java

@@ -1,46 +0,0 @@
-//package com.xzjmyk.pm.activity.audio.voicerecognition;
-//
-//import android.content.Context;
-//import android.widget.Toast;
-//
-//import com.iflytek.cloud.RecognizerResult;
-//import com.iflytek.cloud.SpeechError;
-//import com.iflytek.cloud.ui.RecognizerDialogListener;
-//
-///**
-// * Created by FANGlh on 2017/1/12.
-// * function:
-// */
-//public class MyRecognizerDialogLister implements RecognizerDialogListener {
-//    Context mContext;
-//    public MyRecognizerDialogLister(Context mContext){
-//        this.mContext  = mContext;
-//    }
-//    //自定义的结果回调函数，成功执行第一个方法，失败执行第二个方法
-//    @Override
-//    public void onResult(RecognizerResult results, boolean isLast) {
-//        // TODO Auto-generated method stub
-//        String text = JsonParser.parseIatResult(results.getResultString());
-//        System.out.println(text);
-//        Toast.makeText(mContext, text, Toast.LENGTH_LONG).show();
-//
-//    }
-//    /**
-//     * 识别回调错误.
-//     */
-//    @Override
-//    public void onError(SpeechError error) {
-//        // TODO Auto-generated method stub
-//        int errorCoder = error.getErrorCode();
-//        switch (errorCoder) {
-//            case 10118:
-//                System.out.println("user don't speak anything");
-//                break;
-//            case 10204:
-//                System.out.println("can't connect to internet");
-//                break;
-//            default:
-//                break;
-//        }
-//    }
-//}

WeiChat/src/main/java/com/xzjmyk/pm/activity/audio/voicerecognition/VoiceToWord.java

@@ -1,161 +0,0 @@
-//package com.xzjmyk.pm.activity.audio.voicerecognition;
-//
-//import android.app.Activity;
-//import android.content.Context;
-//import android.content.SharedPreferences;
-//import android.os.Bundle;
-//import android.text.TextUtils;
-//import android.widget.Toast;
-//
-//import com.iflytek.cloud.speech.SpeechConstant;
-//import com.iflytek.cloud.speech.SpeechError;
-//import com.iflytek.cloud.speech.SpeechListener;
-//import com.iflytek.cloud.speech.SpeechRecognizer;
-//import com.iflytek.cloud.speech.SpeechUser;
-//import com.iflytek.cloud.ui.RecognizerDialog;
-//import com.iflytek.cloud.ui.RecognizerDialogListener;
-//import com.xzjmyk.pm.activity.ui.erp.util.Lg;
-//
-//public class VoiceToWord extends Activity{
-//	private Context context;
-//	private Toast mToast;
-//	//识别窗口
-//	private RecognizerDialog iatDialog;
-//	//识别对象
-//	private SpeechRecognizer iatRecognizer;
-//	//缓存，保存当前的引擎参数到下一次启动应用程序使用.
-//	private SharedPreferences mSharedPreferences;
-//	private RecognizerDialogListener recognizerDialogListener = null;
-//
-//	public VoiceToWord(Context context,String APP_ID) {
-//		// TODO Auto-generated constructor stub
-//		//用户登录
-//		this.context = context;
-//		SpeechUser.getUser().login(context, null, null
-//				, "appid=" + APP_ID, listener);
-//		//初始化听写Dialog,如果只使用有UI听写功能,无需创建SpeechRecognizer
-//		iatDialog =new RecognizerDialog(context);
-//		mToast = Toast.makeText(context, "", Toast.LENGTH_LONG);
-////		//初始化听写Dialog,如果只使用有UI听写功能,无需创建SpeechRecognizer
-////		iatDialog =new RecognizerDialog(context);
-//		//初始化缓存对象.
-//		mSharedPreferences = context.getSharedPreferences(context.getPackageName(),MODE_PRIVATE);
-//	}
-//
-//	public VoiceToWord(Context context,String APP_ID,RecognizerDialogListener recognizerDialogListener)
-//	{
-//		this.context = context;
-//		SpeechUser.getUser().login(context, null, null
-//				, "appid=" + APP_ID, listener);
-//		//初始化听写Dialog,如果只使用有UI听写功能,无需创建SpeechRecognizer
-//		iatDialog =new RecognizerDialog(context);
-//		mToast = Toast.makeText(context, "", Toast.LENGTH_LONG);
-////		//初始化听写Dialog,如果只使用有UI听写功能,无需创建SpeechRecognizer
-////		iatDialog =new RecognizerDialog(context);
-//		//初始化缓存对象.
-//		mSharedPreferences = context.getSharedPreferences(context.getPackageName(),MODE_PRIVATE);
-//		this.recognizerDialogListener = recognizerDialogListener;
-//	}
-//
-//	public void GetWordFromVoice()
-//	{
-//		boolean isShowDialog = mSharedPreferences.getBoolean("iat_show",true);
-//		if (isShowDialog) {
-//			//显示语音听写Dialog.
-//			showIatDialog();
-//		} else {
-//			if(null == iatRecognizer) {
-//				iatRecognizer=SpeechRecognizer.createRecognizer(this);
-//			}
-//			if(iatRecognizer.isListening()) {
-//				iatRecognizer.stopListening();
-////				((Button) findViewById(android.R.id.button1)).setEnabled(false);
-//			} else {
-//			}
-//		}
-//	}
-//
-//
-//	private void showTip(String str)
-//	{
-//		if(!TextUtils.isEmpty(str))
-//		{
-//			mToast.setText(str);
-//			mToast.show();
-//		}
-//	}
-//	/**
-//	 * 显示听写对话框.
-//	 * @param
-//	 */
-//	public void showIatDialog()
-//	{
-//		if(null == iatDialog) {
-//			//初始化听写Dialog
-//			iatDialog =new RecognizerDialog(this);
-//		}
-//
-//		//获取引擎参数
-//		String engine = mSharedPreferences.getString(
-//				"iat_engine",
-//				"iat");
-//
-//		//清空Grammar_ID，防止识别后进行听写时Grammar_ID的干扰
-//		iatDialog.setParameter(SpeechConstant.CLOUD_GRAMMAR, null);
-//		//设置听写Dialog的引擎
-//		iatDialog.setParameter(SpeechConstant.DOMAIN, engine);
-//		//设置采样率参数，支持8K和16K
-//		String rate = mSharedPreferences.getString(
-//				"sf",
-//				"sf");
-//		if(rate.equals("rate8k"))
-//		{
-//			iatDialog.setParameter(SpeechConstant.SAMPLE_RATE, "8000");
-//		}
-//		else
-//		{
-//			iatDialog.setParameter(SpeechConstant.SAMPLE_RATE, "16000");
-//		}
-//		Lg.d("recognizerDialogListener="+recognizerDialogListener);
-//		if(recognizerDialogListener == null)
-//		{
-//		//	getRecognizerDialogListener();
-//		}
-//		//显示听写对话框
-//		iatDialog.setListener(recognizerDialogListener);
-//		iatDialog.show();
-//	}
-////	private void getRecognizerDialogListener()
-////	{
-////		/**
-////		 * 识别回调监听器
-////		 */
-////		recognizerDialogListener=;
-////	}
-//
-//	public void setRecognizerDialogListener( RecognizerDialogListener recognizerDialogListener){
-//		this.recognizerDialogListener=recognizerDialogListener;
-//	};
-//
-//	/**
-//	 * 用户登录回调监听器.
-//	 */
-//	private SpeechListener listener = new SpeechListener()
-//	{
-//
-//		@Override
-//		public void onData(byte[] arg0) {
-//		}
-//
-//		@Override
-//		public void onCompleted(SpeechError error) {
-//			if(error != null) {
-//				System.out.println("user login success");
-//			}
-//		}
-//
-//		@Override
-//		public void onEvent(int arg0, Bundle arg1) {
-//		}
-//	};
-//}

WeiChat/src/main/java/com/xzjmyk/pm/activity/broadcast/DateTimeReceiver.java

@@ -4,7 +4,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.xzjmyk.pm.activity.util.oa.AutoErpSigninUitl;
+import com.uas.appworks.OA.erp.utils.AutoErpSigninUitl;
+
 
 /**
  * 日期改变监听器

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -51,10 +51,11 @@ import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.broadcast.MsgBroadcast;
-import com.core.constant.AppConstant;
+import com.core.dao.SignAutoLogDao;
 import com.core.dao.UserDao;
 import com.core.model.CircleMessage;
 import com.core.model.NewFriendMessage;
@@ -72,17 +73,16 @@ import com.core.xmpp.CoreService;
 import com.core.xmpp.ListenerManager;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.AuthStateListener;
+import com.core.xmpp.model.SignAutoLogEntity;
+import com.modular.login.LoginActivity;
+import com.uas.appcontact.listener.ImStatusListener;
+import com.uas.appcontact.ui.fragment.ContactsFragment;
+import com.uas.appcontact.ui.fragment.GroupChatFragment;
 import com.uas.appme.pedometer.service.StepService;
 import com.uas.appme.pedometer.utils.StepCountCheckUtil;
 import com.uas.appme.settings.activity.FeedbackActivity;
-import com.uas.appcontact.listener.ImStatusListener;
-import com.uas.appcontact.ui.fragment.GroupChatFragment;
-import com.uas.appcontact.ui.fragment.ContactsFragment;
 import com.xzjmyk.pm.activity.R;
-import com.core.xmpp.model.SignAutoLogEntity;
-import com.core.dao.SignAutoLogDao;
 import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.modular.login.LoginActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;

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

@@ -47,7 +47,7 @@ import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.CircleMessageDao;
 import com.core.xmpp.dao.FriendDao;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -75,7 +75,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.core.xmpp.utils.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
+import static com.core.app.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
 
 /**
  * 我的商务圈

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

@@ -35,7 +35,7 @@ import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.CircleMessageDao;
 import com.core.xmpp.listener.OnCompleteListener;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appme.other.activity.BasicInfoActivity;
@@ -49,7 +49,7 @@ import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.db.dao.MyPhotoDao;
 import com.core.app.ActionBackActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.im.helper.FileDataHelper;
 import com.xzjmyk.pm.activity.view.PMsgBottomView;
 import com.xzjmyk.pm.activity.view.ResizeLayout;

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

@@ -16,7 +16,7 @@ import android.widget.TextView;
 
 import com.common.ui.CameraUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;

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

@@ -50,7 +50,7 @@ import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.CircleMessageDao;
 import com.core.xmpp.dao.FriendDao;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appme.other.activity.BasicInfoActivity;
@@ -77,7 +77,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.core.xmpp.utils.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
+import static com.core.app.AppConstant.CIRCLE_TYPE_MY_BUSINESS;
 
 /**
  * 工作圈个人中心

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

@@ -20,7 +20,7 @@ import com.android.volley.VolleyError;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.xmpp.model.Area;

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

@@ -20,7 +20,7 @@ import com.baidu.mapapi.map.Marker;
 import com.baidu.mapapi.map.MarkerOptions;
 import com.baidu.mapapi.map.OverlayOptions;
 import com.baidu.mapapi.model.LatLng;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 

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

@@ -46,11 +46,11 @@ import com.core.utils.pictureselector.ComPictureAdapter;
 import com.core.widget.view.Activity.ImgFileListActivity;
 import com.core.widget.view.MyGridView;
 import com.core.xmpp.model.Area;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.xzjmyk.pm.activity.R;
 import com.modular.login.LoginActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
-import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
+import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 
 import java.io.File;

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

@@ -31,7 +31,7 @@ import com.common.system.SystemUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.xmpp.model.Area;

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

@@ -42,7 +42,7 @@ import com.common.ui.ProgressDialogUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.AppConfig;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.xmpp.model.AddAttentionResult;

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

@@ -26,7 +26,7 @@ import com.core.model.User;
 import com.core.utils.TimeUtils;
 import com.core.utils.helper.AvatarHelper;
 import com.core.xmpp.dao.FriendDao;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.uas.appme.other.activity.BasicInfoActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.Praise;

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

@@ -34,7 +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.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;

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

@@ -30,7 +30,7 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.core.model.SelectBean;
 import com.core.base.BaseActivity;
 import com.core.widget.view.Activity.SelectActivity;
@@ -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.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.utils.time.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

@@ -27,25 +27,25 @@ 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.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
+import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 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.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.LeaveAddEntity;
 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.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

@@ -32,17 +32,18 @@ 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.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 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.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 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;
@@ -56,7 +57,6 @@ 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.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

@@ -34,17 +34,18 @@ 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.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 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.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 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;
@@ -58,7 +59,6 @@ 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.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.core.utils.timeutils.wheel.DatePicker;
+import com.core.utils.time.wheel.DatePicker;
 
 import org.json.JSONException;
 import org.json.JSONObject;

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.core.utils.timeutils.wheel.DatePicker;
+import com.core.utils.time.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.core.utils.timeutils.wheel.DatePicker;
+import com.core.utils.time.wheel.DatePicker;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;

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

@@ -14,8 +14,8 @@ import com.alibaba.fastjson.JSON;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
-import com.core.utils.timeutils.wheel.DatePicker;
-import com.core.utils.timeutils.wheel.OptionPicker;
+import com.core.utils.time.wheel.DatePicker;
+import com.core.utils.time.wheel.OptionPicker;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;

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.core.utils.timeutils.wheel.DatePicker;
+import com.core.utils.time.wheel.DatePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -28,8 +28,8 @@ import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
-import com.core.utils.timeutils.wheel.DateTimePicker;
-import com.core.utils.timeutils.wheel.OptionPicker;
+import com.core.utils.time.wheel.DateTimePicker;
+import com.core.utils.time.wheel.OptionPicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;

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

@@ -46,23 +46,21 @@ import com.core.utils.CommonInterface;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
+import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.model.SelectAimModel;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 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.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 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.core.utils.timeutils.wheel.DateTimePicker;
-
-import org.jivesoftware.smack.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -22,7 +22,7 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
-import com.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -30,7 +30,6 @@ 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.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.ArrayList;
 import java.util.Calendar;

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

@@ -26,6 +26,7 @@ import com.core.utils.CommonUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.iflytek.cloud.RecognizerResult;
@@ -34,7 +35,6 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.adapter.DataInquiryFlexAdapter;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.adapter.DataInquirySchemeConditionAdapter;

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

@@ -16,7 +16,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.data.CalendarUtil;
-import com.core.utils.timeutils.wheel.OASigninPicker;
+import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.SchemeConditionBean;

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

@@ -15,7 +15,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.common.data.CalendarUtil;
-import com.core.utils.timeutils.wheel.OASigninPicker;
+import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.ReportConditionBean;

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.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.utils.time.wheel.DateTimePicker;
 
 import java.util.GregorianCalendar;
 import java.util.HashMap;

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

@@ -27,7 +27,7 @@ import com.core.utils.RecognizerDialogUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.PopupWindowHelper;
-import com.core.utils.timeutils.wheel.OASigninPicker;
+import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.MyListView;
 import com.core.widget.view.model.SelectAimModel;
 import com.iflytek.cloud.RecognizerResult;
@@ -36,15 +36,9 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.xzjmyk.pm.activity.ui.erp.presenter.AddVisitReportPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.core.utils.helper.PopupWindowHelper;
-import com.core.utils.RecognizerDialogUtil;
-import com.core.widget.MyListView;
-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

@@ -16,7 +16,7 @@ import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.base.OABaseActivity;
 import com.core.model.SelectBean;
-import com.core.utils.timeutils.wheel.TimePicker;
+import com.core.utils.time.wheel.TimePicker;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;

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

@@ -49,23 +49,25 @@ import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.net.http.http.OnHttpResultListener;
 import com.core.net.http.http.Request;
-import com.core.selectcalendar.OACalendarView;
 import com.core.utils.CommonInterface;
 import com.core.utils.TimeUtils;
 import com.core.widget.EmptyLayout;
 import com.core.widget.MyListView;
+import com.core.widget.view.selectcalendar.OACalendarView;
 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.AddMeetingActivity;
+import com.uas.appworks.OA.erp.activity.DetailTaskActivity;
 import com.uas.appworks.OA.erp.activity.ExpenseReimbursementActivity;
 import com.uas.appworks.OA.erp.activity.MissionActivity;
+import com.uas.appworks.OA.erp.activity.StatisticsActivity;
 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;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
 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;

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

@@ -30,7 +30,7 @@ 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.MissionActivity;
+import com.uas.appworks.OA.erp.activity.MeetingActivity;
 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/OutLogListActivity.java

@@ -26,9 +26,9 @@ import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.helper.AvatarHelper;
-import com.core.utils.timeutils.wheel.OASigninPicker;
+import com.core.utils.time.wheel.OASigninPicker;
 import com.core.widget.EmptyLayout;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;

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

@@ -42,7 +42,7 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.app.Constants;

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

@@ -33,11 +33,12 @@ 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.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.widget.view.selectcalendar.bean.DataState;
 import com.core.xmpp.model.AddAttentionResult;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appcontact.model.contacts.ContactsModel;

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

@@ -26,6 +26,24 @@ import com.core.app.MyApplication;
 import com.core.base.HttpImp;
 import com.core.base.OABaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.widget.CustomerScrollView;
+import com.core.widget.EmptyLayout;
+import com.core.widget.MyListView;
+import com.core.widget.view.selectcalendar.OACalendarView;
+import com.lidroid.xutils.ViewUtils;
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.MainActivity;
+import com.xzjmyk.pm.activity.ui.erp.adapter.booking.BookAdapter;
+import com.xzjmyk.pm.activity.ui.erp.adapter.oa.OACalenderViewPagerAdapter;
+import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
+import com.xzjmyk.pm.activity.ui.erp.model.book.SureBookModel;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.HttpImp;
+import com.core.base.OABaseActivity;
+import com.core.net.http.ViewUtil;
 import com.core.selectcalendar.OACalendarView;
 import com.core.utils.CommonUtil;
 import com.core.widget.CustomerScrollView;
@@ -76,6 +94,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
     private BookAdapter mAdapter;
     private OACalendarView calendarView;
     private OACalenderViewPagerAdapter pagerAdapter;//当前Viewpager适配器
+    private List<SureBookModel> mSureBookModel;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -112,13 +131,13 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.menu_about, menu);
+        getMenuInflater().inflate(R.menu.menu_nearby, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() ==R.id.app_about) {
+        if (item.getItemId() == R.id.search) {
             startActivity(new Intent(mContext, BookingAddActivity.class));
         }
 

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

@@ -1,26 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.secretary;
-
-/**
- * Created by Arison on 2017/6/27.
- */
-
-public class DataState {
-    String value;
-    boolean isClicked;
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public boolean isClicked() {
-        return isClicked;
-    }
-
-    public void setClicked(boolean clicked) {
-        isClicked = clicked;
-    }
-}

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.core.selectcalendar.OACalendarView;
+import com.core.widget.view.selectcalendar.OACalendarView;
 
 import java.util.Calendar;
 import java.util.Date;

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.core.widget.view.selectcalendar.OACalendarView;
+import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.xzjmyk.pm.activity.R;
-import com.core.selectcalendar.OACalendarView;
 
 import java.util.Date;
 import java.util.Set;

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.core.utils.timeutils.wheel.DatePicker;
+import com.core.utils.time.wheel.DatePicker;
 
 import java.util.Calendar;
 

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

@@ -34,7 +34,7 @@ import com.core.utils.sortlist.SideBar;
 import com.core.widget.ClearEditText;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.listener.OnCompleteListener;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.uas.appme.other.activity.BasicInfoActivity;

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

@@ -14,8 +14,10 @@ import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
+import com.core.utils.IntentUtils;
 import com.core.utils.ToastUtil;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.OA.erp.activity.StatisticsActivity;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
@@ -23,8 +25,6 @@ import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.DataInquiryActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.ReportStatisticsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity;
-import com.core.utils.IntentUtils;
 import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/form/Data.java

@@ -1,249 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.model.form;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.core.model.Approval;
-
-/**
- * @desc:动态表单字段 item数据实体类
- * @author：Arison on 2016/11/14
- */
-public class Data implements Parcelable {
-
-    private int groupId;//组ID---控件需要用到
-    private String group;//组名----多组的情况
-    private boolean isSelected;
-    private int detno;//编号
-    private String readonly;//必填
-    private int isDefault;//是否展示和隐藏
-    private String type;//字段类型
-    private String name;//文本字段名
-    private int isNeed;//必填
-    private String value;//编辑框的内容-界面显示
-    private String displayValue;//下拉字段隐藏的值
-    private String field;//字段名
-    private String formStoreKey;//formstore key 上传需要用到的key
-    private int fdid;
-    private boolean isEditing = true;//是否正在编辑
-    private String maxlength;//最大长度
-    private String detailId;//关联主表id
-    private String detailDid;//明细表id
-
-
-    public String getGroup() {
-        return group;
-    }
-
-    public void setGroup(String group) {
-        this.group = group;
-    }
-
-    public int getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(int groupId) {
-        this.groupId = groupId;
-    }
-
-    public int getDetno() {
-        return detno;
-    }
-
-    public void setDetno(int detno) {
-        this.detno = detno;
-    }
-
-    public boolean isSelected() {
-        return isSelected;
-    }
-
-    public void setIsSelected(boolean isSelected) {
-        this.isSelected = isSelected;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public int getIsDefault() {
-        return isDefault;
-    }
-
-    public void setIsDefault(int isDefault) {
-        this.isDefault = isDefault;
-    }
-
-    public String getReadonly() {
-        return readonly;
-    }
-
-    public void setReadonly(String readonly) {
-        this.readonly = readonly;
-    }
-
-    public int getIsNeed() {
-        return isNeed;
-    }
-
-    public void setIsNeed(int isNeed) {
-        this.isNeed = isNeed;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getField() {
-        return field;
-    }
-
-    public void setField(String field) {
-        this.field = field;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getDisplayValue() {
-        return displayValue;
-    }
-
-    public void setDisplayValue(String displayValue) {
-        this.displayValue = displayValue;
-    }
-
-    public String getFormStoreKey() {
-        return formStoreKey;
-    }
-
-    public void setFormStoreKey(String formStoreKey) {
-        this.formStoreKey = formStoreKey;
-    }
-
-    public int getFdid() {
-        return fdid;
-    }
-
-    public void setFdid(int fdid) {
-        this.fdid = fdid;
-    }
-
-    public boolean isEditing() {
-        return isEditing;
-    }
-
-    public void setIsEditing(boolean isEditing) {
-        this.isEditing = isEditing;
-    }
-
-    public String getMaxlength() {
-        return maxlength;
-    }
-
-    public void setMaxlength(String maxlength) {
-        this.maxlength = maxlength;
-    }
-
-    public String getDetailId() {
-        return detailId;
-    }
-
-    public void setDetailId(String detailId) {
-        this.detailId = detailId;
-    }
-
-    public String getDetailDid() {
-        return detailDid;
-    }
-
-    public void setDetailDid(String detailDid) {
-        this.detailDid = detailDid;
-    }
-
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(this.groupId);
-        dest.writeString(this.group);
-        dest.writeByte(this.isSelected ? (byte) 1 : (byte) 0);
-        dest.writeInt(this.detno);
-        dest.writeString(this.readonly);
-        dest.writeInt(this.isDefault);
-        dest.writeString(this.type);
-        dest.writeString(this.name);
-        dest.writeInt(this.isNeed);
-        dest.writeString(this.value);
-        dest.writeString(this.displayValue);
-        dest.writeString(this.field);
-        dest.writeString(this.formStoreKey);
-        dest.writeInt(this.fdid);
-        dest.writeByte(this.isEditing ? (byte) 1 : (byte) 0);
-        dest.writeString(this.maxlength);
-        dest.writeString(this.detailId);
-        dest.writeString(this.detailDid);
-    }
-
-
-    public Data() {
-    }
-
-    public Data(boolean isMain, Approval approval) {
-        this.groupId = isMain ? 0 : 1;
-        group = isMain ? "基本信息" : "明细项1";
-        this.field = approval.getValuesKey();
-        this.name = approval.getCaption();
-    }
-
-    protected Data(Parcel in) {
-        this.groupId = in.readInt();
-        this.group = in.readString();
-        this.isSelected = in.readByte() != 0;
-        this.detno = in.readInt();
-        this.readonly = in.readString();
-        this.isDefault = in.readInt();
-        this.type = in.readString();
-        this.name = in.readString();
-        this.isNeed = in.readInt();
-        this.value = in.readString();
-        this.displayValue = in.readString();
-        this.field = in.readString();
-        this.formStoreKey = in.readString();
-        this.fdid = in.readInt();
-        this.isEditing = in.readByte() != 0;
-        this.maxlength = in.readString();
-        this.detailId = in.readString();
-        this.detailDid = in.readString();
-    }
-
-    public static final Creator<Data> CREATOR = new Creator<Data>() {
-        @Override
-        public Data createFromParcel(Parcel source) {
-            return new Data(source);
-        }
-
-        @Override
-        public Data[] newArray(int size) {
-            return new Data[size];
-        }
-    };
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/form/GroupData.java

@@ -1,98 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.model.form;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import java.util.ArrayList;
-
-/**
- * @desc:分组实体类
- * @author：Arison on 2016/11/14
- */
-public class GroupData implements Parcelable {
-
-    private int id;
-    private String name;
-    private ArrayList<Data> datas = new ArrayList<>();
-   
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public ArrayList<Data> getDatas() {
-        return datas;
-    }
-
-    public void setDatas(ArrayList<Data> datas) {
-        this.datas = datas;
-    }
-
-    /**
-     * 获取Item内容
-     *
-     * @param pPosition
-     * @return
-     */
-    public Object getItem(int pPosition) {
-        // Category排在第一位  
-        if (pPosition == 0) {
-            return this;
-        } else {
-            return datas.get(pPosition - 1);
-        }
-    }
-
-    /**
-     * 当前类别Item总数。分组也需要占用一个Item
-     *
-     * @return
-     */
-    public int getItemCount() {
-        return datas.size() + 1;
-    }
-
-    @Override
-    public int describeContents() {
-        return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-        dest.writeInt(this.id);
-        dest.writeString(this.name);
-        dest.writeTypedList(this.datas);
-    }
-
-    public GroupData() {
-    }
-
-    protected GroupData(Parcel in) {
-        this.id = in.readInt();
-        this.name = in.readString();
-        this.datas = in.createTypedArrayList(Data.CREATOR);
-    }
-
-    public static final Parcelable.Creator<GroupData> CREATOR = new Parcelable.Creator<GroupData>() {
-        @Override
-        public GroupData createFromParcel(Parcel source) {
-            return new GroupData(source);
-        }
-
-        @Override
-        public GroupData[] newArray(int size) {
-            return new GroupData[size];
-        }
-    };
-}

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

@@ -37,7 +37,7 @@ import com.core.utils.sortlist.BaseSortModel;
 import com.core.utils.sortlist.PingYinUtil;
 import com.core.xmpp.dao.ChatMessageDao;
 import com.core.xmpp.dao.FriendDao;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.modular.appmessages.activity.MsgsSecondCommonActivity;
 import com.core.dao.MessageDao;
 import com.modular.appmessages.activity.UUHelperActivity;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/CreateGroupActivity.java

@@ -20,7 +20,7 @@ import android.widget.TextView;
 import com.common.system.DisplayUtil;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/groupchat/SelectContactsActivity.java

@@ -38,7 +38,7 @@ import com.common.ui.ProgressDialogUtil;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.xmpp.model.Area;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/LocalVideoActivity.java

@@ -23,7 +23,7 @@ import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.roamer.slidelistview.SlideBaseAdapter;
 import com.roamer.slidelistview.SlideListView;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.VideoFile;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -38,7 +38,7 @@ import com.core.net.http.ViewUtil;
 import com.core.utils.FlexJsonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.AvatarHelper;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.other.model.Master;
 import com.uas.appme.settings.activity.BaseInfoActivity;
@@ -202,7 +202,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private BroadcastReceiver receiverUpdataHead = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if ("updata".equals(intent.getStringExtra(com.core.constant.AppConstant.UPHEAD))) {
+            if ("updata".equals(intent.getStringExtra(com.core.app.AppConstant.UPHEAD))) {
                 AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), mAvatarImg, true);
             }
         }
@@ -217,7 +217,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         if (!mReceiverTag) {     //在注册广播接受者的时候 判断是否已被注册,避免重复多次注册广播
             IntentFilter inflate = new IntentFilter();
             mReceiverTag = true;
-            inflate.addAction(com.core.constant.AppConstant.UPHEAD);
+            inflate.addAction(com.core.app.AppConstant.UPHEAD);
             getActivity().registerReceiver(receiverUpdataHead, inflate);
         }
         super.onResume();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/SpeechrecognitionActivity.java

@@ -10,7 +10,7 @@ import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.core.base.BaseActivity;
 import com.core.utils.RecognizerDialogUtil;
 

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

@@ -56,7 +56,7 @@ import com.core.xmpp.downloader.Downloader;
 import com.core.xmpp.downloader.UploadEngine;
 import com.core.xmpp.listener.ChatMessageListener;
 import com.core.xmpp.model.ChatMessage;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.xmpp.utils.flie.FileUtils;
 import com.core.xmpp.widget.ChatBottomView;
 import com.core.xmpp.widget.ChatContentView;

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

@@ -14,7 +14,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;

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

@@ -52,7 +52,7 @@ import com.core.xmpp.listener.MucListener;
 import com.core.xmpp.model.ChatMessage;
 import com.core.xmpp.model.MucRoom;
 import com.core.xmpp.model.MucRoomMember;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.core.xmpp.widget.ChatBottomView;
 import com.core.xmpp.widget.ChatContentView;
 import com.core.xmpp.widget.PullDownListView;

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

@@ -22,7 +22,7 @@ import com.core.utils.sortlist.PingYinUtil;
 import com.core.utils.sortlist.SideBar;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.model.ChatMessage;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;

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

@@ -20,7 +20,7 @@ import com.core.utils.sortlist.PingYinUtil;
 import com.core.utils.sortlist.SideBar;
 import com.core.xmpp.dao.FriendDao;
 import com.core.xmpp.model.ChatMessage;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;

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

@@ -23,7 +23,7 @@ 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.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.core.model.SelectBean;
 import com.core.base.BaseActivity;
 import com.core.widget.view.Activity.SelectActivity;

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

@@ -49,7 +49,7 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.modular.appmessages.R;
 import com.modular.appmessages.adapter.NewSchedultAdapter;
-import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
+import com.uas.appworks.OA.erp.activity.DetailTaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.WebViewLoadActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.AllProcess;
 

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

@@ -33,7 +33,10 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.model.OAConfig;
 import com.core.net.http.ViewUtil;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.utils.time.wheel.DateTimePicker;
 import com.core.widget.view.SwitchView;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
@@ -42,14 +45,11 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 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.oa.SelectCollisionActivity;
 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.core.utils.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.TagGroup;
-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

@@ -18,14 +18,16 @@ import com.alibaba.fastjson.JSON;
 import com.common.data.JSONUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
+import com.core.app.AppConstant;
 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.core.utils.time.wheel.DateTimePicker;
+import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
@@ -34,11 +36,9 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 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.oa.SelectCollisionActivity;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 import com.xzjmyk.pm.activity.view.TagGroup;
-import com.core.utils.timeutils.wheel.DateTimePicker;
 
 import java.util.Calendar;
 import java.util.HashMap;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/MemoryFileManagement.java

@@ -20,7 +20,7 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.xzjmyk.pm.activity.R;
 
 import java.io.File;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/MultiImagePreviewActivity.java

@@ -1,359 +0,0 @@
-package com.xzjmyk.pm.activity.ui.tool;
-
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.SparseArray;
-import android.view.Gravity;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupWindow;
-import android.widget.TextView;
-
-import com.common.system.DisplayUtil;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;
-import com.core.xmpp.utils.AppConstant;
-import com.xzjmyk.pm.activity.R;
-import com.core.app.ActionBackActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.util.im.Scheme;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
-import uk.co.senab.photoview.PhotoViewAttacher;
-
-/**
- * 图片集的预览
- * 
- * @author Dean Tao
- * @version 1.0
- */
-public class MultiImagePreviewActivity extends ActionBackActivity {
-
-	private ArrayList<String> mImages;
-	private int mPosition;
-	private boolean mChangeSelected;
-	private PhotoViewAttacher mAttacher;
-	private ViewPager mViewPager;
-	private CheckBox mCheckBox;
-	private TextView mIndexCountTv;
-	private List<Integer> mRemovePosition = new ArrayList<Integer>();
-	private View mMoreMenuView;
-	private PopupWindow mMoreWindow;
-	private TextView sava_picture_tv;
-	private TextView cancel_picture_tv;
-	private String mImageUri;
-	private String imageUrl;
-
-	@SuppressWarnings("unchecked")
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);//竖屏
-		if (getIntent() != null) {
-			mImages = (ArrayList<String>) getIntent().getSerializableExtra(AppConstant.EXTRA_IMAGES);
-			mPosition = getIntent().getIntExtra(AppConstant.EXTRA_POSITION, 0);
-			mChangeSelected = getIntent().getBooleanExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
-		}
-		if (mImages == null) {
-			mImages = new ArrayList<String>();
-		}
-		getSupportActionBar().hide();
-		setContentView(R.layout.activity_images_preview);
-		setNotTouchEvent(true);
-		initView();
-	}
-
-	@Override
-	public void onBackPressed() {
-		doFinish();
-	}
-
-	@Override
-	protected boolean onHomeAsUp() {
-		doFinish();
-		return true;
-	}
-
-	private void doFinish() {
-		if (mChangeSelected) {
-			Intent intent = new Intent();
-			ArrayList<String> resultImages = null;
-			if (mRemovePosition.size() == 0) {
-				resultImages = mImages;
-			} else {
-				resultImages = new ArrayList<String>();
-				for (int i = 0; i < mImages.size(); i++) {
-					if (!isInRemoveList(i)) {
-						resultImages.add(mImages.get(i));
-					}
-				}
-			}
-			intent.putExtra(AppConstant.EXTRA_IMAGES, resultImages);
-			setResult(RESULT_OK, intent);
-		}
-		finish();
-	}
-
-	private void initView() {
-		mViewPager = (ViewPager) findViewById(R.id.view_pager);
-		mIndexCountTv = (TextView) findViewById(R.id.index_count_tv);
-		mCheckBox = (CheckBox) findViewById(R.id.check_box);
-		mViewPager.setPageMargin(10);
-
-		mViewPager.setAdapter(new ImagesAdapter());
-
-		updateSelectIndex(mPosition);
-
-		if (mPosition < mImages.size()) {
-			mViewPager.setCurrentItem(mPosition);
-		}
-
-		mViewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-			@Override
-			public void onPageSelected(int arg0) {
-				updateSelectIndex(arg0);
-			}
-
-			@Override
-			public void onPageScrolled(int arg0, float arg1, int arg2) {
-			}
-
-			@Override
-			public void onPageScrollStateChanged(int arg0) {
-			}
-		});
-	}
-
-	public void updateSelectIndex(final int index) {
-		if (mPosition >= mImages.size()) {
-			mIndexCountTv.setText(null);
-		} else {
-			mIndexCountTv.setText((index + 1) + "/" + mImages.size());
-		}
-
-		if (!mChangeSelected) {
-			mCheckBox.setVisibility(View.GONE);
-			return;
-		}
-
-		mCheckBox.setOnCheckedChangeListener(null);
-		boolean removed = isInRemoveList(index);
-		if (removed) {
-			mCheckBox.setChecked(false);
-		} else {
-			mCheckBox.setChecked(true);
-		}
-		mCheckBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-				if (isChecked) {
-					removeFromRemoveList(index);
-				} else {
-					addInRemoveList(index);
-				}
-			}
-		});
-	}
-
-	SparseArray<View> mViews = new SparseArray<View>();
-
-	void addInRemoveList(int position) {
-		if (!isInRemoveList(position)) {
-			mRemovePosition.add(Integer.valueOf(position));
-		}
-	}
-
-	void removeFromRemoveList(int position) {
-		if (isInRemoveList(position)) {
-			mRemovePosition.remove(Integer.valueOf(position));
-		}
-	}
-
-	boolean isInRemoveList(int position) {
-		return mRemovePosition.indexOf(Integer.valueOf(position)) != -1;
-	}
-
-	class ImagesAdapter extends PagerAdapter {
-
-		@Override
-		public int getCount() {
-			return mImages.size();
-		}
-
-		@Override
-		public boolean isViewFromObject(View view, Object object) {
-			return view == object;
-		}
-
-		@Override
-		public Object instantiateItem(ViewGroup container, final int position) {
-			View view = mViews.get(position );
-			// init status
-			imageUrl = mImages.get(position);
-			Scheme scheme = Scheme.ofUri(imageUrl);
-			if (view == null) {
-				view = new ImageView(MultiImagePreviewActivity.this);
-				mViews.put(position, view);
-				view.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						doFinish();
-					}
-				});
-//				view.setOnLongClickListener(new View.OnLongClickListener() {
-//					@Override
-//					public boolean onLongClick(View v) {
-//						longclickshowppw();
-//						return true;
-//					}
-//				});
-			}
-
-
-			switch (scheme) {
-			case HTTP:
-			case HTTPS:// 需要网络加载的
-				ImageLoader.getInstance().displayImage(imageUrl, (ImageView) view, mImageLoadingListener);
-				break;
-			case UNKNOWN:// 如果不知道什么类型，且不为空，就当做是一个本地文件的路径来加载
-				if (!TextUtils.isEmpty(imageUrl)) {
-					ImageLoader.getInstance().displayImage(Uri.fromFile(new File(imageUrl)).toString(), (ImageView) view,mImageLoadingListener);
-//					ImageLoader.getInstance().displayImage(imageUrl, (ImageView) view, mImageLoadingListener);
-				}
-				break;
-			default:
-				// 其他 drawable asset类型不处理
-				break;
-			}
-			mImageUri = Uri.fromFile(new File(imageUrl)).toString();
-			container.addView(view);
-
-
-			return view;
-		}
-
-		@Override
-		public void destroyItem(ViewGroup container, int position, Object object) {
-			View view = mViews.get(position);
-			if (view == null) {
-				super.destroyItem(container, position, object);
-			} else {
-				container.removeView(view);
-			}
-		}
-
-	}
-
-	/**
-	 * @param ：长按点击弹出PopupWindow事件，
-	 * @author: FANGlh 2016-12-6
-	 */
-	public void longclickshowppw(final String imageUrl){
-
-		mMoreMenuView = View.inflate(mContext, R.layout.layout_menu_common_save_picture, null);
-		sava_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.save_tv);
-		cancel_picture_tv = (TextView) mMoreMenuView.findViewById(R.id.cancel_tv);
-
-		mMoreWindow = new PopupWindow(mMoreMenuView, LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT, true);
-		mMoreWindow.setAnimationStyle(R.style.MenuAnimationFade);
-		mMoreWindow.setBackgroundDrawable(new BitmapDrawable());
-		mMoreWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-			@Override
-			public void onDismiss() {
-				closeMorePopupWindow();
-			}
-		});
-
-		mMoreWindow.showAtLocation(getWindow().getDecorView(), Gravity.CENTER, 0, 0);
-		DisplayUtil.backgroundAlpha(mContext, 0.5f);
-
-		sava_picture_tv.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				CommonUtil.saveImageToLocal(mContext, ImageLoader.getInstance().loadImageSync(imageUrl));
-				closeMorePopupWindow();
-			}
-		});
-
-		cancel_picture_tv.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				closeMorePopupWindow();
-			}
-		});
-
-
-	}
-
-
-	private void closeMorePopupWindow() {
-		if (mMoreWindow != null) {
-			mMoreWindow.dismiss();
-			DisplayUtil.backgroundAlpha(mContext, 1f);
-		}
-
-	}
-
-
-	private ImageLoadingListener mImageLoadingListener = new ImageLoadingListener() {
-		@Override
-		public void onLoadingStarted(String arg0, View arg1) {
-
-		}
-
-		@Override
-		public void onLoadingFailed(String arg0, View arg1, FailReason arg2) {
-
-		}
-
-		@Override
-		public void onLoadingComplete(String arg0, View arg1, Bitmap arg2) {
-			mAttacher=new PhotoViewAttacher((ImageView) arg1);
-			Log.i("Arison", "" + mAttacher.getMidScale());
-			Log.i("Arison", "" + mAttacher.getMinimumScale());
-			mAttacher.setMinimumScale(0.5f);
-			mAttacher.update();
-
-			mAttacher.setOnPhotoTapListener(new PhotoViewAttacher.OnPhotoTapListener() {
-				@Override
-				public void onPhotoTap(View view, float x, float y) {
-					finish();
-					overridePendingTransition(0, R.anim.alpha_scale_out);
-				}
-
-				@Override
-				public void onOutsidePhotoTap() {
-
-				}
-			});
-			mAttacher.setOnLongClickListener(new View.OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View v) {
-					longclickshowppw(imageUrl);
-					return true;
-				}
-			});
-		}
-
-		@Override
-		public void onLoadingCancelled(String arg0, View arg1) {
-
-		}
-	};
-}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/SingleImagePreviewActivity.java

@@ -17,7 +17,7 @@ import android.widget.TextView;
 
 import com.common.system.DisplayUtil;
 import com.core.app.ActionBackActivity;
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.assist.ImageLoadingListener;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/tool/VideoPlayActivity.java

@@ -13,7 +13,7 @@ import android.widget.LinearLayout;
 import android.widget.MediaController;
 import android.widget.VideoView;
 
-import com.core.xmpp.utils.AppConstant;
+import com.core.app.AppConstant;
 import com.xzjmyk.pm.activity.R;
 import com.core.utils.ToastUtil;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/dialog/QSearchPpwindowUtils.java

@@ -26,7 +26,7 @@ import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.core.app.Constants;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.QSCModel;

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

@@ -22,9 +22,10 @@ import com.common.thread.ThreadUtil;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.broadcast.MsgBroadcast;
-import com.core.constant.AppConstant;
+import com.core.dao.MessageDao;
 import com.core.model.MissionModel;
 import com.core.model.OAConfig;
 import com.core.model.WorkModel;
@@ -33,8 +34,8 @@ import com.core.utils.NotificationManage;
 import com.core.utils.TimeUtils;
 import com.uas.appme.pedometer.service.StepService;
 import com.uas.appworks.OA.erp.activity.WorkActivity;
+import com.uas.appworks.OA.erp.utils.AutoErpSigninUitl;
 import com.xzjmyk.pm.activity.R;
-import com.core.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;

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

@@ -1,901 +0,0 @@
-package com.xzjmyk.pm.activity.util.oa;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.content.LocalBroadcastManager;
-import android.util.Log;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baidu.mapapi.model.LatLng;
-import com.baidu.mapapi.search.route.DrivingRouteLine;
-import com.baidu.mapapi.search.route.DrivingRouteResult;
-import com.common.LogUtil;
-import com.common.data.DateFormatUtil;
-import com.common.data.JSONUtil;
-import com.common.data.ListUtils;
-import com.common.data.StringUtil;
-import com.common.preferences.PreferenceUtils;
-import com.common.system.SystemUtil;
-import com.common.thread.ThreadUtil;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-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;
-import com.core.model.User;
-import com.core.model.WorkModel;
-import com.core.net.http.http.OAHttpHelper;
-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.MissionDao;
-import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
-import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.erp.presenter.MessagePresenter;
-import com.xzjmyk.pm.activity.util.baidu.BaiduMapUtil;
-
-import java.util.ArrayList;
-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.CommonUtil.getSharedPreferences;
-
-/**
- * 负责签到   内外勤
- * Created by Bitliker on 2016/12/20.
- */
-public class AutoErpSigninUitl implements OnHttpResultListener {
-
-    private final int MAC_VAL = 0x11;//判断mac地址
-    private final int SIGNING = 0x12;//内勤签到
-    private final int LOAD_WORKLOG = 0x13;//打卡列表
-    private final int SIGNIN_MISSION = 0x14;//外勤签到
-    private final int HAVE_OUT_PLAN = 0x15;//还有未拜访外勤计划
-    private final int WORK_DATA = 0x16;//内勤列表
-    private final int WORK_LOG = 0x17;//下拉列表时候的获取打卡列表
-    private final int LOAD_PLAN = 0x18;
-    private final int LOAD_WORK_SET = 0x21;//获取打卡高级设置
-    private boolean isB2b;
-    private NotificationManage notificationManage;
-
-    public AutoErpSigninUitl() {
-        notificationManage = new NotificationManage();
-        isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
-    }
-
-    /**
-     * 签到内勤
-     *
-     * @param model 签到班次对象
-     */
-    public void signinWork(WorkModel model) {
-        //1.判读mac地址是否符合     3.签到
-        if (!MyApplication.getInstance().isNetworkActive()) {
-           CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), getString(R.string.common_notlinknet));
-            return;
-        }
-        String macAddress = SystemUtil.getMac(MyApplication.getInstance());
-        if (StringUtil.isEmpty(macAddress)) {
-           CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), "未获取到mac地址");
-            return;
-        }
-        if (isB2b) {
-            Bundle bundle = new Bundle();
-            bundle.putParcelable("data", model);
-            signinWork(bundle, "");
-        } else {
-            validatorMac(model, macAddress);
-        }
-    }
-
-    /**
-     * 签到外勤
-     *
-     * @param model 签到对象
-     */
-    public void signinMission(MissionModel model) {
-        if (model == null) return;
-        if (!MyApplication.getInstance().isNetworkActive()) {
-            notificationManage.sendNotification(ct, R.string.out_net_signin, MissionActivity.class);
-            CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_outplan_failed), getString(R.string.common_notlinknet));
-            return;
-        }
-        Map<String, Object> param = new HashMap<>();
-        Map<String, Object> formStore = new HashMap<>();
-        String emcode = CommonUtil.getEmcode();
-        String name = CommonUtil.getName();
-        String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
-        if (StringUtil.isEmpty(address))
-            address = model.getCompanyAddr();
-        String remark = model.getStatus() == 2 ? MyApplication.getInstance().getString(R.string.auto_mission_signindown)
-                : MyApplication.getInstance().getString(R.string.auto_mission_signinup);
-        String location = model.getCompanyName();
-        if (StringUtil.isEmpty(location) || isB2b)
-            location = MyApplication.getInstance().getBdLocationHelper().getName();
-        formStore.put("mo_remark", remark);//备注
-        formStore.put("mo_company", location);
-        formStore.put("mo_address", address);
-        if (isB2b) {
-            formStore.put("enuu", CommonUtil.getMaster());
-            formStore.put("mpd_id", model.getId());
-            formStore.put("emcode", emcode);
-        } else {
-            param.put("mpd_id", model.getId());
-            param.put("caller", "Mobile_outsign");
-            formStore.put("mo_man", name);
-            formStore.put("mo_mancode", emcode);
-        }
-        param.put("formStore", JSONUtil.map2JSON(formStore));
-        Bundle bundle = new Bundle();
-        bundle.putParcelable("data", model);
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().saveOutSign :
-                "mobile/addAutoSign.action";
-        Request request = new Request.Bulider()
-                .setBundle(bundle)
-                .setMode(Request.Mode.POST)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(SIGNIN_MISSION)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
-
-    /*判断mac地址是否符合*/
-    private void validatorMac(WorkModel model, String macAddress) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("macAddress", macAddress);
-        param.put("emcode", getSharedPreferences(MyApplication.getInstance(), "erp_username"));
-        Bundle bundle = new Bundle();
-        bundle.putParcelable("data", model);
-        String url = "mobile/addMobileMac.action";
-        Request request = new Request.Bulider()
-                .setBundle(bundle)
-                .setMode(Request.Mode.POST)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(MAC_VAL)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
-
-    //签到
-    private void signinWork(Bundle bunder, String code) {
-        Context ct = MyApplication.getInstance();
-        Map<String, Object> param = new HashMap<>();
-        Map<String, Object> form = new HashMap<>();
-        if (!isB2b)
-            form.put("cl_code", code);
-        String phone = MyApplication.getInstance().mLoginUser.getTelephone();
-        if (StringUtil.isEmpty(phone)) {
-            String userId = MyApplication.getInstance().mLoginUser.getUserId();
-            if (!StringUtil.isEmpty(userId)) {
-                User user = UserDao.getInstance().getUserByUserId(userId);
-                phone = user.getTelephone();
-            } else
-                phone = getSharedPreferences(MyApplication.getInstance(), "user_phone");
-        }
-        form.put("cl_phone", phone);
-        form.put("cl_emcode", getSharedPreferences(ct, "erp_username"));
-        String emname = getSharedPreferences(ct, "erp_emname");
-        if (StringUtil.isEmpty(emname)) {
-            emname = MyApplication.getInstance().mLoginUser.getNickName().trim();
-        }
-        form.put("cl_emname", emname);
-        boolean isp = isPlay(form);
-        if (!isp) {
-            return;//不符合打卡
-        }
-        if (isB2b) {
-            form.put("enuu", getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            form.put("emcode", getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-        } else
-            param.put("caller", "CardLog");
-
-        String formStore = JSONUtil.map2JSON(form);
-        param.put("formStore", formStore);
-        param.put("emcode", getSharedPreferences(ct, "erp_username"));
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url :
-                "mobile/saveCardLog.action";
-        Request request = new Request.Bulider()
-                .setBundle(bunder)
-                .setMode(Request.Mode.POST)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(SIGNING)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-
-    }
-
-
-    /*判断是否符合打卡*/
-    private boolean isPlay(Map<String, Object> form) {
-        try {
-            //判断是否符合打卡
-            BdLocationHelper helper = MyApplication.getInstance().getBdLocationHelper();
-            String address = helper.getAddress();
-            if (StringUtil.isEmpty(address))
-                address = PreferenceUtils.getString("bdaddress");
-            form.put("cl_address", address);
-            form.put("cl_location", "android " + MyApplication.getInstance().getString(R.string.auto_work_signin_log));
-//            int comDistance = PreferenceUtils.getInt("distance", 0);
-            float distance = BaiduMapUtil.getInstence().getDistance();
-            if (distance == 0) {
-                //TODO 规定地址<实际地址  不符合
-                //判断是否有外勤
-                boolean isOutPlan = PreferenceUtils.getBoolean(AppConfig.HAVE_OUT_PLAN, false);
-                if (!isOutPlan) {
-                    //TODO 没有自动外勤
-                }
-                return false;
-            } else {
-                form.put("cl_distance", distance);
-                return true;
-            }
-        } catch (NullPointerException e) {
-            return false;
-        } catch (Exception e) {
-            return false;
-        }
-    }
-
-    //获取打卡记录
-    private void loadLog(Bundle bunder) throws Exception {
-        String date = TimeUtils.s_long_2_str(System.currentTimeMillis());
-        //获取网络数据
-        Map<String, Object> param = new HashMap<>();
-        String code = getSharedPreferences(MyApplication.getInstance(), "erp_username");
-        param.put("currentMaster", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-        if (isB2b) {
-            param.put("pageNumber", 1);
-            param.put("date", DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMMdd"));
-        } else {
-            param.put("page", 1);
-            param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
-        }
-        param.put("pageSize", 100);
-        param.put("caller", "CardLog");
-        param.put("emcode", code);
-        param.put("master", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_record_url :
-                "mobile/oa/workdata.action";
-        Request request = new Request.Bulider()
-                .setBundle(bunder)
-                .setMode(Request.Mode.GET)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(LOAD_WORKLOG)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
-
-    //获取是否有外勤计划
-    public void loadIsMission(MissionModel model) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("emcode", getSharedPreferences(MyApplication.getInstance(), "erp_username"));
-        Bundle bunder = new Bundle();
-        bunder.putParcelable("data", model);
-        String url = "mobile/yesornoplan.action";
-        Request request = new Request.Bulider()
-                .setParam(param)
-                .setBundle(bunder)
-                .setUrl(url)
-                .setWhat(HAVE_OUT_PLAN)
-                .setMode(Request.Mode.GET)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
-
-
-    /*****************
-     * 下拉列表
-     ***********************/
-    /**
-     * 下拉内勤数据
-     */
-    public void loadWorkData() {
-        Map<String, Object> param = new HashMap<>();
-        param.put("date", DateFormatUtil.long2Str("yyyyMMdd"));
-        param.put("emcode", getSharedPreferences(MyApplication.getInstance(), "erp_username"));
-        Bundle bundle = new Bundle();
-
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_schedule_url :
-                "mobile/getWorkDate.action";
-        Request request = new Request.Bulider()
-                .setBundle(bundle)
-                .setMode(Request.Mode.GET)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(WORK_DATA)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-
-    }
-
-
-    private void loadLog(ArrayList<WorkModel> models) {
-        String date = TimeUtils.s_long_2_str(System.currentTimeMillis());
-        //获取网络数据
-        Map<String, Object> param = new HashMap<>();
-        String code = getSharedPreferences(MyApplication.getInstance(), "erp_username");
-        param.put("currentMaster", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-        if (isB2b) {
-            param.put("date", DateFormatUtil.long2Str(System.currentTimeMillis(), "yyyyMMdd"));
-            param.put("pageNumber", 1);
-        } else {
-            param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
-            param.put("page", 1);
-        }
-        param.put("pageSize", 100);
-        param.put("caller", "CardLog");
-        param.put("emcode", code);
-        param.put("master", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-        Bundle bundle = new Bundle();
-        bundle.putParcelableArrayList("models", models);
-
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_record_url :
-                "mobile/oa/workdata.action";
-        Request request = new Request.Bulider()
-                .setBundle(bundle)
-                .setMode(Request.Mode.GET)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(WORK_LOG)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
-
-    public void loadWorkSet() {
-        //获取考勤高级设置时间请求
-        Map<String, Object> param = new HashMap<>();
-        if (!isB2b)
-            param.put("code", 1);
-
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().get_plat_senior_setting_url :
-                "mobile/getconfigs.action";
-        Request request = new Request.Bulider()
-                .setMode(Request.Mode.GET)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(LOAD_WORK_SET)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
-
-    //获取外勤计划列表
-    public void loadMissionPlan() {
-        Map<String, Object> param = new HashMap<>();
-        param.put("emcode", getSharedPreferences(MyApplication.getInstance(), "erp_username"));
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan :
-                "mobile/mobileoutplan.action";
-        Request request = new Request.Bulider()
-                .setMode(Request.Mode.GET)
-                .setParam(param)
-                .setUrl(url)
-                .setWhat(LOAD_PLAN)
-                .bulid();
-        OAHttpHelper.getInstance().requestHttp(request, this);
-    }
-
-    @Override
-    public void result(int what, boolean isJSON, String message, final Bundle bundle) {
-        try {
-            switch (what) {
-                case MAC_VAL://判断mac地址
-                    if (isJSON && JSON.parseObject(message).containsKey("success") &&
-                            JSON.parseObject(message).getBoolean("success")) {
-                        CommonInterface.getInstance().getCodeByNet("CardLog", new CommonInterface.OnResultListener() {
-                            @Override
-                            public void result(boolean isOk, int result, String message) {
-                                signinWork(bundle, message);
-                            }
-                        });
-                    } else {
-                        CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), message);
-                    }
-                    break;
-                case SIGNING:
-                    String subtitle = MyApplication.getInstance().getBdLocationHelper().getName();
-                    if (PreferenceUtils.getBoolean(PreferenceUtils.AUTO_SIGN_SW, true)) {
-                        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);
-                            LocalBroadcastManager.getInstance(MyApplication.getInstance()).sendBroadcast(intent);
-                        }
-                    }
-                    loadLog(bundle);
-                    break;
-                case LOAD_WORKLOG://签到后保存到打卡数据库里面
-                    if (isJSON && JSON.parseObject(message).containsKey("listdata")) {
-                        saveSignin2DB(bundle, JSON.parseObject(message).getJSONArray("listdata"));
-                    }
-                    break;
-                case SIGNIN_MISSION:
-                    if (isJSON) {
-                        if (JSON.parseObject(message).containsKey("success") && JSON.parseObject(message).getBoolean("success")) {
-                            //成功  更新数据库
-                            if (bundle == null) return;
-                            MissionModel mission = bundle.getParcelable("data");
-                            if (mission == null) return;
-                            updataMissonDB(mission);
-                        }
-                    }
-                    break;
-                case HAVE_OUT_PLAN:
-                    if (!isJSON) return;
-                    JSONObject object = JSON.parseObject(message);
-                    if (!object.containsKey("success") || !object.getBoolean("success")) return;
-                    if (object.containsKey("isOffline")) {
-                        int isOffline = Integer.valueOf(object.getString("isOffline"));
-                        //当判断到外勤计划为有值  1.外勤计划有  2.自动外勤
-                        if (bundle != null && bundle.getParcelable("data") != null) {
-                            MissionModel model = bundle.getParcelable("data");
-                            if (model == null) {
-                                LogUtil.i("model==null");
-                                return;
-                            }
-                            boolean saveOk = MissionDao.getInstance().updata(model);
-                            if (isOffline > 0) {//还有外勤计划
-                                if (saveOk)
-                                    notificationManage.sendNotification(MyApplication.getInstance(),
-                                            model.getCompanyName() + MyApplication.getInstance().getString(R.string.success_signin_down_mission), MissionActivity.class);
-                            } else {//没有外勤计划
-                                endMission(model, saveOk);
-                                List<MissionModel> models = MissionDao.getInstance().queryByEnCode();
-                                if (ListUtils.isEmpty(models) || !isMoreMission(models))
-                                    endOfMission();
-
-                            }
-                        }
-                    }
-                case WORK_DATA://打卡班次
-                    handlerWorkData(isJSON, message);
-                    break;
-                case WORK_LOG://
-                    ArrayList<WorkModel> models = null;
-                    if (bundle != null) models = bundle.getParcelableArrayList("models");
-                    handlerWorkLog(isJSON, message, models);
-                    break;
-                case LOAD_PLAN:
-                    JSONArray array = null;
-                    if (isJSON && JSON.parseObject(message).get("data") instanceof JSONArray) {
-                        array = JSON.parseObject(message).getJSONArray("data");
-                    } else if (JSON.parseObject(message).get("success") instanceof JSONArray) {
-                        array = JSON.parseObject(message).getJSONArray("success");
-                    }
-                    handlerData(array);
-                    break;
-
-                case LOAD_WORK_SET:
-                    if (isJSON) {
-                        handlerWorkSet(JSON.parseObject(message));
-                    }
-                    break;
-                default:
-                    break;
-            }
-        } catch (Exception e) {
-            if (e != null) {
-                LogUtil.i("result=" + e.getMessage());
-                CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), e.getMessage());
-            }
-        }
-    }
-
-    boolean isErrorMac;
-
-    @Override
-    public void error(int what, String message, Bundle bundle) {
-        if (!StringUtil.isEmpty(message)) {
-            String msg = null;
-            if (StringUtil.isInclude(message, MyApplication.getInstance().getString(R.string.is_not_common_device))) {
-                msg = MyApplication.getInstance().getString(R.string.is_not_common_device_not_signin);
-                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), msg);
-            } else if (StringUtil.isInclude(message, "设备正处于申请变更绑定阶段")) {
-                msg = MyApplication.getInstance().getString(R.string.is_changeing_not_signin);
-                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), msg);
-            } else if (StringUtil.isInclude(message, "该设备已被他人绑定")) {
-                msg = MyApplication.getInstance().getString(R.string.is_binded_other_not_signin);
-                CommonUtil.saveAutoLogtoLocal(getString(R.string.auto_sign_failed), msg);
-            } else if (what == SIGNIN_MISSION) {
-                try {
-                    Intent intent = new Intent();
-                    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);
-                } catch (Exception e) {
-                }
-            }
-            if (!StringUtil.isEmpty(msg))
-                 CommonUtil.saveAutoLogtoLocal(getString(R.string.app_monitor_log), msg);
-            if (!isErrorMac && !StringUtil.isEmpty(msg)) {
-                isErrorMac = true;
-                notificationManage.sendNotification(MyApplication.getInstance(), msg, WorkActivity.class);
-            }
-        }
-    }
-
-    /**
-     * 外勤签到签退处理
-     * 1.签退：status==1&&离开范围之内==》mission.setStatus(2) ,先把状态设置位2在传进来签退
-     * 2.签到：在范围之内，status不做任何改变 传进来签到
-     *
-     * @param mission 传进来的对象
-     * @throws Exception
-     */
-
-    private void updataMissonDB(MissionModel mission) throws Exception {
-        //更新数据库
-        if (mission == null) return;//如果数据库没有，一般不会出现这样的情况
-        if (StringUtil.isEmpty(mission.getRealTime()))
-            mission.setRealTime(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-        else mission.setRealLeave(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-        String title = "";
-        String subTitle = "";
-        if (mission.getStatus() == 2) {//签退
-            title = MyApplication.getInstance().getString(R.string.auto_mission_alert);
-            if (StringUtil.isEmpty(mission.getCompanyName()))
-                subTitle = MyApplication.getInstance().getString(R.string.uu_auto_signined_down);
-            else
-                subTitle = MyApplication.getInstance().getString(R.string.visit) + mission.getCompanyName() + getString(R.string.success_signin_down);
-
-            CommonInterface.getInstance().endMission(mission.getId(), false);
-            loadIsMission(mission);
-        } else {//签到
-            if (mission.getStatus() < 1) {
-                title = getString(R.string.auto_mission_alert);
-                if (StringUtil.isEmpty(mission.getCompanyName()))
-                    subTitle = getString(R.string.uu_auto_signined_up);
-                else
-                    subTitle = getString(R.string.visit) + mission.getCompanyName() + getString(R.string.success_signin_up);
-                mission.setStatus(1);//说明没有打过卡
-                boolean saveOk = MissionDao.getInstance().updata(mission);
-                if (saveOk)//XXX公司自动外勤签到成功
-                    notificationManage.sendNotification(MyApplication.getInstance(), mission.getCompanyName()
-                                    + getString(R.string.success_signin_up_mission),
-                            MissionActivity.class);
-            }
-        }
-        MissionDao.getInstance().updata(mission);
-        if (!StringUtil.isEmpty(title) && !StringUtil.isEmpty(subTitle))
-            MessageDao.getInstance().instartSignin(title, subTitle);
-    }
-
-    /**
-     * 外勤签退后判断时候还有外勤计划，如果没有，判断是否符合返回公司  返回提示请返回公司签到
-     *
-     * @param model
-     * @param saveOk
-     * @throws Exception
-     */
-    private void endMission(final MissionModel model, final boolean saveOk) throws Exception {
-        float longitude = PreferenceUtils.getFloat("longitude");
-        float latitude = PreferenceUtils.getFloat("latitude");
-        BaiduMapUtil.getInstence().getDrivingRoute(MyApplication.getInstance().
-                getBdLocationHelper().getLocation(), new LatLng(latitude, longitude), new OnGetDrivingRouteResult() {
-            @Override
-            public void onGetDrivingRouteResult(DrivingRouteResult drivingRouteResult) {
-                List<DrivingRouteLine> list = drivingRouteResult.getRouteLines();
-                if (ListUtils.isEmpty(list)) {//获取路线列表为空
-                    if (saveOk)
-                        notificationManage.sendNotification(MyApplication.getInstance(), getString(R.string.to) + model.getCompanyName() + getString(R.string.success_signin_down_mission),
-                                MissionActivity.class);
-                    return;
-                }
-                int minTime = 0;
-                for (DrivingRouteLine e : list) {
-                    if (minTime == 0 || minTime > e.getDuration()) {
-                        minTime = e.getDuration();
-                    }
-                }
-                LogUtil.i("最短时间为" + minTime);
-                //获取使用时间为。。。。
-                //当前时间
-                List<WorkModel> models = WorkModelDao.getInstance().query(true);
-                if (ListUtils.isEmpty(models)) {
-                    LogUtil.i("数据库中的班次为空的");
-                    if (saveOk)
-                        notificationManage.sendNotification(MyApplication.getInstance(), getString(R.string.to) + model.getCompanyName() + getString(R.string.success_signin_down_mission),
-                                MissionActivity.class);
-                    return;
-                }
-                String lastTime = null;
-                for (WorkModel e : models) {
-                    if (StringUtil.isEmpty(e.getOffTime())) continue;
-                    if (StringUtil.isEmpty(lastTime) || e.getOffTime().compareTo(lastTime) > 0)
-                        lastTime = e.getOffTime();
-                }
-                if (StringUtil.isEmpty(lastTime)) {
-                    if (saveOk)
-                        notificationManage.sendNotification(MyApplication.getInstance(), getString(R.string.to) + model.getCompanyName() + getString(R.string.success_signin_down_mission),
-                                MissionActivity.class);
-                    return;
-                }
-                int time = getTime(lastTime);
-                LogUtil.i("与下班时间相差" + time);
-                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);
-                } else {
-                    Log.i("gongpengming", "时间不符合");
-                    if (saveOk)
-                        notificationManage.sendNotification(MyApplication.getInstance(),
-                                R.string.success_signin_down_task_ok, MissionActivity.class);
-                }
-            }
-        });
-    }
-
-    //保存到数据库
-    private void saveSignin2DB(Bundle bundle, JSONArray array) throws Exception {
-        WorkModel model = null;
-        if (bundle != null && bundle.getParcelable("data") != null) {
-            model = bundle.getParcelable("data");
-        } else {
-            List<WorkModel> models = WorkModelDao.getInstance().query(false);
-            if (ListUtils.isEmpty(models)) return;
-            String time = DateFormatUtil.long2Str(System.currentTimeMillis(), "HH:mm");
-            for (WorkModel m : models) {
-                //当前时间位于该班次之间
-                if (m.getWorkStart().compareTo(time) < 0 && m.getOffend().compareTo(time) > 0) {
-                    model = m;
-                    break;
-                }
-            }
-        }
-        //取最后一个
-        JSONObject object = array.getJSONObject(array.size() - 1);
-        String time = object.getString("cl_time");//获取最后一次打卡信息，班次打卡信息
-        time = DateFormatUtil.formatChange(time, DateFormatUtil.HM);//获取到的
-        if (StringUtil.isEmpty(time) || model == null) return;
-
-        if (StringUtil.isEmpty(model.getWorkSignin()) && model.getWorkStart().compareTo(time) <= 0
-                && model.getWorkTime().compareTo(time) >= 0) {
-            model.setWorkSignin(time);
-            long i = WorkModelDao.getInstance().update(model);
-            if (PreferenceUtils.getBoolean(PreferenceUtils.AUTO_SIGN_SW, true))
-                notificationManage.sendNotification(MyApplication.getInstance(),
-                        R.string.auto_signin, WorkActivity.class);
-            boolean b = hasMore();
-            if (!b) {
-                //TODO 关闭任务
-                Intent intent = new Intent();
-                intent.setAction(AppConstant.CHANGE_WORK_TASK);
-                intent.putExtra(AppConstant.CHANGE_WORK_TASK, false);
-                MsgBroadcast.sendLocalBroadcast(intent);
-            }
-        } else if (StringUtil.isEmpty(model.getOffSignin()) && model.getOffTime().compareTo(time) <= 0
-                && model.getOffend().compareTo(time) >= 0) {
-            model.setOffSignin(time);
-            WorkModelDao.getInstance().update(model);
-            if (PreferenceUtils.getBoolean(PreferenceUtils.AUTO_SIGN_SW, true))
-                notificationManage.sendNotification(MyApplication.getInstance(),
-                        R.string.auto_signin, WorkActivity.class);
-            boolean b = hasMore();
-            if (!b) {
-                Intent intent = new Intent();
-                intent.setAction(AppConstant.CHANGE_WORK_TASK);
-                intent.putExtra(AppConstant.CHANGE_WORK_TASK, false);
-                MsgBroadcast.sendLocalBroadcast(intent);
-            }
-        }
-    }
-
-    private boolean hasMore() {
-        List<WorkModel> models = WorkModelDao.getInstance().query(false);
-        if (ListUtils.isEmpty(models)) return false;
-        else {
-            for (WorkModel m : models) {
-                if (StringUtil.isEmpty(m.getWorkSignin()) || StringUtil.isEmpty(m.getOffSignin()))
-                    return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * 处理打卡签到
-     *
-     * @param isJSON
-     * @param message
-     */
-    private void handlerWorkData(boolean isJSON, String message) throws Exception {
-        if (!isJSON)
-            return;
-        JSONObject object = JSON.parseObject(message);
-        ArrayList<WorkModel> models = WorkHandlerUtil.handlerWorkData(object, isB2b);
-        WorkHandlerUtil.handerLocation(object, isB2b);
-        if (ListUtils.isEmpty(models)) {
-            return;
-        }
-        loadLog(models);
-    }
-
-
-    /**
-     * 处理打卡签到列表，建议在线程钟使用
-     *
-     * @param isJSON     是否是json数据
-     * @param message    返回信息
-     * @param workModels 获取班次信息时候的数据
-     * @throws Exception
-     */
-    private void handlerWorkLog(boolean isJSON, String message, ArrayList<WorkModel> workModels) throws Exception {
-        if (!isJSON || ListUtils.isEmpty(workModels)) {
-            saveDb(workModels);
-            return;
-        }
-        JSONObject object = JSON.parseObject(message);
-        ArrayList<WorkModel> models = WorkHandlerUtil.handlerWorkLog(object, workModels);
-        saveDb(models);
-    }
-
-
-    private void saveDb(final List<WorkModel> models) {
-        if (!ListUtils.isEmpty(models)) {
-            ThreadUtil.getInstance().addTask(new Runnable() {
-                @Override
-                public void run() {
-                    boolean saveOK = WorkModelDao.getInstance().createOrUpdata(models, System.currentTimeMillis());
-                    if (saveOK) {
-                        OAHttpHelper.getInstance().post(new Runnable() {
-                            @Override
-                            public void run() {
-                                Intent intent = new Intent();
-                                intent.putExtra(AppConstant.CHANGE_WORK_TASK, true);
-                                intent.setAction(AppConstant.CHANGE_WORK_TASK);//保存到数据库成功，开启
-                                MsgBroadcast.sendLocalBroadcast(intent);
-                            }
-                        });
-                    }
-                }
-            });
-        }
-    }
-
-    /**
-     * 第一次进来应用会请求一次数据，并把数据保存到数据库中，保存成功后发送广播，更新轮询
-     * 解析处理外勤计划列表并保存到数据库
-     *
-     * @param array
-     */
-    private void handlerData(JSONArray array) throws Exception {
-        if (ListUtils.isEmpty(array)) {
-            ThreadUtil.getInstance().addTask(new Runnable() {
-                @Override
-                public void run() {
-                    List<MissionModel> models = MissionDao.getInstance().queryByEnCode();
-                    if (!ListUtils.isEmpty(models)) {
-                        OAHttpHelper.getInstance().post(new Runnable() {
-                            @Override
-                            public void run() {
-                                Intent intent = new Intent();
-                                intent.putExtra(AppConstant.CHANGE_MISSION_TASK, true);
-                                intent.setAction(AppConstant.CHANGE_MISSION_TASK);
-                                MsgBroadcast.sendLocalBroadcast(intent);
-                            }
-                        });
-
-                    }
-                }
-            });
-        } else {
-            JSONObject object = null;
-            MissionModel entity = null;
-            final List<MissionModel> entities = new ArrayList<>();
-            for (int i = 0; i < array.size(); i++) {
-                object = array.getJSONObject(i);
-                entity = WorkHandlerUtil.handlerEntity(isB2b, object);
-                if (entity == null)
-                    continue;
-                entities.add(entity);
-            }
-            if (!ListUtils.isEmpty(entities)) {
-                LogUtil.i("保存到数据库成功");
-                ThreadUtil.getInstance().addTask(new Runnable() {
-                    @Override
-                    public void run() {
-                        boolean saveOk = false;
-                        try {
-                            saveOk = MissionDao.getInstance().updataOrCreate(entities);
-                            if (!saveOk)
-                                saveOk = !ListUtils.isEmpty(MissionDao.getInstance().queryByEnCode());
-                        } catch (Exception e) {
-
-                        }
-                        if (saveOk) {
-                            CommonUtil.saveAutoLogtoLocal(getString(R.string.app_start_log), getString(R.string.app_outplan_running));
-                            //TODO 保存异常数据库
-                            OAHttpHelper.getInstance().post(new Runnable() {
-                                @Override
-                                public void run() {
-                                    Intent intent = new Intent();
-                                    intent.putExtra(AppConstant.CHANGE_MISSION_TASK, true);
-                                    intent.setAction(AppConstant.CHANGE_MISSION_TASK);
-                                    MsgBroadcast.sendLocalBroadcast(intent);
-                                    LogUtil.i("发送广播成功");
-                                }
-                            });
-                        }
-                    }
-                });
-            }
-        }
-    }
-
-
-    private void handlerWorkSet(JSONObject o) {
-        try {
-            WorkHandlerUtil.handlerWorkSet(o);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        if (OAConfig.autosign)
-            loadWorkData();
-        else
-            try {
-                //如果不是自动打卡和提醒，清空数据库今天的数据
-                WorkModelDao.getInstance().clearByDate(System.currentTimeMillis());
-            } catch (Exception e) {
-                if (e != null)
-                    LogUtil.i("initNet Exception=" + e.getMessage());
-            }
-    }
-
-    private boolean isMoreMission(List<MissionModel> models) {
-        for (MissionModel e : models) {
-            if (e.getType() != 1) {
-                LogUtil.i("返回正确");
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void endOfMission() {
-        Intent intent = new Intent();
-        intent.setAction(AppConstant.CHANGE_MISSION_TASK);
-        intent.putExtra(AppConstant.CHANGE_MISSION_TASK, false);
-        MsgBroadcast.sendLocalBroadcast(intent);
-    }
-
-    //获取当前时间鱼下班时间的差
-    private int getTime(String lastTime) {
-        long time = TimeUtils.f_str_2_long(TimeUtils.s_long_2_str(System.currentTimeMillis())
-                + " " + lastTime + ":00");
-        long time2 = time - System.currentTimeMillis();
-        if (time < 0) return 0;
-        return (int) (time2 / 1000);
-    }
-
-    private String getString(int id) {
-        return MyApplication.getInstance().getString(id);
-    }
-
-}

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

@@ -53,7 +53,6 @@ import com.common.LogUtil;
 import com.common.data.CalendarUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
-import com.common.file.PropertiesUtil;
 import com.core.app.MyApplication;
 import com.core.model.Friend;
 import com.core.model.XmppMessage;
@@ -75,7 +74,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.core.utils.timeutils.wheel.DateTimePicker;
+import com.core.utils.time.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,7 +22,7 @@ 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.app.AppConstant;
 import com.core.net.http.ViewUtil;
 import com.core.net.http.http.OAHttpHelper;
 import com.core.utils.NotificationManage;

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/OACalendarView.java

@@ -1,455 +0,0 @@
-package com.xzjmyk.pm.activity.view;
-
-import android.content.Context;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-
-import com.common.LogUtil;
-import com.common.data.DateFormatUtil;
-import com.common.data.StringUtil;
-import com.common.system.DisplayUtil;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-
-/**
- * Created by pengminggong on 2016/9/20.
- */
-public class OACalendarView extends View implements View.OnTouchListener {
-    //日期记录
-    private Date curDate; // 当前日历显示的月
-    private Date today; // 今天的日期
-    private Date downDate; // 手指按下状态时临时日期
-    //索引
-    private int todayIndex; // 今天的索引
-    private int downIndex; // 按下的格子索引
-    private int startIndex; // 开始的格子索引(当月)
-    private int endIndex; // 开始的格子索引(当月)
-    //装饰物 decorat
-    private String decoratDays;
-    private int maxDay;//当月有多少天
-    private int[] workWeeks = {2, 3, 4, 5, 6};
-
-
-    private Calendar calendar;
-    private Surface surface;
-    private int[] date; // 日历显示格子数目
-
-    public OACalendarView(Context context) {
-        this(context, null);
-    }
-
-    public OACalendarView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        surface = new Surface();
-        curDate = today = new Date();
-        calendar = Calendar.getInstance();
-        calendar.setTime(curDate);
-        todayIndex = calendar.get(Calendar.DAY_OF_MONTH);
-        setBackgroundColor(surface.bgColor);
-        surface.density = getResources().getDisplayMetrics().density;
-        //计算格子数
-        calendar.set(Calendar.DAY_OF_MONTH, 1);//设置为当月第一天
-        startIndex = calendar.get(Calendar.DAY_OF_WEEK) - 1;//获取第一天在当周的星期几，返回多1，所以减1
-        maxDay = calendar.getActualMaximum(Calendar.DATE);//获取当月有多少天
-        //如果从星期日开始作为第一天
-        date = new int[maxDay + startIndex];
-        //如果从星期一作为开始第一天         date = new int[daysCountOfMonth + dayInWeek-1];
-        endIndex = date.length - 1;
-        todayIndex += startIndex - 1;
-        for (int i = startIndex, j = 1; i < date.length; i++, j++) {
-            date[i] = j;
-        }
-        downIndex = todayIndex;
-        setOnTouchListener(this);
-    }
-
-
-    private void setCalendar(Date d) {
-        curDate = today = d;
-        calendar.setTime(curDate);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);//设置为当月第一天
-        startIndex = calendar.get(Calendar.DAY_OF_WEEK) - 1;//获取第一天在当周的星期几，返回多1，所以减1
-        maxDay = calendar.getActualMaximum(Calendar.DATE);//获取当月有多少天
-
-        //如果从星期日开始作为第一天
-        date = new int[maxDay + startIndex];
-        endIndex = date.length - 1;
-        for (int i = startIndex, j = 1; i < date.length; i++, j++) {
-            date[i] = j;
-        }
-        if (isThisMonth())
-            downIndex = todayIndex;
-        else
-            downIndex = startIndex;
-        surface.init();
-    }
-
-    /**
-     * 它有三种模式：计算视图大小
-     * UNSPECIFIED(未指定),父元素不对子元素施加任何束缚，子元素可以得到任意想要的大小；(具体值)
-     * EXACTLY(完全)，父元素决定子元素的确切大小，子元素将被限定在给定的边界里而忽略它本身大小；(match_parent)
-     * AT_MOST(至多)，子元素至多达到指定大小的值。(wrap_parent)
-     */
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        int widthMode = MeasureSpec.getMode(widthMeasureSpec);
-        int heightMode = MeasureSpec.getMode(heightMeasureSpec);
-        int widthSize = MeasureSpec.getSize(widthMeasureSpec);
-        int heightSize = MeasureSpec.getSize(heightMeasureSpec);
-        switch (widthMode) {
-            case MeasureSpec.UNSPECIFIED:
-                surface.width = widthSize;
-                break;
-            case MeasureSpec.EXACTLY:
-                surface.width = getResources().getDisplayMetrics().widthPixels;
-                break;
-            case MeasureSpec.AT_MOST:
-                surface.width = getResources().getDisplayMetrics().widthPixels;
-                break;
-        }
-        switch (heightMode) {
-            case MeasureSpec.UNSPECIFIED:
-                surface.height = heightSize;
-                break;
-            case MeasureSpec.EXACTLY:
-                surface.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);
-                break;
-            case MeasureSpec.AT_MOST:
-                surface.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);
-                break;
-        }
-        widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(surface.width, widthMode);
-        heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(surface.height, heightMode);
-        setMeasuredDimension(widthMeasureSpec, heightMeasureSpec);
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-//        surface.width = getResources().getDisplayMetrics().widthPixels;
-//        surface.height = (getResources().getDisplayMetrics().heightPixels * 1 / 3);
-//        widthMeasureSpec = View.MeasureSpec.makeMeasureSpec(surface.width, View.MeasureSpec.EXACTLY);
-//        heightMeasureSpec = View.MeasureSpec.makeMeasureSpec(surface.height, View.MeasureSpec.EXACTLY);
-//        setMeasuredDimension(widthMeasureSpec, heightMeasureSpec);
-//        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        if (changed) {
-            surface.init();
-        }
-        super.onLayout(changed, left, top, right, bottom);
-    }
-
-    float x;
-    float y;
-
-    @Override
-    public boolean onTouch(View view, MotionEvent event) {
-        switch (event.getAction()) {
-            case MotionEvent.ACTION_DOWN:
-                x = event.getX();
-                y = event.getY();
-                break;
-            case MotionEvent.ACTION_MOVE:
-                break;
-            case MotionEvent.ACTION_UP:
-                if (Math.abs(event.getX() - x) < 10 && Math.abs(event.getY() - y) < 10) {//为点击事件
-                    if (setReckon()) {
-                        if (dateListener != null)
-                            this.dateListener.result(downDate);
-                        invalidate();
-                    }
-                } else {
-                    return true;
-                }
-                break;
-        }
-        return true;
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-        //画星期
-        drawWeek(canvas);
-        //画背景
-        drawSelect(canvas);
-        //画日期
-        drawDay(canvas);
-    }
-
-    //绘画点击的内容
-    private void drawSelect(Canvas canvas) {
-        if (downIndex >= startIndex && downIndex <= endIndex) {
-            //圆的最中心
-            float cellY = surface.weekHeight + surface.cellHeight * (downIndex / 7) + surface.cellHeight / 2;
-            float cellX = surface.cellWidth * (downIndex % 7) + surface.cellWidth / 2;
-//            float radius = Math.min(surface.cellHeight, surface.cellWidth) * surface.downScale;
-            canvas.drawCircle(cellX, cellY, surface.downTaxtSize, surface.selectPaint);
-        }
-    }
-
-    //画日期
-    private void drawDay(Canvas canvas) {
-        String chche = "";
-        //画上个月日期
-        calendar.setTime(curDate);
-        calendar.add(Calendar.MONTH, -1);
-        int startItem = calendar.getActualMaximum(Calendar.DATE) - startIndex + 1;//获取当月有多少天
-        calendar.set(Calendar.DAY_OF_MONTH, startItem);
-        //使文字垂直居中
-        Paint.FontMetrics fontMetrics = surface.hineDatePaint.getFontMetrics();
-        float fontHeight = fontMetrics.bottom - fontMetrics.top;
-        float dayTextY = surface.weekHeight + (surface.cellHeight + fontHeight) / 2 - fontMetrics.bottom;
-        for (int i = 0; i < startIndex; i++) {
-            float dayTextX = i * surface.cellWidth + (surface.cellWidth - surface.hineDatePaint.measureText("今")) / 2f;
-            canvas.drawText(calendar.get(Calendar.DAY_OF_MONTH) + "", dayTextX, dayTextY, surface.hineDatePaint);
-            calendar.add(Calendar.DAY_OF_MONTH, 1);
-        }
-        //画当月
-        for (int i = startIndex; i < date.length; i++) {
-            int item = i % surface.weekText.length;
-            if (i != 0 && item == 0) {
-                dayTextY += surface.cellHeight;
-            }
-            if (todayIndex == i && isThisMonth()) {
-                chche = "今";
-                surface.datePaint.setColor(surface.todayColor);
-            } else {
-                chche = String.valueOf(date[i]);
-                surface.datePaint.setColor(surface.dateColor);
-            }
-            if (downIndex == i) {
-                surface.datePaint.setColor(surface.selectColor);
-            }
-            float dayTextX = surface.cellWidth * (i % surface.weekText.length) +
-                    (surface.cellWidth - surface.datePaint.measureText(chche)) / 2f;
-            canvas.drawText(chche, dayTextX, dayTextY, surface.datePaint);
-            //画装饰物
-            int day = (i - startIndex + 1);
-            if (!StringUtil.isEmpty(decoratDays) && getIsDecorat(day)) {
-                drawDecorat(canvas, i, surface.decorPaint);
-            }
-        }
-        //画下个月日期
-        calendar.setTime(curDate);
-        calendar.add(Calendar.MONTH, 1);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        int next = date.length % 7 == 0 ? 0 : (date.length + (7 - date.length % 7));
-        for (int i = date.length; i < next; i++) {
-            float dayTextX = surface.cellWidth * (i % surface.weekText.length) + (surface.cellWidth - surface.datePaint.measureText("今")) / 2f;
-            canvas.drawText(calendar.get(Calendar.DAY_OF_MONTH) + "", dayTextX, dayTextY, surface.hineDatePaint);
-            calendar.add(Calendar.DAY_OF_MONTH, 1);
-        }
-    }
-
-    /*判断*/
-    private boolean getIsDecorat(int day) {
-        Pattern p = Pattern.compile("," + day + ",");//遍历对象
-        Matcher m = p.matcher(decoratDays);//遍历源
-        return m.find();
-    }
-
-    /*判断是否是当月*/
-    public boolean isThisMonth() {
-        calendar.setTime(curDate);
-        int month = calendar.get(Calendar.MONTH);
-        int year = calendar.get(Calendar.YEAR);
-        calendar.setTime(new Date());
-        if (year != calendar.get(Calendar.YEAR))
-            return false;
-        if (month != calendar.get(Calendar.MONTH))
-            return false;
-        return true;
-    }
-    /*end 判断*/
-
-    /**
-     * 绘画装饰物
-     *
-     * @param index      date索引
-     * @param decorPaint 画笔
-     */
-    private void drawDecorat(Canvas canvas, int index, Paint decorPaint) {
-        //圆的最中心
-        float cellY = surface.weekHeight + surface.cellHeight * (index / 7) + surface.cellHeight / 2;
-        float cellX = surface.cellWidth * (index % 7) + surface.cellWidth / 2;
-//        float radius = Math.min(surface.cellWidth, surface.weekHeight) * surface.downScale;
-        canvas.drawCircle(cellX, cellY, surface.downTaxtSize, decorPaint);
-    }
-
-    //画星期
-    private void drawWeek(Canvas canvas) {
-        //1.星期的Y抽位置,星期字体为星期框高度的一半，所以在3/4的位置开始绘画
-        float weekTextY = surface.weekHeight - (surface.weekHeight - surface.weekTaxtSize) / 2;
-        for (int i = 0; i < surface.weekText.length; i++) {
-            //Paint.measureText  获取该字的宽度值
-            float weekTextX = surface.cellWidth * i + (surface.cellWidth - surface.weekPaint.measureText(surface.weekText[i])) / 2f;
-            canvas.drawText(surface.weekText[i], weekTextX, weekTextY, surface.weekPaint);
-        }
-    }
-
-    /*计算判断的点击的索引*/
-    private boolean setReckon() {
-        int indexX = (int) Math.floor(x / surface.cellWidth);
-        int indexY = (int) Math.floor((y - surface.weekHeight) / surface.cellHeight);
-        downIndex = indexY * 7 + indexX;
-        if (downIndex < startIndex || downIndex > endIndex) return false;//当点击的是非本月的日期时候
-        calendar.setTime(curDate);
-        calendar.set(Calendar.DAY_OF_MONTH, date[downIndex]);
-        downDate = calendar.getTime();
-        return true;
-    }
-
-    public Date getCurDate() {
-        return curDate;
-    }
-
-    public Date getDownDate() {
-        int day = date[Math.min(downIndex, date.length - 1)];
-        Calendar c = Calendar.getInstance();
-        c.setTime(curDate);
-        c.set(Calendar.DAY_OF_MONTH, day);
-        return c.getTime();
-    }
-
-    public void setDownIndex(int day) {
-        this.downIndex = Math.min(startIndex + day - 1, date.length - 1);
-        invalidate();
-    }
-
-    /*设置月份*/
-    public void setCurDate(Date date) {
-        LogUtil.d("Test",""+ DateFormatUtil.getStrDate4Date(date,"yyyy-MM-dd"));
-        curDate = date;
-        calendar.setTime(curDate);
-        int curMoth=calendar.get(Calendar.DAY_OF_MONTH);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        startIndex = calendar.get(Calendar.DAY_OF_WEEK) - 1;//获取第一天在当周的星期几，返回多1，所以减1
-        maxDay = calendar.getActualMaximum(Calendar.DATE);//获取当月有多少天
-        //如果从星期日开始作为第一天
-        this.date = new int[maxDay + startIndex];
-        endIndex = this.date.length - 1;
-        for (int i = startIndex, j = 1; i < this.date.length; i++, j++) {
-            this.date[i] = j;
-        }
-        
-//        if (isThisMonth()) {
-//            downIndex = todayIndex;
-//        } else {
-            this.downIndex = Math.min(startIndex + curMoth - 1, this.date.length - 1);
-//        }
-        surface.init();
-        invalidate();
-    }
-
-    /*设置为上个月*/
-    private void setNextMonth() {
-        calendar.setTime(curDate);
-        calendar.add(Calendar.MONTH, 1);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        setCalendar(calendar.getTime());
-    }
-
-    /*设置为下个月*/
-    private void setLastMonth() {
-        calendar.setTime(curDate);
-        calendar.add(Calendar.MONTH, -1);
-        calendar.set(Calendar.DAY_OF_MONTH, 1);
-        setCalendar(calendar.getTime());
-    }
-
-    public void setDecoratDays(Set<Integer> decoratDays) {
-        this.decoratDays = "";
-        StringBuilder builder = new StringBuilder();
-        builder.append(",");
-        for (Integer e : decoratDays) {
-            builder.append(e + ",");
-        }
-        this.decoratDays = builder.toString();
-        invalidate();
-    }
-
-    private class Surface {
-        private float density;//手机屏幕密度
-        private int width;//整个控件宽度
-        private int height;   //整个控件高度
-        private float weekHeight;//周的方框高度
-        private float cellWidth; // 日期方框宽度
-        private float cellHeight; // 日期方框高度
-        private int bgColor = 0xEBE9E9;
-        private int weekColor = Color.BLACK;//周视图的画笔颜色
-        private int dateColor = Color.BLACK;//月视图的画笔颜色x
-        private int selectColor = Color.WHITE;//选择中的画笔颜色
-        private int selectBgColor = Color.RED;//选择中的画笔颜色
-        private int todayColor = Color.RED;//选择中的画笔颜色
-        private int decorColor = Color.RED;//装饰画笔颜色
-        private int hineDateColor = Color.parseColor("#BFD3D3D3");//装饰画笔颜色
-
-        private Paint weekPaint;//周视图的画笔
-        private Paint datePaint;//月视图的画笔
-        private Paint selectPaint;//选择中的画笔
-        private Paint decorPaint;//装饰画笔
-        private Paint hineDatePaint;//非本月日期
-
-        private float weekTaxtSize = 55f;
-        private float dateTaxtSize = 55f;
-        private float downTaxtSize;
-        private String[] weekText = {"日", "一", "二", "三", "四", "五", "六"};
-
-        private void init() {
-            dateTaxtSize = weekTaxtSize = DisplayUtil.dip2px(getContext(), 18);
-            downTaxtSize = (dateTaxtSize + DisplayUtil.dip2px(getContext(), 10)) / 2;
-            //计算周框的高度 1.获取日期共多少行
-            int dateRowNum = date.length / 7 + (date.length % 7 > 0 ? 1 : 0);
-            cellHeight = weekHeight = height / (dateRowNum + 1);
-            cellWidth = width / 7f;
-            selectPaint = new Paint();//选择中的画笔
-            selectPaint.setColor(selectBgColor);
-            selectPaint.setAntiAlias(true);
-            decorPaint = new Paint();//装饰画笔
-            decorPaint.setColor(decorColor);
-            decorPaint.setStyle(Paint.Style.STROKE);
-            decorPaint.setStrokeWidth(3);
-            decorPaint.setAntiAlias(true);
-
-            weekPaint = new Paint();//周视图的画笔
-            weekPaint.setColor(weekColor);
-            weekPaint.setAntiAlias(true);
-            weekPaint.setTextSize(weekTaxtSize);
-
-            datePaint = new Paint();//日期视图的画笔
-            datePaint.setColor(dateColor);
-            datePaint.setAntiAlias(true);
-            datePaint.setTextSize(dateTaxtSize);
-
-            hineDatePaint = new Paint();//日期视图的画笔
-            hineDatePaint.setColor(hineDateColor);
-            hineDatePaint.setAntiAlias(true);
-            hineDatePaint.setTextSize(dateTaxtSize);
-        }
-    }
-
-    // 接口管理
-    public void setDateListener(OnSelectDateListener dateListener) {
-        this.dateListener = dateListener;
-    }
-
-    private OnSelectDateListener dateListener;
-
-    public interface OnSelectDateListener {
-        /**
-         * @param date 日期对象
-         */
-        void result(Date date);
-    }
-
-}

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

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

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

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

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

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

app_core/common/src/main/AndroidManifest.xml

@@ -12,7 +12,8 @@
 
 
         <activity android:name="com.core.widget.view.Activity.CommonWebviewActivity"/>
-        <activity android:name="com.core.widget.view.Activity.ImgFileListActivity"/>
+        <activity android:name="com.core.widget.view.Activity.ImgFileListActivity"
+            android:label="相册列表"/>
         <activity android:name="com.core.utils.pictureselector.ImgsActivity"
             android:label="@string/selector_caption"/>
 
@@ -21,7 +22,8 @@
             android:windowSoftInputMode="stateUnspecified|adjustNothing" />
         <activity android:name="com.core.widget.view.Activity.SelectActivity"/>
         <activity
-            android:name="com.core.selectcalendar.SelectCalendarActivity"
+            android:name="com.core.widget.view.selectcalendar.SelectCalendarActivity"
             android:label="@string/title_activity_select_calendar"/>
+        <activity android:name="com.core.widget.view.Activity.MultiImagePreviewActivity"/>
     </application>
 </manifest>

app_core/common/src/main/java/com/core/constant/AppConstant.java → app_core/common/src/main/java/com/core/app/AppConstant.java

@@ -1,6 +1,7 @@
-package com.core.constant;
+package com.core.app;
 
 public class AppConstant {
+    /* 进入SingleImagePreviewActivity需要带上的参数 */
     /**
      * 某些地方选择数据使用的常量
      */
@@ -65,5 +66,5 @@ public class AppConstant {
     public static final String CHANGE_MISSION_TASK = "CHANGE_MISSION_TASK";//自动外勤任务变更
     public static final String INIT_MISSION_TASK = "INIT_MISSION_TASK";//初始化外勤签到任务
     public static final String DEPOSIT_NOTICE_TASK = "DEPOSIT_NOTICE_TASK";//预约计划提醒任务
-
+    public static final String NEW_FUNCTION_NOTICE = "NEW_FUNCTION_NOTICE";
 }

app_core/common/src/main/java/com/core/utils/CommonUtil.java

@@ -551,6 +551,14 @@ public class CommonUtil {
     }
 
 
+    /**
+     * 检测Sdcard是否存在
+     *
+     * @return
+     */
+    public static boolean isExitsSdcard() {
+        return android.os.Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED);
+    }
 
     /**
      * 打开软键盘

app_core/common/src/main/java/com/core/utils/JsonParser.java

@@ -1,103 +0,0 @@
-package com.core.utils;
-import android.text.TextUtils;
-
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-
-/**
- * Created by FANGlh on 2017/1/11.
- * function: 对云端返回的Json结果进行解析
- */
-public class JsonParser {
-
-	/**
-	 * 听写结果的Json格式解析
-	 * @param json
-	 * @return
-	 */
-	public static String parseIatResult(String json) {
-		if(TextUtils.isEmpty(json))
-			return "";
-
-		StringBuffer ret = new StringBuffer();
-		try {
-			JSONTokener tokener = new JSONTokener(json);
-			JSONObject joResult = new JSONObject(tokener);
-
-			JSONArray words = joResult.getJSONArray("ws");
-			for (int i = 0; i < words.length(); i++) {
-				// 听写结果词，默认使用第一个结果
-				JSONArray items = words.getJSONObject(i).getJSONArray("cw");
-				JSONObject obj = items.getJSONObject(0);
-				ret.append(obj.getString("w"));
-//				如果需要多候选结果，解析数组其他字段
-//				for(int j = 0; j < items.length(); j++)
-//				{
-//					JSONObject obj = items.getJSONObject(j);
-//					ret.append(obj.getString("w"));
-//				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return ret.toString();
-	}
-
-	/**
-	 * 识别结果的Json格式解析
-	 * @param json
-	 * @return
-	 */
-	public static String parseGrammarResult(String json) {
-		StringBuffer ret = new StringBuffer();
-		try {
-			JSONTokener tokener = new JSONTokener(json);
-			JSONObject joResult = new JSONObject(tokener);
-
-			JSONArray words = joResult.getJSONArray("ws");
-			for (int i = 0; i < words.length(); i++) {
-				JSONArray items = words.getJSONObject(i).getJSONArray("cw");
-				for(int j = 0; j < items.length(); j++)
-				{
-					JSONObject obj = items.getJSONObject(j);
-					if(obj.getString("w").contains("nomatch"))
-					{
-						ret.append("没有匹配结果.");
-						return ret.toString();
-					}
-					ret.append("【结果】" + obj.getString("w"));
-					ret.append("【置信度】" + obj.getInt("sc"));
-					ret.append("\n");
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-			ret.append("没有匹配结果.");
-		}
-		return ret.toString();
-	}
-
-	/**
-	 * 语义结果的Json格式解析
-	 * @param json
-	 * @return
-	 */
-	public static String parseUnderstandResult(String json) {
-		StringBuffer ret = new StringBuffer();
-		try {
-			JSONTokener tokener = new JSONTokener(json);
-			JSONObject joResult = new JSONObject(tokener);
-
-			ret.append("【应答码】" + joResult.getString("rc") + "\n");
-			ret.append("【转写结果】" + joResult.getString("text") + "\n");
-			ret.append("【服务名称】" + joResult.getString("service") + "\n");
-			ret.append("【操作名称】" + joResult.getString("operation") + "\n");
-			ret.append("【完整结果】" + json);
-		} catch (Exception e) {
-			e.printStackTrace();
-			ret.append("没有匹配结果.");
-		}
-		return ret.toString();
-	}
-}

app_core/common/src/main/java/com/core/utils/pictureselector/PictureSelectorDemo.java

@@ -12,6 +12,7 @@ import android.widget.AdapterView;
 import android.widget.Toast;
 
 import com.common.ui.CameraUtil;
+import com.core.app.AppConstant;
 import com.core.app.MyApplication;
 import com.core.app.R;
 import com.core.base.BaseActivity;
@@ -19,7 +20,6 @@ import com.core.utils.ToastUtil;
 import com.core.widget.view.Activity.ImgFileListActivity;
 import com.core.widget.view.Activity.MultiImagePreviewActivity;
 import com.core.widget.view.MyGridView;
-import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.ViewUtils;
 
 import java.io.File;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/BottomPopup.java → app_core/common/src/main/java/com/core/utils/time/wheel/BottomPopup.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.content.DialogInterface;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/ConfirmPopup.java → app_core/common/src/main/java/com/core/utils/time/wheel/ConfirmPopup.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.graphics.Color;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/ConvertUtils.java → app_core/common/src/main/java/com/core/utils/time/wheel/ConvertUtils.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.annotation.TargetApi;
 import android.content.Context;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/DatePicker.java → app_core/common/src/main/java/com/core/utils/time/wheel/DatePicker.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.support.annotation.IntDef;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/DateTimePicker.java → app_core/common/src/main/java/com/core/utils/time/wheel/DateTimePicker.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.support.annotation.IntDef;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/DateUtils.java → app_core/common/src/main/java/com/core/utils/time/wheel/DateUtils.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
@@ -8,7 +8,6 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 
 /**
  * 日期时间工具类

app_core/common/src/main/java/com/core/utils/timeutils/wheel/LogUtils.java → app_core/common/src/main/java/com/core/utils/time/wheel/LogUtils.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.os.Debug;
 import android.os.Environment;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/OASigninPicker.java → app_core/common/src/main/java/com/core/utils/time/wheel/OASigninPicker.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.support.annotation.IntDef;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/OptionPicker.java → app_core/common/src/main/java/com/core/utils/time/wheel/OptionPicker.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/Popup.java → app_core/common/src/main/java/com/core/utils/time/wheel/Popup.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.content.Context;
 import android.content.DialogInterface;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/ScreenUtils.java → app_core/common/src/main/java/com/core/utils/time/wheel/ScreenUtils.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.content.Context;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/TimePicker.java → app_core/common/src/main/java/com/core/utils/time/wheel/TimePicker.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.support.annotation.IntDef;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/WheelPicker.java → app_core/common/src/main/java/com/core/utils/time/wheel/WheelPicker.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.support.annotation.ColorInt;

app_core/common/src/main/java/com/core/utils/timeutils/wheel/WheelView.java → app_core/common/src/main/java/com/core/utils/time/wheel/WheelView.java

@@ -1,4 +1,4 @@
-package com.core.utils.timeutils.wheel;
+package com.core.utils.time.wheel;
 
 import android.app.Activity;
 import android.content.Context;

app_core/common/src/main/java/com/core/widget/VoiceSearchView.java

@@ -10,7 +10,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.core.app.R;
-import com.core.utils.JsonParser;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechError;