19:41

WeiChat/src/main/AndroidManifest.xml

@@ -376,7 +376,7 @@
         <!-- 文件选择的内容提供者 -->
         <provider
             android:name="com.ipaulpro.afilechooser.LocalStorageProvider"
-            android:authorities="com.uas.afilechooser.provider"
+            android:authorities="com.me.afilechooser.provider"
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"

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

@@ -53,6 +53,7 @@ import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.constant.AppConstant;
 import com.core.dao.UserDao;
 import com.core.model.CircleMessage;
 import com.core.model.NewFriendMessage;
@@ -64,7 +65,6 @@ import com.core.net.volley.FastVolley;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonArrayRequest;
 import com.core.utils.helper.LoginHelper;
-import com.uas.appme.settings.Constant.Constant;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SignAutoLogEntity;
 import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
@@ -489,7 +489,7 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         SIP_SERVER_HOST = host == null ? "120.24.211.24" : host;
         PushManager.startWork(getApplicationContext(), PushConstants.LOGIN_TYPE_API_KEY,
                 CommonUtil.getMetaValue(this, "api_key"));
-        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), Constant.BAIDU_PUSH);
+        int isPush = PreferenceUtils.getInt(MyApplication.getInstance(), AppConstant.BAIDU_PUSH);
         if (isPush == 0) {
             PushManager.stopWork(this);
         }

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

@@ -25,6 +25,7 @@ import com.common.data.StringUtil;
 import com.common.data.DateFormatUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
+import com.core.constant.AppConstant;
 import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
@@ -64,7 +65,6 @@ import java.util.List;
  * @version 1.0
  */
 public class BasicInfoEditActivity extends BaseActivity implements View.OnClickListener {
-    public static final String UPHEAD = "UPHEAD";
     private User mUser;
     // widget
     private ImageView mAvatarImg;
@@ -512,8 +512,8 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
 
                 ProgressDialogUtil.dismiss(mProgressDialog);
                 if (success) {
-                    Intent intent = new Intent(UPHEAD);
-                    intent.putExtra(UPHEAD, "updata");
+                    Intent intent = new Intent(AppConstant.UPHEAD);
+                    intent.putExtra(AppConstant.UPHEAD, "updata");
                     BasicInfoEditActivity.this.sendBroadcast(intent);
                     AvatarHelper.getInstance().deleteAvatar(loginUserId);
                     ToastUtil.showToast(BasicInfoEditActivity.this, R.string.upload_avatar_success);

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

@@ -199,7 +199,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private BroadcastReceiver receiverUpdataHead = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if ("updata".equals(intent.getStringExtra(BasicInfoEditActivity.UPHEAD))) {
+            if ("updata".equals(intent.getStringExtra(com.core.constant.AppConstant.UPHEAD))) {
                 AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), mAvatarImg, true);
             }
         }
@@ -214,7 +214,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         if (!mReceiverTag) {     //在注册广播接受者的时候 判断是否已被注册,避免重复多次注册广播
             IntentFilter inflate = new IntentFilter();
             mReceiverTag = true;
-            inflate.addAction(BasicInfoEditActivity.UPHEAD);
+            inflate.addAction(com.core.constant.AppConstant.UPHEAD);
             getActivity().registerReceiver(receiverUpdataHead, inflate);
         }
         super.onResume();

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

@@ -29,27 +29,26 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.baidu.mapapi.search.core.PoiInfo;
 import com.common.LogUtil;
+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.MyApplication;
+import com.core.base.BaseActivity;
+import com.core.net.http.ViewUtil;
 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.bean.oa.OfficeAddressBean;
 import com.xzjmyk.pm.activity.bean.oa.PlatSignAddressBean;
 import com.xzjmyk.pm.activity.bean.oa.SearchPoiParam;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;
-import com.core.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SearchLocationActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectActivity;
-import com.core.net.http.ViewUtil;
 import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.core.app.Constants;
-import com.common.data.ListUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
-import com.core.api.wxapi.ApiConfig;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUtils;
 
 import org.json.JSONArray;
 import org.json.JSONException;

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

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.uas.appme.settings.activity.SelectLanguageActivity">
+    tools:context="com.me.appme.settings.activity.SelectLanguageActivity">
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
         style="@style/ListViewBasic"

app_core/common/build.gradle

@@ -8,6 +8,8 @@ android {
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
+
+
     }
     useLibrary 'org.apache.http.legacy'
 
@@ -30,9 +32,11 @@ dependencies {
         force = true
     }
     compile deps.circleimageview
-    compile project(':lib-zxing')
     compile deps.activityOnCrash
     compile 'com.umeng.analytics:analytics:6.1.2'
+    compile deps.photoView
+    compile deps.stickyListHeaders
+    compile deps.stickyGridHeaders
 
     compile project(':pullToRefershLibraryMy')
     compile project(':MPAndroidChart')
@@ -43,4 +47,5 @@ dependencies {
     compile project(':library-viewpager-indicator')
     compile project(':lib-zxing')
     compile project(':library-refreshlayout')
+
 }

app_core/common/src/main/java/com/core/base/OABaseActivity.java

@@ -2,10 +2,10 @@ package com.core.base;
 
 import android.os.Bundle;
 
-import com.common.R;
 import com.common.data.StringUtil;
+import com.core.app.R;
 import com.core.utils.ToastUtil;
-import com.core.view.imp.HttpImp;
+import com.core.widget.view.imp.HttpImp;
 
 /**
  * Created by Bitliker on 2017/1/17.

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

@@ -53,4 +53,8 @@ public class AppConstant {
 
     public static final String EXTRA_URL = "url";
     public static final String EXTRA_TITLE = "title";
+
+
+    public static final String UPHEAD = "UPHEAD";
+    public  static  final  String BAIDU_PUSH = "BAIDU_PUSH";
 }

app_core/common/src/main/java/com/core/dao/work/VideoFileDao.java

@@ -1,12 +1,12 @@
-package com.xzjmyk.pm.activity.db.dao;
+package com.core.dao.work;
 
+import com.core.app.MyApplication;
+import com.core.db.SQLiteHelper;
+import com.core.model.VideoFile;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.QueryBuilder;
-import com.core.model.VideoFile;
-import com.core.db.SQLiteHelper;
-import com.core.app.MyApplication;
 
 import java.sql.SQLException;
 import java.util.List;

app_core/common/src/main/java/com/core/dao/work/WorkModelDao.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.db.dao;
+package com.core.dao.work;
 
 import android.content.ContentValues;
 import android.database.Cursor;
@@ -7,8 +7,8 @@ import android.database.sqlite.SQLiteDatabase;
 import com.common.LogUtil;
 import com.common.data.StringUtil;
 import com.core.db.DatabaseManager;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.model.WorkModel;
+import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 
 import java.util.ArrayList;

app_core/common/src/main/java/com/core/selectcalendar/CalendarDateFragmet.java

@@ -8,8 +8,8 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.common.R;
 import com.common.data.DateFormatUtil;
+import com.core.app.R;
 
 import java.util.Date;
 import java.util.Set;

app_core/common/src/main/java/com/core/selectcalendar/SelectCalendarActivity.java

@@ -27,7 +27,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.common.LogUtil;
-import com.common.R;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
@@ -37,8 +36,10 @@ import com.core.api.wxapi.ApiUAS;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.Constants;
 import com.core.app.MyApplication;
+import com.core.app.R;
 import com.core.base.BaseActivity;
 import com.core.net.http.ViewUtil;
+import com.core.net.http.http.OAHttpHelper;
 import com.core.selectcalendar.bean.Data;
 import com.core.selectcalendar.bean.DataState;
 import com.core.utils.CommonUtil;
@@ -63,37 +64,23 @@ import java.util.Set;
  */
 public class SelectCalendarActivity extends BaseActivity implements View.OnClickListener {
 
-    @ViewInject(R.id.viewPager)
     private ViewPager viewPager;
-    @ViewInject(R.id.ll_date_start)
     private LinearLayout ll_date_start;
-    @ViewInject(R.id.ll_date_end)
     private LinearLayout ll_date_end;
-    @ViewInject(R.id.ll_time_start)
     private LinearLayout ll_time_start;
-    @ViewInject(R.id.ll_time_end)
     private LinearLayout ll_time_end;
-    @ViewInject(R.id.ll_bottom)
     private LinearLayout ll_bottom;
 
-    @ViewInject(R.id.tv_date_start)
     private TextView tv_date_start;
-    @ViewInject(R.id.tv_date_end)
     private TextView tv_date_end;
 
-    @ViewInject(R.id.v_date_start)
     private TextView v_date_start;
-    @ViewInject(R.id.v_date_end)
     private TextView v_date_end;
 
-    @ViewInject(R.id.v_time_start)
     private TextView v_time_start;
-    @ViewInject(R.id.v_time_end)
     private TextView v_time_end;
 
-    @ViewInject(R.id.gv_date_list)
     private GridView gv_date_list;
-    @ViewInject(R.id.click_btn)
     private Button click_btn;
 
     private List<DataState> mTimeData = new ArrayList<>();
@@ -113,7 +100,17 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     private int status;//0:在录入（无值）1：在录入（有值）
     private boolean swich = false;//true 按时间段   false按时间
     private boolean isMenuShuffle = false;//默认隐藏
-
+    private Boolean mWorkovertime = false;
+    private String start_hour_min = "";
+    private String end_hour_min = "";
+    private String first_start_date;
+    private String first_end_date;
+    private String first_start_time;
+    private String first_end_time;
+    private Boolean breastfeeding = false;
+    private int imId;
+    private int type;//0:默认erp：1：小秘书
+    private ArrayList<DataState> totals = new ArrayList<>();
     private Handler mHandler = new Handler() {
 
         @Override
@@ -180,18 +177,6 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     };
 
 
-    private Boolean mWorkovertime = false;
-    private String start_hour_min = "";
-    private String end_hour_min = "";
-    private String first_start_date;
-    private String first_end_date;
-    private String first_start_time;
-    private String first_end_time;
-    private Boolean breastfeeding = false;
-    private int imId;
-    private int type;//0:默认erp：1：小秘书
-    private ArrayList<DataState> totals = new ArrayList<>();
-
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.menu_date_select, menu);
@@ -213,50 +198,47 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.oa_leave:
-                if (swich) {
-                    //按时间请假
-                    getSupportActionBar().setTitle("按时间请假");
-                    getSupportActionBar().setSubtitle("只适合普通请假");
-                    ll_bottom.setVisibility(View.GONE);
-                    swich = false;
-                    startDate = true;
-                    startTime = true;
-
-                    tv_date_start.setText("开始时间");
-                    tv_date_end.setText("结束时间");
-
-                    currentSelectDate = null;
-                    v_date_start.setText(first_start_date);
-                    v_date_end.setText(first_end_date);
-                    v_time_start.setText(first_start_time);
-                    v_time_end.setText(first_end_time);
-                    swichDateButton(true);
-                    ll_date_end.setEnabled(false);
-                    ll_time_end.setEnabled(false);
-                } else {
-                    //按时间段请假
-                    getSupportActionBar().setTitle("按时段请假");
-                    getSupportActionBar().setSubtitle("只适合特殊请假");
-                    ll_bottom.setVisibility(View.VISIBLE);
-                    swich = true;
-                    startDate = true;
-                    startTime = true;
-
-                    currentSelectDate = null;
-                    tv_date_start.setText("开始日期");
-                    tv_date_end.setText("结束日期");
-                    v_date_start.setText(first_start_date);
-                    v_date_end.setText(first_end_date);
-                    v_time_start.setText(first_start_time);
-                    v_time_end.setText(first_end_time);
-                    swichTimeButton(true);
-                    ll_date_end.setEnabled(false);
-                    ll_time_end.setEnabled(false);
-                }
-                break;
-        }
+        if (item.getItemId() == R.id.oa_leave)
+            if (swich) {
+                //按时间请假
+                getSupportActionBar().setTitle("按时间请假");
+                getSupportActionBar().setSubtitle("只适合普通请假");
+                ll_bottom.setVisibility(View.GONE);
+                swich = false;
+                startDate = true;
+                startTime = true;
+
+                tv_date_start.setText("开始时间");
+                tv_date_end.setText("结束时间");
+
+                currentSelectDate = null;
+                v_date_start.setText(first_start_date);
+                v_date_end.setText(first_end_date);
+                v_time_start.setText(first_start_time);
+                v_time_end.setText(first_end_time);
+                swichDateButton(true);
+                ll_date_end.setEnabled(false);
+                ll_time_end.setEnabled(false);
+            } else {
+                //按时间段请假
+                getSupportActionBar().setTitle("按时段请假");
+                getSupportActionBar().setSubtitle("只适合特殊请假");
+                ll_bottom.setVisibility(View.VISIBLE);
+                swich = true;
+                startDate = true;
+                startTime = true;
+
+                currentSelectDate = null;
+                tv_date_start.setText("开始日期");
+                tv_date_end.setText("结束日期");
+                v_date_start.setText(first_start_date);
+                v_date_end.setText(first_end_date);
+                v_time_start.setText(first_start_time);
+                v_time_end.setText(first_end_time);
+                swichTimeButton(true);
+                ll_date_end.setEnabled(false);
+                ll_time_end.setEnabled(false);
+            }
         return super.onOptionsItemSelected(item);
     }
 
@@ -276,6 +258,25 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
     private void initView() {
         ViewUtils.inject(this);
         getSupportActionBar().setTitle("选择时间");
+
+
+        ll_date_start = (LinearLayout) findViewById(R.id.ll_date_start);
+        tv_date_start = (TextView) findViewById(R.id.tv_date_start);
+        v_date_start = (TextView) findViewById(R.id.v_date_start);
+        ll_date_end = (LinearLayout) findViewById(R.id.ll_date_end);
+        v_date_end = (TextView) findViewById(R.id.v_date_end);
+        ll_bottom = (LinearLayout) findViewById(R.id.ll_bottom);
+        ll_time_start = (LinearLayout) findViewById(R.id.ll_time_start);
+        v_time_start = (TextView) findViewById(R.id.v_time_start);
+        ll_time_end = (LinearLayout) findViewById(R.id.ll_time_end);
+        v_time_end = (TextView) findViewById(R.id.v_time_end);
+        gv_date_list = (GridView) findViewById(R.id.gv_date_list);
+        click_btn = (Button) findViewById(R.id.click_btn);
+        gv_date_list = (GridView) findViewById(R.id.gv_date_list);
+        viewPager = (ViewPager) findViewById(R.id.viewPager);
+        ll_bottom = (LinearLayout) findViewById(R.id.ll_bottom);
+        tv_date_end = (TextView) findViewById(R.id.tv_date_end);
+        v_date_start= (TextView) findViewById(R.id.v_date_start);
         //getSupportActionBar().setSubtitle("只适合普通请假");
         swichDateButton(true);
         Intent intent = getIntent();
@@ -346,6 +347,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             imId = intent.getIntExtra("imId", 0);
         }
         initListener();
+
     }
 
     @Override
@@ -740,28 +742,23 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.ll_date_start:
-                startDate = true;
-                ll_date_end.setEnabled(true);
-                swichDateButton(startDate);
-                break;
-            case R.id.ll_date_end:
-                startDate = false;
-                swichDateButton(startDate);
-                v_date_end.setText(v_date_start.getText().toString());
-                break;
-            case R.id.ll_time_start:
-                startTime = true;
-                ll_time_end.setEnabled(true);
-                swichTimeButton(startTime);
-                break;
-            case R.id.ll_time_end:
+        if (v.getId() == R.id.ll_date_start){
+            startDate = true;
+            ll_date_end.setEnabled(true);
+            swichDateButton(startDate);
+        }else if (v.getId() == R.id.ll_date_end){
+            startDate = false;
+            swichDateButton(startDate);
+            v_date_end.setText(v_date_start.getText().toString());
+        }else if (v.getId() == R.id.ll_time_start){
+            startTime = true;
+            ll_time_end.setEnabled(true);
+            swichTimeButton(startTime);
+        }else if (v.getId() == R.id.ll_time_end){
                 startTime = false;
                 swichTimeButton(startTime);
                 v_date_end.setText(v_date_start.getText().toString());
-                break;
-            case R.id.click_btn:
+        }else if (v.getId() == R.id.click_btn){
                 if (swich) {
                     //时间段
                     if (!StringUtil.isEmpty(v_date_start.getText().toString()) && !
@@ -859,9 +856,6 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                         ToastMessage("请选择开始时间和结束时间！");
                     }
                 }
-
-
-                break;
         }
     }
 
