会议管理迁移完成

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" />
@@ -562,13 +559,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" />
@@ -603,14 +594,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"
@@ -663,10 +656,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="申请订阅" />
@@ -683,10 +673,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" />
@@ -694,10 +681,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"

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

@@ -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

@@ -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/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/ui/circle/BusinessCircleFragment.java

@@ -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/SendShuoshuoActivity.java

@@ -50,7 +50,7 @@ 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/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;

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

@@ -39,7 +39,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.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;

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

@@ -43,7 +43,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.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;

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

@@ -45,7 +45,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.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;

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

@@ -46,21 +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.time.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/oa/AddVisitReportActivity.java

@@ -36,7 +36,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.xzjmyk.pm.activity.ui.erp.presenter.AddVisitReportPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IAddVisitReport;
 

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

@@ -58,6 +58,8 @@ 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;
@@ -66,7 +68,6 @@ 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/secretary/BookingAddActivity.java

@@ -38,6 +38,7 @@ 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/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/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/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.time.wheel.DateTimePicker;
 
 import java.io.File;
 import java.io.IOException;

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

@@ -27,6 +27,7 @@ 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.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
@@ -35,7 +36,6 @@ 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;

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.app.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/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/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"/>
 
@@ -23,6 +24,6 @@
         <activity
             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/utils/CommonUtil.java

@@ -550,6 +550,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/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;

app_core/common/src/main/java/com/core/widget/view/imp/JsonParser.java

@@ -1,103 +0,0 @@
-package com.core.widget.view.imp;
-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/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_modular/appmessages/src/main/java/com/modular/appmessages/activity/ApprovalActivity.java

@@ -35,10 +35,10 @@ import com.core.model.Approval;
 import com.core.model.OAConfig;
 import com.core.model.SelectBean;
 import com.core.utils.CommonUtil;
-import com.core.utils.JsonParser;
 import com.core.utils.RecognizerDialogUtil;
 import com.core.widget.listener.EditChangeListener;
 import com.core.widget.view.Activity.SelectActivity;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;

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

@@ -28,7 +28,7 @@ import com.modular.appmessages.R;
 import com.modular.appmessages.model.ApprovalRecord;
 import com.modular.appmessages.presenter.imp.IApproval;
 import com.uas.appworks.OA.erp.activity.form.DataFormFieldActivity;
-import com.uas.appworks.OA.erp.model.form.Data;
+import com.core.widget.view.selectcalendar.bean.Data;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_modular/appworks/build.gradle

@@ -21,5 +21,4 @@ android {
 dependencies {
     //project
     compile project(':common')
-
 }

app_modular/appworks/src/main/AndroidManifest.xml

@@ -38,5 +38,32 @@
         <activity
             android:name="com.uas.appworks.OA.erp.activity.TeamsAttShowActivity"
             android:label="@string/sign_teams_rank" />
+
+        <activity
+            android:name="com.uas.appworks.OA.erp.MeetDetailsActivity"
+            android:label="@string/meet_detail"
+            android:theme="@style/OAThemeMeet" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.DetailTaskActivity"
+            android:windowSoftInputMode="adjustUnspecified|stateHidden" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.AddMeetingActivity"
+            android:label="@string/new_meet"
+            android:launchMode="singleTask"
+            android:screenOrientation="portrait"
+            android:theme="@style/OAThemeMeet"
+            android:windowSoftInputMode="stateUnspecified|adjustNothing" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.MeetingActivity"
+            android:label="@string/meet_manage"
+            android:theme="@style/OAThemeMeet" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.SaveMeetActivity"
+            android:label="@string/meet_details"
+            android:theme="@style/OAThemeMeet" />
+        <activity
+            android:name="com.uas.appworks.OA.erp.activity.AddMeetTaskActivity"
+            android:label="@string/meet_task"
+            android:theme="@style/OAThemeMeet" />
     </application>
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MeetDetailsActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/MeetDetailsActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.OA.erp;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
@@ -20,49 +20,36 @@ import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
 import com.core.widget.view.Activity.SearchLocationActivity;
 import com.core.widget.view.model.SearchPoiParam;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetEntity;
-import com.xzjmyk.pm.activity.bean.oa.MeetingDocBean;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.OA.erp.activity.AddMeetTaskActivity;
+import com.uas.appworks.OA.erp.activity.SaveMeetActivity;
+import com.uas.appworks.OA.erp.model.MeetEntity;
+import com.uas.appworks.OA.erp.model.MeetingDocBean;
+import com.uas.appworks.R;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
 public class MeetDetailsActivity extends BaseActivity implements View.OnClickListener {
-    @ViewInject(R.id.name_tv)
     private TextView name_tv;
-    @ViewInject(R.id.addr_tv)
     private TextView addr_tv;
-    @ViewInject(R.id.sub_tv)
     private TextView sub_tv;
-    @ViewInject(R.id.tag_tv)
     private TextView tag_tv;
-    @ViewInject(R.id.user_tv)
     private TextView user_tv;
-    @ViewInject(R.id.oa_meeting_start)
     private TextView oa_meeting_start;
-    @ViewInject(R.id.oa_meeting_end_date)
     private TextView oa_meeting_end_date;
-    @ViewInject(R.id.oa_meeting_end)
     private TextView oa_meeting_end;
-    @ViewInject(R.id.click_btn)
     private Button click_btn;
-    @ViewInject(R.id.oa_meeting_start_date)
     private TextView oa_meeting_start_date;
-    @ViewInject(R.id.end_meet_tv)
     private TextView end_meet_tv;
-    @ViewInject(R.id.status_tv)
     private TextView status_tv;
-    @ViewInject(R.id.location_tv)
     private TextView location_tv;
-    @ViewInject(R.id.num_tv)
     private TextView num_tv;
     private final int whatLoad = 0x11, SIGNNIN = 0x12, ENDMEET = 0x13;
     private int ma_id;
@@ -184,6 +171,7 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     }
 
     private void initView() {
+        initIDs();
         location_tv.setText(MyApplication.getInstance().getBdLocationHelper().getAddress());
         findViewById(R.id.meet_save).setOnClickListener(this);
         findViewById(R.id.num_tag).setOnClickListener(this);
@@ -223,6 +211,24 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
         }
     }
 
