闪退解决

WeiChat/src/main/AndroidManifest.xml

@@ -866,7 +866,7 @@
             android:name=".ui.message.Subscription2Activity"
             android:label="@string/subscribe_title" />
         <activity
-            android:name=".ui.erp.activity.oa.MissionSetActivity"
+            android:name="com.uas.appworks.OA.erp.activity.MissionSetActivity"
             android:label="@string/activity_mission_set" />
         <activity
             android:name=".ui.erp.activity.oa.DestinationActivity"
@@ -995,11 +995,12 @@
         <activity
             android:name=".ui.erp.activity.oa.NavigationActivity"
             android:label="@string/navigation" />
-
-            android:name="com.me.appme.pedometer.view.NewStepListActivity"
+        <activity android:name="com.uas.appme.pedometer.view.NewStepActivity"
+            android:label="@string/set_sport"></activity>
+        <activity
+            android:name="com.uas.appme.pedometer.view.NewStepListActivity"
             android:label="@string/sports_recode_more"/>
-            android:name="com.me.appme.pedometer.view.StepSplashActivity"
-            android:exported="true"/>
+           <activity android:name="com.uas.appme.pedometer.view.StepSplashActivity"></activity>
         <!-- 计步功能 服务 -->
         <service
             android:name="com.uas.appme.pedometer.service.StepService"
@@ -1078,6 +1079,9 @@
             android:label="个人注册" />
         <activity android:name=".ui.account.RegisterSelectActivity"></activity>
         <activity android:name=".ui.me.TemperatureActivity"></activity>
+
+        <activity android:name="com.core.widget.view.Activity.ImgFileListActivity"></activity>
+        <activity android:name=".ui.tool.MultiImagePreviewActivity"></activity>
     </application>
 
 </manifest>

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

@@ -25,22 +25,29 @@ import com.android.volley.VolleyError;
 import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.Friend;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.dao.CircleMessageDao;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.utils.AppConstant;
+import com.core.xmpp.utils.HtmlUtils;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
-import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
-import com.core.xmpp.dao.CircleMessageDao;
-import com.core.xmpp.dao.FriendDao;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
@@ -49,15 +56,8 @@ import com.xzjmyk.pm.activity.ui.circle.showCEView;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkDailyAddActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.core.xmpp.utils.HtmlUtils;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -26,22 +26,28 @@ import com.common.data.DateFormatUtil;
 import com.common.data.StringUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.model.Friend;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.dao.CircleMessageDao;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.utils.AppConstant;
+import com.core.xmpp.utils.HtmlUtils;
+import com.nostra13.universalimageloader.core.ImageLoader;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.audio.AudioPalyer;
-import com.core.model.Friend;
 import com.xzjmyk.pm.activity.bean.circle.Comment;
 import com.xzjmyk.pm.activity.bean.circle.Praise;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Body;
 import com.xzjmyk.pm.activity.bean.circle.PublicMessage.Resource;
-import com.core.xmpp.dao.CircleMessageDao;
-import com.core.xmpp.dao.FriendDao;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment.ListenerAudioFragment;
@@ -49,14 +55,8 @@ 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.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.ToastUtil;
-import com.core.xmpp.utils.HtmlUtils;
 import com.xzjmyk.pm.activity.util.im.LinkMovementClickMethod;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.OperationMorePopWindow;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonObjectRequest;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -34,22 +34,22 @@ import com.common.system.PermissionUtil;
 import com.common.system.SystemUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.core.xmpp.utils.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.core.xmpp.model.Area;
+import com.core.base.BaseActivity;
 import com.core.model.UploadFileResult;
+import com.core.net.volley.ObjectResult;
+import com.core.net.volley.Result;
+import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;
-import com.xzjmyk.pm.activity.util.im.helper.UploadService;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.model.Area;
+import com.core.xmpp.utils.AppConstant;
+import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.LocationMapActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.MyGridView;
-import com.core.net.volley.ObjectResult;
-import com.core.net.volley.Result;
-import com.core.net.volley.StringJsonObjectRequest;
+import com.xzjmyk.pm.activity.util.im.helper.UploadService;
 import com.xzjmyk.pm.pictureselector.ComPictureAdapter;
 import com.xzjmyk.pm.pictureselector.ImgFileListActivity;
 

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

@@ -25,11 +25,21 @@ import com.common.LogUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.ActivityUtils;
+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.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.net.http.ViewUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.widget.EmptyLayout;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.adapter.ComDocGriddataOutAdapter;
 import com.xzjmyk.pm.activity.adapter.CommonDocApprovalFlowAdapter;
@@ -37,26 +47,16 @@ import com.xzjmyk.pm.activity.adapter.CommonDocMainMsgAdapter;
 import com.xzjmyk.pm.activity.adapter.NodeAdapter;
 import com.xzjmyk.pm.activity.bean.oa.CommonApprovalFlowBean;
 import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.DataFormDetailActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ExpenseReimbursementActivity;
-import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.Approval;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ApprovaNodeUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.CustomerScrollView;
-import com.core.widget.EmptyLayout;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -33,6 +33,7 @@ import com.core.utils.ToastUtil;
 import com.core.widget.ClearEditText;
 import com.core.widget.EmptyLayout;
 import com.core.widget.listener.EditChangeListener;
+import com.core.widget.view.SmoothCheckBox;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
@@ -40,7 +41,6 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.crouton.Style;
 

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

@@ -21,6 +21,7 @@ import com.common.data.StringUtil;
 import com.core.app.Constants;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.widget.view.SmoothCheckBox;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
