20:46

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/FriendDao.java

@@ -432,6 +432,7 @@ public class FriendDao {
                     .or().eq("type", XmppMessage.TYPE_ERP)
                     .prepare();
             friends = friendDao.query(preparedQuery);
+            
         } catch (SQLException e) {
             e.printStackTrace();
         }

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/dao/UserDao.java

@@ -2,8 +2,10 @@ package com.xzjmyk.pm.activity.db.dao;
 
 import android.util.Log;
 
+import com.j256.ormlite.android.AndroidDatabaseResults;
 import com.j256.ormlite.android.apptools.OpenHelperManager;
 import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper;
+import com.j256.ormlite.dao.CloseableIterator;
 import com.j256.ormlite.dao.Dao;
 import com.j256.ormlite.dao.DaoManager;
 import com.j256.ormlite.stmt.UpdateBuilder;
@@ -133,14 +135,24 @@ public class UserDao {
 			builder.updateColumnValue(columnName, value);
 			builder.where().idEq(userId);
 			userDao.update(builder.prepare());
-
+			
 			User user = userDao.queryForId(userId);
+			
 			Log.d("roamer", "user.sex:" + user.getSex());
 		} catch (SQLException e) {
 			e.printStackTrace();
+		}finally {
+			closeCursor();
+			userDao.closeableIterator().closeQuietly();
 		}
 	}
 