+    private void initIDs() {
+
+        name_tv = (TextView) findViewById(R.id.name_tv);
+        addr_tv = (TextView) findViewById(R.id.addr_tv);
+        sub_tv = (TextView) findViewById(R.id.sub_tv);
+        tag_tv = (TextView) findViewById(R.id.tag_tv);
+        user_tv = (TextView) findViewById(R.id.user_tv);
+        oa_meeting_start = (TextView) findViewById(R.id.oa_meeting_start);
+        oa_meeting_end_date = (TextView) findViewById(R.id.oa_meeting_end_date);
+        oa_meeting_end= (TextView) findViewById(R.id.oa_meeting_end);
+        click_btn = (Button) findViewById(R.id.click_btn);
+        oa_meeting_start_date = (TextView) findViewById(R.id.oa_meeting_start_date);
+        end_meet_tv = (TextView) findViewById(R.id.end_meet_tv);
+        status_tv = (TextView) findViewById(R.id.status_tv);
+        location_tv = (TextView) findViewById(R.id.location_tv);
+        num_tv = (TextView) findViewById(R.id.num_tv);
+    }
+
     String baseUrl;
 
     //获取会议详情接口（获取到的数据太少，先不用）
@@ -315,85 +321,72 @@ public class MeetDetailsActivity extends BaseActivity implements View.OnClickLis
     @Override
     public void onClick(View view) {
         Intent intent = null;
-        switch (view.getId()) {
-            case R.id.num_tag:
-                intent = new Intent(MeetDetailsActivity.this, OARegisterActivity.class);
-                intent.putExtra("code", ma_code);
-                intent.putExtra("id", ma_code);
-                startActivity(intent);
-                break;
-            case R.id.meet_save://会议纪要
-                if (!user_tv.getText().toString().trim().equals(emname)) {
-                    ToastUtil.showToast(ct, R.string.not_power_edit_tag);
-                    return;
-                }
-                StringBuilder name = new StringBuilder();
-                StringBuilder emcome = new StringBuilder();
-                if (array != null && array.size() > 0) {
-                    for (int i = 0; i < array.size(); i++) {
-                        name.append(";" + array.getJSONObject(i).getString("EM_NAME"));
-                        emcome.append(";employee#" + array.getJSONObject(i).getString("EM_ID"));
-                    }
-                    name.delete(0, 1);
-                    emcome.delete(0, 1);
-                }
-                MeetingDocBean bean = new MeetingDocBean();
-                intent = new Intent(ct, SaveMeetActivity.class);
-                bean.setMd_recorder(user_tv.getText().toString());
-                bean.setMd_recorderdate("");
-                bean.setMd_status("在录入");
-                bean.setMd_title(name_tv.getText().toString());
-                bean.setMd_mtname("");
-                bean.setMd_meetingname(name_tv.getText().toString());
-                bean.setMd_meetingcode(ma_code);
-                bean.setMd_mrcode(entity.getMa_mrcode());
-                bean.setMd_mrname(entity.getMa_mrname());
-                bean.setMd_starttime(entity == null ? TimeUtils.f_long_2_str(System.currentTimeMillis()) : entity.getMa_starttime());
-                bean.setMd_statuscode("ENTERING");
-                bean.setMd_endtime(entity == null ? TimeUtils.f_long_2_str(System.currentTimeMillis()) : entity.getMa_endtime());
-                bean.setMd_group(name.toString());//数据返回
-                bean.setMd_attachs("");
-                bean.setMd_contents("");
-                bean.setMd_groupid(emcome.toString());//数据返回
-                intent.putExtra("data", bean);
-                intent.putExtra("code", ma_code);
-                startActivity(intent);
-                break;
-            case R.id.end_meet_tv:
-                if (!user_tv.getText().toString().trim().equals(emname)) {
-                    ToastUtil.showToast(ct, R.string.not_power_end_meet);
-                    return;
+        if (view.getId() == R.id.num_tag){
+            intent = new Intent("com.modular.metting.appworks.OARegisterActivity");
+            intent.putExtra("code", ma_code);
+            intent.putExtra("id", ma_code);
+            startActivity(intent);
+        }else if (view.getId() == R.id.meet_save){
+            if (!user_tv.getText().toString().trim().equals(emname)) {
+                ToastUtil.showToast(ct, R.string.not_power_edit_tag);
+                return;
+            }
+            StringBuilder name = new StringBuilder();
+            StringBuilder emcome = new StringBuilder();
+            if (array != null && array.size() > 0) {
+                for (int i = 0; i < array.size(); i++) {
+                    name.append(";" + array.getJSONObject(i).getString("EM_NAME"));
+                    emcome.append(";employee#" + array.getJSONObject(i).getString("EM_ID"));
                 }
-                showExitDialog();
-                break;
-            case R.id.click_btn:
-                if (isPlay) {
-                    if ("已结束".equals(status_tv.getText().toString().trim())) {
-                        ToastUtil.showToast(ct, R.string.meet_ended_not_signin);
-                    } else {
-                        doNetSubmit(SIGNNIN);
-                    }
+                name.delete(0, 1);
+                emcome.delete(0, 1);
+            }
+            MeetingDocBean bean = new MeetingDocBean();
+            intent = new Intent(ct, SaveMeetActivity.class);
+            bean.setMd_recorder(user_tv.getText().toString());
+            bean.setMd_recorderdate("");
+            bean.setMd_status("在录入");
+            bean.setMd_title(name_tv.getText().toString());
+            bean.setMd_mtname("");
+            bean.setMd_meetingname(name_tv.getText().toString());
+            bean.setMd_meetingcode(ma_code);
+            bean.setMd_mrcode(entity.getMa_mrcode());
+            bean.setMd_mrname(entity.getMa_mrname());
+            bean.setMd_starttime(entity == null ? TimeUtils.f_long_2_str(System.currentTimeMillis()) : entity.getMa_starttime());
+            bean.setMd_statuscode("ENTERING");
+            bean.setMd_endtime(entity == null ? TimeUtils.f_long_2_str(System.currentTimeMillis()) : entity.getMa_endtime());
+            bean.setMd_group(name.toString());//数据返回
+            bean.setMd_attachs("");
+            bean.setMd_contents("");
+            bean.setMd_groupid(emcome.toString());//数据返回
+            intent.putExtra("data", bean);
+            intent.putExtra("code", ma_code);
+            startActivity(intent);
+        }else if (view.getId() == R.id.click_btn){
+            if (isPlay) {
+                if ("已结束".equals(status_tv.getText().toString().trim())) {
+                    ToastUtil.showToast(ct, R.string.meet_ended_not_signin);
                 } else {
-                    ToastUtil.showToast(ct, R.string.already_signined);
+                    doNetSubmit(SIGNNIN);
                 }
-                break;
-            case R.id.location_tag://点击重新定位
-                intent = new Intent(ct, SearchLocationActivity.class);
-                SearchPoiParam poiParam = new SearchPoiParam();
-                poiParam.setType(1);
-                poiParam.setTitle(getResources().getString(R.string.unoffice));
-                poiParam.setRadius(300);
-                poiParam.setContrastLatLng(MyApplication.getInstance().getBdLocationHelper().getLocation());
-                poiParam.setResultCode(0x20);
-                poiParam.setDistanceTag("m");
-                intent.putExtra("data", poiParam);
-                startActivityForResult(intent, 0x20);
-                break;
-            case R.id.add_task_ll://添加任务
-                intent = new Intent(ct, AddMeetTaskActivity.class);
-                intent.putExtra("name", StringUtil.getTextRexHttp(name_tv) + StringUtil.getMessage(ma_code));
-                startActivity(intent);
-                break;
+            } else {
+                ToastUtil.showToast(ct, R.string.already_signined);
+            }
+        }else if (view.getId() == R.id.location_tag){
+            intent = new Intent(ct, SearchLocationActivity.class);
+            SearchPoiParam poiParam = new SearchPoiParam();
+            poiParam.setType(1);
+            poiParam.setTitle(getResources().getString(R.string.unoffice));
+            poiParam.setRadius(300);
+            poiParam.setContrastLatLng(MyApplication.getInstance().getBdLocationHelper().getLocation());
+            poiParam.setResultCode(0x20);
+            poiParam.setDistanceTag("m");
+            intent.putExtra("data", poiParam);
+            startActivityForResult(intent, 0x20);
+        }else if (view.getId() == R.id.add_task_ll){
+            intent = new Intent(ct, AddMeetTaskActivity.class);
+            intent.putExtra("name", StringUtil.getTextRexHttp(name_tv) + StringUtil.getMessage(ma_code));
+            startActivity(intent);
         }
     }
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetTaskActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetTaskActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.OA.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -21,12 +21,10 @@ import com.common.data.StringUtil;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.activity.DetailTaskActivity;
-import com.xzjmyk.pm.activity.ui.platform.task.TaskAddErpActivity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.R;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -74,7 +72,7 @@ public class AddMeetTaskActivity extends BaseActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (R.id.add_item == item.getItemId()) {
-            Intent intent = new Intent(ct, TaskAddErpActivity.class);
+            Intent intent = new Intent("com.modular.task.TaskAddErpActivity");
             intent.putExtra("reid", R.style.OAThemeMeet);
             intent.putExtra("type", 2);
             intent.putExtra("isPower", true);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/AddMeetingActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.OA.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -25,25 +25,24 @@ import com.core.model.OAConfig;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonInterface;
+import com.core.utils.CommonUtil;
 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.SwitchView;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
+import com.core.xmpp.utils.audio.voicerecognition.JsonParser;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
-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.uas.appworks.OA.erp.model.form.Data;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.widget.view.selectcalendar.bean.Data;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -52,26 +51,16 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static com.alibaba.fastjson.JSON.parseObject;
-import static com.xzjmyk.pm.activity.util.oa.CommonUtil.getEmcode;
 
 public class AddMeetingActivity extends BaseActivity implements View.OnClickListener, RecognizerDialogListener {
-    @ViewInject(R.id.start_tv)
     private TextView start_tv;
-    @ViewInject(R.id.create_ric_sv)
     private SwitchView create_ric_sv;
-    @ViewInject(R.id.end_tv)
     private TextView end_tv;
-    @ViewInject(R.id.users_tv)
     private TextView users_tv;
-    @ViewInject(R.id.user_tv)
     private TextView user_tv;
-    @ViewInject(R.id.location_et)
     private TextView location_et;
-    @ViewInject(R.id.name_et)
     private EditText name_et;
-    @ViewInject(R.id.about_et)
     private EditText about_et;
-    @ViewInject(R.id.tag_et)
     private TextView tag_et;
     private int voice_type = 0;
     private AddMeetingActivity ct;
@@ -205,6 +194,15 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
 
 
     private void initView() {
+        start_tv = (TextView) findViewById(R.id.start_tv);
+        create_ric_sv = (SwitchView) findViewById(R.id.create_ric_sv);
+        end_tv = (TextView) findViewById(R.id.end_tv);
+        users_tv = (TextView) findViewById(R.id.users_tv);
+        location_et = (TextView) findViewById(R.id.location_et);
+        name_et= (EditText) findViewById(R.id.name_et);
+        about_et = (EditText) findViewById(R.id.about_et);
+        tag_et = (TextView) findViewById(R.id.tag_et);
+        user_tv = (TextView) findViewById(R.id.user_tv);
         String name = CommonUtil.getSharedPreferences(ct, "erp_emname");
         if (StringUtil.isEmpty(name))
             name = MyApplication.getInstance().mLoginUser.getNickName();
@@ -226,60 +224,46 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     @Override
     public void onClick(View view) {
         Intent intent = null;
-
-        switch (view.getId()) {
-            case R.id.start_rl://开始时间
-                turn2SelectCalendar();
-//                showDateDialog(start_tv);
-                break;
-            case R.id.end_rl://结束时间
-                turn2SelectCalendar();
-//                if (start_tv.getText() == null || start_tv.getText().length() <= 0) {
-//                    ToastUtil.showToast(ct, R.string.please_input_start_time);
-//                } else {
-//                    showDateDialog(end_tv);
-//                }
-                break;
-            case R.id.users_rl://选择参会人员
-                intent = new Intent(ct, SelectCollisionActivity.class);
-                SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
-                        .setSureText(getString(R.string.common_sure))
-                        .setSelectType(getString(R.string.member))
-                        .setTitle(getString(R.string.select_user))
-                        .setSelectCode(getSelectCode());
-                intent.putExtra(OAConfig.MODEL_DATA, bean);
-                startActivityForResult(intent, 0x21);
-                break;
-            case R.id.tag_rl://点击会议标签
-                getMeetTag();
-                break;
-            case R.id.location_rl://点击会议地点
-                getMeetRoom();
-                break;
-            case R.id.voice_name_iv:
-                voice_type = 1;
-                RecognizerDialog dialog = new RecognizerDialog(this, null);
-                dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
-                dialog.setParameter(SpeechConstant.ACCENT, "mandarin");
-                dialog.setListener(this);
-                dialog.show();
-                break;
-            case R.id.voice_introduce_iv:
-                voice_type = 2;
-                dialog = new RecognizerDialog(this, null);
-                dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
-                dialog.setParameter(SpeechConstant.ACCENT, "mandarin");
-                dialog.setListener(this);
-                dialog.show();
-                break;
-            case R.id.bt_save:
-                CommonInterface.getInstance().getCodeByNet("Meetingroomapply", new CommonInterface.OnResultListener() {
-                    @Override
-                    public void result(boolean isOk, int what, String message) {
-                        ma_code = message;
-                        getIdByNet();
-                    }
-                }); break;
+        if (view.getId() == R.id.start_rl){
+            turn2SelectCalendar();
+        }else if (view.getId() ==  R.id.end_rl){
+            turn2SelectCalendar();
+        }else if (view.getId() == R.id.users_rl){
+            intent = new Intent("com.modular.main.SelectCollisionActivity");
+            SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
+                    .setSureText(getString(R.string.common_sure))
+                    .setSelectType(getString(R.string.member))
+                    .setTitle(getString(R.string.select_user))
+                    .setSelectCode(getSelectCode());
+            intent.putExtra(OAConfig.MODEL_DATA, bean);
+            startActivityForResult(intent, 0x21);
+        }else if (view.getId() == R.id.tag_rl){
+            getMeetTag();
+        }else if (view.getId() == R.id.location_rl){
+            getMeetRoom();
+        }else if (view.getId() == R.id.voice_name_iv){
+            voice_type = 1;
+            RecognizerDialog dialog = new RecognizerDialog(this, null);
+            dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
+            dialog.setParameter(SpeechConstant.ACCENT, "mandarin");
+            dialog.setListener(this);
+            dialog.show();
+        }else if (view.getId() == R.id.voice_introduce_iv){
+            voice_type = 2;
+            RecognizerDialog dialog = new RecognizerDialog(this, null);
+            dialog = new RecognizerDialog(this, null);
+            dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
+            dialog.setParameter(SpeechConstant.ACCENT, "mandarin");
+            dialog.setListener(this);
+            dialog.show();
+        }else if (view.getId() == R.id.bt_save){
+            CommonInterface.getInstance().getCodeByNet("Meetingroomapply", new CommonInterface.OnResultListener() {
+                @Override
+                public void result(boolean isOk, int what, String message) {
+                    ma_code = message;
+                    getIdByNet();
+                }
+            });
         }
     }
 
@@ -357,29 +341,24 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
             @Override
             public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
                 String time = year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00";
-                switch (tv.getId()) {
-                    case R.id.start_tv:
-                        if (!StringUtil.isEmpty(end_tv.getText().toString())) {
-                            if (end_tv.getText().toString().compareTo(time) < 0) {
-                                ToastUtil.showToast(ct, R.string.not_time_start_biger_end);
-                            } else {
-                                start_tv.setText(time);
-                            }
+                if (tv.getId() == R.id.start_tv){
+                    if (!StringUtil.isEmpty(end_tv.getText().toString())) {
+                        if (end_tv.getText().toString().compareTo(time) < 0) {
+                            ToastUtil.showToast(ct, R.string.not_time_start_biger_end);
                         } else {
                             start_tv.setText(time);
                         }
-                        break;
-                    case R.id.end_tv:
-                        if (!StringUtil.isEmpty(start_tv.getText().toString())) {
-                            if (time.compareTo(start_tv.getText().toString()) <= 0) {
-                                ToastUtil.showToast(ct, R.string.not_time_start_biger_end);
-                            } else {
-                                end_tv.setText(time);
-                            }
-                        } else {
-                            ToastUtil.showToast(ct, R.string.please_input_start_time);
-                        }
-                        break;
+                    } else {
+                        start_tv.setText(time);
+                    }
+                }else if (tv.getId() == R.id.end_tv){
+                    if (time.compareTo(start_tv.getText().toString()) <= 0) {
+                        ToastUtil.showToast(ct, R.string.not_time_start_biger_end);
+                    } else {
+                        end_tv.setText(time);
+                    }
+                } else {
+                    ToastUtil.showToast(ct, R.string.please_input_start_time);
                 }
             }
         });
@@ -559,7 +538,7 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
     private SelectEmUser getMeForDB() {
         DBManager manager = new DBManager();
         String whichsys = CommonUtil.getMaster();
-        String em_code = getEmcode();
+        String em_code = CommonUtil.getEmcode();
         String[] selectionArgs = {em_code, whichsys};
         String selection = "em_code=? and whichsys=? ";
         //获取数据库数据

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DetailTaskActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/DetailTaskActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.uas.appworks.OA.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -24,21 +24,20 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.HttpUtil;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonUtil;
+import com.core.utils.TimeUtils;
+import com.core.widget.CustomerListView;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.net.HttpUtil;
-import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.core.widget.CustomerListView;
-import com.core.utils.TimeUtils;
+import com.uas.appworks.R;
 
 import java.io.File;
 import java.io.IOException;
@@ -54,44 +53,23 @@ import java.util.regex.Pattern;
  */
 public class DetailTaskActivity extends BaseActivity implements OnClickListener {
 
-    @ViewInject(R.id.bt_task_huifu)
     private Button bt_task_huifu;
-    @ViewInject(R.id.bt_task_queren)
     private Button bt_task_queren;
-    @ViewInject(R.id.bt_task_bohui)
     private Button bt_task_bohui;
-    @ViewInject(R.id.ll_bt_task)
     private LinearLayout ll_bt_task;
-    @ViewInject(R.id.reply_ll)
     private LinearLayout reply_ll;
-    @ViewInject(R.id.et_task_name)
     private EditText et_task_name;
-
-    @ViewInject(R.id.tv_task_endtime)
     private TextView tv_task_endtime;
-    @ViewInject(R.id.tv_task_name)
     private TextView tv_task_name;
-    @ViewInject(R.id.tv_task_emcode)
     private TextView tv_task_emcode;
-    @ViewInject(R.id.tv_task_performer)
     private TextView tv_task_performer;
-    @ViewInject(R.id.tv_task_starttime)
     private TextView tv_task_starttime;
-    @ViewInject(R.id.tv_task_duration)
     private TextView tv_task_duration;
-    @ViewInject(R.id.tv_task_status)
     private TextView tv_task_status;
-    @ViewInject(R.id.tv_task_describe)
     private TextView tv_task_describe;
-
-    @ViewInject(R.id.lay_voice_task)
     private LinearLayout lay_voice_task;// 语音展示
-    @ViewInject(R.id.iv_recode)
     private ImageView iv_recode;// 播放
-    @ViewInject(R.id.tv_voice_msg)
     private TextView tv_voice_msg;
-
-    @ViewInject(R.id.iv_taskMsg)
     private CustomerListView iv_taskMsg;
 
     SimpleAdapter adapter;
@@ -169,10 +147,33 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        initIDs();
         initView();
         initData();
     }
 
+    private void initIDs() {
+        bt_task_huifu = (Button) findViewById(R.id.bt_task_huifu);
+        bt_task_huifu= (Button) findViewById(R.id.bt_task_huifu);
+        bt_task_queren= (Button) findViewById(R.id.bt_task_queren);
+        bt_task_bohui = (Button) findViewById(R.id.bt_task_bohui);
+        ll_bt_task = (LinearLayout) findViewById(R.id.ll_bt_task);
+        reply_ll = (LinearLayout) findViewById(R.id.reply_ll);
+        et_task_name = (EditText) findViewById(R.id.et_task_name);
+        tv_task_endtime  = (TextView) findViewById(R.id.tv_task_endtime);
+        tv_task_name = (TextView) findViewById(R.id.tv_task_name);
+        tv_task_emcode = (TextView) findViewById(R.id.tv_task_emcode);
+        tv_task_performer = (TextView) findViewById(R.id.tv_task_performer);
+        tv_task_starttime = (TextView) findViewById(R.id.tv_task_starttime);
+        tv_task_duration= (TextView) findViewById(R.id.tv_task_duration);
+        tv_task_status  = (TextView) findViewById(R.id.tv_task_status);
+        tv_task_describe = (TextView) findViewById(R.id.tv_task_describe);
+        lay_voice_task = (LinearLayout) findViewById(R.id.lay_voice_task);
+        iv_recode = (ImageView) findViewById(R.id.iv_recode);
+        tv_voice_msg = (TextView) findViewById(R.id.tv_voice_msg);
+        iv_taskMsg = (CustomerListView) findViewById(R.id.iv_taskMsg);
+    }
+
     public void initView() {
         setContentView(R.layout.act_task_detail);
         ViewUtils.inject(this);
@@ -277,47 +278,50 @@ public class DetailTaskActivity extends BaseActivity implements OnClickListener
      */
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.bt_task_huifu:
-                Map<String, String> param = new HashMap<String, String>();
-                if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
-                    param.put("ra_id", taskId);
-                    param.put("record", et_task_name.getText().toString());
-                    sendDataToServer("plm/record/endBillTask.action", param);
-                } else {
-                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
-                }
-                break;
-            case R.id.bt_task_bohui:
-                if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
-                    param = new HashMap<String, String>();
-                    param.put("ra_id", taskId);
-                    param.put("record", et_task_name.getText().toString());
-                    sendDataToServer("plm/record/noConfirmBillTask.action", param);
-                } else {
-                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
-                }
+        Map<String, String> param = new HashMap<String, String>();
 
-                break;
-            case R.id.bt_task_queren:
-                if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
-                    param = new HashMap<String, String>();
-                    param.put("ra_id", taskId);
-                    param.put("record", et_task_name.getText().toString());
-                    sendDataToServer("plm/record/confirmBillTask.action", param);
-                } else {
-                    ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
-                }
-                break;
-            case R.id.iv_recode:
-                if (filepath != null) {
-                    tv_voice_msg.setText("正在播放...");
-                    playVolice(filepath);
-                }
-                break;
-            default:
-                break;
+        if (v.getId() == R.id.bt_task_huifu){
+            if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
+                param.put("ra_id", taskId);
+                param.put("record", et_task_name.getText().toString());
+                sendDataToServer("plm/record/endBillTask.action", param);
+            } else {
+                ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
+            }
+        }else if (v.getId() ==  R.id.bt_task_huifu){
+            if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
+                param.put("ra_id", taskId);
+                param.put("record", et_task_name.getText().toString());
+                sendDataToServer("plm/record/endBillTask.action", param);
+            } else {
+                ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
+            }
+        }else if (v.getId() == R.id.bt_task_bohui){
+            if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
+                param = new HashMap<String, String>();
+                param.put("ra_id", taskId);
+                param.put("record", et_task_name.getText().toString());
+                sendDataToServer("plm/record/noConfirmBillTask.action", param);
+            } else {
+                ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
+            }
+
+        }else if (v.getId() == R.id.bt_task_queren){
+            if (!StringUtil.isEmpty(et_task_name.getText().toString())) {
+                param = new HashMap<String, String>();
+                param.put("ra_id", taskId);
+                param.put("record", et_task_name.getText().toString());
+                sendDataToServer("plm/record/confirmBillTask.action", param);
+            } else {
+                ViewUtil.ShowMessageTitle(ct, getString(R.string.task_input_detail_info));
+            }
+        }else if (v.getId() == R.id.iv_recode){
+            if (filepath != null) {
+                tv_voice_msg.setText("正在播放...");
+                playVolice(filepath);
+            }
         }
+
     }
 
     public void sendDataToServer(String url, Map<String, String> param) {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MeetingActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MeetingActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.OA.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -22,17 +22,16 @@ 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.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.widget.EmptyLayout;
 import com.core.widget.VoiceSearchView;
 import com.core.widget.listener.EditChangeListener;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetEntity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.uas.appworks.OA.erp.MeetDetailsActivity;
+import com.uas.appworks.OA.erp.model.MeetEntity;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -48,9 +47,7 @@ public class MeetingActivity extends BaseActivity  {
     private final int whatLoad = 0x11;
     private int requestCode = 0x13;
     private int basePager = 1;
-    @ViewInject(R.id.list_business)
     private PullToRefreshListView list_business;
-    @ViewInject(R.id.voiceSearchView)
     private VoiceSearchView voiceSearchView;
     private MesstingAdapter adapter;
     private List<MeetEntity> entities;//网络获取来的item总数
@@ -101,7 +98,8 @@ public class MeetingActivity extends BaseActivity  {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_meeting);
-        ViewUtils.inject(this);
+        list_business = (PullToRefreshListView) findViewById(R.id.list_business);
+        voiceSearchView= (VoiceSearchView) findViewById(R.id.voiceSearchView);
         mEmptyLayout = new EmptyLayout(this, list_business.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);
@@ -112,6 +110,7 @@ public class MeetingActivity extends BaseActivity  {
     }
 
     private void initView() {
+
         progressDialog.show();
         loadNetData(basePager);
 

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

@@ -38,7 +38,7 @@ import com.core.widget.view.model.SelectAimModel;
 import com.lidroid.xutils.ViewUtils;
 import com.uas.appworks.R;
 import com.uas.appworks.OA.erp.adapter.MissionAdapter;
-import com.uas.appworks.OA.erp.imp.IMissionPresenter;
+import com.uas.appworks.OA.erp.presenter.IMissionPresenter;
 import com.uas.appworks.OA.erp.model.IMission;
 import com.uas.appworks.OA.erp.presenter.MissionPresenter;
 import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/SaveMeetActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/SaveMeetActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.uas.appworks.OA.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -17,15 +17,14 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonInterface;
+import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.ToastUtil;
+import com.core.widget.crouton.Crouton;
 import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.oa.MeetingDocBean;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.uas.appworks.OA.erp.model.MeetingDocBean;
+import com.uas.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -38,13 +37,9 @@ import static com.alibaba.fastjson.JSON.parseObject;
 
 //会议纪要
 public class SaveMeetActivity extends BaseActivity {
-    @ViewInject(R.id.summary_et)
     private EditText summary_et;
-    @ViewInject(R.id.resolution_et)
     private EditText resolution_et;
-    @ViewInject(R.id.wreckage_et)
     private EditText wreckage_et;
-    @ViewInject(R.id.follow_et)
     private EditText follow_et;
     private int id;
     private String noid = null;
@@ -188,6 +183,14 @@ public class SaveMeetActivity extends BaseActivity {
         setContentView(R.layout.activity_save_meet);
         ViewUtils.inject(this);
         bean = getIntent().getParcelableExtra("data");
+        initIDs();
+    }
+
+    private void initIDs(){
+        summary_et = (EditText) findViewById(R.id.summary_et);
+        resolution_et = (EditText) findViewById(R.id.resolution_et);
+        wreckage_et = (EditText) findViewById(R.id.wreckage_et);
+        follow_et = (EditText) findViewById(R.id.follow_et);
     }
 
     private void sendToSelect(JSONArray data) {

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

@@ -51,7 +51,7 @@ import com.core.widget.view.model.SelectAimModel;
 import com.core.widget.view.selectcalendar.SelectCalendarActivity;
 import com.lidroid.xutils.ViewUtils;
 import com.uas.appworks.OA.erp.activity.CommonDocDetailsActivity;
-import com.uas.appworks.OA.erp.model.form.Data;
+import com.core.widget.view.selectcalendar.bean.Data;
 import com.uas.appworks.OA.erp.model.form.GroupData;
 import com.uas.appworks.R;
 

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

@@ -23,7 +23,7 @@ import com.core.widget.view.MyStickyGridHeadersGridView;
 import com.lidroid.xutils.ViewUtils;
 import com.tonicartos.widget.stickygridheaders.StickyGridHeadersGridView;
 import com.uas.appworks.OA.erp.adapter.StickyGridAdapter;
-import com.uas.appworks.OA.erp.model.form.Data;
+import com.core.widget.view.selectcalendar.bean.Data;
 import com.uas.appworks.R;
 
 import java.util.ArrayList;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/adapter/StickyGridAdapter.java

@@ -11,7 +11,7 @@ import android.widget.TextView;
 import com.common.data.StringUtil;
 import com.core.app.R;
 import com.tonicartos.widget.stickygridheaders.StickyGridHeadersSimpleAdapter;
-import com.uas.appworks.OA.erp.model.form.Data;
+import com.core.widget.view.selectcalendar.bean.Data;
 
 import java.util.List;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/MeetEntity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/MeetEntity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/MeetingDocBean.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/MeetingDocBean.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.bean.oa;
+package com.uas.appworks.OA.erp.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/form/Data.java

@@ -1,249 +0,0 @@
-package com.uas.appworks.OA.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];
-        }
-    };
-}

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/model/form/GroupData.java

@@ -3,6 +3,7 @@ package com.uas.appworks.OA.erp.model.form;
 import android.os.Parcel;
 import android.os.Parcelable;
 
+import com.core.widget.view.selectcalendar.bean.Data;
 
 import java.util.ArrayList;
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/imp/IMissionPresenter.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/IMissionPresenter.java

@@ -1,4 +1,4 @@
-package com.uas.appworks.OA.erp.imp;
+package com.uas.appworks.OA.erp.presenter;
 
 import android.content.Intent;
 

app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/presenter/MissionPresenter.java

@@ -27,7 +27,6 @@ import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.WorkHandlerUtil;
 import com.uas.appworks.R;
-import com.uas.appworks.OA.erp.imp.IMissionPresenter;
 import com.uas.appworks.OA.erp.model.IMission;
 import com.uas.appworks.dao.MissionDao;