@@ -912,7 +906,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         } else if (ApiUtils.getApiModel() instanceof ApiPlatform) {
             String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_schedule_url;
             Map<String, Object> param = new HashMap<>();
-            param.put("date",DateFormatUtil.getStrDate4Date(new Date(), "yyyyMMdd"));
+            param.put("date", DateFormatUtil.getStrDate4Date(new Date(), "yyyyMMdd"));
             param.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
             param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
             LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
@@ -1072,7 +1066,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
 
     /*当点击了指定日期（点击日期、滑动时候触发）*/
     public void setClickDay(Date date) {
-        currentSelectDate =DateFormatUtil.getStrDate4Date(date, "yyyy-MM-dd");
+        currentSelectDate = DateFormatUtil.getStrDate4Date(date, "yyyy-MM-dd");
         Calendar c = Calendar.getInstance();
         c.setTime(date);
         selectDay = c.get(Calendar.DAY_OF_MONTH);

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.util.baidu;
+package com.core.utils;
 
 import android.util.Log;
 
@@ -30,14 +30,14 @@ import com.baidu.mapapi.search.route.RoutePlanSearch;
 import com.baidu.mapapi.search.route.TransitRouteResult;
 import com.baidu.mapapi.search.route.WalkingRouteResult;
 import com.baidu.mapapi.utils.DistanceUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.core.app.AppConfig;
-import com.core.net.location.BdLocationHelper;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.db.dao.WorkLocationDao;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkLocationModel;
-import com.common.data.ListUtils;
+import com.core.app.R;
+import com.core.dao.WorkLocationDao;
+import com.core.model.WorkLocationModel;
+import com.core.net.location.BdLocationHelper;
 
 import java.text.DecimalFormat;
 import java.util.List;

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

@@ -1,8 +1,11 @@
 package com.core.utils;
 
+import android.app.Dialog;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Environment;
@@ -10,6 +13,7 @@ import android.provider.MediaStore;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.afollestad.materialdialogs.MaterialDialog;
 import com.core.app.R;
 import com.common.data.StringUtil;
 import com.common.file.PropertiesUtil;
@@ -344,4 +348,64 @@ public class CommonUtil {
             name = MyApplication.getInstance().mLoginUser.getNickName();
         return StringUtil.isEmpty(name) ? "" : name;
     }
+
+
+    /**
+     * 获得当前包的版本号 return
+     **/
+    public static String ApkVersionCode(Context context) {
+        if (context != null) {
+            PackageManager pack = context.getPackageManager();
+            PackageInfo packageInfo = null;
+            String versionCode = null;
+            try {
+                packageInfo = pack.getPackageInfo(context.getPackageName(), 0);
+                versionCode = packageInfo.versionName;
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
+            return versionCode;
+        } else {
+            return null;
+        }
+
+    }
+
+
+    /**
+     * 对话框是否展示
+     *
+     * @param dialog
+     * @return
+     */
+    public static boolean isDialogShowing(Dialog dialog) {
+        if (dialog != null && dialog.isShowing()) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * @desc:打电话确认框
+     * @author：Arison on 2016/11/3
+     */
+    public static void phoneAction(final Context mContext, final String phone) {
+        MaterialDialog dialog = new MaterialDialog.Builder(mContext).title(R.string.dialog_confim_phone).content(mContext.getString(R.string.dialog_phone) + phone)
+                .positiveText(R.string.dialog_phone_action).negativeText(R.string.common_cancel).autoDismiss(false).callback(new MaterialDialog.ButtonCallback() {
+                    @Override
+                    public void onPositive(MaterialDialog dialog) {
+                        // 用intent启动拨打电话
+                        Intent intent = new Intent(Intent.ACTION_CALL, Uri.parse("tel:" + phone));
+                        mContext.startActivity(intent);
+                    }
+
+                    @Override
+                    public void onNegative(MaterialDialog dialog) {
+                        super.onNegative(dialog);
+                        dialog.dismiss();
+                    }
+                }).build();
+
+        dialog.show();
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.utils;
 
 import android.app.Activity;
 import android.content.Context;
@@ -26,8 +26,8 @@ public final class ScreenUtils {
         WindowManager windowManager = (WindowManager) context
                 .getSystemService(Context.WINDOW_SERVICE);
         windowManager.getDefaultDisplay().getMetrics(dm);
-        LogUtils.verbose("screen width=" + dm.widthPixels + "px, screen height=" + dm.heightPixels
-                + "px, densityDpi=" + dm.densityDpi + ", density=" + dm.density);
+//        LogUtils.verbose("screen width=" + dm.widthPixels + "px, screen height=" + dm.heightPixels
+//                + "px, densityDpi=" + dm.densityDpi + ", density=" + dm.density);
         return dm;
     }
 

app_core/common/src/main/java/com/core/utils/sortlist/BaseComparator.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.sortlist;
+package com.core.utils.sortlist;
 
 import java.util.Comparator;
 

app_core/common/src/main/java/com/core/utils/sortlist/BaseSortModel.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.sortlist;
+package com.core.utils.sortlist;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app_core/common/src/main/java/com/core/utils/sortlist/PingYinUtil.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.sortlist;
+package com.core.utils.sortlist;
 
 import android.text.TextUtils;
 

app_core/common/src/main/java/com/core/utils/sortlist/SideBar.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.sortlist;
+package com.core.utils.sortlist;
 
 import android.content.Context;
 import android.graphics.Canvas;
@@ -11,8 +11,8 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
-import com.xzjmyk.pm.activity.R;
 
+import com.core.app.R;
 
 import java.util.HashMap;
 import java.util.Map;

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

@@ -9,6 +9,10 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.core.utils.timeutils.wheel.DateUtils;
+import com.core.utils.timeutils.wheel.WheelPicker;
+import com.core.widget.view.WheelView;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.utils.timeutils.wheel;
 
 import android.app.Activity;
 import android.content.DialogInterface;
@@ -11,6 +11,7 @@ import android.view.ViewGroup;
 import android.view.Window;
 
 import com.common.LogUtil;
+import com.core.utils.ScreenUtils;
 
 
 /**

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

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

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.utils.timeutils.wheel;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -237,7 +237,7 @@ public class ConvertUtils {
                 }
                 bitmap = BitmapFactory.decodeByteArray(bytes, 0, bytes.length, options);
             } catch (Exception e) {
-                LogUtils.error(e);
+//                LogUtils.error(e);
             }
         }
         return bitmap;
@@ -324,7 +324,7 @@ public class ConvertUtils {
     public static int toPx(Context context, float dpValue) {
         final float scale = context.getResources().getDisplayMetrics().density;
         int pxValue = (int) (dpValue * scale + 0.5f);
-        LogUtils.verbose(dpValue + " dp == " + pxValue + " px");
+//        LogUtils.verbose(dpValue + " dp == " + pxValue + " px");
         return pxValue;
     }
 
@@ -350,7 +350,7 @@ public class ConvertUtils {
     public static int toDp(Context context, float pxValue) {
         final float scale = context.getResources().getDisplayMetrics().density;
         int dpValue = (int) (pxValue / scale + 0.5f);
-        LogUtils.verbose(pxValue + " px == " + dpValue + " dp");
+//        LogUtils.verbose(pxValue + " px == " + dpValue + " dp");
         return dpValue;
     }
 
@@ -364,7 +364,7 @@ public class ConvertUtils {
     public static int toSp(Context context, float pxValue) {
         final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
         int spValue = (int) (pxValue / fontScale + 0.5f);
-        LogUtils.verbose(pxValue + " px == " + spValue + " sp");
+//        LogUtils.verbose(pxValue + " px == " + spValue + " sp");
         return spValue;
     }
 
@@ -378,7 +378,7 @@ public class ConvertUtils {
         try {
             return new String(str.getBytes("utf-8"), "gbk");
         } catch (UnsupportedEncodingException e) {
-            LogUtils.warn(e.getMessage());
+//            LogUtils.warn(e.getMessage());
             return str;
         }
     }
@@ -420,7 +420,7 @@ public class ConvertUtils {
             }
             is.close();
         } catch (IOException e) {
-            LogUtils.error(e);
+//            LogUtils.error(e);
         }
         return sb.toString();
     }

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.utils.timeutils.wheel;
 
 import android.app.Activity;
 import android.support.annotation.IntDef;
@@ -9,6 +9,8 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.core.widget.view.WheelView;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.utils.timeutils.wheel;
 
 import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
@@ -178,8 +178,8 @@ public class DateUtils extends android.text.format.DateUtils {
         long elapsedMinutes = differentMilliSeconds / minutesInMilli;
         differentMilliSeconds = differentMilliSeconds % minutesInMilli;
         long elapsedSeconds = differentMilliSeconds / secondsInMilli;
-        LogUtils.debug(String.format(Locale.CHINA, "different: %d ms, %d days, %d hours, %d minutes, %d seconds",
-                differentMilliSeconds, elapsedDays, elapsedHours, elapsedMinutes, elapsedSeconds));
+//        LogUtils.debug(String.format(Locale.CHINA, "different: %d ms, %d days, %d hours, %d minutes, %d seconds",
+//                differentMilliSeconds, elapsedDays, elapsedHours, elapsedMinutes, elapsedSeconds));
         return new long[]{elapsedDays, elapsedHours, elapsedMinutes, elapsedSeconds};
     }
 
@@ -269,7 +269,7 @@ public class DateUtils extends android.text.format.DateUtils {
             Date date = dateFormat.parse(dateStr);
             return new Date(date.getTime());
         } catch (Exception e) {
-            LogUtils.warn(e);
+//            LogUtils.warn(e);
             return null;
         }
     }

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.utils.timeutils.wheel;
 
 import android.content.Context;
 import android.content.DialogInterface;
@@ -13,7 +13,7 @@ import android.view.Window;
 import android.widget.FrameLayout;
 
 import com.common.LogUtil;
-import com.xzjmyk.pm.activity.R;
+import com.core.app.R;
 
 
 /**

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

@@ -1,10 +1,12 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.utils.timeutils.wheel;
 
 import android.app.Activity;
 import android.support.annotation.ColorInt;
 import android.support.annotation.IntRange;
 import android.view.View;
 
+import com.core.widget.view.WheelView;
+
 
 /**
  * 滑轮选择器

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

@@ -16,7 +16,7 @@ import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
-import com.common.R;
+import com.core.app.R;
 
 
 /**

app_core/common/src/main/java/com/core/widget/view/Activity/CommonWebviewActivity.java

@@ -1,4 +1,4 @@
-package com.core.view.Activity;
+package com.core.widget.view.Activity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -12,8 +12,8 @@ import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
-import com.common.R;
 import com.common.file.DownloadUtil;
+import com.core.app.R;
 
 /**
  * 公共网页打开页面

app_core/common/src/main/java/com/core/widget/view/Activity/ImgFileListActivity.java

@@ -1,4 +1,4 @@
-package com.core.view.Activity;
+package com.core.widget.view.Activity;
 
 import android.Manifest;
 import android.content.Intent;
@@ -10,12 +10,12 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 
-import com.common.R;
 import com.common.system.PermissionUtil;
+import com.core.app.R;
 import com.core.base.BaseActivity;
 import com.core.utils.pictureselect.FileTraversal;
 import com.core.utils.pictureselect.Util;
-import com.core.view.adapter.ImgFileListAdapter;
+import com.core.widget.view.adapter.ImgFileListAdapter;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_core/common/src/main/java/com/core/widget/view/Activity/ImgsActivity.java

@@ -1,4 +1,4 @@
-package com.core.view.Activity;
+package com.core.widget.view.Activity;
 
 import android.annotation.SuppressLint;
 import android.content.Intent;
@@ -19,12 +19,13 @@ import android.widget.LinearLayout;
 import android.widget.LinearLayout.LayoutParams;
 import android.widget.RelativeLayout;
 
-import com.common.R;
 import com.common.data.ListUtils;
+import com.core.app.R;
 import com.core.base.BaseActivity;
 import com.core.utils.pictureselect.FileTraversal;
+import com.core.utils.pictureselect.ImgCallBack;
 import com.core.utils.pictureselect.Util;
-import com.core.view.adapter.ImgsAdapter;
+import com.core.widget.view.adapter.ImgsAdapter;
 
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
@@ -157,22 +158,18 @@ public class ImgsActivity extends BaseActivity {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.sure:
-				if (!ListUtils.isEmpty(filelist)){
-					Intent intent = new Intent();
-					intent.putExtra("files",filelist);
-					Log.i("files0x03",filelist.toString());
-					setResult(0x03,intent);
-					finish();
-				}else {
-					ToastMessage(getString(R.string.please_add_image));
-				}
-				break;
-			case android.R.id.home:
-				onBackPressed();
-				break;
-
+		if (item.getItemId() == R.id.sure){
+			if (!ListUtils.isEmpty(filelist)){
+				Intent intent = new Intent();
+				intent.putExtra("files",filelist);
+				Log.i("files0x03",filelist.toString());
+				setResult(0x03,intent);
+				finish();
+			}else {
+				ToastMessage(getString(R.string.please_add_image));
+			}
+		}else if (item.getItemId() == android.R.id.home){
+			onBackPressed();
 		}
 		return true;
 	}

app_core/common/src/main/java/com/core/widget/view/Activity/MultiImagePreviewActivity.java

@@ -1,4 +1,4 @@
-package com.core.view.Activity;
+package com.core.widget.view.Activity;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
@@ -23,6 +23,7 @@ import android.widget.TextView;
 
 import com.common.system.DisplayUtil;
 import com.core.app.ActionBackActivity;
+import com.core.app.R;
 import com.core.constant.AppConstant;
 import com.core.net.http.Scheme;
 import com.core.utils.CommonUtil;

app_core/common/src/main/java/com/core/widget/view/Activity/SearchLocationActivity.java

@@ -1,4 +1,4 @@
-package com.core.view.Activity;
+package com.core.widget.view.Activity;
 
 import android.os.Bundle;
 import android.text.Editable;
@@ -12,21 +12,24 @@ import com.baidu.mapapi.model.LatLng;
 import com.common.data.ListUtils;
 import com.core.app.R;
 import com.core.base.OABaseActivity;
+import com.core.utils.BaiduMapUtil;
 import com.core.utils.ToastUtil;
-import com.core.view.imp.ISearchView;
+import com.core.widget.view.EmptyLayout;
+import com.core.widget.view.adapter.SearchLocationAdapter;
+import com.core.widget.view.imp.EditChangeListener;
+import com.core.widget.view.imp.ISearchView;
+import com.core.widget.view.imp.SearchPresenter;
+import com.core.widget.view.model.SearchLocationModel;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
+
+import java.util.List;
 
 
 public class SearchLocationActivity extends OABaseActivity implements ISearchView {
-    @ViewInject(R.id.search_edit)
     private EditText search_edit;
-    @ViewInject(R.id.bmapView)
     private MapView bmapView;
-    @ViewInject(R.id.listview)
     private PullToRefreshListView listview;
-    @ViewInject(R.id.search_rl)
     private RelativeLayout search_rl;
 
     private SearchPresenter presenter;
@@ -43,6 +46,11 @@ public class SearchLocationActivity extends OABaseActivity implements ISearchVie
     }
 
     private void initView() {
+        search_edit = (EditText) findViewById(R.id.search_edit);
+        bmapView = (MapView) findViewById(R.id.bmapView);
+        listview = (PullToRefreshListView) findViewById(R.id.listview);
+        search_rl = (RelativeLayout) findViewById(R.id.search_rl);
+
         mEmptyLayout = new EmptyLayout(this, listview.getRefreshableView());
         mEmptyLayout.setShowLoadingButton(false);
         mEmptyLayout.setShowEmptyButton(false);

app_core/common/src/main/java/com/core/widget/view/Activity/SelectActivity.java

@@ -1,4 +1,4 @@
-package com.core.view.Activity;
+package com.core.widget.view.Activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -29,10 +29,13 @@ import com.common.data.StringUtil;
 import com.core.api.wxapi.ApiConfig;
 import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
+import com.core.app.R;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
-import com.core.view.EmptyLayout;
+import com.core.utils.CommonUtil;
+import com.core.widget.VoiceSearchView;
+import com.core.widget.view.EmptyLayout;
 
 import java.util.ArrayList;
 import java.util.HashMap;

app_core/common/src/main/java/com/core/widget/view/ClearEditText.java

@@ -1,4 +1,4 @@
-package com.core.view;
+package com.core.widget.view;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -15,7 +15,7 @@ import android.view.animation.CycleInterpolator;
 import android.view.animation.TranslateAnimation;
 import android.widget.EditText;
 
-import com.common.R;
+import com.core.app.R;
 
 
 public class ClearEditText extends EditText implements OnFocusChangeListener, TextWatcher {

app_core/common/src/main/java/com/core/widget/view/EmptyLayout.java

@@ -1,4 +1,4 @@
-package com.core.view;
+package com.core.widget.view;
 
 
 import android.app.Activity;
@@ -15,8 +15,8 @@ import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 import android.widget.TextView;
 
-import com.common.R;
 import com.core.app.MyApplication;
+import com.core.app.R;
 
 public class EmptyLayout {
 

app_core/common/src/main/java/com/core/widget/view/MyGridView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view;
+package com.core.widget.view;
 
 import android.content.Context;
 import android.util.AttributeSet;

app_core/common/src/main/java/com/core/widget/view/SmoothCheckBox.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.core.view;
+package com.core.widget.view;
 
 import android.animation.ValueAnimator;
 import android.annotation.TargetApi;
@@ -33,7 +33,7 @@ import android.view.View;
 import android.view.animation.LinearInterpolator;
 import android.widget.Checkable;
 
-import com.common.R;
+import com.core.app.R;
 import com.core.utils.CommonUtil;
 
 

app_core/common/src/main/java/com/core/widget/view/SwitchView.java

@@ -1,4 +1,4 @@
-package com.core.view;
+package com.core.widget.view;
 
 
 import android.content.Context;

app_core/common/src/main/java/com/core/widget/view/WheelView.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.view.wheel;
+package com.core.widget.view;
 
 import android.app.Activity;
 import android.content.Context;
@@ -163,7 +163,7 @@ public class WheelView extends ScrollView {
         tv.setPadding(padding, padding, padding, padding);
         if (0 == itemHeight) {
             itemHeight = getViewMeasuredHeight(tv);
-            LogUtils.debug(this, "itemHeight: " + itemHeight);
+//            LogUtils.debug(this, "itemHeight: " + itemHeight);
             views.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, itemHeight * displayItemCount));
             LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) this.getLayoutParams();
             setLayoutParams(new LinearLayout.LayoutParams(lp.width, itemHeight * displayItemCount));
@@ -241,7 +241,7 @@ public class WheelView extends ScrollView {
     public void setBackgroundDrawable(Drawable background) {
         if (viewWidth == 0) {
             viewWidth = ((Activity) context).getWindowManager().getDefaultDisplay().getWidth();
-            LogUtils.debug(this, "viewWidth: " + viewWidth);
+//            LogUtils.debug(this, "viewWidth: " + viewWidth);
         }
 
         // 2015/12/22 可设置分隔线是否可见
@@ -290,7 +290,7 @@ public class WheelView extends ScrollView {
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
-        LogUtils.debug(this, "w: " + w + ", h: " + h + ", oldw: " + oldw + ", oldh: " + oldh);
+//        LogUtils.debug(this, "w: " + w + ", h: " + h + ", oldw: " + oldw + ", oldh: " + oldh);
         viewWidth = w;
         setBackgroundDrawable(null);
     }
@@ -307,10 +307,10 @@ public class WheelView extends ScrollView {
                 previousY = ev.getY();
                 break;
             case MotionEvent.ACTION_UP:
-                LogUtils.debug(this, String.format("items=%s, offset=%s", items.size(), offset));
-                LogUtils.debug(this, "selectedIndex=" + selectedIndex);
+//                LogUtils.debug(this, String.format("items=%s, offset=%s", items.size(), offset));
+//                LogUtils.debug(this, "selectedIndex=" + selectedIndex);
                 float delta = ev.getY() - previousY;
-                LogUtils.debug(this, "delta=" + delta);
+//                LogUtils.debug(this, "delta=" + delta);
                 if (selectedIndex == offset && delta > 0) {
                     //滑动到第一项时，若继续向下滑动，则自动跳到最后一项
                     setSelectedIndex(items.size() - offset * 2 - 1);
@@ -574,14 +574,14 @@ public class WheelView extends ScrollView {
         public void run() {
             // 2015/12/17 java.lang.ArithmeticException: divide by zero
             if (itemHeight == 0) {
-                LogUtils.debug(this, "itemHeight is zero");
+//                LogUtils.debug(this, "itemHeight is zero");
                 return;
             }
             int newY = getScrollY();
             if (initialY - newY == 0) { // stopped
                 final int remainder = initialY % itemHeight;
                 final int divided = initialY / itemHeight;
-                LogUtils.debug(this, "initialY: " + initialY + ", remainder: " + remainder + ", divided: " + divided);
+//                LogUtils.debug(this, "initialY: " + initialY + ", remainder: " + remainder + ", divided: " + divided);
                 if (remainder == 0) {
                     selectedIndex = divided + offset;
                     onSelectedCallBack();

app_core/common/src/main/java/com/core/widget/view/adapter/ImgFileListAdapter.java

@@ -1,4 +1,4 @@
-package com.core.view.adapter;
+package com.core.widget.view.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -9,7 +9,7 @@ import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.common.R;
+import com.core.app.R;
 import com.core.utils.pictureselect.ImgCallBack;
 import com.core.utils.pictureselect.Util;
 

app_core/common/src/main/java/com/core/widget/view/adapter/ImgsAdapter.java

@@ -1,4 +1,4 @@
-package com.core.view.adapter;
+package com.core.widget.view.adapter;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,7 +10,7 @@ import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 import android.widget.ImageView;
 
-import com.common.R;
+import com.core.app.R;
 import com.core.utils.pictureselect.ImgCallBack;
 import com.core.utils.pictureselect.Util;
 

app_core/common/src/main/java/com/core/widget/view/adapter/SearchLocationAdapter.java

@@ -1,4 +1,4 @@
-package com.core.view.adapter;
+package com.core.widget.view.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,7 +9,7 @@ import android.widget.TextView;
 
 import com.common.data.ListUtils;
 import com.core.app.R;
-import com.core.view.model.SearchLocationModel;
+import com.core.widget.view.model.SearchLocationModel;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.entity;
+package com.core.widget.view.imp;
 
 import android.text.TextWatcher;
 
@@ -6,7 +6,7 @@ import android.text.TextWatcher;
  * Created by Bitliker on 2016/11/24.
  */
 
-public abstract class  EditChangeListener implements TextWatcher {
+public abstract class EditChangeListener implements TextWatcher {
     @Override
     public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
 

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

@@ -1,4 +1,4 @@
-package com.core.view.imp;
+package com.core.widget.view.imp;
 
 /**
  * 有网络请求的接口

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

@@ -1,6 +1,9 @@
-package com.core.view.imp;
+package com.core.widget.view.imp;
 
 import com.baidu.mapapi.model.LatLng;
+import com.core.widget.view.model.SearchLocationModel;
+
+import java.util.List;
 
 /**
  * Created by Bitliker on 2017/2/6.

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

@@ -1,4 +1,4 @@
-package com.core.view.imp;
+package com.core.widget.view.imp;
 import android.text.TextUtils;
 
 import org.json.JSONArray;

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

@@ -1,4 +1,4 @@
-package com.core.view.imp;
+package com.core.widget.view.imp;
 
 import android.content.Intent;
 
@@ -12,8 +12,8 @@ import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.net.location.BdLocationHelper;
 import com.core.utils.BaiduMapUtil;
-import com.core.view.model.SearchLocationModel;
-import com.core.view.model.SearchPoiParam;
+import com.core.widget.view.model.SearchLocationModel;
+import com.core.widget.view.model.SearchPoiParam;
 
 import java.util.ArrayList;
 import java.util.Collections;

app_core/common/src/main/java/com/core/widget/view/model/SearchLocationModel.java

@@ -1,4 +1,4 @@
-package com.core.view.model;
+package com.core.widget.view.model;
 
 import com.baidu.mapapi.search.core.PoiInfo;
 

app_core/common/src/main/java/com/core/widget/view/model/SearchPoiParam.java

@@ -1,4 +1,4 @@
-package com.core.view.model;
+package com.core.widget.view.model;
 
 /**
  * 因为考虑到查询地址的时候传的参数太多了，所以定义一个参数实体类

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

@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".view.NewStepActivity">
+   >
 
     <LinearLayout
         android:orientation="horizontal"

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

@@ -209,7 +209,6 @@
                 android:textSize="16sp" />
 
             <ImageView
-                android:id="@+id/iv_remain"
                 android:layout_width="15dp"
                 android:layout_height="15dp"
                 android:layout_centerVertical="true"

app_core/message/build.gradle

@@ -7,7 +7,7 @@ android {
 
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion rootProject.ext.android.minSdkVersion
         targetSdkVersion rootProject.ext.android.targetSdkVersion
         versionCode rootProject.ext.android.versionCode
         versionName rootProject.ext.android.versionName
@@ -25,5 +25,4 @@ dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile deps.junit
     compile deps.appcompatV7
-    compile  deps.supertoasts
 }

app_modular/appcontact/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
 
-          package="com.uas.appcontact">
+          package="com.me.appcontact">
 
     <application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true">
 

app_modular/appme/build.gradle

@@ -18,17 +18,9 @@ android {
     }
 }
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.fastjson
     //project
     compile project(':common')
-    compile project(':message')
+//    compile project(':message')
     compile project(':appworks')
-    compile project(':pullToRefershLibraryMy')
-    compile project(':libbdupdatesdk')
-
-    compile files('libs/ormlite-core-4.48.jar')
 
 }

app_modular/appme/src/main/AndroidManifest.xml

@@ -1,12 +1,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.uas.appme" >
+    package="com.me.appme" >
 
 <application
     android:allowBackup="true"
     android:label="@string/app_name"
     android:supportsRtl="true">
-    
-    <activity android:name=".pedometer.view.StepSplashActivity"/>
-    <activity android:name=".pedometer.view.NewStepActivity"/>
+
 </application>
 </manifest>

app_modular/appme/src/main/java/com/me/appme/MeFragment.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.me;
+package com.me.appme;
 
 import android.Manifest;
 import android.app.Activity;
@@ -27,42 +27,32 @@ import com.common.data.JSONUtil;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.common.system.PermissionUtil;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.uuzuche.lib_zxing.activity.CaptureActivity;
+import com.core.api.wxapi.ApiPlatform;
+import com.core.api.wxapi.ApiUAS;
+import com.core.api.wxapi.ApiUtils;
 import com.core.app.AppConfig;
-import com.xzjmyk.pm.activity.AppConstant;
-import com.xzjmyk.pm.activity.CaptureResultActivity;
-import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
 import com.core.app.Constants;
-import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAMainActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.Master;
+import com.core.app.MyApplication;
+import com.core.base.EasyFragment;
+import com.core.constant.AppConstant;
 import com.core.net.http.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.MasterDialog;
-import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
+import com.core.utils.CommonUtil;
+import com.core.utils.FlexJsonUtil;
 import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.util.im.UserRoleUtils;
 import com.core.utils.helper.AvatarHelper;
-import com.core.utils.FlexJsonUtil;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.view.crouton.Style;
-import com.core.api.wxapi.ApiPlatform;
-import com.core.api.wxapi.ApiUAS;
-import com.core.api.wxapi.ApiUtils;
-import com.xzjmyk.pm.im.audio.FaceRecognition.FaceView.OnlineFaceDemo;
+import com.core.widget.crouton.Style;
+import com.me.appme.other.model.Master;
+import com.me.appme.settings.activity.BaseInfoActivity;
+import com.me.appme.settings.activity.SettingActivity;
+import com.me.appme.widget.MasterDialog;
+import com.uuzuche.lib_zxing.activity.CaptureActivity;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.xzjmyk.pm.activity.R.id.my_friend_rl;
-import static com.xzjmyk.pm.activity.util.oa.CommonUtil.getSharedPreferencesBoolean;
+import static com.core.utils.CommonUtil.getSharedPreferencesBoolean;
 
 
 public class MeFragment extends EasyFragment implements View.OnClickListener {
@@ -71,51 +61,23 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private ImageView mAvatarImg;
     private TextView mNickNameTv;
     private TextView mPhoneNumTv;
-
-    @ViewInject(R.id.company_tv)
     private TextView company_tv;
-    @ViewInject(R.id.iv_remain)
     private ImageView iv_remain;
-    @ViewInject(R.id.master_tv)
     private TextView master_tv;
-
-    @ViewInject(R.id.tv_menu_setting)
     private TextView tv_menu_setting;
-
-
-    @ViewInject(R.id.tv_oa_desc)
     private TextView tv_oa_desc;
-    @ViewInject(R.id.iv_desc_oa)
     private ImageView iv_desc_oa;
-
-    @ViewInject(R.id.tv_uas_login)
     private TextView tv_uas_login;
-    @ViewInject(R.id.tv_b2b_login)
     private TextView tv_b2b_login;
-
-
-    @ViewInject(R.id.info_rl)
     private RelativeLayout rl_info;
-
-    @ViewInject(R.id.rl_company_change)
     private RelativeLayout rl_company_change;
-    @ViewInject(R.id.rl_master_change)
     private RelativeLayout rl_master_change;
-    @ViewInject(R.id.app_scan_code_rl)
     private RelativeLayout rl_scan_code;
-    @ViewInject(R.id.app_drafts_rl)
     private RelativeLayout app_drafts_rl;
-    @ViewInject(R.id.test_rl)
     private RelativeLayout test_rl;
-    @ViewInject(R.id.my_qr_code_rl)
     private RelativeLayout my_qr_code_rl;
-    @ViewInject(R.id.picture_selector_rl)
     private RelativeLayout picture_selector_rl;
-
-
-    @ViewInject(R.id.app_friend_rl)
     private RelativeLayout app_friend_rl;
-
     private Context ct;
     public MasterDialog mDialog;
 
@@ -199,7 +161,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private BroadcastReceiver receiverUpdataHead = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if ("updata".equals(intent.getStringExtra(BasicInfoEditActivity.UPHEAD))) {
+            if ("updata".equals(intent.getStringExtra(AppConstant.UPHEAD))) {
                 AvatarHelper.getInstance().displayAvatar(MyApplication.getInstance().mLoginUser.getUserId(), mAvatarImg, true);
             }
         }
@@ -214,7 +176,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         if (!mReceiverTag) {     //在注册广播接受者的时候 判断是否已被注册,避免重复多次注册广播
             IntentFilter inflate = new IntentFilter();
             mReceiverTag = true;
-            inflate.addAction(BasicInfoEditActivity.UPHEAD);
+            inflate.addAction(AppConstant.UPHEAD);
             getActivity().registerReceiver(receiverUpdataHead, inflate);
         }
         super.onResume();
@@ -257,6 +219,23 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
         findViewById(R.id.setting_rl).setOnClickListener(this);
+        company_tv = (TextView) findViewById(R.id.company_tv);
+        iv_remain = (ImageView) findViewById(R.id.iv_remain);
+        master_tv = (TextView) findViewById(R.id.master_tv);
+        tv_menu_setting = (TextView) findViewById(R.id.tv_menu_setting);
+        tv_oa_desc = (TextView) findViewById(R.id.tv_oa_desc);
+        iv_desc_oa = (ImageView) findViewById(R.id.iv_desc_oa);
+        tv_uas_login = (TextView) findViewById(R.id.tv_uas_login);
+        tv_b2b_login = (TextView) findViewById(R.id.tv_b2b_login);
+        rl_info = (RelativeLayout) findViewById(R.id.info_rl);
+        rl_company_change = (RelativeLayout) findViewById(R.id.rl_company_change);
+        rl_master_change = (RelativeLayout) findViewById(R.id.rl_master_change);
+        rl_scan_code = (RelativeLayout) findViewById(R.id.app_scan_code_rl);
+        app_drafts_rl = (RelativeLayout) findViewById(R.id.app_drafts_rl);
+        test_rl = (RelativeLayout) findViewById(R.id.test_rl);
+        my_qr_code_rl = (RelativeLayout) findViewById(R.id.my_qr_code_rl);
+        picture_selector_rl = (RelativeLayout) findViewById(R.id.picture_selector_rl);
+        app_friend_rl = (RelativeLayout) findViewById(R.id.app_friend_rl);
 
         rl_company_change.setOnClickListener(this);
         rl_master_change.setOnClickListener(this);
@@ -316,14 +295,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                 startActivity(intent);
             }
         });
-        //TODO UU登入、登出、被杀死时间统计
-        findViewById(R.id.time_statistics_rl).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(ct, TimeStatisticsActivity.class));
-            }
-        });
-        boolean seting = CommonUtil.getSharedPreferencesBoolean(ct, Constants.NEW_SETING);
+        boolean seting = getSharedPreferencesBoolean(ct, Constants.NEW_SETING);
         tv_menu_setting.setVisibility(seting ? View.GONE : View.VISIBLE);
 //        tv_oa_desc.setVisibility(seting ? View.GONE : View.VISIBLE);
 //        iv_desc_oa.setVisibility(seting ? View.GONE : View.VISIBLE);
@@ -348,14 +320,14 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         my_qr_code_rl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(ct, OnlineFaceDemo.class));
+//                startActivity(new Intent(ct, OnlineFaceDemo.class));
             }
         });
 
         my_qr_code_rl.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
             public boolean onLongClick(View v) {
-                startActivity(new Intent(ct, InfoCodeActivity.class));
+//                startActivity(new Intent(ct, InfoCodeActivity.class));
                 return true;
             }
         });
@@ -412,75 +384,28 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        switch (id) {
-            case R.id.rl_company_change://公司切换
-                com.core.net.http.ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
-                        , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
-                break;
-            case R.id.info_rl://个人资料
-                startActivity(new Intent(getActivity(), BaseInfoActivity.class));
-                break;
-            case R.id.rl_master_change://切换账套
-                if (!platform) {
-                    changeMaster();
-                }
-                break;
-            case R.id.my_data_rl:// 我的资料
-                //作废
-                //  startActivityForResult(new Intent(getActivity(), BasicInfoEditActivity.class), 1);
-                break;
-            case my_friend_rl://我的朋友圈
-                setChangerRemain(true);
-                MainActivity.isUnReadWork = false;
-                Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
-                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
-                PreferenceUtils.putLong(getActivity(), "TIMEMAIN", System.currentTimeMillis() / 1000);
-                startActivity(intent);
-                break;
-            case R.id.setting_rl:// 设置
-                startActivity(new Intent(getActivity(), SettingActivity.class));
-                CommonUtil.setSharedPreferences(ct, Constants.NEW_SETING, true);
-                tv_menu_setting.setVisibility(View.GONE);
-                tv_oa_desc.setVisibility(View.GONE);
-                iv_desc_oa.setVisibility(View.GONE);
-                break;
-//            case R.id.app_scan_code_rl://APP二维码
-//                ImageView imageView = new ImageView(getActivity());
-//                imageView.setImageResource(R.drawable.ic_uu_scan_code);
-//                MaterialDialog materialDialog = new MaterialDialog.Builder(getActivity())
-//                        .title("UU互联最新版二维码\n长按可识别")
-//                        .customView(imageView, false)
-//                        .titleGravity(GravityEnum.CENTER)
-//                        .show();
-//                final Bitmap bitmap = ((BitmapDrawable) imageView.getDrawable()).getBitmap();
-//                imageView.setOnLongClickListener(new View.OnLongClickListener() {
-//                    @Override
-//                    public boolean onLongClick(View v) {
-//                        CodeUtils.analyzeBitmap(bitmap, new CodeUtils.AnalyzeCallback() {
-//                            @Override
-//                            public void onAnalyzeSuccess(Bitmap mBitmap, String result) {
-//                                Intent intent = new Intent();
-//                                intent.setClass(getActivity(), CommonWebviewActivity.class);
-//                                intent.putExtra("scan_url", result);
-//                                Log.d("image_url", result);
-//                                startActivity(intent);
-//                            }
-//
-//                            @Override
-//                            public void onAnalyzeFailed() {
-//
-//                            }
-//                        });
-//                        return false;
-//                    }
-//                });
-//                break;
-//            case R.id.app_drafts_rl:
-//                ToastUtil.showToast(getActivity(), "新功能未上线！请期待！");
-//                break;
-//            case R.id.app_friend_rl:
-//
-//                break;
+        if (id == R.id.rl_company_change){
+            ViewUtil.LoginTask(MyApplication.getInstance().mLoginUser.getTelephone()
+                    , CommonUtil.getSharedPreferences(ct, "user_password"), ct);
+        }else if(id == R.id.info_rl){
+            startActivity(new Intent(getActivity(), BaseInfoActivity.class));
+        }else if(id == R.id.rl_master_change){
+            if (!platform) {
+                changeMaster();
+            }
+        }else if(id == R.id.my_friend_rl){
+            setChangerRemain(true);
+            MainActivity.isUnReadWork = false;
+            Intent intent = new Intent(getActivity(), BusinessCircleActivity.class);
+            intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_MY_BUSINESS);
+            PreferenceUtils.putLong(getActivity(), "TIMEMAIN", System.currentTimeMillis() / 1000);
+            startActivity(intent);
+        }else if(id == R.id.setting_rl){
+            startActivity(new Intent(getActivity(), SettingActivity.class));
+            CommonUtil.setSharedPreferences(ct, Constants.NEW_SETING, true);
+            tv_menu_setting.setVisibility(View.GONE);
+            tv_oa_desc.setVisibility(View.GONE);
+            iv_desc_oa.setVisibility(View.GONE);
         }
     }
 

app_modular/appme/src/main/java/com/me/appme/dao/AreasDao.java

@@ -9,7 +9,7 @@ import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.dao.GenericRawResults;
 import com.j256.ormlite.stmt.QueryBuilder;
-import com.xzjmyk.pm.activity.bean.Area;
+import com.me.appme.settings.model.Area;
 
 import java.sql.SQLException;
 import java.util.List;
@@ -91,7 +91,7 @@ public class AreasDao {
 	/**
 	 * 根据Type查询
 	 * 
-	 * @param type
+	 * @param
 	 * @return
 	 */
 	public boolean hasSubAreas(int id) {

app_modular/appme/src/main/java/com/me/appme/other/activity/BasicInfoEditActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.me;
+package com.me.appme.other.activity;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -21,33 +21,32 @@ import android.widget.TextView;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
-import com.common.data.StringUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
+import com.common.data.StringUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.core.constant.AppConstant;
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.AsyncHttpResponseHandler;
-import com.loopj.android.http.RequestParams;
-import com.nostra13.universalimageloader.core.ImageLoader;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
-import com.core.model.User;
-import com.core.dao.UserDao;
-import com.core.utils.helper.AvatarHelper;
-import com.core.utils.helper.LoginHelper;
 import com.core.base.BaseActivity;
+import com.core.constant.AppConstant;
 import com.core.dao.DBManager;
+import com.core.dao.UserDao;
 import com.core.model.EmployeesEntity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
+import com.core.model.User;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.CommonUtil;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.helper.LoginHelper;
+import com.loopj.android.http.AsyncHttpClient;
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.loopj.android.http.RequestParams;
+import com.me.appme.R;
+import com.me.appme.settings.model.Area;
+import com.nostra13.universalimageloader.core.ImageLoader;
 
 import org.apache.http.Header;
 
@@ -150,28 +149,21 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.avatar_img:
-                showSelectAvatarDialog();
-                break;
-            case R.id.sex_select_rl:
-//                showSelectSexDialog();
-                break;
-            case R.id.birthday_select_rl:
-                showSelectBirthdayDialog();//选择生日
-                break;
-            case R.id.city_select_rl: //选择城市
-                Intent intent = new Intent(BasicInfoEditActivity.this, SelectAreaActivity.class);
-                intent.putExtra(SelectAreaActivity.EXTRA_AREA_TYPE, Area.AREA_TYPE_PROVINCE);
-                intent.putExtra(SelectAreaActivity.EXTRA_AREA_PARENT_ID, Area.AREA_DATA_CHINA_ID);// 直接选择中国，
-                intent.putExtra(SelectAreaActivity.EXTRA_AREA_DEEP, Area.AREA_TYPE_COUNTY);
-                startActivityForResult(intent, 4);
-                break;
-            case R.id.next_step_btn:
-                next();
-                break;
+        if (v.getId() == R.id.avatar_img){
+            showSelectAvatarDialog();
+        }else if (v.getId() == R.id.sex_select_rl){
+            showSelectSexDialog();
+        }else if (v.getId() == R.id.birthday_select_rl){
+            showSelectBirthdayDialog();//选择生日
+        }else if (v.getId() == R.id.city_select_rl){
+            Intent intent = new Intent(BasicInfoEditActivity.this, SelectAreaActivity.class);
+            intent.putExtra(SelectAreaActivity.EXTRA_AREA_TYPE, Area.AREA_TYPE_PROVINCE);
+            intent.putExtra(SelectAreaActivity.EXTRA_AREA_PARENT_ID, Area.AREA_DATA_CHINA_ID);// 直接选择中国，
+            intent.putExtra(SelectAreaActivity.EXTRA_AREA_DEEP, Area.AREA_TYPE_COUNTY);
+            startActivityForResult(intent, 4);
+        }else if (v.getId() == R.id.next_step_btn){
+            next();
         }
-
     }
 
     private void showSelectAvatarDialog() {

app_modular/appme/src/main/java/com/me/appme/other/activity/CardcastActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.cardcast;
+package com.me.appme.other.activity;
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -9,14 +9,15 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBar.Tab;
-import android.util.Log;
 import android.view.View;
 import android.widget.RadioButton;
 
-import com.core.model.NewFriendMessage;
-import com.xzjmyk.pm.activity.xmpp.CoreService;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
+import com.core.model.NewFriendMessage;
+import com.me.appme.R;
+import com.me.appme.other.fragment.AttentionFragment;
+import com.me.appme.other.fragment.FriendFragment;
+import com.me.appme.other.fragment.RoomFragment;
 
 /**
  * 我的名片盒

app_modular/appme/src/main/java/com/me/appme/other/activity/SelectAreaActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.tool;
+package com.me.appme.other.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -11,12 +11,12 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
+import com.core.app.ActionBackActivity;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
-import com.xzjmyk.pm.activity.db.dao.AreasDao;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
-import com.xzjmyk.pm.activity.view.PinnedSectionListView;
+import com.core.widget.PinnedSectionListView;
+import com.me.appme.R;
+import com.me.appme.dao.AreasDao;
+import com.me.appme.settings.model.Area;
 
 import java.util.ArrayList;
 import java.util.List;

app_modular/appme/src/main/java/com/me/appme/other/activity/UpdateSexActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.me;
+package com.me.appme.other.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -6,8 +6,8 @@ import android.view.View;
 import android.widget.CheckBox;
 import android.widget.LinearLayout;
 
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
+import com.me.appme.R;
 
 /**
   * @desc:更新性别

app_modular/appme/src/main/java/com/me/appme/other/activity/UpdateSingleTextActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.me;
+package com.me.appme.other.activity;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,11 +10,11 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.ImageView;
 
+import com.core.base.BaseActivity;
+import com.core.widget.crouton.Crouton;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
-import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.me.appme.R;
 
 import java.util.Timer;
 import java.util.TimerTask;

app_modular/appme/src/main/java/com/me/appme/other/adapter/FriendSortAdapter.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.adapter;
+package com.me.appme.other.adapter;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -12,13 +12,13 @@ import android.widget.SectionIndexer;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.R;
 import com.core.model.Friend;
+import com.core.utils.CommonUtil;
 import com.core.utils.helper.AvatarHelper;
-import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.view.SelectPicPopupWindow;
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
+import com.core.utils.sortlist.BaseSortModel;
+import com.core.widget.crouton.Crouton;
+import com.me.appme.R;
+import com.me.appme.other.widget.SelectPicPopupWindow;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -29,6 +29,7 @@ import java.util.regex.Pattern;
 
 import se.emilsjolander.stickylistheaders.StickyListHeadersAdapter;
 
+
 public class FriendSortAdapter extends BaseAdapter implements SectionIndexer,StickyListHeadersAdapter {
 
     private Context mContext;
@@ -120,7 +121,7 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer,Sti
             } else if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友的头像
                 holder.header_img.setImageResource(R.drawable.im_new_friends);
             } else if (Integer.valueOf(friend.getUserId()) == 0) {
-                holder.header_img.setImageResource(com.xzjmyk.pm.activity.R.drawable.avatar_normal);
+                holder.header_img.setImageResource(R.drawable.avatar_normal);
             } else {// 其他
                 if (isRefeshed) {
                     AvatarHelper.getInstance().display(friend.getUserId(), holder.header_img, true, true);//设定为每次刷新都会去删除缓存重新获取数据

app_modular/appme/src/main/java/com/me/appme/other/fragment/AttentionFragment.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.cardcast;
+package com.me.appme.other.fragment;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -19,29 +19,27 @@ import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.data.StringUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
+import com.core.base.EasyFragment;
+import com.core.constant.AppConstant;
 import com.core.model.Friend;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.core.xmpp.dao.FriendDao;
-import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
-import com.xzjmyk.pm.activity.sortlist.BaseComparator;
-import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
-import com.xzjmyk.pm.activity.sortlist.SideBar;
-import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.core.utils.ToastUtil;
 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.sortlist.BaseComparator;
+import com.core.utils.sortlist.BaseSortModel;
+import com.core.utils.sortlist.PingYinUtil;
+import com.core.utils.sortlist.SideBar;
+import com.core.xmpp.dao.FriendDao;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.appme.R;
+import com.me.appme.other.activity.CardcastActivity;
+import com.me.appme.other.adapter.FriendSortAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;

app_modular/appme/src/main/java/com/me/appme/other/fragment/FriendFragment.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.cardcast;
+package com.me.appme.other.fragment;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -21,37 +21,25 @@ import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.data.StringUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
+import com.core.base.EasyFragment;
 import com.core.model.AttentionUser;
 import com.core.model.Friend;
 import com.core.model.NewFriendMessage;
 import com.core.model.XmppMessage;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.core.xmpp.dao.FriendDao;
-import com.core.xmpp.listener.OnCompleteListener;
-import com.xzjmyk.pm.activity.util.im.helper.FriendHelper;
-import com.xzjmyk.pm.activity.sortlist.BaseComparator;
-import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
-import com.xzjmyk.pm.activity.sortlist.SideBar;
-import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.circle.BasicInfoActivity;
-import com.xzjmyk.pm.activity.ui.message.ChatActivity;
-import com.xzjmyk.pm.activity.ui.message.NewFriendActivity;
-import com.core.utils.ToastUtil;
 import com.core.net.volley.ArrayResult;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonArrayRequest;
 import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.ToastUtil;
+import com.core.xmpp.dao.FriendDao;
+import com.core.xmpp.listener.OnCompleteListener;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.appme.R;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;

app_modular/appme/src/main/java/com/me/appme/other/fragment/RoomFragment.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.cardcast;
+package com.me.appme.other.fragment;
 
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
@@ -15,27 +15,26 @@ import android.widget.TextView;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.common.ui.ProgressDialogUtil;
-import com.handmark.pulltorefresh.library.PullToRefreshBase;
-import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
-import com.handmark.pulltorefresh.library.PullToRefreshListView;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.adapter.FriendSortAdapter;
+import com.core.base.EasyFragment;
+import com.core.constant.AppConstant;
 import com.core.model.Friend;
-import com.xzjmyk.pm.activity.broadcast.MsgBroadcast;
-import com.core.xmpp.dao.ChatMessageDao;
-import com.core.xmpp.dao.FriendDao;
-import com.xzjmyk.pm.activity.sortlist.BaseComparator;
-import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
-import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
-import com.xzjmyk.pm.activity.sortlist.SideBar;
-import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.message.MucChatActivity;
-import com.core.utils.ToastUtil;
 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.sortlist.BaseComparator;
+import com.core.utils.sortlist.BaseSortModel;
+import com.core.utils.sortlist.PingYinUtil;
+import com.core.utils.sortlist.SideBar;
+import com.core.xmpp.dao.ChatMessageDao;
+import com.core.xmpp.dao.FriendDao;
+import com.handmark.pulltorefresh.library.PullToRefreshBase;
+import com.handmark.pulltorefresh.library.PullToRefreshBase.Mode;
+import com.handmark.pulltorefresh.library.PullToRefreshListView;
+import com.me.appme.R;
+import com.me.appme.other.activity.CardcastActivity;
+import com.me.appme.other.adapter.FriendSortAdapter;
 
 import java.util.ArrayList;
 import java.util.Collections;

app_modular/appme/src/main/java/com/me/appme/other/model/Master.java

@@ -1,4 +1,4 @@
-package com.me.appme;
+package com.me.appme.other.model;
 
 import java.io.Serializable;
 import java.util.Date;

app_modular/appme/src/main/java/com/me/appme/other/widget/SelectPicPopupWindow.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.view;
+package com.me.appme.other.widget;
 
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
@@ -13,7 +13,7 @@ import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.common.data.StringUtil;
-import com.xzjmyk.pm.activity.R;
+import com.me.appme.R;
 
 public class SelectPicPopupWindow extends PopupWindow {
 

app_modular/appme/src/main/java/com/me/appme/pedometer/view/NewStepActivity.java

@@ -22,7 +22,6 @@ import android.widget.TextView;
 
 import com.core.base.BaseActivity;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.me.appme.R;
 import com.me.appme.pedometer.bean.StepEntity;
 import com.me.appme.pedometer.calendar.BeforeOrAfterCalendarView;
@@ -59,21 +58,13 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
     private StepDataDao stepDataDao;
     private Boolean support_step;
 
-    @ViewInject(R.id.movement_records_calender_ll)
     private LinearLayout movementCalenderLl;
-    @ViewInject(R.id.movement_total_km_time_tv)
     private TextView kmTimeTv;
-    @ViewInject(R.id.movement_total_km_tv)
     private TextView totalKmTv;
-    @ViewInject(R.id.movement_total_steps_time_tv)
     private TextView stepsTimeTv;
-    @ViewInject(R.id.movement_total_steps_tv)
     private TextView totalStepsTv;
-    @ViewInject(R.id.is_support_tv)
     private TextView supportTv;
-    @ViewInject(R.id.steps_history_ll)
     private LinearLayout steps_history_ll;
-    @ViewInject(R.id.steps_history_tv)
     private TextView steps_history_tv;
 
 
@@ -86,8 +77,16 @@ public class NewStepActivity extends BaseActivity implements Handler.Callback {
         initData();
     }
 
-
     private void initView() {
+        movementCalenderLl = (LinearLayout) findViewById(R.id.movement_records_calender_ll);
+        kmTimeTv = (TextView) findViewById(R.id.movement_total_km_time_tv);
+        totalKmTv = (TextView) findViewById(R.id.movement_total_km_tv);
+        stepsTimeTv = (TextView) findViewById(R.id.movement_total_steps_time_tv);
+        totalStepsTv = (TextView) findViewById(R.id.movement_total_steps_tv);
+        supportTv = (TextView) findViewById(R.id.is_support_tv);
+        steps_history_ll  = (LinearLayout) findViewById(R.id.steps_history_ll);
+        steps_history_tv = (TextView) findViewById(R.id.steps_history_tv);
+
         steps_history_tv.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线效果
         curSelDate = TimeUtil.getCurrentDate();
 //        curSelDate = TimeUtils.s_long_2_str(System.currentTimeMillis());

app_modular/appme/src/main/java/com/me/appme/pedometer/view/NewStepListActivity.java

@@ -16,13 +16,13 @@ import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
+import com.core.dao.DBManager;
 import com.core.utils.CommonUtil;
 import com.core.utils.TimeUtils;
 import com.core.utils.helper.AvatarHelper;
 import com.core.widget.CircleImageView;
 import com.core.widget.MyListView;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.me.appme.R;
 import com.me.appme.pedometer.bean.StepEntity;
 import com.me.appme.pedometer.db.StepDataDao;
@@ -38,18 +38,12 @@ public class NewStepListActivity extends BaseActivity {
     private UuStepNumAdapter muuStepNumAdapter;
     private StepDataDao stepDataDao;
     private List<StepEntity> stepEntityList;
-    @ViewInject(R.id.step_num_lv)
     private MyListView step_num_lv;
-    @ViewInject(R.id.steps_history_tv)
     private TextView steps_history_tv;
-    @ViewInject(R.id.steps_history_ll)
     private LinearLayout step_ll;
     private DBManager manager;
-    @ViewInject(R.id.step_photo_im)
     private CircleImageView step_photo_im;
-    @ViewInject(R.id.step_name_tv)
     private TextView step_name_tv;
-    @ViewInject(R.id.step_em_ll)
     private LinearLayout step_em_ll;
     private String em_name = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_emname");
     private String em_code;
@@ -65,15 +59,6 @@ public class NewStepListActivity extends BaseActivity {
         initData();
         showNotice();
     }
-
-    private void showNotice() {
-        new AlertDialog.Builder(mContext)
-                .setTitle(getString(R.string.uu_friend_notice))
-                .setMessage(getString(R.string.uu_love_notice))
-                .setPositiveButton(getString(R.string.i_known),null)
-                .show();
-    }
-
     private void initView() {
         muuStepNumAdapter = new UuStepNumAdapter();
         stepEntityList = new ArrayList<>();
@@ -87,7 +72,22 @@ public class NewStepListActivity extends BaseActivity {
         step_ll.setVisibility(View.GONE);
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         manager = new DBManager(this);
+        step_num_lv = (MyListView) findViewById(R.id.step_num_lv);
+        steps_history_tv = (TextView) findViewById(R.id.steps_history_tv);
+        step_ll = (LinearLayout) findViewById(R.id.steps_history_ll);
+        step_photo_im = (CircleImageView) findViewById(R.id.step_photo_im);
+        step_name_tv = (TextView) findViewById(R.id.step_name_tv);
+        step_em_ll = (LinearLayout) findViewById(R.id.step_em_ll);
     }
+    private void showNotice() {
+        new AlertDialog.Builder(mContext)
+                .setTitle(getString(R.string.uu_friend_notice))
+                .setMessage(getString(R.string.uu_love_notice))
+                .setPositiveButton(getString(R.string.i_known),null)
+                .show();
+    }
+
+
     private void initData() {
         //获取数据库
         stepDataDao = new StepDataDao(this);

app_modular/appme/src/main/java/com/me/appme/pedometer/view/StepSplashActivity.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Handler;
-import android.preference.PreferenceActivity;
 import android.view.Window;
 import android.view.WindowManager;
 import android.view.animation.Animation;
@@ -19,6 +18,7 @@ import com.me.appme.R;
 import com.me.appme.pedometer.constant.Constant;
 import com.me.appme.pedometer.utils.StepHttpUtils;
 
+import org.apache.http.Header;
 import org.json.JSONException;
 import org.json.JSONObject;
 
@@ -43,11 +43,11 @@ public class StepSplashActivity extends Activity {
         initImage();
 
         new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            startActivity();
-                        }
-                    }, 3000);
+            @Override
+            public void run() {
+                startActivity();
+            }
+        }, 3000);
 
     }
 
@@ -76,13 +76,13 @@ public class StepSplashActivity extends Activity {
                 if (StepHttpUtils.isNetworkConnected(StepSplashActivity.this)) {
                     StepHttpUtils.get(Constant.START, new AsyncHttpResponseHandler() {
                         @Override
-                        public void onSuccess(int i, PreferenceActivity.Header[] headers, byte[] bytes) {
+                        public void onSuccess(int i, Header[] headers, byte[] bytes) {
                             try {
                                 JSONObject jsonObject = new JSONObject(new String(bytes));
                                 String url = jsonObject.getString("img");
                                 StepHttpUtils.getImage(url, new BinaryHttpResponseHandler() {
                                     @Override
-                                    public void onSuccess(int i, PreferenceActivity.Header[] headers, byte[] bytes) {
+                                    public void onSuccess(int i, Header[] headers, byte[] bytes) {
                                         saveImage(imgFile, bytes);
                                         startActivity();
                                     }

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

@@ -18,9 +18,9 @@ import com.afollestad.materialdialogs.MaterialDialog;
 import com.common.system.SystemUtil;
 import com.core.base.BaseActivity;
 import com.core.utils.CommonUtil;
-import com.core.view.Activity.CommonWebviewActivity;
+import com.core.utils.IntentUtils;
+import com.core.widget.view.Activity.CommonWebviewActivity;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.me.appme.R;
 import com.umeng.socialize.Config;
 import com.umeng.socialize.ShareAction;
@@ -31,13 +31,8 @@ import com.uuzuche.lib_zxing.activity.CodeUtils;
 
 public class AboutActivity extends BaseActivity implements View.OnClickListener {
 
-    @ViewInject(R.id.me_name)
     private RelativeLayout me_name;//评价
-
-    @ViewInject(R.id.me_function)
     private RelativeLayout me_function;
-
-    @ViewInject(R.id.me_QRcode)
     private RelativeLayout me_QRcode;
 
     @Override
@@ -61,6 +56,13 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
 //		UmengTool.getREDICRECT_URL(activity);
 //		UmengTool.checkWx(activity);
 //		UmengTool.checkSina(activity);
+        initView();
+    }
+
+    private void initView() {
+        me_name = (RelativeLayout) findViewById(R.id.me_name);
+        me_function = (RelativeLayout) findViewById(R.id.me_function);
+        me_QRcode = (RelativeLayout) findViewById(R.id.me_QRcode);
     }
 
     @Override
@@ -71,26 +73,24 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.app_about:
-                new ShareAction(activity).setDisplayList(
-                        SHARE_MEDIA.SINA,
-                        SHARE_MEDIA.QQ,
-                        SHARE_MEDIA.QZONE,
-                        SHARE_MEDIA.WEIXIN,
-                        SHARE_MEDIA.WEIXIN_CIRCLE,
-                        SHARE_MEDIA.WEIXIN_FAVORITE,
-                        SHARE_MEDIA.MORE)
-                        .withTitle("UU互联")
-                        .withText("UU互联 Android客户端"+ SystemUtil.getVersionName(mContext))
-                        .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
-                        .withTargetUrl("http://www.usoftchina.com/usoft/uas_client.html")
-                        .setCallback(CommonUtil.umShareListener)
-                        .open();
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId() == R.id.app_about){
+            new ShareAction(activity).setDisplayList(
+                    SHARE_MEDIA.SINA,
+                    SHARE_MEDIA.QQ,
+                    SHARE_MEDIA.QZONE,
+                    SHARE_MEDIA.WEIXIN,
+                    SHARE_MEDIA.WEIXIN_CIRCLE,
+                    SHARE_MEDIA.WEIXIN_FAVORITE,
+                    SHARE_MEDIA.MORE)
+                    .withTitle("UU互联")
+                    .withText("UU互联 Android客户端"+ SystemUtil.getVersionName(mContext))
+                    .withMedia(new UMImage(activity, "http://img.my.csdn.net/uploads/201609/30/1475204542_1365.png"))
+                    .withTargetUrl("http://www.usoftchina.com/usoft/uas_client.html")
+                    .setCallback(CommonUtil.umShareListener)
+                    .open();
+        }else if (item.getItemId() == android.R.id.home){
+
+            onBackPressed();
         }
         return true;
     }
@@ -98,53 +98,49 @@ public class AboutActivity extends BaseActivity implements View.OnClickListener
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.me_name:
-                try {
-                    Uri uri = Uri.parse("market://details?id=" + getPackageName());
-                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(intent);
-                } catch (Exception e) {
-                    IntentUtils.webLinks(ct, "http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html", "UU互联");
+        if (v.getId() ==  R.id.me_name){
+            try {
+                Uri uri = Uri.parse("market://details?id=" + getPackageName());
+                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
+            } catch (Exception e) {
+                IntentUtils.webLinks(ct, "http://apk.91.com/Soft/Android/com.xzjmyk.pm.activity-54.html", "UU互联");
+            }
+        }else if (v.getId() ==  R.id.me_function){
+            String url="https://www.taobao.com/";
+            url=  "http://113.105.74.140:8080/new/";
+            IntentUtils.webLinks(ct, url, getString(R.string.about_function));
+        }else if (v.getId() ==  R.id.me_QRcode){
+            ImageView imageView = new ImageView(ct);
+            imageView.setImageResource(R.drawable.ic_uu_scan_code);
+            new MaterialDialog.Builder(ct)
+                    .title(getString(R.string.about_qcode_msg))
+                    .customView(imageView, false)
+                    .titleGravity(GravityEnum.CENTER)
+                    .show();
+            final Bitmap bitmap = ((BitmapDrawable) imageView.getDrawable()).getBitmap();
+            imageView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    CodeUtils.analyzeBitmap(bitmap, new CodeUtils.AnalyzeCallback() {
+                        @Override
+                        public void onAnalyzeSuccess(Bitmap mBitmap, String result) {
+                            Intent intent = new Intent();
+                            intent.setClass(ct, CommonWebviewActivity.class);
+                            intent.putExtra("scan_url", result);
+                            Log.d("image_url", result);
+                            startActivity(intent);
+                        }
+
+                        @Override
+                        public void onAnalyzeFailed() {
+
+                        }
+                    });
+                    return false;
                 }
-                break;
-            case R.id.me_function:
-                String url="https://www.taobao.com/";
-                  url=  "http://113.105.74.140:8080/new/";
-                IntentUtils.webLinks(ct, url, getString(R.string.about_function));
-                break;
-            case R.id.me_QRcode:
-                ImageView imageView = new ImageView(ct);
-                imageView.setImageResource(R.drawable.ic_uu_scan_code);
-                new MaterialDialog.Builder(ct)
-                        .title(getString(R.string.about_qcode_msg))
-                                .customView(imageView, false)
-                                .titleGravity(GravityEnum.CENTER)
-                                .show();
-                final Bitmap bitmap = ((BitmapDrawable) imageView.getDrawable()).getBitmap();
-                imageView.setOnLongClickListener(new View.OnLongClickListener() {
-                    @Override
-                    public boolean onLongClick(View v) {
-                        CodeUtils.analyzeBitmap(bitmap, new CodeUtils.AnalyzeCallback() {
-                            @Override
-                            public void onAnalyzeSuccess(Bitmap mBitmap, String result) {
-                                Intent intent = new Intent();
-                                intent.setClass(ct, CommonWebviewActivity.class);
-                                intent.putExtra("scan_url", result);
-                                Log.d("image_url", result);
-                                startActivity(intent);
-                            }
-
-                            @Override
-                            public void onAnalyzeFailed() {
-
-                            }
-                        });
-                        return false;
-                    }
-                });
-                break;
+            });
         }
     }
 

app_modular/appme/src/main/java/com/me/appme/settings/activity/BaseInfoActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.me.appme.settings.activity;
 
 import android.app.Activity;
 import android.app.ProgressDialog;
@@ -21,42 +21,39 @@ import com.android.volley.Response;
 import com.android.volley.VolleyError;
 import com.common.LogUtil;
 import com.common.data.DateFormatUtil;
+import com.common.data.ListUtils;
 import com.common.data.StringUtil;
 import com.common.system.DisplayUtil;
 import com.common.ui.CameraUtil;
 import com.common.ui.ProgressDialogUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.loopj.android.http.AsyncHttpClient;
-import com.loopj.android.http.AsyncHttpResponseHandler;
-import com.loopj.android.http.RequestParams;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.xzjmyk.pm.activity.AppConstant;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.bean.Area;
-import com.core.model.User;
-import com.core.dao.UserDao;
-import com.core.utils.helper.AvatarHelper;
-import com.core.utils.helper.LoginHelper;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.cardcast.CardcastActivity;
-import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.me.UpdateSexActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.me.UpdateSingleTextActivity;
+import com.core.constant.AppConstant;
 import com.core.dao.DBManager;
+import com.core.dao.UserDao;
 import com.core.model.EmployeesEntity;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
-import com.common.data.ListUtils;
-import com.xzjmyk.pm.activity.ui.me.BasicInfoEditActivity;
-import com.xzjmyk.pm.activity.ui.me.LocalVideoActivity;
-import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
-import com.core.utils.TimeUtils;
-import com.core.utils.ToastUtil;
-import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
+import com.core.model.User;
 import com.core.net.volley.ObjectResult;
 import com.core.net.volley.Result;
 import com.core.net.volley.StringJsonObjectRequest;
+import com.core.utils.CommonUtil;
+import com.core.utils.TimeUtils;
+import com.core.utils.ToastUtil;
+import com.core.utils.helper.AvatarHelper;
+import com.core.utils.helper.LoginHelper;
+import com.core.utils.timeutils.wheel.DateTimePicker;
+import com.lidroid.xutils.ViewUtils;
+import com.loopj.android.http.AsyncHttpClient;
+import com.loopj.android.http.AsyncHttpResponseHandler;
+import com.loopj.android.http.RequestParams;
+import com.me.appme.R;
+import com.me.appme.other.activity.BasicInfoEditActivity;
+import com.me.appme.other.activity.CardcastActivity;
+import com.me.appme.other.activity.SelectAreaActivity;
+import com.me.appme.other.activity.UpdateSexActivity;
+import com.me.appme.other.activity.UpdateSingleTextActivity;
+import com.me.appme.settings.model.Area;
+import com.nostra13.universalimageloader.core.ImageLoader;
 
 import org.apache.http.Header;
 
@@ -67,41 +64,25 @@ import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.List;
 
-import static com.xzjmyk.pm.activity.R.id.me_nickname_tv;
-import static com.xzjmyk.pm.activity.R.id.tv_name_value;
 
 /**
  * 个人资料页面
  */
 public class BaseInfoActivity extends BaseActivity implements View.OnClickListener {
 
-    @ViewInject(R.id.me_heard_tv)
     private ImageView iv_headImage;
-    @ViewInject(me_nickname_tv)
     private TextView tv_nickname;
-    @ViewInject(R.id.me_sex_tv)
     private TextView tv_sex;
-    @ViewInject(R.id.me_birthday_tv)
     private TextView tv_birthday;
-    @ViewInject(R.id.me_address_tv)
     private TextView tv_address;
-    @ViewInject(tv_name_value)
     private TextView tv_name;
-    @ViewInject(R.id.tv_tel_value)
     private TextView tv_tel;
-    @ViewInject(R.id.tv_depart_value)
     private TextView tv_depart;
-    @ViewInject(R.id.tv_position_value)
     private TextView tv_position;
-    @ViewInject(R.id.me_heard)
     private RelativeLayout rl_me_heard;
-    @ViewInject(R.id.me_nickname)
     private RelativeLayout rl_me_nickname;
-    @ViewInject(R.id.me_sex)
     private RelativeLayout rl_me_sex;
-    @ViewInject(R.id.me_birthday)
     private RelativeLayout rl_me_birthday;
-    @ViewInject(R.id.me_address)
     private RelativeLayout rl_me_address;
 
     private User mUser;
@@ -134,6 +115,21 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
     }
 
     private void initView() {
+        iv_headImage = (ImageView) findViewById(R.id.me_heard_tv);
+        tv_nickname = (TextView) findViewById(R.id.me_nickname_tv);
+        tv_sex = (TextView) findViewById(R.id.me_sex_tv);
+        tv_birthday = (TextView) findViewById(R.id.me_birthday_tv);
+        tv_address = (TextView) findViewById(R.id.me_address_tv);
+        tv_name = (TextView) findViewById(R.id.tv_name_value);
+        tv_tel = (TextView) findViewById(R.id.tv_tel_value);
+        tv_depart = (TextView) findViewById(R.id.tv_depart_value);
+        tv_position = (TextView) findViewById(R.id.tv_position_value);
+        rl_me_heard = (RelativeLayout) findViewById(R.id.me_heard);
+        rl_me_nickname = (RelativeLayout) findViewById(R.id.me_nickname);
+        rl_me_sex = (RelativeLayout) findViewById(R.id.me_birthday);
+        rl_me_birthday = (RelativeLayout) findViewById(R.id.me_birthday);
+        rl_me_address = (RelativeLayout) findViewById(R.id.me_address);
+
         mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait));
         mUser = MyApplication.getInstance().mLoginUser;
         if (!LoginHelper.isUserValidation(mUser)) {
@@ -238,86 +234,75 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        switch (id) {
-            case R.id.my_data_rl:// 我的资料
-                startActivityForResult(new Intent(this, BasicInfoEditActivity.class), 1);
-                break;
-            case R.id.my_friend_rl:// 我的朋友
-                startActivity(new Intent(this, CardcastActivity.class));
-                break;
-            case R.id.my_space_rl:// 我的空间
-                Intent intent = new Intent(this, BusinessCircleActivity.class);
-                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
-                startActivity(intent);
-                break;
-            case R.id.local_video_rl:// 本地视频
-                startActivity(new Intent(this, LocalVideoActivity.class));
-                break;
-            case R.id.me_heard://切换头像
-                WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
-                View headSelectView = View.inflate(BaseInfoActivity.this, R.layout.layout_select_head, null);
-
-                mHeadPopupWindow = new PopupWindow(headSelectView,
-                        LinearLayout.LayoutParams.MATCH_PARENT,
-                        LinearLayout.LayoutParams.WRAP_CONTENT);
-                mHeadPopupWindow.setAnimationStyle(R.style.MenuAnimationFade);
-                mHeadPopupWindow.setFocusable(true);
-                mHeadPopupWindow.setOutsideTouchable(true);
-                DisplayUtil.backgroundAlpha(this, 0.5f);
-                mHeadPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
-                    @Override
-                    public void onDismiss() {
-                        closePopupWindow();
-                    }
-                });
-                mHeadPopupWindow.showAtLocation(View.inflate(this, R.layout.activity_base_info, null), Gravity.BOTTOM, 0, 0);
-                TextView takePicTv = (TextView) headSelectView.findViewById(R.id.head_take_picture);
-                TextView selectPicTv = (TextView) headSelectView.findViewById(R.id.head_select_photos);
-                TextView cancelTv = (TextView) headSelectView.findViewById(R.id.head_cancel);
-
-                takePicTv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        takePhoto();
-                        closePopupWindow();
-                    }
-                });
+        Intent intent = null;
+        if (id == R.id.my_data_rl){
+            startActivityForResult(new Intent(this, BasicInfoEditActivity.class), 1);
+        }else if (id == R.id.my_friend_rl){
+            startActivity(new Intent(this, CardcastActivity.class));
+        }else if (id == R.id.my_space_rl){
+        }else if (id == R.id.local_video_rl){
+            startActivity(new Intent(this, LocalVideoActivity.class));
+
+        }else if (id == R.id.me_heard){
+            WindowManager windowManager = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+            View headSelectView = View.inflate(BaseInfoActivity.this, R.layout.layout_select_head, null);
+
+            mHeadPopupWindow = new PopupWindow(headSelectView,
+                    LinearLayout.LayoutParams.MATCH_PARENT,
+                    LinearLayout.LayoutParams.WRAP_CONTENT);
+            mHeadPopupWindow.setAnimationStyle(R.style.MenuAnimationFade);
+            mHeadPopupWindow.setFocusable(true);
+            mHeadPopupWindow.setOutsideTouchable(true);
+            DisplayUtil.backgroundAlpha(this, 0.5f);
+            mHeadPopupWindow.setOnDismissListener(new PopupWindow.OnDismissListener() {
+                @Override
+                public void onDismiss() {
+                    closePopupWindow();
+                }
+            });
+            mHeadPopupWindow.showAtLocation(View.inflate(this, R.layout.activity_base_info, null), Gravity.BOTTOM, 0, 0);
+            TextView takePicTv = (TextView) headSelectView.findViewById(R.id.head_take_picture);
+            TextView selectPicTv = (TextView) headSelectView.findViewById(R.id.head_select_photos);
+            TextView cancelTv = (TextView) headSelectView.findViewById(R.id.head_cancel);
+
+            takePicTv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    takePhoto();
+                    closePopupWindow();
+                }
+            });
 
-                selectPicTv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        selectPhoto();
-                        closePopupWindow();
-                    }
-                });
+            selectPicTv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    selectPhoto();
+                    closePopupWindow();
+                }
+            });
 