@@ -28,7 +29,6 @@ import com.lidroid.xutils.view.annotation.ViewInject;
 import com.uas.appme.settings.model.Business;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.SmoothCheckBox;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

@@ -46,6 +46,19 @@ import com.common.system.DisplayUtil;
 import com.common.system.PermissionUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ImageUtil;
+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.dao.DBManager;
+import com.core.model.EmployeesEntity;
+import com.core.model.SelectBean;
+import com.core.net.http.ViewUtil;
+import com.core.utils.ToastUtil;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.exception.HttpException;
@@ -55,8 +68,6 @@ import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.nostra13.universalimageloader.core.ImageLoader;
-import com.core.xmpp.utils.AppConstant;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.CommonDocAMBean;
 import com.xzjmyk.pm.activity.bean.oa.CostBean;
@@ -64,28 +75,17 @@ import com.xzjmyk.pm.activity.bean.oa.CostSingleBean;
 import com.xzjmyk.pm.activity.bean.oa.CostTypeSingleBean;
 import com.xzjmyk.pm.activity.bean.oa.CostUpdatePModel;
 import com.xzjmyk.pm.activity.bean.oa.SaveCostDetailsGridStoreBean;
-import com.core.model.SelectBean;
 import com.xzjmyk.pm.activity.bean.oa.UpdateCostDetailsGridStoreBean;
-import com.core.app.Constants;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.CommonDocDetailsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.form.FormListSelectActivity;
-import com.core.dao.DBManager;
-import com.core.model.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.AddCostBean;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.CostFormModel;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.view.NScrollerGridView;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
-import com.core.utils.ToastUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.MyGridView;
 import com.xzjmyk.pm.activity.view.MyListView;
 import com.xzjmyk.pm.activity.view.SquareCenterImageView;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 import com.xzjmyk.pm.pictureselector.ImgFileListActivity;
 
 import java.io.File;

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

@@ -32,6 +32,7 @@ import com.core.net.location.BdLocationHelper;
 import com.core.utils.TimeUtils;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
+import com.uas.appworks.OA.erp.activity.MissionSetActivity;
 import com.uas.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.adapter.MissionAdapter;

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

@@ -1,206 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
-
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-
-import com.common.data.StringUtil;
-import com.common.preferences.PreferenceUtils;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
-import com.core.app.AppConfig;
-import com.core.base.BaseActivity;
-import com.core.model.SelectBean;
-import com.core.utils.CommonInterface;
-import com.core.widget.view.SwitchView;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-
-import java.util.ArrayList;
-
-public class MissionSetActivity extends BaseActivity implements View.OnClickListener {
-    @ViewInject(R.id.auto_sv)
-    private SwitchView auto_sv;
-    @ViewInject(R.id.needprocess_sv)
-    private SwitchView needprocess_sv;
-    @ViewInject(R.id.distance_rl)
-    private RelativeLayout distance_rl;
-    @ViewInject(R.id.time_rl)
-    private RelativeLayout time_rl;
-    @ViewInject(R.id.distance_tv)
-    private TextView distance_tv;
-    @ViewInject(R.id.time_tv)
-    private TextView time_tv;
-
-    private boolean isAuto = false;//是否自动外勤
-    private int distance = 100;//
-    private int time = 30;
-    private boolean adminStatus;
-    private boolean needprocess;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_mission_set);
-        ViewUtils.inject(this);
-        adminStatus = getIntent() == null ? false : getIntent().getBooleanExtra(AppConfig.IS_ADMIN, false);
-        initView();
-        initEvent();
-    }
-
-    @Override
-    public void onBackPressed() {
-        endActivity();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            endActivity();
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void endActivity() {
-        Intent intent = new Intent();
-        intent.putExtra("isAuto", auto_sv.isChecked());
-        setResult(0x20, intent);
-        finish();
-    }
-
-    private void initEvent() {
-        auto_sv.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(View view, boolean isChecked) {
-                isAuto = isChecked;
-                updataSet();
-                setClickAble(isAuto);
-                PreferenceUtils.putBoolean(AppConfig.AUTO_MISSION, isAuto);
-            }
-        });
-        needprocess_sv.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(View view, boolean isChecked) {
-                needprocess = isChecked;
-                updataSet();
-                PreferenceUtils.putBoolean(AppConfig.NEED_PROCESS, needprocess);
-            }
-        });
-        if (adminStatus) {
-            distance_rl.setOnClickListener(this);
-            time_rl.setOnClickListener(this);
-        }
-        auto_sv.setFocusable(adminStatus);
-        auto_sv.setClickable(adminStatus);
-        needprocess_sv.setFocusable(adminStatus);
-        needprocess_sv.setClickable(adminStatus);
-    }
-
-    private void initView() {
-        if (ApiUtils.getApiModel() instanceof ApiPlatform) {
-            findViewById(R.id.auto_rl).setVisibility(View.GONE);
-        }
-        isAuto = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
-        needprocess = PreferenceUtils.getBoolean(AppConfig.NEED_PROCESS, false);
-        auto_sv.setChecked(isAuto);
-        needprocess_sv.setChecked(needprocess);
-        setClickAble(isAuto);
-        distance = PreferenceUtils.getInt(AppConfig.ALARM_MISSION_DISTANCE, 500);
-        distance_tv.setText(distance + "m");
-        time = PreferenceUtils.getInt(AppConfig.AUTO_MISSION_TIME, 20);
-        time_tv.setText(time + getResources().getString(R.string.minute));
-    }
-
-    private void setClickAble(boolean isAuto) {
-        distance_rl.setClickable(isAuto);
-        distance_rl.setFocusable(isAuto);
-        time_rl.setClickable(isAuto);
-        time_rl.setFocusable(isAuto);
-        setTextColor(isAuto, distance_rl, time_rl);
-    }
-
-    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
-    public void setTextColor(boolean isAdmain, View... view) {
-        if (view != null && view.length > 0 && Build.VERSION.SDK_INT >= 9) {
-            for (View v : view) {
-                if (v instanceof TextView)
-                    v.setAlpha(isAdmain ? 1f : 0.26f);
-            }
-        }
-    }
-
-    @Override
-    public void onClick(View view) {
-        Intent intent = null;
-        String[] str;
-        SelectBean bean = null;
-        ArrayList<SelectBean> beans = null;
-        switch (view.getId()) {
-            case R.id.distance_rl:
-                str = new String[]{"100m", "200m", "500m", "1000m", "1500m"};
-                beans = new ArrayList<>();
-                for (String e : str) {
-                    bean = new SelectBean();
-                    bean.setName(e);
-                    bean.setClick(false);
-                    beans.add(bean);
-                }
-                intent = new Intent(ct, SelectActivity.class);
-                intent.putExtra("type", 2);
-                intent.putParcelableArrayListExtra("data", beans);
-                intent.putExtra("title", getResources().getString(R.string.effective_range));
-                startActivityForResult(intent, 0x22);
-                break;
-            case R.id.time_rl:
-                str = new String[]{"10" + getString(R.string.minute), "20" + getString(R.string.minute),
-                        "30" + getString(R.string.minute), "45" + getString(R.string.minute), "60" + getString(R.string.minute)};
-                beans = new ArrayList<>();
-                for (String e : str) {
-                    bean = new SelectBean();
-                    bean.setName(e);
-                    bean.setClick(false);
-                    beans.add(bean);
-                }
-                intent = new Intent(ct, SelectActivity.class);
-                intent.putExtra("type", 2);
-                intent.putParcelableArrayListExtra("data", beans);
-                intent.putExtra("title", getString(R.string.reserve_time));
-                startActivityForResult(intent, 0x23);
-                break;
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (data == null || resultCode != 0x20) return;
-        SelectBean bean = data.getParcelableExtra("data");
-        if (bean == null || StringUtil.isEmpty(bean.getName())) {
-            return;
-        }
-        switch (requestCode) {
-            case 0x22:
-                distance_tv.setText(bean.getName());
-                distance = StringUtil.getFirstInt(bean.getName(), 5);
-                PreferenceUtils.putInt(AppConfig.ALARM_MISSION_DISTANCE, distance);
-                updataSet();
-                break;
-            case 0x23:
-                time_tv.setText(bean.getName());
-                time = StringUtil.getFirstInt(bean.getName(), 5);
-                PreferenceUtils.putInt(AppConfig.AUTO_MISSION_TIME, time);
-                updataSet();
-                break;
-        }
-    }
-
-    private void updataSet() {
-        CommonInterface.getInstance().addOutSet(distance, time, isAuto, needprocess, null);
-    }
-}

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

