Merge branch 'draft' of https://gitlab.com/Arisono/SkWeiChat-Baidu into uu_v1.0

# Conflicts:
#	WeiChat/build.gradle
#	WeiChat/src/main/AndroidManifest.xml
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/bean/oa/SelectBean.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/PMsgDetailActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DataInquiryActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/DataInquiryListActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/contanct/ContactsActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/form/DataFormDetailActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/message/ProcessMsgActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ApprovalActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/ExpenseReimbursementActivity.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/oa/ApprovalAdapter.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBManager.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/ApprovaPresenter.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/OpenFilesUtils.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpService.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XReconnectionManager.java
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/xmpp/XmppConnectionManager.java
#	WeiChat/src/main/res/layout/action_data_inquiry_list.xml
#	WeiChat/src/main/res/layout/activity_data_inquiry.xml
#	WeiChat/src/main/res/layout/activity_data_inquiry_list.xml
#	app_core/common/libs/asmack.jar
#	app_core/network/src/main/java/network/app/http/HttpBase.java

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

@@ -10,7 +10,6 @@ import android.widget.VideoView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 public class DMsgVideoHeaderView extends PMsgTypeView {
 
@@ -29,14 +28,12 @@ public class DMsgVideoHeaderView extends PMsgTypeView {
         videoVV.setOnPreparedListener(new MediaPlayer.OnPreparedListener() {
             @Override
             public void onPrepared(MediaPlayer mp) {
-                LogUtil.i("setOnPreparedListener");
                 progress.setVisibility(GONE);
             }
         });
         videoVV.setOnErrorListener(new MediaPlayer.OnErrorListener() {
             @Override
             public boolean onError(MediaPlayer mp, int what, int extra) {
-                LogUtil.i("setOnErrorListener");
                 progress.setVisibility(GONE);
                 return false;
             }

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

@@ -31,11 +31,10 @@ import com.baidu.cyberplayer.core.BVideoView.OnInfoListener;
 import com.baidu.cyberplayer.core.BVideoView.OnPlayingBufferCacheListener;
 import com.baidu.cyberplayer.core.BVideoView.OnPreparedListener;
 import com.baidu.cyberplayer.core.BVideoView.OnSeekCompleteListener;
+import com.core.utils.helper.AvatarHelper;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
-import com.xzjmyk.pm.activity.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 import java.util.Formatter;
 import java.util.Locale;
@@ -254,7 +253,6 @@ public class PMsgVideoHeaderView extends PMsgTypeView implements OnPreparedListe
      * @param timeout The timeout in milliseconds. Use 0 to show the controller until hide() is called.
      */
     public void show(int timeout) {
-        LogUtil.i("sDefaultTimeout="+timeout);
         mMediaControlView.setVisibility(VISIBLE);
         setProgress();
         mMediaControlView.updatePausePlay(mBVideoView.isPlaying());

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

@@ -23,7 +23,6 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.PopupWindow;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
@@ -32,35 +31,38 @@ import com.andreabaccega.widget.FormEditText;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
 import com.common.data.JSONUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
+import com.core.api.wxapi.ApiConfig;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUtils;
+import com.core.app.Constants;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.SelectBean;
+import com.core.net.http.ViewUtil;
+import com.core.utils.CommonInterface;
+import com.core.utils.RecognizerDialogUtil;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.widget.view.Activity.SelectActivity;
+import com.core.widget.view.model.SelectAimModel;
 import com.iflytek.cloud.RecognizerResult;
 import com.iflytek.cloud.SpeechError;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.voicerecognition.JsonParser;
-import com.core.model.SelectBean;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
-import com.core.widget.view.Activity.SelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectAimActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectRemarkActivity;
-import com.core.widget.view.model.SelectAimModel;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.core.utils.CommonInterface;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.utils.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
+
+import org.jivesoftware.smack.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -535,7 +537,7 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 break;
             case R.id.tv_visit_steps:
 //                Toast.makeText(this,"当前阶段",Toast.LENGTH_SHORT).show();
-                String url = Constants.getAppBaseUrl(getApplicationContext()) + "mobile/crm/getBusinessChanceStage.action";
+                String url = CommonUtil.getAppBaseUrl(getApplicationContext()) + "mobile/crm/getBusinessChanceStage.action";
                 Map<String, Object> params = new HashMap<>();
                 LinkedHashMap headers = new LinkedHashMap();
                 headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(getApplicationContext(), "sessionId"));

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

@@ -5,14 +5,14 @@ import android.os.Handler;
 import android.os.Message;
 import android.widget.ListView;
 
+import com.common.LogUtil;
+import com.core.app.Constants;
+import com.core.utils.CommonUtil;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.adapter.DataInquiryMenuListAdapter;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.GridMenuDataInquiryBean;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -54,7 +54,7 @@ public class DataInquiryActivity extends BaseActivity {
 
     private void getMenuData() {
         progressDialog.show();
-        String url = Constants.getAppBaseUrl(this) + "mobile/qry/queryJsp.action";
+        String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/queryJsp.action";
         Map<String, Object> params = new HashMap<>();
         params.put("emcode", CommonUtil.getSharedPreferences(ct, "erp_username"));
         LinkedHashMap<String, Object> headers = new LinkedHashMap<>();

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

@@ -19,6 +19,11 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.common.LogUtil;
+import com.core.app.Constants;
+import com.core.widget.ClearEditText;
+import com.core.widget.EmptyLayout;
+import com.core.widget.MyListView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.iflytek.cloud.RecognizerResult;
@@ -40,12 +45,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.SchemeConditionBe
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database.HistoricalRecordBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.database.HistoricalRecordDao;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.Constants;
-import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.EmptyLayout;
-import com.xzjmyk.pm.activity.view.ClearEditText;
-import com.xzjmyk.pm.activity.view.MyListView;
+import com.xzjmyk.pm.activity.util.oa.CommonUtil;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -171,7 +171,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
         } else {
             if (mQueryScheme != null) {
                 progressDialog.show();
-                String url = Constants.getAppBaseUrl(this) + "mobile/qry/schemeCondition.action";
+                String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/schemeCondition.action";
                 Map<String, Object> params = new HashMap<>();
                 params.put("caller", mQueryScheme.getCaller());
                 params.put("id", mQueryScheme.getSchemeId());
@@ -894,7 +894,7 @@ public class DataInquiryListActivity extends BaseActivity implements View.OnClic
     }
 
     private void getSchemeData() {
-        String url = Constants.getAppBaseUrl(this) + "mobile/qry/schemeResult.action";
+        String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/schemeResult.action";
         Map<String, Object> params = new HashMap<>();
         params.put("caller", mCaller);
         params.put("id", mSchemeId);

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

@@ -205,7 +205,7 @@ public class ReportQueryCriteriaActivity extends BaseActivity implements View.On
         } else {
             if (mReportInfo != null) {
                 progressDialog.show();
-                String url = Constants.getAppBaseUrl(this) + "mobile/qry/reportCondition.action";
+                String url = CommonUtil.getAppBaseUrl(this) + "mobile/qry/reportCondition.action";
                 Map<String, Object> params = new HashMap<>();
                 params.put("caller", mReportInfo.getCaller());
                 params.put("title", mReportInfo.getTitle());

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

@@ -9,12 +9,12 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.core.widget.view.MyGridView;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.DataInquiryListActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.activity.DataInquiryMoreMenuActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.DataInquiryGirdItemBean;
 import com.xzjmyk.pm.activity.ui.erp.activity.datainquiry.bean.GridMenuDataInquiryBean;
-import com.xzjmyk.pm.activity.view.MyGridView;
 
 import java.io.Serializable;
 import java.util.ArrayList;