-                cancelTv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        closePopupWindow();
-                    }
-                });
-                break;
-            case R.id.me_nickname://修改昵称
-                intent = new Intent(BaseInfoActivity.this, UpdateSingleTextActivity.class);
-                intent.putExtra("nickname", tv_nickname.getText().toString().trim());
-                startActivityForResult(intent, UPDATE_NICKNAME);
-                break;
-            case R.id.me_sex://切换性别
-                intent = new Intent(BaseInfoActivity.this, UpdateSexActivity.class);
-                intent.putExtra("sex", tv_sex.getText().toString().trim());
-                startActivityForResult(intent, UPDATE_SEX);
-                break;
-            case R.id.me_birthday://修改生日
-                showSelectBirthdayDialog();
-                break;
-            case R.id.me_address://修改地区
-                intent = new Intent(BaseInfoActivity.this, SelectAreaActivity.class);
-                intent.putExtra(SelectAreaActivity.EXTRA_AREA_TYPE, Area.AREA_TYPE_PROVINCE);
-                intent.putExtra(SelectAreaActivity.EXTRA_AREA_PARENT_ID, Area.AREA_DATA_CHINA_ID);// 直接选择中国，
-                intent.putExtra(SelectAreaActivity.EXTRA_AREA_DEEP, Area.AREA_TYPE_COUNTY);
-                startActivityForResult(intent, SELECT_ADDRESS);
-                break;
+            cancelTv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    closePopupWindow();
+                }
+            });
+        }else if (id == R.id.me_nickname){
+            intent = new Intent(BaseInfoActivity.this, UpdateSingleTextActivity.class);
+            intent.putExtra("nickname", tv_nickname.getText().toString().trim());
+            startActivityForResult(intent, UPDATE_NICKNAME);
+        }else if (id == R.id.me_sex){
+            intent = new Intent(BaseInfoActivity.this, UpdateSexActivity.class);
+            intent.putExtra("sex", tv_sex.getText().toString().trim());
+            startActivityForResult(intent, UPDATE_SEX);
+        }else if (id == R.id.me_birthday){
+            showSelectBirthdayDialog();
+        }else if (id == R.id.me_address){
+            intent = new Intent(BaseInfoActivity.this, SelectAreaActivity.class);
+            intent.putExtra(SelectAreaActivity.EXTRA_AREA_TYPE, Area.AREA_TYPE_PROVINCE);
+            intent.putExtra(SelectAreaActivity.EXTRA_AREA_PARENT_ID, Area.AREA_DATA_CHINA_ID);// 直接选择中国，
+            intent.putExtra(SelectAreaActivity.EXTRA_AREA_DEEP, Area.AREA_TYPE_COUNTY);
+            startActivityForResult(intent, SELECT_ADDRESS);
         }
     }
 