@@ -1,31 +0,0 @@
-package com.xzjmyk.pm.activity.view;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.GridView;
-
-/**
- * 自定义gridview，解决ListView中嵌套gridview显示不正常的问题（1行半）
- * 
- * @author wangyx
- * @version 1.0.0 2012-9-14
- */
-public class MyGridView extends GridView {
-	public MyGridView(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	public MyGridView(Context context) {
-		super(context);
-	}
-
-	public MyGridView(Context context, AttributeSet attrs, int defStyle) {
-		super(context, attrs, defStyle);
-	}
-
-	@Override
-	public void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-		int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2, MeasureSpec.AT_MOST);
-		super.onMeasure(widthMeasureSpec, expandSpec);
-	}
-}

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

@@ -1,423 +0,0 @@
-/**
- * * Copyright 2016 andy
- * <p/>
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p/>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p/>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.xzjmyk.pm.activity.view;
-
-import android.animation.ValueAnimator;
-import android.annotation.TargetApi;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Color;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.Point;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.animation.LinearInterpolator;
-import android.widget.Checkable;
-
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-
-/**
- * Author : andy
- * Date   : 16/1/21 11:28
- * Email  : andyxialm@gmail.com
- * Github : github.com/andyxialm
- * Description : A custom CheckBox with animation for Android
- */
-
-public class SmoothCheckBox extends View implements Checkable {
-    private static final String KEY_INSTANCE_STATE = "InstanceState";
-
-    private static final int COLOR_TICK = Color.WHITE;
-    private static final int COLOR_UNCHECKED = Color.WHITE;
-    private static final int COLOR_CHECKED = Color.parseColor("#FB4846");
-    private static final int COLOR_FLOOR_UNCHECKED = Color.parseColor("#DFDFDF");
-
-    private static final int DEF_DRAW_SIZE = 25;
-    private static final int DEF_ANIM_DURATION = 300;
-
-    private Paint mPaint, mTickPaint, mFloorPaint;
-    private Point[] mTickPoints;
-    private Point mCenterPoint;
-    private Path mTickPath;
-
-    private float mLeftLineDistance, mRightLineDistance, mDrewDistance;
-    private float mScaleVal = 1.0f, mFloorScale = 1.0f;
-    private int mWidth, mAnimDuration, mStrokeWidth;
-    private int mCheckedColor, mUnCheckedColor, mFloorColor, mFloorUnCheckedColor;
-
-    private boolean mChecked;
-    private boolean mTickDrawing;
-    private OnCheckedChangeListener mListener;
-
-    public SmoothCheckBox(Context context) {
-        this(context, null);
-    }
-
-    public SmoothCheckBox(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public SmoothCheckBox(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(attrs);
-    }
-
-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-    public SmoothCheckBox(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-        init(attrs);
-    }
-
-    private void init(AttributeSet attrs) {
-
-        TypedArray ta = getContext().obtainStyledAttributes(attrs, R.styleable.SmoothCheckBox);
-        int tickColor = ta.getColor(R.styleable.SmoothCheckBox_color_tick, COLOR_TICK);
-        mAnimDuration = ta.getInt(R.styleable.SmoothCheckBox_duration, DEF_ANIM_DURATION);
-        mFloorColor = ta.getColor(R.styleable.SmoothCheckBox_color_unchecked_stroke, COLOR_FLOOR_UNCHECKED);
-        mCheckedColor = ta.getColor(R.styleable.SmoothCheckBox_color_checked, COLOR_CHECKED);
-        mUnCheckedColor = ta.getColor(R.styleable.SmoothCheckBox_color_unchecked, COLOR_UNCHECKED);
-        mStrokeWidth = ta.getDimensionPixelSize(R.styleable.SmoothCheckBox_stroke_width, CommonUtil.convertDip2Px(getContext(), 0));
-        ta.recycle();
-
-        mFloorUnCheckedColor = mFloorColor;
-        mTickPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mTickPaint.setStyle(Paint.Style.STROKE);
-        mTickPaint.setStrokeCap(Paint.Cap.ROUND);
-        mTickPaint.setColor(tickColor);
-
-        mFloorPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mFloorPaint.setStyle(Paint.Style.FILL);
-        mFloorPaint.setColor(mFloorColor);
-
-        mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mPaint.setStyle(Paint.Style.FILL);
-        mPaint.setColor(mCheckedColor);
-
-        mTickPath = new Path();
-        mCenterPoint = new Point();
-        mTickPoints = new Point[3];
-        mTickPoints[0] = new Point();
-        mTickPoints[1] = new Point();
-        mTickPoints[2] = new Point();
-
-        setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                toggle();
-                mTickDrawing = false;
-                mDrewDistance = 0;
-                if (isChecked()) {
-                    startCheckedAnimation();
-                } else {
-                    startUnCheckedAnimation();
-                }
-            }
-        });
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        Bundle bundle = new Bundle();
-        bundle.putParcelable(KEY_INSTANCE_STATE, super.onSaveInstanceState());
-        bundle.putBoolean(KEY_INSTANCE_STATE, isChecked());
-        return bundle;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (state instanceof Bundle) {
-            Bundle bundle = (Bundle) state;
-            boolean isChecked = bundle.getBoolean(KEY_INSTANCE_STATE);
-            setChecked(isChecked);
-            super.onRestoreInstanceState(bundle.getParcelable(KEY_INSTANCE_STATE));
-            return;
-        }
-        super.onRestoreInstanceState(state);
-    }
-
-    @Override
-    public boolean isChecked() {
-        return mChecked;
-    }
-
-    @Override
-    public void toggle() {
-        this.setChecked(!isChecked());
-    }
-
-    @Override
-    public void setChecked(boolean checked) {
-        mChecked = checked;
-        reset();
-        invalidate();
-        if (mListener != null) {
-            mListener.onCheckedChanged(SmoothCheckBox.this, mChecked);
-        }
-    }
-
-    /**
-     * checked with animation
-     * @param checked checked
-     * @param animate change with animation
-     */
-    public void setChecked(boolean checked, boolean animate) {
-        if (animate) {
-            mTickDrawing = false;
-            mChecked = checked;
-            mDrewDistance = 0f;
-            if (checked) {
-                startCheckedAnimation();
-            } else {
-                startUnCheckedAnimation();
-            }
-            if (mListener != null) {
-                mListener.onCheckedChanged(SmoothCheckBox.this, mChecked);
-            }
-
-        } else {
-            this.setChecked(checked);
-        }
-    }
-
-    private void reset() {
-        mTickDrawing = true;
-        mFloorScale = 1.0f;
-        mScaleVal = isChecked() ? 0f : 1.0f;
-        mFloorColor = isChecked() ? mCheckedColor : mFloorUnCheckedColor;
-        mDrewDistance = isChecked() ? (mLeftLineDistance + mRightLineDistance) : 0;
-    }
-
-    private int measureSize(int measureSpec) {
-        int defSize = CommonUtil.convertDip2Px(getContext(), DEF_DRAW_SIZE);
-        int specSize = MeasureSpec.getSize(measureSpec);
-        int specMode = MeasureSpec.getMode(measureSpec);
-
-        int result = 0;
-        switch (specMode) {
-            case MeasureSpec.UNSPECIFIED:
-            case MeasureSpec.AT_MOST:
-                result = Math.min(defSize, specSize);
-                break;
-            case MeasureSpec.EXACTLY:
-                result = specSize;
-                break;
-        }
-        return result;
-    }
-
-    @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-        setMeasuredDimension(measureSize(widthMeasureSpec), measureSize(heightMeasureSpec));
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        mWidth = getMeasuredWidth();
-        mStrokeWidth = (mStrokeWidth == 0 ? getMeasuredWidth() / 10 : mStrokeWidth);
-        mStrokeWidth = mStrokeWidth > getMeasuredWidth() / 5 ? getMeasuredWidth() / 5 : mStrokeWidth;
-        mStrokeWidth = (mStrokeWidth < 3) ? 3 : mStrokeWidth;
-        mCenterPoint.x = mWidth / 2;
-        mCenterPoint.y = getMeasuredHeight() / 2;
-
-        mTickPoints[0].x = Math.round((float) getMeasuredWidth() / 30 * 7);
-        mTickPoints[0].y = Math.round((float) getMeasuredHeight() / 30 * 14);
-        mTickPoints[1].x = Math.round((float) getMeasuredWidth() / 30 * 13);
-        mTickPoints[1].y = Math.round((float) getMeasuredHeight() / 30 * 20);
-        mTickPoints[2].x = Math.round((float) getMeasuredWidth() / 30 * 22);
-        mTickPoints[2].y = Math.round((float) getMeasuredHeight() / 30 * 10);
-
-        mLeftLineDistance = (float) Math.sqrt(Math.pow(mTickPoints[1].x - mTickPoints[0].x, 2) +
-                Math.pow(mTickPoints[1].y - mTickPoints[0].y, 2));
-        mRightLineDistance = (float) Math.sqrt(Math.pow(mTickPoints[2].x - mTickPoints[1].x, 2) +
-                Math.pow(mTickPoints[2].y - mTickPoints[1].y, 2));
-        mTickPaint.setStrokeWidth(mStrokeWidth);
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        drawBorder(canvas);
-        drawCenter(canvas);
-        drawTick(canvas);
-    }
-
-    private void drawCenter(Canvas canvas) {
-        mPaint.setColor(mUnCheckedColor);
-        float radius = (mCenterPoint.x - mStrokeWidth) * mScaleVal;
-        canvas.drawCircle(mCenterPoint.x, mCenterPoint.y, radius, mPaint);
-    }
-
-    private void drawBorder(Canvas canvas) {
-        mFloorPaint.setColor(mFloorColor);
-        int radius = mCenterPoint.x;
-        canvas.drawCircle(mCenterPoint.x, mCenterPoint.y, radius * mFloorScale, mFloorPaint);
-    }
-
-    private void drawTick(Canvas canvas) {
-        if (mTickDrawing && isChecked()) {
-            drawTickPath(canvas);
-        }
-    }
-
-    private void drawTickPath(Canvas canvas) {
-        mTickPath.reset();
-        // draw left of the tick
-        if (mDrewDistance < mLeftLineDistance) {
-            float step = (mWidth / 20.0f) < 3 ? 3 : (mWidth / 20.0f);
-            mDrewDistance += step;
-            float stopX = mTickPoints[0].x + (mTickPoints[1].x - mTickPoints[0].x) * mDrewDistance / mLeftLineDistance;
-            float stopY = mTickPoints[0].y + (mTickPoints[1].y - mTickPoints[0].y) * mDrewDistance / mLeftLineDistance;
-
-            mTickPath.moveTo(mTickPoints[0].x, mTickPoints[0].y);
-            mTickPath.lineTo(stopX, stopY);
-            canvas.drawPath(mTickPath, mTickPaint);
-
-            if (mDrewDistance > mLeftLineDistance) {
-                mDrewDistance = mLeftLineDistance;
-            }
-        } else {
-
-            mTickPath.moveTo(mTickPoints[0].x, mTickPoints[0].y);
-            mTickPath.lineTo(mTickPoints[1].x, mTickPoints[1].y);
-            canvas.drawPath(mTickPath, mTickPaint);
-
-            // draw right of the tick
-            if (mDrewDistance < mLeftLineDistance + mRightLineDistance) {
-                float stopX = mTickPoints[1].x + (mTickPoints[2].x - mTickPoints[1].x) * (mDrewDistance - mLeftLineDistance) / mRightLineDistance;
-                float stopY = mTickPoints[1].y - (mTickPoints[1].y - mTickPoints[2].y) * (mDrewDistance - mLeftLineDistance) / mRightLineDistance;
-
-                mTickPath.reset();
-                mTickPath.moveTo(mTickPoints[1].x, mTickPoints[1].y);
-                mTickPath.lineTo(stopX, stopY);
-                canvas.drawPath(mTickPath, mTickPaint);
-
-                float step = (mWidth / 20) < 3 ? 3 : (mWidth / 20);
-                mDrewDistance += step;
-            } else {
-                mTickPath.reset();
-                mTickPath.moveTo(mTickPoints[1].x, mTickPoints[1].y);
-                mTickPath.lineTo(mTickPoints[2].x, mTickPoints[2].y);
-                canvas.drawPath(mTickPath, mTickPaint);
-            }
-        }
-
-        // invalidate
-        if (mDrewDistance < mLeftLineDistance + mRightLineDistance) {
-            postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    postInvalidate();
-                }
-            }, 10);
-        }
-    }
-
-    private void startCheckedAnimation() {
-        ValueAnimator animator = ValueAnimator.ofFloat(1.0f, 0f);
-        animator.setDuration(mAnimDuration / 3 * 2);
-        animator.setInterpolator(new LinearInterpolator());
-        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                mScaleVal = (float) animation.getAnimatedValue();
-                mFloorColor = getGradientColor(mUnCheckedColor, mCheckedColor, 1 - mScaleVal);
-                postInvalidate();
-            }
-        });
-        animator.start();
-
-        ValueAnimator floorAnimator = ValueAnimator.ofFloat(1.0f, 0.8f, 1.0f);
-        floorAnimator.setDuration(mAnimDuration);
-        floorAnimator.setInterpolator(new LinearInterpolator());
-        floorAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                mFloorScale = (float) animation.getAnimatedValue();
-                postInvalidate();
-            }
-        });
-        floorAnimator.start();
-
-        drawTickDelayed();
-    }
-
-    private void startUnCheckedAnimation() {
-        ValueAnimator animator = ValueAnimator.ofFloat(0f, 1.0f);
-        animator.setDuration(mAnimDuration);
-        animator.setInterpolator(new LinearInterpolator());
-        animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                mScaleVal = (float) animation.getAnimatedValue();
-                mFloorColor = getGradientColor(mCheckedColor, mFloorUnCheckedColor, mScaleVal);
-                postInvalidate();
-            }
-        });
-        animator.start();
-
-        ValueAnimator floorAnimator = ValueAnimator.ofFloat(1.0f, 0.8f, 1.0f);
-        floorAnimator.setDuration(mAnimDuration);
-        floorAnimator.setInterpolator(new LinearInterpolator());
-        floorAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                mFloorScale = (float) animation.getAnimatedValue();
-                postInvalidate();
-            }
-        });
-        floorAnimator.start();
-    }
-
-    private void drawTickDelayed() {
-        postDelayed(new Runnable() {
-            @Override
-            public void run() {
-                mTickDrawing = true;
-                postInvalidate();
-            }
-        }, mAnimDuration);
-    }
-
-    private static int getGradientColor(int startColor, int endColor, float percent) {
-        int sr = (startColor & 0xff0000) >> 0x10;
-        int sg = (startColor & 0xff00) >> 0x8;
-        int sb = (startColor & 0xff);
-
-        int er = (endColor & 0xff0000) >> 0x10;
-        int eg = (endColor & 0xff00) >> 0x8;
-        int eb = (endColor & 0xff);
-
-        int cr = (int) (sr * (1 - percent) + er * percent);
-        int cg = (int) (sg * (1 - percent) + eg * percent);
-        int cb = (int) (sb * (1 - percent) + eb * percent);
-        return Color.argb(0xff, cr, cg, cb);
-    }
-
-    public void setOnCheckedChangeListener(OnCheckedChangeListener l) {
-        this.mListener = l;
-    }
-
-    public interface OnCheckedChangeListener {
-        void onCheckedChanged(SmoothCheckBox checkBox, boolean isChecked);
-    }
-}