+	private void closeCursor() {
+		CloseableIterator<User> iterator =userDao.iterator();
+		AndroidDatabaseResults results= (AndroidDatabaseResults) iterator.getRawResults();
+		results.close();
+	}
+
 	/**
 	 * 该方法只适用于调用了获取用户资料接口，得到User对象，来更新本地数据库。<br/>
 	 * 在其他地方使用会造成不准确的后果<br/>

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -105,7 +105,7 @@ public abstract class BaseActivity extends ActionBackActivity {
         }
     }
 
-    private View getRootView() {
+    public View getRootView() {
         return ((ViewGroup) findViewById(android.R.id.content)).getChildAt(0);
     }
 

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

@@ -54,7 +54,10 @@ import com.xzjmyk.pm.activity.db.dao.NewFriendDao;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.helper.FriendHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
+import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.message.ChatActivity;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskAddB2BActivity;
@@ -753,6 +756,13 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
                         // 更新界面
                         do_next_tv.setText(R.string.send_msg);
                         do_next_tv.setOnClickListener(new SendMsgListener());
+                        
+                        ContactsModel model=new ContactsModel();
+                        model.setImid(mUser.getUserId());
+                        model.setOwnerId(MyApplication.getInstance().mLoginUser.getUserId());
+                        model.setWhichsys(CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master"));
+                        model.setType(1);
+                        ContactsDao.getInstance().update(model);
                         // 由陌生或者关注变为好友了,那么右上角更多操作可以显示了
                         initFriendMoreAction();
                         // 更新名片盒

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

@@ -215,6 +215,8 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                     models.clear();
                     models.addAll(cacheData);
                     adapter.notifyDataSetChanged();
+                    //查询需要优化
+                    getStateByPhones(cacheData);
                     if (models.size()==0){
                         emptyLayout.showEmpty();
                     }
@@ -359,7 +361,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
             @Override
             public void run() {
               final List<ContactsModel> lists=  getLocalContactsByDB();
-               if (!ListUtils.isEmpty(lists)||!isHasNet){
+               if (!ListUtils.isEmpty(lists)&&!isHasNet){
                    LogUtil.d("Test","缓存不为空！");
                    getStateByPhones(lists);
                    OAHttpHelper.getInstance().post(new Runnable() {
@@ -477,6 +479,7 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                             if (isfriend.equals("0")){
                                 model.setType(2);//非好友
                                 model.setImid(String.valueOf(_id));
+                               // contactsDao.update(model,String.valueOf(_id));
                             }else if (isfriend.equals("1")){
                                 model.setType(1);//好友
                                 model.setImid(String.valueOf(_id));
@@ -542,6 +545,9 @@ public class ContactsActivity extends OABaseActivity implements ContactsAdapter.
                        
                      
                       ContactsModel tData=  models.get(position);
+                      if (StringUtils.isEmpty(tData.getWhichsys())){
+                          tData.setWhichsys("");
+                      }
                       tData.setType(1);
                       LogUtil.d("Test","tdata:"+JSON.toJSONString(tData));
                       contactsDao.update(tData);

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

@@ -1510,96 +1510,105 @@ public class DataFormDetailActivity extends BaseActivity implements View.OnClick
                 initData();
                 break;
             case 0x11:
-                Data model = data.getParcelableExtra("object");
-                id = data.getIntExtra("id", 0);
-                String startDate = data.getStringExtra("startDate");
-                String endDate = data.getStringExtra("endDate");
+                try {
+                    parseResultByField(data);
+                } catch (Exception e) {
+                   
+                }
+                break;
+        }
 
-                startDate = startDate + ":00";
-                endDate = endDate + ":00";
+    }
 
-                startDate_v = startDate;//赋值给全局变量
-                endDate_v = endDate;//赋值给全局变量
+    private void parseResultByField(Intent data) {
+        int id;Data model = data.getParcelableExtra("object");
+        id = data.getIntExtra("id", 0);
+        String startDate = data.getStringExtra("startDate");
+        String endDate = data.getStringExtra("endDate");
+
+        startDate = startDate + ":00";
+        endDate = endDate + ":00";
+
+        startDate_v = startDate;//赋值给全局变量
+        endDate_v = endDate;//赋值给全局变量
+
+        String field = data.getStringExtra("field");
+        LogUtil.d("id=" + id);
+        LogUtil.d("groupId=" + model.getGroupId());
+        if ("Ask4Leave".equals(caller)) {
+            //va_startime
+            //va_endtime
+            int va_alldays = 0;
+            int va_alltimes = 0;
+            List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
+            for (int i = 0; i < tempLists.size(); i++) {
+                Data tempData = tempLists.get(i);
+                if (tempData.getField().equals("va_startime")) {
+                    va_alldays = i + 1;
+                }
+                if (tempData.getField().equals("va_endtime")) {
+                    va_alltimes = i + 1;
+                }
+            }
+            mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
+            mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
+        }
+        if ("Workovertime".equals(caller)||"ExtraWork$".equals(caller)) {
+            int va_alldays = 0;
+            int va_alltimes = 0;
 
-                String field = data.getStringExtra("field");
-                LogUtil.d("id=" + id);
-                LogUtil.d("groupId=" + model.getGroupId());
-                if ("Ask4Leave".equals(caller)) {
-                    //va_startime
-                    //va_endtime
-                    int va_alldays = 0;
-                    int va_alltimes = 0;
-                    List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
-                    for (int i = 0; i < tempLists.size(); i++) {
-                        Data tempData = tempLists.get(i);
-                        if (tempData.getField().equals("va_startime")) {
-                            va_alldays = i + 1;
-                        }
-                        if (tempData.getField().equals("va_endtime")) {
-                            va_alltimes = i + 1;
-                        }
-                    }
-                    mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
-                    mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
+            List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
+            for (int i = 0; i < tempLists.size(); i++) {
+                Data tempData = tempLists.get(i);
+                if (tempData.getField().equals("wod_startdate")) {
+                    va_alldays = i + 1;
                 }
-                if ("Workovertime".equals(caller)||"ExtraWork$".equals(caller)) {
-                    int va_alldays = 0;
-                    int va_alltimes = 0;
-
-                    List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
-                    for (int i = 0; i < tempLists.size(); i++) {
-                        Data tempData = tempLists.get(i);
-                        if (tempData.getField().equals("wod_startdate")) {
-                            va_alldays = i + 1;
-                        }
-                        if (tempData.getField().equals("wod_enddate")) {
-                            va_alltimes = i + 1;
-                        }
-                    }
-                    mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
-                    mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
+                if (tempData.getField().equals("wod_enddate")) {
+                    va_alltimes = i + 1;
+                }
+            }
+            mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
+            mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
 
-                    distance(startDate, endDate, model.getGroupId());
+            distance(startDate, endDate, model.getGroupId());
 
-                }
+        }
 
 
-                if ("FeePlease!CCSQ".equals(caller)||"FeePlease!CCSQ!new".equals(caller)) {
-                    int va_alldays = 0;
-                    int va_alltimes = 0;
-                    //fp_preenddate
-                    //fp_prestartdate
-                    if ("fp_preenddate".equals(field) || "fp_prestartdate".equals(field)) {
-                        List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
-                        for (int i = 0; i < tempLists.size(); i++) {
-                            Data tempData = tempLists.get(i);
-                            if (tempData.getField().equals("fp_preenddate")) {
-                                va_alldays = i + 1;
-                            }
-                            if (tempData.getField().equals("fp_prestartdate")) {
-                                va_alltimes = i + 1;
-                            }
-                        }
-                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(startDate);
-                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(endDate);
+        if ("FeePlease!CCSQ".equals(caller)||"FeePlease!CCSQ!new".equals(caller)) {
+            int va_alldays = 0;
+            int va_alltimes = 0;
+            //fp_preenddate
+            //fp_prestartdate
+            if ("fp_preenddate".equals(field) || "fp_prestartdate".equals(field)) {
+                List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
+                for (int i = 0; i < tempLists.size(); i++) {
+                    Data tempData = tempLists.get(i);
+                    if (tempData.getField().equals("fp_preenddate")) {
+                        va_alldays = i + 1;
                     }
-                    if ("fpd_date1".equals(field) || "fpd_date2".equals(field)) {
-                        List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
-                        for (int i = 0; i < tempLists.size(); i++) {
-                            Data tempData = tempLists.get(i);
-                            if (tempData.getField().equals("fpd_date1")) {
-                                va_alldays = i + 1;
-                            }
-                            if (tempData.getField().equals("fpd_date2")) {
-                                va_alltimes = i + 1;
-                            }
-                        }
-                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
-                        mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
+                    if (tempData.getField().equals("fp_prestartdate")) {
+                        va_alltimes = i + 1;
                     }
                 }
+                mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(startDate);
+                mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(endDate);
+            }
+            if ("fpd_date1".equals(field) || "fpd_date2".equals(field)) {
+                List<Data> tempLists = mAdapter.getmListData().get(model.getGroupId()).getDatas();
+                for (int i = 0; i < tempLists.size(); i++) {
+                    Data tempData = tempLists.get(i);
+                    if (tempData.getField().equals("fpd_date1")) {
+                        va_alldays = i + 1;
+                    }
+                    if (tempData.getField().equals("fpd_date2")) {
+                        va_alltimes = i + 1;
+                    }
+                }
+                mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alldays - 1).setValue(startDate);
+                mAdapter.getmListData().get(model.getGroupId()).getDatas().get(va_alltimes - 1).setValue(endDate);
+            }
         }
-
     }
 
     private void muiltCallerMainTain(Data vaules, String value) {

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

@@ -387,9 +387,11 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                         //结束时间
                         v_date_end.setText( modle.tv_text.getText().toString());
                         end_hour_min = modle.tv_text.getText().toString();
+                       
                     }
                     return;
                 }
+                
                 if (StringUtils.isEmpty(currentSelectDate)) {
                     ToastMessage("请先选择日期,再选择时间段！");
                     return;
@@ -443,7 +445,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                         Log.d("currentSelectDate4", currentSelectDate);
                         v_date_end.setText(currentSelectDate + " " + modle.tv_text.getText().toString());
                         end_hour_min = modle.tv_text.getText().toString();
-
+                       
                     }
                 }
             }
@@ -540,6 +542,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + start_hour_min);
             } else {
                 v_date_end.setText(yeas + "-" + m + "-" + d + " " + end_hour_min);
+                
                 Log.d("Slide_date88", yeas + "-" + month + "-" + day + " " + end_hour_min);
             }
 
@@ -575,7 +578,7 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
             if (type == 0) {
                 mTimeData.addAll(timeAddMuilt("08:30", "18:30", minute));
             } else {
-                mTimeData.addAll(timeAddMuilt("08:00", "18:00", minute));
+                mTimeData.addAll(timeAddMuilt("08:00", "20:00", minute));
             }
         }
     }
@@ -767,11 +770,19 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                     if (!StringUtils.isEmpty(v_date_start.getText().toString()) && !
                             StringUtils.isEmpty(v_date_end.getText().toString())) {
                         if (!checkDateStr(v_date_end.getText().toString() + " " + v_time_end.getText().toString())) {
-                            ToastMessage("结束时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("结束时间 请选择具体时间点!");
+                            }
                             return;
                         }
                         if (!checkDateStr(v_date_start.getText().toString() + " " + v_time_start.getText().toString())) {
-                            ToastMessage("开始时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("开始时间 请选择具体时间点!");
+                            }
                             return;
                         }
                         Intent intent = new Intent();
@@ -795,11 +806,19 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                             return;
                         }
                         if (!checkDateStr(v_date_end.getText().toString())) {
-                            ToastMessage("结束时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("结束时间 请选择具体时间点!");
+                            }
                             return;
                         }
                         if (!checkDateStr(v_date_start.getText().toString())) {
-                            ToastMessage("开始时间 请选择具体时间点!");
+                            if(type==1){
+                                ToastMessage("不能预约过去时间!");
+                            }else {
+                                ToastMessage("开始时间 请选择具体时间点!");
+                            }
                             return;
                         }
 
@@ -1063,6 +1082,23 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
         String today = DateFormatUtil.getDateStr();
         if (today.compareTo(currentSelectDate) > 0 && type == 1){
             ToastMessage("不能预约过去时间");
+            //按时间
+            currentSelectDate="";
+            // v_date_start.setText(DateFormatUtil.getStrDate4Date(date,"yyyy-MM-dd"));
+            //按时间请假：
+            if (startDate) {//按钮状态
+                //开始时间
+                v_date_start.setText(currentSelectDate);
+            } else {
+                //结束时间
+                v_date_end.setText(currentSelectDate);
+                if (type==1){
+                    startDate = true;
+                    ll_date_end.setEnabled(true);
+                    swichDateButton(startDate);
+                    v_date_start.setText(currentSelectDate);
+                }
+            }
             return;
         }else {
             if (swich) {
@@ -1083,6 +1119,12 @@ public class SelectCalendarActivity extends BaseActivity implements View.OnClick
                 } else {
                     //结束时间
                     v_date_end.setText(currentSelectDate);
+                   if (type==1){
+                       startDate = true;
+                       ll_date_end.setEnabled(true);
+                       swichDateButton(startDate);
+                       v_date_start.setText(currentSelectDate);
+                   }
                 }
             }
             //ToastMessage(currentSelectDate);

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

@@ -32,7 +32,6 @@ import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.AppWebViewActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.ApprovalActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.setting.ComApprovalUtil;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
@@ -361,14 +360,14 @@ public class ProcessMsgActivity extends BaseActivity implements View.OnClickList
                 LogUtil.i("url="+url);
                 String master = model.master == null ? CommonUtil.getSharedPreferences(ct, "erp_master") : model.master;
                 if (CommonUtil.isReleaseVersion()) {
-//                    CommonUtil.loadWebView(ct, url, title, master, null, null);
-                    Intent intent = new Intent(ct, AppWebViewActivity.class);
-                    intent.putExtra("url", url);
-                    intent.putExtra("p", title);
-                    intent.putExtra("master", master);
-                    intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
-                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-                    startActivity(intent);
+                    CommonUtil.loadWebView(ct, url, title, master, null, null);
+//                    Intent intent = new Intent(ct, AppWebViewActivity.class);
+//                    intent.putExtra("url", url);
+//                    intent.putExtra("p", title);
+//                    intent.putExtra("master", master);
+//                    intent.putExtra("nodeid", Integer.valueOf(model.JP_NODEID));
+//                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+//                    startActivity(intent);
                 } else {
                     Intent intent = new Intent(ct, ApprovalActivity.class);
                     intent.putExtra("imid", d_imids);

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

@@ -47,7 +47,6 @@ import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.OAConfig;
 import com.xzjmyk.pm.activity.ui.erp.util.oa.RecognizerDialogUtil;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -321,7 +320,7 @@ public class ApprovalActivity extends OABaseActivity implements IApproval, Appro
         window.getContentView().measure(0, 0);
         window.setHeight(DisplayUtil.dip2px(this, 190));
         window.setWidth(DisplayUtil.dip2px(this, 85));
-        window.setAnimationStyle(R.style.MenuAnimationFade);
+//        window.setAnimationStyle(R.style.MenuAnimationFade);
         window.setOutsideTouchable(false);
         window.setFocusable(true);
         //获取需要在其上方显示的控件的位置信息

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

@@ -163,16 +163,22 @@ public class SelectCollisionActivity extends OABaseActivity implements ISelectAc
     @Override
     public void showModel(List<BaseSortModel<SelectEmUser>> models) {
         adapter = new SelectCollisionAdapter(models);
-        listView.setAdapter(adapter);
         if (ListUtils.isEmpty(models)) {
             emptyLayout.showEmpty();
             sidebar.setVisibility(View.GONE);
             select_rl.setVisibility(View.GONE);
         } else {
-            sidebar.setVisibility(View.VISIBLE);
+            if (selectBean.getTitle().equals(getString(R.string.select_share_friend))){
+                sidebar.setVisibility(View.GONE);
+                adapter.setBaseSortEnable(false);
+            }else {
+                adapter.setBaseSortEnable(true);
+                sidebar.setVisibility(View.VISIBLE);
+            }
             if (!selectBean.isSingleAble())
                 select_rl.setVisibility(View.VISIBLE);
         }
+        listView.setAdapter(adapter);
     }
 
 

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

@@ -34,6 +34,7 @@ import com.xzjmyk.pm.activity.ui.erp.presenter.WorkPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkView;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.UserRoleUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.WifiReceiverUtil;
 import com.xzjmyk.pm.activity.ui.me.OfficeAddressSettingsActivity;
 import com.xzjmyk.pm.activity.ui.me.SignSeniorSettingActivity;
@@ -144,6 +145,8 @@ public class WorkActivity extends OABaseActivity implements View.OnClickListener
         findViewById(R.id.signin_btn).setOnClickListener(this);
         findViewById(R.id.unoffice_).setOnClickListener(this);
         date_tv.setOnClickListener(this);
+
+        
     }
 
     @Override

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

@@ -96,14 +96,10 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
         Animation animation= AnimationUtils.loadAnimation(this, R.anim.anim_translate_bookingprogress);
         
         
-      
-       
-        
-        
         if (getIntent()!=null){
             model=getIntent().getExtras().getParcelable("model");
             boolean isShared=getIntent().getExtras().getBoolean("isShared");
-            tvTime.setText(model.getAb_starttime().substring(11,16)+"-"+
+            tvTime.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
                     model.getAb_endtime().substring(11,16));
             tvAddress.setText(model.getAb_address());
             tvContent.setText(model.getAb_content());
@@ -125,6 +121,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                 ivResultInfo.startAnimation(animation);
                 if( MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_recordid())){
                     ((Button)findViewById(R.id.bt_change)).setText("变更");
+                    ((Button)findViewById(R.id.bt_change)).setTextColor(getResources().getColor(R.color.white));
                     ((Button)findViewById(R.id.bt_cancle)).setText("取消");
                 }else{
                     ((Button)findViewById(R.id.bt_change)).setText("确认");
@@ -136,7 +133,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                 ivResultInfo.setImageDrawable(mContext. getResources().getDrawable(R.drawable.icon_queren1));
                 isMenuShuffle=true;
                 if (model.getAb_sharestatus().equals("已共享")){
-                    isMenuShuffle=false;
+                    isMenuShuffle=true;
                 }
                 if( MyApplication.getInstance().mLoginUser.getUserId().equals(model.getAb_recordid())){
                     ((Button)findViewById(R.id.bt_change)).setText("变更");
@@ -145,6 +142,10 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                   
                 }else{
                    // ll_bottom.setVisibility(View.VISIBLE);
+                    ((Button)findViewById(R.id.bt_change)).setText("变更");
+                    ((Button)findViewById(R.id.bt_cancle)).setText("取消");
+                    ((Button)findViewById(R.id.bt_change)).setVisibility(View.GONE);
+                    ll_bottom.setVisibility(View.VISIBLE);
                 }
             }
             if("已取消".equals(model.getAb_confirmstatus())){
@@ -216,7 +217,7 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
             case R.id.app_about:
                Intent intent = new Intent(ct, SelectCollisionActivity.class);
                 SelectCollisionTurnBean bean = new SelectCollisionTurnBean()
-                        .setTitle(getString(R.string.select_doman))
+                        .setTitle(getString(R.string.select_share_friend))
                         .setSingleAble(false);
                 intent.putExtra(OAConfig.MODEL_DATA, bean);
                 startActivityForResult(intent, 0x02);
@@ -280,14 +281,14 @@ public class BookingDetailActivity extends OABaseActivity implements HttpImp,Vie
                          try {
                              if (JSON.parseObject(msg.getData().getString("result")).getString("result").equals("true")){
                                  ToastMessage(getString(R.string.make_adeal_success));
-                                 mMenu .findItem(R.id.app_about).setVisible(false);
+                                // mMenu .findItem(R.id.app_about).setVisible(false);
                              }else{
                                  ToastMessage(getString(R.string.make_adeal_failed));
-                                 mMenu .findItem(R.id.app_about).setVisible(true);
+                               //  mMenu .findItem(R.id.app_about).setVisible(true);
                              }
                          } catch (Exception e) {
                              ToastMessage(getString(R.string.make_adeal_failed));
-                             mMenu .findItem(R.id.app_about).setVisible(true);
+                            // mMenu .findItem(R.id.app_about).setVisible(true);
                          }
                          break;
                      case Constants.APP_SOCKETIMEOUTEXCEPTION:

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

@@ -231,6 +231,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
 
         viewPager.setCurrentItem(OACalenderViewPagerAdapter.MAX_NUM / 2);
         mAdapter = new BookAdapter(mContext, mDatas);
+        mAdapter.setCurrentDate(curDate);
         lv_book.setAdapter(mAdapter);
     }
 
@@ -325,6 +326,7 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                             return;
                         }
                         if (tv_book_me.isSelected()) {
+                           
                             JSONArray jsonArray = JSON.parseArray(JSON.parseObject(result).getString("bookinglist"));
                             if (jsonArray != null) {
                                 Set<Integer> tags = new HashSet<>();
@@ -351,10 +353,38 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                                         mDatas.add(model);
                                     }
                                 }
+
+                               if (DateFormatUtil.getStrDate4Date(curDate, "yyyy-MM-dd").equals(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"))){
+                                   JSONArray tenArray = JSON.parseArray(JSON.parseObject(result).getString("tenlist"));
+                                   for (int i = 0; i < tenArray.size(); i++) {
+                                       JSONObject object = tenArray.getJSONObject(i);
+                                       BookingModel model = new BookingModel();
+                                       model.setAb_address(object.getString("ab_address"));
+                                       model.setAb_bman(object.getString("ab_bman"));
+                                       model.setAb_bmanid(object.getString("ab_bmanid"));
+                                       model.setAb_confirmstatus(object.getString("ab_confirmstatus"));
+                                       model.setAb_content(object.getString("ab_content"));
+                                       model.setAb_endtime(object.getString("ab_endtime"));
+                                       model.setAb_id(object.getString("ab_id"));
+                                       model.setAb_latitude(object.getString("ab_latitude"));
+                                       model.setAb_longitude(object.getString("ab_longitude"));
+                                       model.setAb_recorddate(object.getString("ab_recorddate"));
+                                       model.setAb_recordid(object.getString("ab_recordid"));
+                                       model.setAb_recordman(object.getString("ab_recordman"));
+                                       model.setAb_sharestatus(object.getString("ab_sharestatus"));
+                                       model.setAb_starttime(object.getString("ab_starttime"));
+                                       model.setAb_type(object.getString("ab_type"));
+                                       mDatas.add(model);
+                                   }
+                               }
+                                
+                                
                                 if (mAdapter != null) {
+                                    mAdapter.setCurrentDate(curDate);
                                     mAdapter.notifyDataSetChanged();
                                 } else {
                                     mAdapter = new BookAdapter(mContext, mDatas);
+                                    mAdapter.setCurrentDate(curDate);
                                     lv_book.setAdapter(mAdapter);
                                 }
                                 calendarView.setDecoratDays(tags);
@@ -394,9 +424,11 @@ public class BookingListActivity extends OABaseActivity implements HttpImp, View
                                     }
                                 }
                                 if (mAdapter != null) {
+                                    mAdapter.setCurrentDate(curDate);
                                     mAdapter.notifyDataSetChanged();
                                 } else {
                                     mAdapter = new BookAdapter(mContext, mDatas);
+                                    mAdapter.setCurrentDate(curDate);
                                     lv_book.setAdapter(mAdapter);
                                 }
                                 calendarView.setDecoratDays(tags);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/booking/BookAdapter.java

@@ -10,8 +10,10 @@ import android.widget.TextView;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.erp.model.book.BookingModel;
+import com.xzjmyk.pm.activity.util.DateFormatUtil;
 
 import java.util.ArrayList;
+import java.util.Date;
 
 /**
  * Created by Arison on 2017/6/23.
@@ -21,6 +23,16 @@ public class BookAdapter extends BaseAdapter {
     
     private Context ct;
     private int type=1;
+    private Date currentDate;
+
+    public Date getCurrentDate() {
+        return currentDate;
+    }
+
+    public void setCurrentDate(Date currentDate) {
+        this.currentDate = currentDate;
+    }
+
     private ArrayList<BookingModel> datas=new ArrayList<>();
     
     public BookAdapter(Context ct,ArrayList<BookingModel> data){
@@ -71,8 +83,15 @@ public class BookAdapter extends BaseAdapter {
         try {
             BookingModel model=datas.get(position);
             holder.model=model;
-            holder.title_tv.setText(model.getAb_starttime().substring(11,16)+"-"+
-            model.getAb_endtime().substring(11,16));
+
+            if (DateFormatUtil.getStrDate4Date(currentDate, "yyyy-MM-dd").equals(DateFormatUtil.getStrDate4Date(new Date(), "yyyy-MM-dd"))){
+                holder.title_tv.setText(model.getAb_starttime().substring(0,10)+" "+model.getAb_starttime().substring(11,16)+"-"+
+                        model.getAb_endtime().substring(11,16));
+            }else{
+                holder.title_tv.setText(model.getAb_starttime().substring(11,16)+"-"+
+                        model.getAb_endtime().substring(11,16));
+            }
+          
            
             holder.status_tv.setText(model.getAb_confirmstatus());
            

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

@@ -24,6 +24,11 @@ import java.util.List;
 
 public class SelectCollisionAdapter extends BaseAdapter {
     private List<BaseSortModel<SelectEmUser>> listData;
+    boolean BaseSortEnable=true;//默认是分类展示
+    
+    public void setBaseSortEnable(boolean baseSortEnable) {
+        BaseSortEnable = baseSortEnable;
+    }
 
     public SelectCollisionAdapter(List<BaseSortModel<SelectEmUser>> listData) {
         this.listData = listData;
@@ -70,10 +75,28 @@ public class SelectCollisionAdapter extends BaseAdapter {
         } else {
             holder = (ViewHolder) convertView.getTag();
         }
-        onBindViewHolder(holder, position);
+        if (BaseSortEnable){
+            onBindViewHolder(holder, position);
+        }else{
+            onBindViewHolderBy(holder, position);
+        }
+       
         return convertView;
 
     }
+    
+    public void onBindViewHolderBy(ViewHolder holder, final int position){
+        final BaseSortModel<SelectEmUser> model = listData.get(position);
+        holder.cb.setChecked(model.isClick());
+        holder.tag_tv.setVisibility(View.GONE);
+        holder.tag_view.setVisibility(View.GONE);
+        AvatarHelper.getInstance().display(model.getBean().getImId() + "", holder.head_img, true, false);//设定为每次刷新都会去删除缓存重新获取数据
+        holder.name_tv.setText(model.getBean().getEmName());
+        holder.sub_tv.setText((StringUtils.isEmpty(model.getBean().getDepart()) ? "" : (model.getBean().getDepart() + ">"))
+                + " " + (StringUtils.isEmpty(model.getBean().getPosition()) ? "" : model.getBean().getPosition()));
+        holder.cb.setFocusable(false);
+        holder.cb.setClickable(false);
+    }
 
     public void onBindViewHolder(ViewHolder holder, final int position) {
         final BaseSortModel<SelectEmUser> model = listData.get(position);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/dao/ContactsDao.java

@@ -59,6 +59,10 @@ public class ContactsDao {
     
 
     //select * from tbl_contacts a where id=(select min(id) from tbl_contacts where tf_phone=a.tf_phone) and (tf_phone<>'未填写' and tf_phone<>'') and tf_ownerId='' and (tf_whichSys="" or tf_whichSys="" )
+    /**
+      * @desc:UU+企业架构+本地通讯录  已去重
+      * @author：Arison on 2017/8/1
+      */
     public  List<ContactsModel> find(){
         SQLiteDatabase db=  DatabaseManager.getInstance().openDatabase();
         String master= CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master");
@@ -88,6 +92,39 @@ public class ContactsDao {
         return models;
     }
 
+    /**
+      * @desc:UU好友+企业架构人员  已去重
+      * @author：Arison on 2017/8/1
+      */
+    public  List<ContactsModel> findByShare(){
+        SQLiteDatabase db=  DatabaseManager.getInstance().openDatabase();
+        String master= CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master");
+        if (StringUtils.isEmpty(master)) {
+            master="";
+        }
+        String ownerId=MyApplication.getInstance().mLoginUser.getUserId();
+        LogUtil.d("Test","master:"+master+" ownerId:"+ownerId);
+        List<ContactsModel> models=new ArrayList<>();
+        Cursor cursor =db.rawQuery("select * from tbl_contacts a where id=" +
+                "(select min(id) from tbl_contacts where tf_phone=a.tf_phone and tf_ownerId=? ) and (tf_phone<> ? and tf_phone<> ?) " +
+                "  and (tf_whichSys=? or tf_whichSys=? ) and tf_type<> ? ", new String[]{ownerId,"未填写"," ",master,"","3"});
+        while (cursor.moveToNext()) {
+            ContactsModel model=new ContactsModel();
+            model.setName(cursor.getString(cursor.getColumnIndex("tf_name")));
+            model.setCompany(cursor.getString(cursor.getColumnIndex("tf_company")));
+            model.setWhichsys(cursor.getString(cursor.getColumnIndex("tf_whichSys")));
+            model.setPhone(cursor.getString(cursor.getColumnIndex("tf_phone")));
+            model.setEmail(cursor.getString(cursor.getColumnIndex("tf_email")));
+            model.setType(cursor.getInt(cursor.getColumnIndex("tf_type")));
+            model.setImid(cursor.getString(cursor.getColumnIndex("tf_imId")));
+            model.setOwnerId(cursor.getString(cursor.getColumnIndex("tf_ownerId")));
+            models.add(model);
+        }
+        cursor.close();
+        DatabaseManager.getInstance().closeDatabase();
+        return models;
+    }
+
     public  List<ContactsModel> find(String key){
         SQLiteDatabase db=  DatabaseManager.getInstance().openDatabase();
         String master= CommonUtil.getSharedPreferences(MyApplication.getInstance(),"erp_master");
@@ -127,13 +164,30 @@ public class ContactsDao {
     public  void update(ContactsModel model){
         SQLiteDatabase db=  DatabaseManager.getInstance().openDatabase();
         String sql = "update tbl_contacts"
-                + " set tf_type=?"
+                + " set tf_type=? , tf_imId=? "
+                + " where tf_ownerId=? and tf_whichSys=? and tf_imId=?;";
+        SQLiteStatement sta = db.compileStatement(sql);
+        sta.bindLong(1, model.getType());
+        sta.bindString(2, model.getImid());
+        sta.bindString(3, model.getOwnerId());
+        sta.bindString(4, model.getWhichsys());
+        sta.bindString(5, model.getImid());
+        long row=  sta.executeInsert();
+        DatabaseManager.getInstance().closeDatabase();
+    }
+
+    //针对本地通讯录  model的字段为空
+    public  void update(ContactsModel model,String imId){
+        SQLiteDatabase db=  DatabaseManager.getInstance().openDatabase();
+        String sql = "update tbl_contacts"
+                + " set tf_type=? , tf_imId=? "
                 + " where tf_ownerId=? and tf_whichSys=? and tf_imId=?;";
         SQLiteStatement sta = db.compileStatement(sql);
         sta.bindLong(1, model.getType());
-        sta.bindString(2, model.getOwnerId());
-        sta.bindString(3, model.getWhichsys());
-        sta.bindString(4, model.getImid());
+        sta.bindString(2, imId);
+        sta.bindString(3, model.getOwnerId());
+        sta.bindString(4, model.getWhichsys());
+        sta.bindString(5, model.getImid());
         long row=  sta.executeInsert();
         DatabaseManager.getInstance().closeDatabase();
     }

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

@@ -12,7 +12,7 @@ import android.widget.TextView;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
-import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
+import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.crm.ClientActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
@@ -21,6 +21,7 @@ import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.UserRoleUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.wxapi.ApiPlatform;
 import com.xzjmyk.pm.activity.wxapi.ApiUtils;
@@ -29,7 +30,7 @@ import com.xzjmyk.pm.activity.wxapi.ApiUtils;
  * @desc:工作
  * @author：Administrator on 2016/1/30 16:15
  */
-public class WorksFragment extends XutilsFragment implements View.OnClickListener {
+public class WorksFragment extends EasyFragment implements View.OnClickListener {
     private static final String HASHCODE = "WorksFragment";
     private static final String TIME_MILL = "TIMEMILL";
     private String TAG = "WorksFragment";
@@ -98,22 +99,12 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
             tv_business_num.setVisibility(View.GONE);
             tv_desc_business.setVisibility(View.GONE);
             iv_business_desc.setVisibility(View.GONE);
-          
         }
-        
- 
         show_new_function_ll.setOnClickListener(this);
-      //  int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
-//        if (new_function_notice == 1) {
-//            show_new_function_ll.setVisibility(View.INVISIBLE);
-//        } else {
-//            //TODO 发布版本先隐藏
-//            show_new_function_ll.setVisibility(View.INVISIBLE);
-//        }
-
         if (platform){
             my_client_rl.setVisibility(View.GONE);
         }
+        UserRoleUtils.checkUserRole(this,getmRootView());
     }
 
     @Override

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

@@ -711,7 +711,7 @@ public class ViewUtil {
      */
     private static void showDialogCompany(String json, String phone, String password) {
         List<LoginEntity> logMsg = JSON.parseArray(json, LoginEntity.class);
-        erpEntities = new ArrayList<LoginEntity>();
+        erpEntities = new ArrayList<>();
         LoginEntity logB2b = null;
         if (logMsg != null && !logMsg.isEmpty()) {
             for (int i = 0; i < logMsg.size(); i++) {
@@ -752,13 +752,15 @@ public class ViewUtil {
                         //选择
                         showDialogB2B(phone, password, sModel);
                     } else {
-                        //默认
+                        //个人用户
+                        
                         CommonUtil.setSharedPreferences(MyApplication.getInstance().getApplicationContext(), "spaceId", String.valueOf(sModel.get(0).getId()));
                         CommonUtil.setSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyName", String.valueOf(sModel.get(0).getName()));
                         CommonUtil.setSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu", String.valueOf(sModel.get(0).getEnuu()));
                         LoginB2BTask(phone, password, sModel.get(0).getId());//登录B2B
                     }
                 }else{
+                    CommonUtil.setSharedPreferences(MyApplication.getInstance().getApplicationContext(), "userRole", "1");
                     if (ct!=null) {
                         ct.startActivity(new Intent(ct, MainActivity.class));
                     }
@@ -849,14 +851,14 @@ public class ViewUtil {
                     HttpUtil.Response result = httpSendTask(url, params, headers, request);
                     LogUtil.prinlnLongMsg("result", "http 发送请求-----------------------------------------");
                     LogUtil.prinlnLongMsg("result", "url：" + url);
-                    LogUtil.prinlnLongMsg("resultParams", "parms：" + params.toString());
+                    LogUtil.prinlnLongMsg("result", "parms：" + params.toString());
                     if (result != null)
-                        LogUtil.prinlnLongMsg("resultResponse", result.toString());
-                    else LogUtil.prinlnLongMsg("resultResponse", "result == null");
+                        LogUtil.prinlnLongMsg("result", result.getResponseText());
+                    else LogUtil.prinlnLongMsg("result", "result == null");
                     if (result != null) {
-                        Log.i("result", "statusCode：" + result.getStatusCode());
+                        Log.i("result", "result：" + result.getStatusCode());
                         // Log.i("result", "statusCode：" +result.getResponseText());
-                        LogUtil.prinlnLongMsg("resultText", result.getResponseText());
+                        LogUtil.prinlnLongMsg("result", result.getResponseText());
                         Log.i("result", "http 接收响应-----------------------------------------");
                         if (result.getStatusCode() == 200) {
                             finalBundle.putString("result", result.getResponseText());
@@ -1060,5 +1062,8 @@ public class ViewUtil {
         CommonUtil.clearSharedPreferences(ct, "b2b_uu");
         CommonUtil.clearSharedPreferences(ct, "Master_ch");
         CommonUtil.clearSharedPreferences(ct, "erp_emname");
+        CommonUtil.clearSharedPreferences(ct, "userRole");
+        
+        
     }
 }

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

@@ -1015,7 +1015,7 @@ public class ApprovaPresenter implements OnHttpResultListener {
             iApproval.showToast("正在提交请求，请不要重复提交", R.color.load_submit);
             return false;
         }
-        return false;
+        return true;
     }
 
     //判断要点

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

@@ -1,5 +1,6 @@
 package com.xzjmyk.pm.activity.ui.erp.presenter;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Looper;
 import android.support.annotation.NonNull;
@@ -17,8 +18,10 @@ import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.sortlist.PingYinUtil;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.db.dao.ContactsDao;
 import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.entity.SelectCollisionTurnBean;
+import com.xzjmyk.pm.activity.ui.erp.model.contacts.ContactsModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.ISelectActiveView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
@@ -41,12 +44,13 @@ public class SelectCollisionPresenter {
     private ISelectActiveView iSelectActiveView;
     private List<BaseSortModel<SelectEmUser>> allList;
     private BaseComparator<SelectEmUser> mBaseComparator;
-
+    private Activity mActivity;
     private SelectCollisionTurnBean selectBean;
 
     public SelectCollisionPresenter(ISelectActiveView iSelectActiveView) {
         if (iSelectActiveView == null) new NullPointerException("iSelectActiveView is Null");
         this.iSelectActiveView = iSelectActiveView;
+        this.mActivity= (Activity) iSelectActiveView;
     }
 
 
@@ -64,10 +68,19 @@ public class SelectCollisionPresenter {
         List<SelectEmUser> selects = selectBean.getSelectList();
         if (!StringUtils.isEmpty(selectBean.getSureText()))
             iSelectActiveView.showSureText(selectBean.getSureText());
-        if (ListUtils.isEmpty(selects))
-            loadDataInThread();
-        else
+        if (ListUtils.isEmpty(selects)) {
+            if(selectBean.getTitle().equals(mActivity.getString(R.string.select_share_friend))){//分享好友
+                //企业架构+UU好友
+                loadShareFriendInThread();
+            }else{
+                //企业架构
+                loadDataInThread();
+            }
+            
+        }
+        else {
             setUser2Sort(selects, true);
+        }
     }
 
     public void changeChecked(boolean b, List<BaseSortModel<SelectEmUser>> listData) {
@@ -139,6 +152,22 @@ public class SelectCollisionPresenter {
         }
         return chche;
     }
+    
+    
+    private void loadShareFriendInThread(){
+        iSelectActiveView.showLoading();
+        ThreadPool.getThreadPool().addTask(new Runnable() {
+            @Override
+            public void run() {
+              List<ContactsModel> models=  ContactsDao.getInstance().findByShare();
+              if (!ListUtils.isEmpty(models)){
+                  handlerLoadShareData(models);
+              }else{
+                  //联网加载
+              }
+            }
+        });
+    }
 
     /*开启线程获取数据*/
     private void loadDataInThread() {
@@ -206,6 +235,25 @@ public class SelectCollisionPresenter {
             iSelectActiveView.showToast(message, R.color.load_warning);
     }
 
+    
+    private void handlerLoadShareData(List<ContactsModel> employees){
+        if (ListUtils.isEmpty(employees)) return;//TODO 请求下来时候数据为空
+        List<SelectEmUser> users = new ArrayList<>();
+        SelectEmUser user = null;
+        for (ContactsModel e : employees) {
+            user = new SelectEmUser();
+            //user.setDefaultorid(e.getEm_defaultorid());
+           // user.setDepart(e.getEM_DEPART());
+            user.setEmName(e.getName());
+            user.setImId(Integer.valueOf(e.getImid()));
+           // user.setEmCode(e.getEM_CODE());
+           // user.setPosition(e.getEM_POSITION());
+           // user.setEmId(e.getEM_ID());
+            users.add(user);
+        }
+        setUser2Sort(users, false);
+    }
+    
     private void handlerLoadData(List<EmployeesEntity> employees) {
        
         if (ListUtils.isEmpty(employees)) return;//TODO 请求下来时候数据为空
@@ -237,10 +285,16 @@ public class SelectCollisionPresenter {
                 if (isClickAll) numSelect++;
             }
             mode.setBean(e);
-            setSortCondition(mode);
+            //判断界面类型决定是否排序
+            if (!selectBean.getTitle().equals(mActivity.getString(R.string.select_share_friend))) {
+                setSortCondition(mode);
+            }
             allList.add(mode);
         }
-        Collections.sort(allList, mBaseComparator);
+        if (!selectBean.getTitle().equals(mActivity.getString(R.string.select_share_friend))) {
+            Collections.sort(allList, mBaseComparator);
+        }
+      
         //计算全部数据完成
        OAHttpHelper.getInstance().post(new Runnable() {
            @Override

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

@@ -117,9 +117,13 @@ public class ContactsUtils {
                 contactsId = cursor.getString(0);
                 phoneNum = cursor.getString(1);
                 name = cursor.getString(2);
-
+                
                 Contacts model = new Contacts();
-                model.setPhone(phoneNum);
+                if (!StringUtils.isEmpty(phoneNum)) {
+                    model.setPhone(phoneNum.replace(" ", "").replace("-", ""));
+                }else{
+                    model.setPhone("0");
+                }
                 model.setName(name);
                 model.setId(Integer.valueOf(contactsId));
                 contacts.add(model);

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

@@ -0,0 +1,55 @@
+package com.xzjmyk.pm.activity.ui.erp.util;
+
+import android.view.View;
+
+import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
+import com.xzjmyk.pm.activity.ui.me.MeFragment;
+import com.xzjmyk.pm.activity.ui.me.SettingActivity;
+import com.xzjmyk.pm.activity.ui.message.MessageFragment;
+
+/**
+ * Created by Arison on 2017/8/7.
+ */
+
+public class UserRoleUtils {
+
+    public static void checkUserRole(Object fragment, View view) {
+        String userRole= CommonUtil.getSharedPreferences(MyApplication.getInstance(),"userRole");
+        try {
+            if (!StringUtils.isEmpty(userRole)){
+                if (userRole.equals("1")){//个人用户
+                    if (fragment instanceof MessageFragment){
+                        view.findViewById(R.id.schedule_rl).setVisibility(View.GONE);//审批流
+                        view.findViewById(R.id.waitting_work_rl).setVisibility(View.GONE);//待办工作
+                        view.findViewById(R.id.subscribe_rl).setVisibility(View.GONE);//我的订阅
+                    }
+                    if (fragment instanceof WorksFragment){
+                        view.findViewById(R.id.rl_uas_sys).setVisibility(View.GONE);
+                        view.findViewById(R.id.my_client_rl).setVisibility(View.GONE);
+                        view.findViewById(R.id.setting_rl).setVisibility(View.GONE);
+                    }
+                    if (fragment instanceof MeFragment){
+                        view.findViewById(R.id.rl_company_change).setVisibility(View.GONE);
+                        view.findViewById(R.id.rl_master_change).setVisibility(View.GONE);
+                    }
+                    if (fragment instanceof SettingActivity){
+                        view.findViewById(R.id.sign_in_rl).setVisibility(View.GONE);
+                        view.findViewById(R.id.sign_out_rl).setVisibility(View.GONE);
+                    }
+                }
+                if (userRole.equals("2")){//uas用户
+    
+                }
+                if(userRole.equals("3")){//平台用户
+    
+                }
+            }else{
+    
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

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

@@ -130,10 +130,15 @@ public class AutoErpService extends Service {
         public void onReceive(Context context, Intent intent) {
             try {
                 if (intent == null || StringUtils.isEmpty(intent.getAction())) return;
-                else if (intent.getAction().equals(UPDATA_ERP_CHANGE) || intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {//账套变更，重新刷新数据，初始化任务
-                    log(UPDATA_ERP_CHANGE);
-                    CommonInterface.getInstance().judgeManager(null);
-                    init();
+                else if (intent.getAction().equals(UPDATA_ERP_CHANGE)
+                        || intent.getAction().equals(MsgBroadcast.ACTION_MSG_COMPANY_UPDATE)) {//账套变更，重新刷新数据，初始化任务
+                    log(intent.getAction());
+                    String falg = intent.getStringExtra("falg");
+                    LogUtil.i("falg=" + falg);
+                    if (StringUtils.isEmpty(falg) || falg.equals("home")) {
+                        CommonInterface.getInstance().judgeManager(null);
+                        init();
+                    }
                 } else if (intent.getAction().equals(CHANGE_WORK_TASK)) {//自动打卡任务变更
                     log(CHANGE_WORK_TASK);
                     canWork = intent.getBooleanExtra(CHANGE_WORK_TASK, true);//获取是否开启任务
@@ -314,7 +319,7 @@ public class AutoErpService extends Service {
                         isDNoticeRuning = true;
                         LogUtil.i("startDNoticeTask Runnable");
                         int i = DNOTICE_ITER - 1;
-                        Log.i("dnoticeIter",dnoticeIter+"");
+                        Log.i("dnoticeIter", dnoticeIter + "");
 
                         if (dnoticeIter == i) {
                             LogUtil.i("dnoticeIter == i");

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import com.iflytek.cloud.SpeechConstant;
 import com.iflytek.cloud.ui.RecognizerDialog;
 import com.iflytek.cloud.ui.RecognizerDialogListener;
+import com.xzjmyk.pm.activity.MyApplication;
 
 /**
  * Created by Bitliker on 2017/6/12.
@@ -13,6 +14,8 @@ import com.iflytek.cloud.ui.RecognizerDialogListener;
 public class RecognizerDialogUtil {
 
     public static void showRecognizerDialog(Context context, RecognizerDialogListener recognizerDialogListener) {
+        if (context == null)
+            context = MyApplication.getInstance();
         RecognizerDialog dialog = new RecognizerDialog(context, null);
         dialog.setParameter(SpeechConstant.LANGUAGE, "zh_cn");
         dialog.setParameter(SpeechConstant.ACCENT, "mandarin");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/http/DepositNoticeUtil.java

@@ -65,7 +65,8 @@ public class DepositNoticeUtil {
                 case 0x01:
                     if (!StringUtils.isEmpty(result)) {
                         if (JSON.parseObject(result).getString("resultMsg") != null) {
-                            Toast.makeText(MyApplication.getInstance(), JSON.parseObject(result).getString("resultMsg"), Toast.LENGTH_LONG).show();
+                            //先不提示
+//                            Toast.makeText(MyApplication.getInstance(), JSON.parseObject(result).getString("resultMsg"), Toast.LENGTH_LONG).show();
                             return;
                         } else {
                             if (!ListUtils.isEmpty(mSureBookModel))
@@ -123,20 +124,21 @@ public class DepositNoticeUtil {
 
     /**
      * 判断model里面的数据是否符合提醒条件
+     *
      * @param models
      */
     public static void isNoticeTimeInMainLooper(List<SureBookModel> models) {
         for (SureBookModel model : models) {
             LatLng latLng = new LatLng(Double.valueOf(model.getAb_latitude()), Double.valueOf(model.getAb_longitude()));
             float distance = BaiduMapUtil.getInstence().autoDistance(latLng);
-            if (distance == -1f){
+            if (distance == -1f) {
                 LogUtil.i("distance == -1f");
                 continue;
             }
-            if (model.getAb_starttime().compareTo(TimeUtils.f_long_2_str(System.currentTimeMillis())) > 0){
+            if (model.getAb_starttime().compareTo(TimeUtils.f_long_2_str(System.currentTimeMillis())) > 0) {
                 setNoticeTime(model.getAb_starttime(), latLng, distance);
             }
-            LogUtil.prinlnLongMsg("startTime,current_T",model.getAb_starttime()+","+TimeUtils.f_long_2_str(System.currentTimeMillis()));
+            LogUtil.prinlnLongMsg("startTime,current_T", model.getAb_starttime() + "," + TimeUtils.f_long_2_str(System.currentTimeMillis()));
 
         }
     }
@@ -148,6 +150,7 @@ public class DepositNoticeUtil {
     /**
      * 对于符合当前条件的预约，进行提前预约时间计算得出：开始提醒的具体时间点startNoticeTime
      * 然后：startNoticeTime <= 当前时间则开始进行通知提醒
+     *
      * @param startTime
      * @param location
      * @param dis
@@ -165,7 +168,7 @@ public class DepositNoticeUtil {
                                 if (dis != 0) {
                                     minTime = (int) (TimeUtils.f_str_2_long(startTime) - (dis / 3) * 1000 - 15 * 60 * 1000);
                                 } else {
-                                    minTime = (int) (TimeUtils.f_str_2_long(startTime) - 800 * 1000-15 * 60 * 1000);
+                                    minTime = (int) (TimeUtils.f_str_2_long(startTime) - 800 * 1000 - 15 * 60 * 1000);
                                 }
                             } else {
                                 for (DrivingRouteLine e : list) {
@@ -174,18 +177,18 @@ public class DepositNoticeUtil {
                                     }
                                 }
                             }
-                            long startNoticeTime = TimeUtils.f_str_2_long(startTime) - minTime * 1000-15 * 60 * 1000;
+                            long startNoticeTime = TimeUtils.f_str_2_long(startTime) - minTime * 1000 - 15 * 60 * 1000;
                             if (startNoticeTime <= System.currentTimeMillis()) {
                                 //TODO 提醒
-                                Log.i("notificationManage","开始提醒");
+                                Log.i("notificationManage", "开始提醒");
                                 notificationManage.sendNotification(MyApplication.getInstance(),
                                         "您有预约计划即将开始！", BookingListActivity.class);
-                            }else{
-                                Log.i("notificationManage","提醒时间不符合");
+                            } else {
+                                Log.i("notificationManage", "提醒时间不符合");
                             }
-                            LogUtil.i("minTime="+minTime);
-                            LogUtil.i("startNoticeTime="+TimeUtils.f_long_2_str(startNoticeTime));
-                            LogUtil.i("System.currentTimeMillis()="+TimeUtils.f_long_2_str( System.currentTimeMillis()));
+                            LogUtil.i("minTime=" + minTime);
+                            LogUtil.i("startNoticeTime=" + TimeUtils.f_long_2_str(startNoticeTime));
+                            LogUtil.i("System.currentTimeMillis()=" + TimeUtils.f_long_2_str(System.currentTimeMillis()));
                         } catch (Exception e) {
                             if (e != null)
                                 Log.i("setStartime Exception=", e.getMessage() + "");

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

@@ -45,6 +45,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.UserRoleUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.MasterDialog;
 import com.xzjmyk.pm.activity.ui.tool.SingleImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.PermissionUtil;
@@ -180,6 +181,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                         String sessionId = results.get("sessionId").toString();
                         String master = msg.getData().getString("master");
                         String master_ch = msg.getData().getString("master_ch");
+                        CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(results.get("uu")));
                         CommonUtil.setSharedPreferences(ct, "sessionId", sessionId);
                         CommonUtil.setSharedPreferences(ct, "erp_master", master);
                         CommonUtil.setSharedPreferences(ct, "Master_ch", master_ch);
@@ -252,7 +254,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
     private void initView() {
         ct = getActivity();
         findViewById(R.id.my_data_rl).setOnClickListener(this);
-        findViewById(my_friend_rl).setOnClickListener(this);
+        findViewById(R.id.my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);
         findViewById(R.id.setting_rl).setOnClickListener(this);
@@ -329,6 +331,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         CommonUtil.clearSharedPreferences(ct, "seting");
         CommonUtil.clearSharedPreferences(ct, "seting_1");
         doHITask(); // TODO 测试按钮
+
+        UserRoleUtils.checkUserRole(this,getmRootView());
     }
 
     private void doHITask() {

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

@@ -41,7 +41,7 @@ import com.xzjmyk.pm.activity.db.dao.VideoFileDao;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.sp.UserSp;
 import com.xzjmyk.pm.activity.ui.MainActivity;
-import com.xzjmyk.pm.activity.ui.base.ActionBackActivity;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.me.FeedbackActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.FlightsActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.MissionSetActivity;
@@ -52,6 +52,7 @@ import com.xzjmyk.pm.activity.ui.erp.entity.InAndExitTimeEntity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.ui.erp.util.UserRoleUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
 import com.xzjmyk.pm.activity.ui.tool.WebViewActivity;
 import com.xzjmyk.pm.activity.util.DisplayUtil;
@@ -70,7 +71,7 @@ import java.io.File;
 /**
  * 设置
  */
-public class SettingActivity extends ActionBackActivity implements View.OnClickListener {
+public class SettingActivity extends BaseActivity implements View.OnClickListener {
 
     private Button mExitBtn;
     private TextView mCacheTv;
@@ -103,7 +104,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
 
     @ViewInject(R.id.tv_help_new)
     private TextView tv_help_new;
-  
+
 
     @ViewInject(R.id.language_us_rl)
     private RelativeLayout language_us_rl;
@@ -271,6 +272,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         } else {
             language_us_rl.setVisibility(View.VISIBLE);
         }
+        UserRoleUtils.checkUserRole(this,getRootView());
     }
 
     private boolean isServiceRunning(String servicename) { // 判断某个服务是否已经运行
@@ -374,7 +376,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
             break;
             case R.id.about_us_rl:// 关于我们
                 startActivity(new Intent(mContext, AboutActivity.class));
-              
+
                 break;
             case R.id.share_rl:
                 share();

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

@@ -37,6 +37,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
+import com.xzjmyk.pm.activity.ui.erp.util.UserRoleUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.VoiceSearchView;
 import com.xzjmyk.pm.activity.ui.platform.task.TaskB2BActivity;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
@@ -229,9 +230,12 @@ public class MessageFragment extends EasyFragment implements IMessageView,   Vie
             subscribe_rl.setVisibility(View.VISIBLE);
 //            news_notice_rl.setVisibility(View.GONE);
         }
+        UserRoleUtils.checkUserRole(this,view);
         return view;
     }
 
+  
+
     private void showPopupWindow() {
         if (setWindow == null) initPopupWindow();
         setWindow.showAtLocation(mContext.getWindow().getDecorView().

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

@@ -9,6 +9,7 @@ import java.util.concurrent.Executors;
  */
 public class ThreadUtil {
     private static ThreadUtil instance = null;
+    ExecutorService cachedThreadPool =  Executors.newCachedThreadPool();
 
     public static ThreadUtil getInstance() {
         if (instance == null) {
@@ -26,13 +27,12 @@ public class ThreadUtil {
      * @param runnable
      */
     public void addLoopTask(Runnable runnable) {
-        ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
+//        ExecutorService cachedThreadPool = Executors.newCachedThreadPool();
         cachedThreadPool.execute(runnable);
     }
 
     //普通线程
     public void addTask(Runnable runnable) {
-        ExecutorService cachedThreadPool = Executors.newFixedThreadPool(10);
         cachedThreadPool.execute(runnable);
     }
 

WeiChat/src/main/res/drawable/bg_bule_btn1.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape>
+            <solid android:color="@color/btn_orange_press" />
+       
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="@color/titleBlue" />
+            <padding android:bottom="0.5dp" android:left="0.5dp" android:right="0.5dp" android:top="0.5dp" />
+        </shape>
+    </item>
+</selector>

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

@@ -198,17 +198,17 @@
        
         <Button
             android:id="@+id/bt_change"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/select_weixin_list_item"
+            android:background="@drawable/bg_bule_btn1"
             android:text="@string/booking_change" />
 
         <View style="@style/app_line_v_1dp"></View>
 
         <Button
             android:id="@+id/bt_cancle"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"

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

@@ -84,6 +84,13 @@
                 android:background="@drawable/selector_me_menu_item_bg"
                 android:visibility="gone">
 
+                <View
+                    android:id="@+id/view2"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:layout_alignParentBottom="true"
+                    android:background="@color/item_line" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -103,17 +110,19 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
-
             <RelativeLayout
                 android:id="@+id/uu_step_rl"
                 style="@style/IMTbleLine1"
                 android:background="@drawable/selector_me_menu_item_bg"
                 android:visibility="visible">
 
+                <View
+                    android:id="@+id/view3"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+
                 <TextView
                     android:id="@+id/uu_step_text"
                     android:layout_width="wrap_content"
@@ -154,16 +163,19 @@
 
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
             <!--设置关闭推送-->
             <RelativeLayout
                 android:id="@+id/close_push_rl"
                 style="@style/IMTbleLine1"
                 android:background="@drawable/selector_me_menu_item_bg">
 
+                <View
+                    android:id="@+id/view4"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+
                 <TextView
                     android:id="@+id/push_setting_text"
                     android:layout_width="wrap_content"
@@ -181,15 +193,19 @@
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true" />
             </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
 
             <RelativeLayout
                 android:id="@+id/sign_in_rl"
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg">
+
+                <View
+                    android:id="@+id/view5"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
+
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -217,15 +233,17 @@
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
             </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
 
             <RelativeLayout
                 android:id="@+id/sign_out_rl"
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:id="@+id/view5"
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -253,15 +271,16 @@
                     android:textColor="@android:color/white"
                     android:textSize="10.0dip" />
             </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
 
             <RelativeLayout
                 android:id="@+id/booking_set_rl"
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg">
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -290,16 +309,16 @@
                     android:textSize="10.0dip" />
             </RelativeLayout>
             <!--清除缓存-->
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
 
             <RelativeLayout
                 android:id="@+id/clear_cache_rl"
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg">
-
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
                 <TextView
                     android:id="@+id/cache_text"
                     android:layout_width="wrap_content"
@@ -328,11 +347,6 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
-
             <RelativeLayout
                 android:id="@+id/use_help_rl"
                 style="@style/IMTbleLine"
@@ -415,7 +429,11 @@
                 android:id="@+id/about_us_rl"
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg">
-
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -435,11 +453,6 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
-
             <RelativeLayout
                 android:id="@+id/share_rl"
                 style="@style/IMTbleLine"
@@ -470,7 +483,11 @@
                 style="@style/IMTbleLine"
                 android:background="@drawable/selector_me_menu_item_bg"
                 android:clickable="true">
-
+                <View
+                    android:layout_alignParentBottom="true"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/line"
+                    android:background="@color/item_line" />
                 <TextView
                     android:id="@+id/version_text"
                     android:layout_width="wrap_content"
@@ -499,11 +516,6 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:background="@color/item_line" />
-
             <Button
                 android:id="@+id/exit_btn"
                 android:layout_width="match_parent"

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

@@ -232,14 +232,13 @@
             android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
-
         <View
             android:layout_width="match_parent"
             android:layout_height="@dimen/line"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
-            android:layout_marginTop="7dp"
-            android:background="@color/item_line" />
+            android:layout_marginTop="7dp" />
+    
         <!--公司-->
         <!--账套-->
         <RelativeLayout
@@ -247,6 +246,15 @@
             style="@style/IMTbleLine_UP_Me"
             android:background="@drawable/selector_me_menu_item_bg">
 
+            <View
+                android:id="@+id/view"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_alignParentBottom="true"
+                android:background="@color/item_line" />
+
             <TextView
                 android:id="@+id/company_text"
                 android:layout_width="wrap_content"
@@ -278,13 +286,6 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line"
-            android:layout_marginLeft="10dp"
-            android:layout_marginRight="10dp"
-            android:background="@color/item_line" />
-
         <RelativeLayout
             android:id="@+id/rl_master_change"
             style="@style/IMTbleLine_UP_Me"
@@ -326,6 +327,7 @@
             android:layout_height="@dimen/line"
             android:layout_marginLeft="10dp"
             android:layout_marginRight="10dp"
+            android:visibility="gone"
             android:background="@color/item_line" />
 
         <RelativeLayout

WeiChat/src/main/res/values/colors.xml

@@ -256,7 +256,7 @@
     <color name="darkgreen">#006400</color> <!-- 暗绿色 -->
     <color name="blue">#0000FF</color> <!-- 蓝色 -->
     <!--标题栏颜色-->
-    <color name="titleBlue">#3C97D7</color> <!-- 青蓝色 -->
+    <color name="titleBlue">#BF2F95DD</color> <!-- 青蓝色 -->
     <color name="titleCustomer">#DF8339</color>
     <color name="titleVisit">#6FB660</color>
     <color name="titleTask">#D0A233</color>

WeiChat/src/main/res/values/strings.xml

@@ -1837,6 +1837,7 @@
     <string name="booking_times">时间段：</string>
 
     <string name="booking_add">预约计划</string>
+    <string name="select_share_friend">分享好友</string>
 
     <!--关于新审批流的，后期会添加到四个文件中-->
     <string name="title_approval">审批单据</string>
@@ -1861,4 +1862,6 @@
     <string name="to_login">已有账户？登录</string>
     <string name="input_phone_number">请输入手机号</string>
     <string name="input_name">请输入姓名</string>
+    
+    
 </resources>

app_core/imageload/build.gradle

@@ -0,0 +1,34 @@
+apply plugin: 'com.android.library'
+
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    testCompile 'junit:junit:4.12'
+}

app_core/imageload/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app_core/imageload/src/androidTest/java/base/android/com/imageload/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package base.android.com.imageload;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("base.android.com.imageload.test", appContext.getPackageName());
+    }
+}

app_core/imageload/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="base.android.com.imageload" />

app_core/imageload/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">imageload</string>
+</resources>

app_core/imageload/src/test/java/base/android/com/imageload/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package base.android.com.imageload;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}

app_core/network/build.gradle

@@ -0,0 +1,34 @@
+apply plugin: 'com.android.library'
+
+
+android {
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
+
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 25
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+        exclude group: 'com.android.support', module: 'support-annotations'
+    })
+
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    testCompile 'junit:junit:4.12'
+}

app_core/network/proguard-rules.pro

@@ -0,0 +1,25 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Android\sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app_core/network/src/androidTest/java/base/android/com/network/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package base.android.com.network;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumentation test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("base.android.com.network.test", appContext.getPackageName());
+    }
+}

app_core/network/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="base.android.com.network" />

app_core/network/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">network</string>
+</resources>

app_core/network/src/test/java/base/android/com/network/ExampleUnitTest.java

@@ -0,0 +1,17 @@
+package base.android.com.network;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}