app_modular/appme/src/main/java/com/me/appme/settings/activity/BookingSetActivity.java

@@ -16,10 +16,13 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.OABaseActivity;
 import com.core.net.http.ViewUtil;
-import com.core.view.imp.HttpImp;
+import com.core.selectcalendar.SelectCalendarActivity;
+import com.core.utils.CommonUtil;
+import com.core.utils.timeutils.TimePicker;
+import com.core.widget.view.imp.HttpImp;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.me.appme.R;
+import com.me.appworks.OA.erp.model.MapData;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -31,11 +34,8 @@ import java.util.Map;
  */
 public class BookingSetActivity extends OABaseActivity implements HttpImp, View.OnClickListener {
 
-    @ViewInject(R.id.submit_btn)
     private Button submit_btn;
-    @ViewInject(R.id.tv_endTime)
     private TextView tv_endTime;
-    @ViewInject(R.id.tv_startTime)
     private TextView tv_startTime;
     private final int what_getTime = 0;
     private final int what_setTime = 1;
@@ -93,6 +93,10 @@ public class BookingSetActivity extends OABaseActivity implements HttpImp, View.
         setContentView(R.layout.activity_booking_set);
         ViewUtils.inject(this);
         getSupportActionBar().setTitle(getString(R.string.booking_time_set));
+        submit_btn = (Button) findViewById(R.id.submit_btn);
+        tv_endTime = (TextView) findViewById(R.id.tv_endTime);
+        tv_startTime = (TextView) findViewById(R.id.tv_startTime);
+
         tv_startTime.setOnClickListener(this);
         tv_endTime.setOnClickListener(this);
         submit_btn.setOnClickListener(this);
@@ -106,28 +110,23 @@ public class BookingSetActivity extends OABaseActivity implements HttpImp, View.
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.submit_btn:
-                setBookingTime();
-                break;
-            case R.id.tv_startTime:
-                //showDateDialog(mContext, tv_startTime, 01, 00);
-                startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
-                                .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
-                                .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
-                                .putExtra("hasMenu", false)
-                                .putExtra("type", 2)
-                        , 0x24);
-                break;
-            case R.id.tv_endTime:
-//                showDateDialog(mContext, tv_endTime, 23, 59);
-                startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
-                                .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
-                                .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
-                                .putExtra("hasMenu", false)
-                                .putExtra("type", 2)
-                        , 0x24);
-                break;
+
+        if (v.getId() == R.id.submit_btn){
+            setBookingTime();
+        }else if (v.getId() == R.id.tv_startTime){
+            startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
+                            .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
+                            .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
+                            .putExtra("hasMenu", false)
+                            .putExtra("type", 2)
+                    , 0x24);
+        }else if (v.getId() == R.id.tv_endTime){
+            startActivityForResult(new Intent(mContext, SelectCalendarActivity.class)
+                            .putExtra("startDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
+                            .putExtra("endDate", DateFormatUtil.long2Str(DateFormatUtil.YMD_HMS))
+                            .putExtra("hasMenu", false)
+                            .putExtra("type", 2)
+                    , 0x24);
         }
     }
 