WeiChat/src/main/java/com/xzjmyk/pm/pictureselector/PictureSelectorDemo.java

@@ -12,15 +12,15 @@ import android.widget.AdapterView;
 import android.widget.Toast;
 
 import com.common.ui.CameraUtil;
+import com.core.app.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.utils.ToastUtil;
+import com.core.widget.view.MyGridView;
+import com.core.xmpp.utils.AppConstant;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.core.xmpp.utils.AppConstant;
-import com.core.app.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.MyGridView;
 
 import java.io.File;
 import java.util.ArrayList;

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

@@ -133,7 +133,7 @@
                 android:layout_marginLeft="10dp"
                 android:text="需要回复" />
 
-            <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+            <com.core.widget.view.SwitchView
                 android:id="@+id/cb_task_reply"
                 android:layout_width="50dp"
                 android:layout_height="35dp"

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

@@ -296,7 +296,7 @@
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
-            <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+            <com.core.widget.view.SwitchView
                 android:id="@+id/create_ric_sv"
                 android:layout_width="50dp"
                 android:layout_height="35dp"

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

@@ -124,7 +124,7 @@
                     android:paddingTop="5dp"
                     android:paddingBottom="5dp"/>
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -43,7 +43,7 @@
             android:textColor="@color/titleBlue"/>
     </LinearLayout>
 
-    <com.xzjmyk.pm.activity.view.MyGridView
+    <com.core.widget.view.MyGridView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:numColumns="3"

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

@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.xzjmyk.pm.activity.view.MyGridView
+        <com.core.widget.view.MyGridView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"

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

@@ -321,7 +321,7 @@
                 android:background="@color/white"
                 android:padding="10dp">
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -55,7 +55,7 @@
                 android:background="@color/white"
                 android:padding="10dp">
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -64,7 +64,8 @@
                     android:listSelector="#00000000"
                     android:numColumns="4"
                     android:stretchMode="columnWidth"
-                    android:verticalSpacing="3dp" />
+                    android:verticalSpacing="3dp" >
+                </com.core.widget.view.MyGridView>
             </LinearLayout>
 
             <View

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

@@ -19,7 +19,7 @@
             android:text="@string/auto_mission"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/auto_sv"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -110,7 +110,7 @@
             android:text="@string/neer_submit_able"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/needprocess_sv"
             android:layout_width="40dp"
             android:layout_height="25dp"

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

@@ -19,7 +19,7 @@
             android:text="自动打卡"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/auto_signin_sw"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -44,7 +44,7 @@
             android:text="考勤提醒"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/isalarma_sw"
             android:layout_width="40dp"
             android:layout_height="25dp"

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