@@ -147,8 +146,6 @@ public class BookingSetActivity extends OABaseActivity implements HttpImp, View.
                 break;
             
         }
-
-
     }
 
     private void showDateDialog(Context ct, final TextView tv, int hh, int minth) {

app_modular/appme/src/main/java/com/me/appme/settings/activity/FeedbackActivity.java

@@ -50,16 +50,16 @@ import com.core.net.volley.StringJsonObjectRequest;
 import com.core.utils.CommonUtil;
 import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;
-import com.core.view.Activity.MultiImagePreviewActivity;
+import com.core.widget.view.MyGridView;
 import com.lidroid.xutils.HttpUtils;
 import com.lidroid.xutils.exception.HttpException;
 import com.lidroid.xutils.http.RequestParams;
 import com.lidroid.xutils.http.ResponseInfo;
 import com.lidroid.xutils.http.callback.RequestCallBack;
 import com.lidroid.xutils.http.client.HttpRequest;
-import com.nostra13.universalimageloader.core.ImageLoader;
 import com.me.appme.R;
-import com.me.appme.workcircle.cusview.MyGridView;
+import com.me.appme.settings.model.Area;
+import com.nostra13.universalimageloader.core.ImageLoader;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -455,33 +455,14 @@ public class FeedbackActivity extends BaseActivity implements View.OnClickListen
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.location_rl:
-                ToastMessage("该功能还未完善");
-                break;
-            case R.id.display_rl:
-//                startActivityForResult(new Intent(), LOCATION);
-                ToastMessage("该功能还未完善");
-                break;
-            case R.id.release_btn:
-                    if (ListUtils.isEmpty(mPhotoList)){
-                        ToastMessage(getString(R.string.please_add_image));
-                    }else {
-                        newSendWord();
-                    }
-                LogUtil.prinlnLongMsg("mPhotoList", JSON.toJSONString(mPhotoList) + "hi");
-               /* if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
-                    return;
-                }
-                if (mPhotoList.size() <= 0) {// 发文字
-                    sendShuoshuo();
-                } else {//  图片+文字
-                    new UploadPhpto().execute();
-                }*/
-                break;
+        if (view.getId() == R.id.release_btn){
+            if (ListUtils.isEmpty(mPhotoList)){
+                ToastMessage(getString(R.string.please_add_image));
+            }else {
+                newSendWord();
+            }
+            LogUtil.prinlnLongMsg("mPhotoList", JSON.toJSONString(mPhotoList) + "hi");
         }
-
-
     }
     private void sendWord() {
         if (!StringUtil.isEmpty(mTextEdit.getText().toString())) {

app_modular/appme/src/main/java/com/me/appme/settings/activity/MissionSetActivity.java

@@ -17,26 +17,19 @@ import com.core.app.AppConfig;
 import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.utils.CommonInterface;
-import com.core.view.Activity.SelectActivity;
-import com.core.view.SwitchView;
+import com.core.widget.view.Activity.SelectActivity;
+import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.me.appme.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;//是否自动外勤
@@ -108,6 +101,14 @@ 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
+        );
         isAuto = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
         needprocess = PreferenceUtils.getBoolean(AppConfig.NEED_PROCESS, false);
         auto_sv.setChecked(isAuto);
@@ -143,38 +144,36 @@ public class MissionSetActivity extends BaseActivity implements View.OnClickList
         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;
+
+        if (view.getId() == 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);
+        }else if (view.getId() == 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);
         }
     }
 

app_modular/appme/src/main/java/com/me/appme/settings/activity/SelectLanguageActivity.java

@@ -18,12 +18,11 @@ import android.widget.TextView;
 import com.common.data.StringUtil;
 import com.common.preferences.PreferenceUtils;
 import com.core.base.BaseActivity;
-import com.core.view.EmptyLayout;
-import com.core.view.SmoothCheckBox;
+import com.core.widget.view.EmptyLayout;
+import com.core.widget.view.SmoothCheckBox;
 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.me.appme.R;
 import com.me.appme.settings.model.Business;
 
@@ -36,7 +35,6 @@ import java.util.ArrayList;
 public class  SelectLanguageActivity extends BaseActivity {
 
 
-    @ViewInject(R.id.list_business)
     private PullToRefreshListView mlist;
     private EmptyLayout mEmptyLayout;
     private BussinessDetailAdapter mAdapter;
@@ -52,19 +50,16 @@ public class  SelectLanguageActivity extends BaseActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.btn_save:
-              if (!TextUtils.isEmpty(currentLanguage)) {
-                    switchLanguage(currentLanguage);
-                    switchLanguageAction();
-                } else {
-                    switchLanguage("rCN");
-                    switchLanguageAction();
-                }
-                break;
-            case android.R.id.home:
-                onBackPressed();
-                break;
+        if (item.getItemId() == R.id.btn_save){
+            if (!TextUtils.isEmpty(currentLanguage)) {
+                switchLanguage(currentLanguage);
+                switchLanguageAction();
+            } else {
+                switchLanguage("rCN");
+                switchLanguageAction();
+            }
+        }else if (item.getItemId() == android.R.id.home){
+            onBackPressed();
         }
         return true;
     }