@@ -21,7 +21,7 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/auto_signin_sw"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -48,7 +48,7 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/isImage"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -75,7 +75,7 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/allow_chance_location"
             android:layout_width="40dp"
             android:layout_height="25dp"

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

@@ -49,7 +49,7 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <com.xzjmyk.pm.activity.view.MyGridView
+            <com.core.widget.view.MyGridView
                 android:id="@+id/grid_view"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"

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

@@ -37,7 +37,7 @@
                 android:background="@color/white"
                 android:padding="10dp">
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -46,7 +46,8 @@
                     android:listSelector="#00000000"
                     android:numColumns="4"
                     android:stretchMode="columnWidth"
-                    android:verticalSpacing="3dp" />
+                    android:verticalSpacing="3dp" >
+                </com.core.widget.view.MyGridView>
             </LinearLayout>
 
 

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

@@ -142,7 +142,7 @@
                     android:src="@drawable/uu_step"
                     android:visibility="gone" />
 
-                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                <com.core.widget.view.SwitchView
                     android:id="@+id/uu_step_reply"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
@@ -186,7 +186,7 @@
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
-                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                <com.core.widget.view.SwitchView
                     android:id="@+id/cb_task_reply"
                     android:layout_width="40dp"
                     android:layout_height="25dp"

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

@@ -10,7 +10,7 @@
     android:background="@drawable/selector_me_menu_item_bg"
     android:layout_height="wrap_content">
 
-    <com.xzjmyk.pm.activity.view.SmoothCheckBox
+    <com.core.widget.view
         android:id="@+id/cb_left"
         android:layout_width="20dp"
         android:layout_height="20dp"

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

@@ -10,7 +10,7 @@
     style="@style/crm_ll_card"
     android:layout_height="wrap_content">
 
-    <com.xzjmyk.pm.activity.view.SmoothCheckBox
+    <com.core.widget.view
         android:id="@+id/cb_left"
         android:layout_width="30dp"
         android:layout_height="30dp"

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

@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:maxHeight="70dp" />
 
-    <com.xzjmyk.pm.activity.view.MyGridView
+    <com.core.widget.view.MyGridView
         android:id="@+id/grid_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -21,6 +21,7 @@
         android:listSelector="#00000000"
         android:numColumns="3"
         android:stretchMode="columnWidth"
-        android:verticalSpacing="3dp" />
+        android:verticalSpacing="3dp" >
+    </com.core.widget.view.MyGridView>
 
 </LinearLayout>

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.xzjmyk.pm.activity.view.MyGridView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.core.widget.view.MyGridView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/grid_view"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"

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

@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         android:padding="20dp"
         android:orientation="vertical">
-        <com.xzjmyk.pm.activity.view.MyGridView
+        <com.core.widget.view.MyGridView
             android:id="@+id/grid_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -19,7 +19,8 @@
             android:listSelector="#00000000"
             android:numColumns="4"
             android:stretchMode="columnWidth"
-            android:verticalSpacing="3dp" />
+            android:verticalSpacing="3dp" >
+        </com.core.widget.view.MyGridView>
     </LinearLayout>
 
 </LinearLayout>

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

@@ -45,7 +45,7 @@
                     android:src="@drawable/uu_step"
                     android:visibility="visible" />
 
-                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                <com.core.widget.view.SwitchView
                     android:id="@+id/senior_setting_auto_sign_sw"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
@@ -75,7 +75,7 @@
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
-                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                <com.core.widget.view.SwitchView
                     android:id="@+id/signin_alert_sv"
                     android:layout_width="40dp"
                     android:layout_height="25dp"

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

@@ -133,7 +133,7 @@
                 android:layout_marginLeft="10dp"
                 android:text="需要回复" />
 
-            <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+            <com.core.widget.view.SwitchView
                 android:id="@+id/cb_task_reply"
                 android:layout_width="50dp"
                 android:layout_height="35dp"

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

@@ -296,7 +296,7 @@
                 android:textColor="@color/text_main"
                 android:textSize="@dimen/text_main" />
 
-            <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+            <com.core.widget.view.SwitchView
                 android:id="@+id/create_ric_sv"
                 android:layout_width="50dp"
                 android:layout_height="35dp"

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

@@ -124,7 +124,7 @@
                     android:paddingTop="5dp"
                     android:paddingBottom="5dp"/>
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -43,7 +43,7 @@
             android:textColor="@color/titleBlue"/>
     </LinearLayout>
 
-    <com.xzjmyk.pm.activity.view.MyGridView
+    <com.core.widget.view.MyGridView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:numColumns="3"

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

@@ -13,7 +13,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <com.xzjmyk.pm.activity.view.MyGridView
+        <com.core.widget.view.MyGridView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/white"

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

@@ -321,7 +321,7 @@
                 android:background="@color/white"
                 android:padding="10dp">
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -55,7 +55,7 @@
                 android:background="@color/white"
                 android:padding="10dp">
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -19,7 +19,7 @@
             android:text="@string/auto_mission"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/auto_sv"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -110,7 +110,7 @@
             android:text="@string/neer_submit_able"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/needprocess_sv"
             android:layout_width="40dp"
             android:layout_height="25dp"

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

@@ -19,7 +19,7 @@
             android:text="自动打卡"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/auto_signin_sw"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -44,7 +44,7 @@
             android:text="考勤提醒"
             android:textSize="14sp" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/isalarma_sw"
             android:layout_width="40dp"
             android:layout_height="25dp"

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

@@ -21,7 +21,7 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/auto_signin_sw"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -48,7 +48,7 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/isImage"
             android:layout_width="40dp"
             android:layout_height="25dp"
@@ -75,7 +75,7 @@
             android:textColor="@color/text_main"
             android:textSize="@dimen/text_main" />
 
-        <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+        <com.core.widget.view.SwitchView
             android:id="@+id/allow_chance_location"
             android:layout_width="40dp"
             android:layout_height="25dp"

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

@@ -49,7 +49,7 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <com.xzjmyk.pm.activity.view.MyGridView
+            <com.core.widget.view.MyGridView
                 android:id="@+id/grid_view"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"

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

@@ -37,7 +37,7 @@
                 android:background="@color/white"
                 android:padding="10dp">
 
-                <com.xzjmyk.pm.activity.view.MyGridView
+                <com.core.widget.view.MyGridView
                     android:id="@+id/grid_view"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"

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

@@ -21,7 +21,7 @@
         android:textSize="30.0dip"
         android:visibility="invisible" />
 