@@ -80,6 +75,8 @@ public class  SelectLanguageActivity extends BaseActivity {
 
     private void initView() {
         getSupportActionBar().setTitle(getString(R.string.set_language));
+
+        mlist = (PullToRefreshListView) findViewById(R.id.list_business);
         mEmptyLayout = new EmptyLayout(this, mlist.getRefreshableView());
         mlist.setMode(PullToRefreshBase.Mode.DISABLED);
         mlist.setOnItemClickListener(new AdapterView.OnItemClickListener() {

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

@@ -41,11 +41,13 @@ import com.core.app.Constants;
 import com.core.app.MyApplication;
 import com.core.base.BaseActivity;
 import com.core.constant.AppConstant;
+import com.core.dao.work.VideoFileDao;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
+import com.core.utils.ToastUtil;
 import com.core.utils.helper.LoginHelper;
 import com.core.utils.sp.UserSp;
-import com.core.view.SwitchView;
+import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.me.appme.R;
@@ -53,6 +55,9 @@ import com.me.appme.pedometer.view.NewStepActivity;
 import com.me.appme.pedometer.view.StepSplashActivity;
 import com.me.appme.settings.Constant.Constant;
 import com.me.appworks.OA.erp.activity.FlightsActivity;
+import com.me.appworks.OA.erp.activity.MyRuleSetActivity;
+import com.me.appworks.OA.erp.activity.OfficeAddressSettingsActivity;
+import com.me.appworks.OA.erp.activity.SignSeniorSettingActivity;
 
 import java.io.File;
 
@@ -64,56 +69,25 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
     private Button mExitBtn;
     private TextView mCacheTv;
-    @ViewInject(R.id.uas_website_tv)
     private TextView uas_website_tv;
-
-
-    @ViewInject(R.id.tv_menu_setting)
     private TextView tv_menu_setting;
-
-    @ViewInject(R.id.cb_task_reply)
     private SwitchView cb_task_reply;
-
-    @ViewInject(R.id.uu_step_rl)
     private RelativeLayout uu_step_rl;
-
-    @ViewInject(R.id.sign_in_rl)
     private RelativeLayout sign_in_rl;
-    @ViewInject(R.id.sign_out_rl)
     private RelativeLayout sign_out_rl;
-
-    @ViewInject(R.id.tv_signauto_new)
     private TextView tv_signauto_new;
-    @ViewInject(R.id.tv_sign_new)
     private TextView tv_sign_new;
-    @ViewInject(R.id.tv_language_new)
     private TextView tv_language_new;
-    @ViewInject(R.id.tv_booking_new)
     private TextView tv_booking_new;
-
-    @ViewInject(R.id.tv_help_new)
     private TextView tv_help_new;
-
-
-    @ViewInject(R.id.language_us_rl)
     private RelativeLayout language_us_rl;
-
-    @ViewInject(R.id.uu_step_im)
     private ImageView uu_step_im;
-    @ViewInject(R.id.uu_step_reply)
     private SwitchView uu_step_reply;
-
-    @ViewInject(R.id.rl_app_update)
     private RelativeLayout rl_app_update;
-    @ViewInject(R.id.version_value)
     private TextView version_value;
-    @ViewInject(R.id.close_push_rl)
     private RelativeLayout close_push_rl;
-    @ViewInject(R.id.speech_recognition_rl)
     private RelativeLayout speech_recognition_rl;
-    @ViewInject(R.id.new_step_rl)
     private RelativeLayout new_step_rl;
-    @ViewInject(R.id.booking_set_rl)
     private RelativeLayout booking_set_rl;
 
     private ProgressDialog dialog;
@@ -142,6 +116,28 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
 
     private void initView() {
+        uas_website_tv = (TextView) findViewById(R.id.uas_website_tv);
+        tv_menu_setting = (TextView) findViewById(R.id.tv_menu_setting);
+        cb_task_reply = (SwitchView) findViewById(R.id.cb_task_reply);
+        uu_step_rl = (RelativeLayout) findViewById(R.id.uu_step_rl);
+        sign_in_rl = (RelativeLayout) findViewById(R.id.sign_in_rl);
+        sign_out_rl = (RelativeLayout) findViewById(R.id.sign_out_rl);
+        tv_signauto_new = (TextView) findViewById(R.id.tv_signauto_new);
+        tv_sign_new = (TextView) findViewById(R.id.tv_sign_new);
+        tv_language_new = (TextView) findViewById(R.id.tv_language_new);
+        tv_booking_new = (TextView) findViewById(R.id.tv_booking_new);
+        tv_help_new = (TextView) findViewById(R.id.tv_help_new);
+        language_us_rl = (RelativeLayout) findViewById(R.id.language_us_rl);
+        uu_step_im = (ImageView) findViewById(R.id.uu_step_im);
+        uu_step_reply = (SwitchView) findViewById(R.id.uu_step_reply);
+        rl_app_update = (RelativeLayout) findViewById(R.id.rl_app_update);
+        version_value = (TextView) findViewById(R.id.version_value);
+        close_push_rl = (RelativeLayout) findViewById(R.id.close_push_rl);
+        speech_recognition_rl = (RelativeLayout) findViewById(R.id.speech_recognition_rl);
+        new_step_rl = (RelativeLayout) findViewById(R.id.new_step_rl);
+        booking_set_rl = (RelativeLayout) findViewById(R.id.booking_set_rl);
+
+
         new_step_rl.setOnClickListener(this);
 //        new_step_rl.setVisibility(View.GONE);
 
@@ -310,102 +306,85 @@ public class SettingActivity extends BaseActivity implements View.OnClickListene
 
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.booking_set_rl:
-                startActivity(new Intent(this, BookingSetActivity.class));
-                CommonUtil.setSharedPreferences(this, Constants.SET_BOOKING_TIME, true);
-                tv_booking_new.setVisibility(View.GONE);
-                break;
-            case R.id.language_us_rl:
-                startActivity(new Intent(this, SelectLanguageActivity.class));
-                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_LANGUAGE, true);
-                tv_language_new.setVisibility(View.GONE);
-                break;
-            case R.id.sign_in_rl:
-                showPopupWindow();
-                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_IN, true);
-                tv_sign_new.setVisibility(View.GONE);
-                break;
-            case R.id.sign_out_rl:
-                Intent intent = new Intent(mContext, MissionSetActivity.class);
-                intent.putExtra(AppConfig.IS_ADMIN, PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false));
-                startActivity(intent);
-                CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_AUTO, true);
-                tv_signauto_new.setVisibility(View.GONE);
-                break;
-            case R.id.clear_cache_rl:
-                showclearDialog();
-                break;
-            case R.id.use_help_rl: {
-                CommonUtil.setSharedPreferences(this, Constants.SET_CALL, true);
-                tv_help_new.setVisibility(View.GONE);
-                intent = new Intent(mContext, FeedbackActivity.class);
-                intent.putExtra("type", 1);
-                intent.putExtra(AppConstant.EXTRA_URL, mConfig.help_url);
-                intent.putExtra(AppConstant.EXTRA_TITLE, getString(R.string.use_help));
-                startActivity(intent);
-            }
-            break;
-            case R.id.about_us_rl:// 关于我们
-                startActivity(new Intent(mContext, AboutActivity.class));
-
-                break;
-            case R.id.share_rl:
-                share();
-                break;
-            case R.id.rl_app_update:
-                dialog.setMessage(getString(R.string.set_check_update_wait));
-                dialog.show();
-                BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
-                    @Override
-                    public void onCheckComplete() {
-                        BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
-                                new CPCheckUpdateCallback() {
-
-                                    @Override
-                                    public void onCheckUpdateCallback(
-                                            AppUpdateInfo info,
-                                            AppUpdateInfoForInstall infoForInstall) {
-                                        if (infoForInstall != null
-                                                && !TextUtils
-                                                .isEmpty(infoForInstall
-                                                        .getInstallPath())) {
-                                        } else if (info != null) {
-                                        } else {
-                                            ViewUtil.ShowMessageTitle(
-                                                    SettingActivity.this,
-                                                    getString(R.string.set_isnewVersion));
-                                        }
-                                        dialog.dismiss();
-                                    }
-                                });
-                    }
-                });
-
-                break;
-            case R.id.super_setting_tv:
-                startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
-                closePopupWindow();
-                break;
-            case R.id.work_setting_tv:
-                intent = new Intent(mContext, FlightsActivity.class);
-                startActivityForResult(intent, 0x12);
-                closePopupWindow();
-                break;
-            case R.id.office_addr_setting_tv:
-                startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
-                closePopupWindow();
-                break;
-            case R.id.my_rule_setting_tv:
-                intent = new Intent(mContext, MyRuleSetActivity.class);
+        Intent intent = null;
+       if (v.getId() == R.id.booking_set_rl){
+           startActivity(new Intent(this, BookingSetActivity.class));
+           CommonUtil.setSharedPreferences(this, Constants.SET_BOOKING_TIME, true);
+           tv_booking_new.setVisibility(View.GONE);
+       }else if (v.getId() == R.id.language_us_rl){
+           startActivity(new Intent(this, SelectLanguageActivity.class));
+           CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_LANGUAGE, true);
+           tv_language_new.setVisibility(View.GONE);
+       }else if (v.getId() == R.id.sign_in_rl){
+           showPopupWindow();
+           CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_IN, true);
+           tv_sign_new.setVisibility(View.GONE);
+       }else if (v.getId() == R.id.sign_out_rl){
+           Intent intent = new Intent(mContext, MissionSetActivity.class);
+           intent.putExtra(AppConfig.IS_ADMIN, PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false));
+           startActivity(intent);
+           CommonUtil.setSharedPreferences(this, Constants.SET_SIGN_AUTO, true);
+           tv_signauto_new.setVisibility(View.GONE);
+       }else if (v.getId() == R.id.clear_cache_rl){
+           showclearDialog();
+       }else if (v.getId() == R.id.use_help_rl){
+           CommonUtil.setSharedPreferences(this, Constants.SET_CALL, true);
+           tv_help_new.setVisibility(View.GONE);
+           intent = new Intent(mContext, FeedbackActivity.class);
+           intent.putExtra("type", 1);
+           intent.putExtra(AppConstant.EXTRA_URL, mConfig.help_url);
+           intent.putExtra(AppConstant.EXTRA_TITLE, getString(R.string.use_help));
+           startActivity(intent);
+       }else if (v.getId() == R.id.about_us_rl){
+           startActivity(new Intent(mContext, AboutActivity.class));
+       }else if (v.getId() == R.id.share_rl){
+           share();
+       }else if (v.getId() == R.id.rl_app_update){
+           dialog.setMessage(getString(R.string.set_check_update_wait));
+           dialog.show();
+           BDAutoUpdateSDK.uiUpdateAction(this, new UICheckUpdateCallback() {
+               @Override
+               public void onCheckComplete() {
+                   BDAutoUpdateSDK.cpUpdateCheck(SettingActivity.this,
+                           new CPCheckUpdateCallback() {
+
+                               @Override
+                               public void onCheckUpdateCallback(
+                                       AppUpdateInfo info,
+                                       AppUpdateInfoForInstall infoForInstall) {
+                                   if (infoForInstall != null
+                                           && !TextUtils
+                                           .isEmpty(infoForInstall
+                                                   .getInstallPath())) {
+                                   } else if (info != null) {
+                                   } else {
+                                       ViewUtil.ShowMessageTitle(
+                                               SettingActivity.this,
+                                               getString(R.string.set_isnewVersion));
+                                   }
+                                   dialog.dismiss();
+                               }
+                           });
+               }
+           });
+       }else if (v.getId() == R.id.super_setting_tv){
+           startActivityForResult(new Intent(mContext, SignSeniorSettingActivity.class), 0x12);
+           closePopupWindow();
+       }else if (v.getId() == R.id.work_setting_tv){
+           intent = new Intent(mContext, FlightsActivity.class);
+           startActivityForResult(intent, 0x12);
+           closePopupWindow();
+       }else if (v.getId() == R.id.office_addr_setting_tv){
+           startActivityForResult(new Intent(mContext, OfficeAddressSettingsActivity.class), 0x12);
+           closePopupWindow();
+       }else if (v.getId() == R.id.my_rule_setting_tv){
+           intent = new Intent(mContext, MyRuleSetActivity.class);
 //                presenter.showMyRele(intent, adapter.getModels());
-                startActivity(intent);
-                closePopupWindow();
-                break;
-            case R.id.cancel_tv:
-                closePopupWindow();
-                break;
-        }
+           startActivity(intent);
+           closePopupWindow();
+       }else if (v.getId() == R.id.cancel_tv){
+           closePopupWindow();
+       }
     }
 
     private void share() {

app_modular/appme/src/main/java/com/me/appme/settings/model/Area.java

@@ -1,11 +1,11 @@
-package com.xzjmyk.pm.activity.bean;
+package com.me.appme.settings.model;
 
 import android.text.TextUtils;
 
+import com.core.app.MyApplication;
 import com.j256.ormlite.field.DatabaseField;
 import com.j256.ormlite.table.DatabaseTable;
-import com.xzjmyk.pm.activity.db.dao.AreasDao;
-import com.core.app.MyApplication;
+import com.me.appme.dao.AreasDao;
 
 import java.util.ArrayList;
 import java.util.List;

app_modular/appme/src/main/java/com/me/appme/widget/MasterDialog.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.view;
+package com.me.appme.widget;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -15,13 +15,14 @@ import android.widget.ListView;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.erp.model.Master;
-import com.xzjmyk.pm.activity.util.oa.CommonUtil;
+import com.core.utils.CommonUtil;
+import com.me.appme.R;
+import com.me.appme.other.model.Master;
 
 import java.util.ArrayList;
 import java.util.List;
 
+
 /**
  * @author LiuJie
  * @功能:自定义的对话框

app_modular/appworks/build.gradle

@@ -18,17 +18,7 @@ android {
     }
 }
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    testCompile deps.junit
-    compile deps.appcompatV7
-    compile deps.fastjson
     //project
     compile project(':common')
-//    compile project(':message')
-//    compile project(':appworks')
-    compile project(':pullToRefershLibraryMy')
-    compile project(':libbdupdatesdk')
-
-    compile files('libs/ormlite-core-4.48.jar')
 
 }

app_modular/appworks/src/main/AndroidManifest.xml

@@ -1 +1,12 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.uas.appme" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.me.appworks" >
+
+
+
+    <application
+        android:allowBackup="true"
+        android:label="@string/app_name"
+        android:supportsRtl="true">
+
+    </application>
+</manifest>

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/activity/AddFlihtsActivity.java

@@ -20,12 +20,16 @@ import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.base.OABaseActivity;
 import com.core.utils.ToastUtil;
+import com.core.widget.crouton.Crouton;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appme.R;
+import com.me.appworks.OA.erp.model.FlightsModel;
 import com.me.appworks.OA.erp.model.SelectCollisionTurnBean;
+import com.me.appworks.OA.erp.model.SelectEmUser;
 import com.me.appworks.OA.erp.presenter.AddFlihtsPresenter;
 import com.me.appworks.OA.erp.view.IAddFlihtsView;
+import com.me.appworks.R;
+
+import java.util.ArrayList;
 
 
 public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView, View.OnClickListener {
@@ -36,30 +40,20 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
             COLLISION_MUNBER_TV = 0x15,
             COLLISION_DEPARTMENT_TV = 0x16;
 
-    @ViewInject(R.id.rule_name_et)
     private EditText rule_name_et;
-    @ViewInject(R.id.time_tv)
     private TextView time_tv;
-    @ViewInject(R.id.date_tv)
     private TextView date_tv;
-    @ViewInject(R.id.calender_select_ll)
     private LinearLayout calender_select_ll;
-    @ViewInject(R.id.click_btn)
     private Button click_btn;
-    @ViewInject(R.id.department_tv)
     private TextView department_tv;
-    @ViewInject(R.id.munber_tv)
     private TextView munber_tv;
-    @ViewInject(R.id.collision_department_tv)
     private TextView collision_department_tv;//冲突部门
-    @ViewInject(R.id.collision_munber_tv)
     private TextView collision_munber_tv;//冲突员工
-    @ViewInject(R.id.department_rl)
     private RelativeLayout department_rl;
-    @ViewInject(R.id.munber_rl)
     private RelativeLayout munber_rl;
     private AddFlihtsPresenter presenter;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -72,9 +66,25 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
             department_rl.setVisibility(View.GONE);
             munber_rl.setVisibility(View.GONE);
         }
+        initView();
         initEvent();
     }
 
+    private void initView() {
+
+        rule_name_et = (EditText) findViewById(R.id.rule_name_et);
+        time_tv = (TextView) findViewById(R.id.time_tv);
+        calender_select_ll = (LinearLayout) findViewById(R.id.calender_select_ll);
+        date_tv = (TextView) findViewById(R.id.date_tv);
+        department_rl = (RelativeLayout) findViewById(R.id.department_rl);
+        department_tv = (TextView) findViewById(R.id.department_tv);
+        collision_department_tv = (TextView) findViewById(R.id.collision_department_tv);
+        munber_rl = (RelativeLayout) findViewById(R.id.munber_rl);
+        munber_tv = (TextView) findViewById(R.id.munber_tv);
+        collision_munber_tv = (TextView) findViewById(R.id.collision_munber_tv);
+        click_btn = (Button) findViewById(R.id.click_btn);
+    }
+
     private void initEvent() {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         if (!isB2b) {
@@ -98,7 +108,7 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
         Intent intent = null;
         SelectCollisionTurnBean bean = null;
         switch (view.getId()) {
-            case R.id.time_tv:
+           /* case R.id.time_tv:
                 intent = new Intent(ct, FlihtsTimeActivity.class);
                 presenter.putData2Intent(view.getId(), intent);
                 startActivityForResult(intent, TIME_TV);
@@ -155,7 +165,7 @@ public class AddFlihtsActivity extends OABaseActivity implements IAddFlihtsView,
                 //TODO 进入修改班次的考勤日期选择，跳日历界面
 //                ToastMessage("进入修改班次的考勤日期选择，跳日历界面");
                 startActivity(new Intent(getApplicationContext(), FlihtsDateSelectActivity.class));
-                break;
+                break;*/
         }
     }
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/activity/FlightsActivity.java

@@ -15,12 +15,12 @@ import com.core.api.wxapi.ApiPlatform;
 import com.core.api.wxapi.ApiUtils;
 import com.core.base.OABaseActivity;
 import com.core.widget.RecycleViewDivider;
-import com.me.appme.R;
 import com.me.appworks.OA.erp.adapter.FlightsAdapter;
 import com.me.appworks.OA.erp.model.FlightsModel;
 import com.me.appworks.OA.erp.presenter.FlightsPresernter;
 import com.me.appworks.OA.erp.utils.MostLinearLayoutManager;
 import com.me.appworks.OA.erp.view.IFlightsView;
+import com.me.appworks.R;
 
 import java.util.List;
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/activity/HolidaysActivity.java

@@ -1,16 +1,14 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.me.appworks.OA.erp.activity;
 
 import android.os.Bundle;
 import android.widget.TextView;
 
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.xzjmyk.pm.activity.R;
 import com.core.base.BaseActivity;
+import com.lidroid.xutils.ViewUtils;
+import com.me.appworks.R;
 
 public class HolidaysActivity extends BaseActivity {
 
-    @ViewInject(R.id.zq_and_gq)
     private TextView zq_and_gq;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -27,5 +25,6 @@ public class HolidaysActivity extends BaseActivity {
 
     private void initView() {
         ViewUtils.inject(this);
+        zq_and_gq = (TextView) findViewById(R.id.zq_and_gq);
     }
 }

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/activity/MyRuleSetActivity.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+package com.me.appworks.OA.erp.activity;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -10,32 +10,25 @@ import android.widget.TextView;
 import com.common.data.DateFormatUtil;
 import com.common.data.ListUtils;
 import com.common.data.StringUtil;
-import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
 import com.core.app.MyApplication;
-import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.db.dao.WorkModelDao;
 import com.core.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
+import com.core.dao.work.WorkModelDao;
+import com.core.model.WorkModel;
 import com.core.utils.TimeUtils;
+import com.lidroid.xutils.ViewUtils;
+import com.me.appworks.R;
 
 import java.util.List;
 
+
 public class MyRuleSetActivity extends BaseActivity {
 
-    @ViewInject(R.id.name_tv)
     private TextView name_tv;
-    @ViewInject(R.id.type_tv)
     private TextView type_tv;
-    @ViewInject(R.id.empty_tv)
     private TextView empty_tv;
-    @ViewInject(R.id.time_tv)
     private TextView time_tv;
-    @ViewInject(R.id.date_tv)
     private TextView date_tv;
-    @ViewInject(R.id.context_ll)
     private LinearLayout context_ll;
-    @ViewInject(R.id.empty_rl)
     private RelativeLayout empty_rl;
 
     private List<WorkModel> models;
@@ -45,6 +38,7 @@ public class MyRuleSetActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my_rule_set);
         ViewUtils.inject(this);
+        initView();
         initDate();
 
         findViewById(R.id.click_tv).setOnClickListener(new View.OnClickListener() {
@@ -55,6 +49,16 @@ public class MyRuleSetActivity extends BaseActivity {
         });
     }
 
+    private void initView() {
+        name_tv = (TextView) findViewById(R.id.name_tv);
+        type_tv = (TextView) findViewById(R.id.name_tv);
+        empty_tv = (TextView) findViewById(R.id.empty_tv);
+        time_tv = (TextView) findViewById(R.id.time_tv);
+        date_tv = (TextView) findViewById(R.id.date_tv);
+        context_ll = (LinearLayout) findViewById(R.id.context_ll);
+        empty_rl = (RelativeLayout) findViewById(R.id.empty_rl);
+    }
+
 
     boolean isFree;
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/activity/OfficeAddressSettingsActivity.java

@@ -40,14 +40,14 @@ import com.core.base.BaseActivity;
 import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
-import com.core.view.Activity.SearchLocationActivity;
-import com.core.view.Activity.SelectActivity;
+import com.core.widget.MyListView;
+import com.core.widget.view.Activity.SearchLocationActivity;
+import com.core.widget.view.Activity.SelectActivity;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appme.R;
 import com.me.appworks.OA.erp.model.OfficeAddressBean;
 import com.me.appworks.OA.erp.model.PlatSignAddressBean;
 import com.me.appworks.OA.erp.model.SearchPoiParam;
+import com.me.appworks.R;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -74,15 +74,10 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
     private static final int GET_PLAT_SIGN_ADDRESS = 0307;
     private static final int DELETE_PLAT_SIGN_ADDRESS = 3101;
     private static final int SAVE_PLAT_OFFICE_ADDRESS = 3102;
-    @ViewInject(R.id.of_add_set_sign_range)
     private TextView sign_range;  //打卡范围
-    @ViewInject(R.id.of_add_set_work_range_tv)
     private TextView work_range;  //办公范围
-    @ViewInject(R.id.of_add_set_address_lv)
     private MyListView address_lv;  //地址列表
-    @ViewInject(R.id.of_add_set_addaddress_rl)
     private RelativeLayout add_address;  // + 添加办公地址
-    @ViewInject(R.id.of_add_set_save_bt)
     private Button save_btn;   // 保存
     private OfficeAddressAdapter myadapter;
     private int search_rangge = 0;
@@ -240,6 +235,12 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         getSupportActionBar().setTitle(getString(R.string.office_addr_setting));
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
 
+        sign_range = (TextView) findViewById(R.id.of_add_set_sign_range);
+        work_range = (TextView) findViewById(R.id.of_add_set_work_range_tv);
+        address_lv = (MyListView) findViewById(R.id.of_add_set_address_lv);
+        add_address = (RelativeLayout) findViewById(R.id.of_add_set_addaddress_rl);
+        save_btn = (Button) findViewById(R.id.of_add_set_save_bt);
+
         address_names = new ArrayList<>();
         address_location = new ArrayList<>();
         address_latitud = new ArrayList<>();

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/activity/SignSeniorSettingActivity.java

@@ -1,4 +1,4 @@
-package com.me.appme.settings.activity;
+package com.me.appworks.OA.erp.activity;
 
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -27,17 +27,18 @@ import com.core.model.SelectBean;
 import com.core.net.http.ViewUtil;
 import com.core.utils.CommonUtil;
 import com.core.utils.WorkHandlerUtil;
-import com.core.view.Activity.SelectActivity;
-import com.core.view.SwitchView;
+import com.core.widget.view.Activity.SelectActivity;
+import com.core.widget.view.SwitchView;
 import com.lidroid.xutils.ViewUtils;
-import com.lidroid.xutils.view.annotation.ViewInject;
-import com.me.appme.R;
+import com.me.appworks.R;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import static com.me.appworks.R.id.senior_setting_leave_early_tv;
+
 /**
  * Created by FANGlh on 2017/1/16.
  * function:打卡2.0高级设置
@@ -56,19 +57,12 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
     private String default_serious_late_time = "10";
     private String default_leave_early_time = "15";
     private String default_absenteeism_time = "60";
-    @ViewInject(R.id.senior_setting_auto_sign_sw)
     private SwitchView auto_sign_sw;
-    @ViewInject(R.id.signin_alert_sv)
     private SwitchView signin_alert_sv;
-    @ViewInject(R.id.senior_setting_late_time_tv)
     private TextView late_time_tv;
-    @ViewInject(R.id.senior_setting_serious_late_time_tv)
     private TextView serious_late_time_tv;
-    @ViewInject(R.id.senior_setting_leave_early_tv)
     private TextView leave_early_tv;
-    @ViewInject(R.id.senior_setting_absenteeism_tv)
     private TextView absenteeism_time_tv;
-    @ViewInject(R.id.senior_setting_save_bt)
     private Button save_btn;
     private boolean isAuto;
     private String caller = "MOBILE_ATTENDSYSTEM";
@@ -227,6 +221,14 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
 
 
     private void initView() {
+
+        auto_sign_sw = (SwitchView) findViewById(R.id.senior_setting_auto_sign_sw);
+        signin_alert_sv = (SwitchView) findViewById(R.id.signin_alert_sv);
+        late_time_tv = (TextView) findViewById(R.id.senior_setting_late_time_tv);
+        serious_late_time_tv = (TextView) findViewById(R.id.senior_setting_late_time_tv);
+        leave_early_tv = (TextView) findViewById(senior_setting_leave_early_tv);
+        absenteeism_time_tv = (TextView) findViewById(R.id.senior_setting_absenteeism_tv);
+        save_btn = (Button) findViewById(R.id.senior_setting_save_bt);
         platform = ApiUtils.getApiModel() instanceof ApiPlatform;
         getSupportActionBar().setTitle(getString(R.string.super_setting));
         isAuto = true; //初次进来设置状态
@@ -339,43 +341,34 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
     public void onClick(View v) {
         int requestCode = 0;
         String[] time = null;
-        switch (v.getId()) {
-            case R.id.senior_setting_late_time_tv:
-                time = getResources().getStringArray(R.array.late_time);
-                requestCode = LATE_TIME_CODE;
-                break;
-            case R.id.senior_setting_serious_late_time_tv:
-                time = getResources().getStringArray(R.array.serious_late_time);
-                requestCode = ERIOUS_LATE_TIME;
-                break;
-            case R.id.senior_setting_leave_early_tv:
-                time = getResources().getStringArray(R.array.serious_leave_early_time);
-                requestCode = LEAVE_EARLY_TIME;
-                break;
-            case R.id.senior_setting_absenteeism_tv:
-                time = getResources().getStringArray(R.array.absenteeism_time);
-                requestCode = ABSENTEEISM_TIME;
-                break;
-            case R.id.senior_setting_save_bt:
-                doTimejudgment();
-                break;
-            case R.id.senior_setting_auto_sign_sw:
-                if (!platform) {
-                    doCheckjudge();
-                } else {
-                    if (auto_sign == 1) {
-                        ToastMessage(getString(R.string.close_sign_notice1));
-                        auto_sign = 0;
-                        auto_sign_sw.setChecked(false);
-                    } else if (auto_sign == 0) {
-                        ToastMessage(getString(R.string.open_sign_notice1));
-                        auto_sign = 1;
-                        auto_sign_sw.setChecked(true);
-                    }
+        if (v.getId() == R.id.senior_setting_late_time_tv){
+            time = getResources().getStringArray(R.array.late_time);
+            requestCode = LATE_TIME_CODE;
+        }else if (v.getId() == R.id.senior_setting_serious_late_time_tv){
+            time = getResources().getStringArray(R.array.serious_late_time);
+            requestCode = ERIOUS_LATE_TIME;
+        }else if (v.getId() == R.id.senior_setting_leave_early_tv){
+            time = getResources().getStringArray(R.array.serious_leave_early_time);
+            requestCode = LEAVE_EARLY_TIME;
+        }else if (v.getId() == R.id.senior_setting_absenteeism_tv){
+            time = getResources().getStringArray(R.array.absenteeism_time);
+            requestCode = ABSENTEEISM_TIME;
+        }else if (v.getId() == R.id.senior_setting_save_bt){
+            doTimejudgment();
+        }else if (v.getId() ==  R.id.senior_setting_auto_sign_sw){
+            if (!platform) {
+                doCheckjudge();
+            } else {
+                if (auto_sign == 1) {
+                    ToastMessage(getString(R.string.close_sign_notice1));
+                    auto_sign = 0;
+                    auto_sign_sw.setChecked(false);
+                } else if (auto_sign == 0) {
+                    ToastMessage(getString(R.string.open_sign_notice1));
+                    auto_sign = 1;
+                    auto_sign_sw.setChecked(true);
                 }
-                break;
-            default:
-                break;
+            }
         }
         ArrayList<SelectBean> beans = new ArrayList<>();
         SelectBean bean = null;
@@ -503,10 +496,8 @@ public class SignSeniorSettingActivity extends BaseActivity implements View.OnCl
 
     @Override
     public void onCheckedChanged(View view, final boolean isChecked) {
-        switch (view.getId()) {
-            case R.id.signin_alert_sv:
-                PreferenceUtils.putBoolean(PreferenceUtils.AUTO_SIGN_SW, isChecked);
-                break;
+        if (view.getId() == R.id.signin_alert_sv){
+            PreferenceUtils.putBoolean(PreferenceUtils.AUTO_SIGN_SW, isChecked);
         }
     }
 

app_modular/appworks/src/main/java/com/me/appworks/OA/erp/model/MapData.java

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity.secretary;
+package com.me.appworks.OA.erp.model;
 
 /**
  * Created by Arison on 2017/6/26.