-    <com.core.widget.sortlist.SideBar
+    <com.core.utils.sortlist.SideBar
         android:id="@+id/sidebar"
         android:layout_width="30.0dip"
         android:layout_height="match_parent"

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

@@ -10,7 +10,7 @@
     android:background="@drawable/selector_me_menu_item_bg"
     android:layout_height="wrap_content">
 
-    <com.xzjmyk.pm.activity.view.SmoothCheckBox
+    <com.core.widget.view
         android:id="@+id/cb_left"
         android:layout_width="20dp"
         android:layout_height="20dp"

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

@@ -10,7 +10,7 @@
     style="@style/crm_ll_card"
     android:layout_height="wrap_content">
 
-    <com.xzjmyk.pm.activity.view.SmoothCheckBox
+    <com.core.widget.view
         android:id="@+id/cb_left"
         android:layout_width="30dp"
         android:layout_height="30dp"

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

@@ -12,7 +12,7 @@
         android:layout_height="wrap_content"
         android:maxHeight="70dp" />
 
-    <com.xzjmyk.pm.activity.view.MyGridView
+    <com.core.widget.view.MyGridView
         android:id="@+id/grid_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.xzjmyk.pm.activity.view.MyGridView xmlns:android="http://schemas.android.com/apk/res/android"
+<com.core.widget.view.MyGridView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/grid_view"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"

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

@@ -10,7 +10,7 @@
         android:layout_height="match_parent"
         android:padding="20dp"
         android:orientation="vertical">
-        <com.xzjmyk.pm.activity.view.MyGridView
+        <com.core.widget.view.MyGridView
             android:id="@+id/grid_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

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

@@ -45,7 +45,7 @@
                     android:src="@drawable/uu_step"
                     android:visibility="visible" />
 
-                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                <com.core.widget.view.SwitchView
                     android:id="@+id/senior_setting_auto_sign_sw"
                     android:layout_width="40dp"
                     android:layout_height="25dp"
@@ -75,7 +75,7 @@
                     android:textColor="@color/black"
                     android:textSize="14sp" />
 
-                <com.xzjmyk.pm.activity.ui.erp.view.SwitchView
+                <com.core.widget.view.SwitchView
                     android:id="@+id/signin_alert_sv"
                     android:layout_width="40dp"
                     android:layout_height="25dp"

app_modular/appme/src/main/java/com/uas/appme/settings/activity/AboutActivity.java

@@ -44,6 +44,7 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
         String appName = getString(R.string.app_name);
         String versionName = SystemUtil.getVersionName(mContext);
         versionTv.setText(appName + " " + versionName);
+        initView();
 
         ViewUtils.inject(this);
         me_name.setOnClickListener(this);
@@ -56,7 +57,6 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
 //		UmengTool.getREDICRECT_URL(activity);
 //		UmengTool.checkWx(activity);
 //		UmengTool.checkSina(activity);
-        initView();
     }
 
     private void initView() {

app_modular/appme/src/main/java/com/uas/appme/settings/activity/SettingActivity.java

@@ -53,9 +53,11 @@ import com.uas.appme.pedometer.view.NewStepActivity;
 import com.uas.appme.pedometer.view.StepSplashActivity;
 import com.uas.appme.settings.Constant.Constant;
 import com.uas.appworks.OA.erp.activity.FlightsActivity;
+import com.uas.appworks.OA.erp.activity.MissionSetActivity;
 import com.uas.appworks.OA.erp.activity.MyRuleSetActivity;
 import com.uas.appworks.OA.erp.activity.OfficeAddressSettingsActivity;
 import com.uas.appworks.OA.erp.activity.SignSeniorSettingActivity;
+
 import java.io.File;
 
 

app_modular/appme/src/main/java/com/uas/appme/settings/activity/MissionSetActivity.java → app_modular/appworks/src/main/java/com/uas/appworks/OA/erp/activity/MissionSetActivity.java

@@ -1,4 +1,4 @@
-package com.uas.appme.settings.activity;
+package com.uas.appworks.OA.erp.activity;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -20,7 +20,7 @@ import com.core.utils.CommonInterface;
 import com.core.widget.view.Activity.SelectActivity;
 import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.ViewUtils;
-import com.me.appme.R;
+import com.me.appworks.R;
 
 import java.util.ArrayList;
 
@@ -101,14 +101,13 @@ public class MissionSetActivity extends BaseActivity implements View.OnClickList
         if (ApiUtils.getApiModel() instanceof ApiPlatform) {
             findViewById(R.id.auto_rl).setVisibility(View.GONE);
         }
-
         auto_sv = (SwitchView) findViewById(R.id.auto_sv);
         needprocess_sv = (SwitchView) findViewById(R.id.needprocess_sv);
         distance_rl = (RelativeLayout) findViewById(R.id.distance_rl);
         time_rl = (RelativeLayout) findViewById(R.id.time_rl);
         distance_tv = (TextView) findViewById(R.id.distance_tv);
-        time_tv = (TextView) findViewById(R.id.time_tv
-        );
+        time_tv = (TextView) findViewById(R.id.time_tv);
+
         isAuto = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
         needprocess = PreferenceUtils.getBoolean(AppConfig.NEED_PROCESS, false);
         auto_sv.setChecked(isAuto);
@@ -145,7 +144,7 @@ public class MissionSetActivity extends BaseActivity implements View.OnClickList
         SelectBean bean = null;
         ArrayList<SelectBean> beans = null;
 
-        if (view.getId() == R.id.distance_rl ){
+        if (view.getId() == R.id.distance_rl){
             str = new String[]{"100m", "200m", "500m", "1000m", "1500m"};
             beans = new ArrayList<>();
             for (String e : str) {