Merge branch 'developer_master' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_master

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

@@ -61,7 +61,7 @@ public class ScheduleActivity extends BaseActivity{
 					}else{
 						adapter=new SchedultAdapter(ScheduleActivity.this, allList);
 						listview_main.setAdapter(adapter);
-					   }
+				  }
 				  listview_main.onRefreshComplete();
 			} else if (msg.what==0) {
 				mEmptyLayout.setErrorMessage("网络未连接！");
@@ -159,7 +159,6 @@ public class ScheduleActivity extends BaseActivity{
 	    	   if (results.get("allProcess")!=null) {
 	        	   String count=results.get("count").toString();
 	        	   Intent intent_update =new Intent("com.activity.update.data");
-	        	   
 	        	   getSharedPreferences("setting", MODE_PRIVATE).edit().putString("count", count).commit();
 	        	   List<AllProcess> allProcesses = new ArrayList<AllProcess>();
 	        	   try {
@@ -219,7 +218,8 @@ public class ScheduleActivity extends BaseActivity{
 		mEmptyLayout.showLoading();
 		listview_main.setRefreshing(true);
 		if (CommonUtil.isNetWorkConnected(this)) {
-			new Thread(new getallprocess_run()).start();Log.i("Task", "initData()");
+			new Thread(new getallprocess_run()).start();
+			Log.i("Task", "initData()");
 		}else{
 			listview_main.onRefreshComplete();
 			mEmptyLayout.setErrorMessage("网络未连接！");

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

@@ -183,25 +183,26 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     private void getDataByDB(List<Friend> friend) {
         if (manager == null)
             manager = new DBManager(ct);
-
         String master = CommonUtil.getSharedPreferences(ct, "erp_master"); //待优化   每次都 读取文件耗性能
-
         List<EmployeesEntity> emList = manager.select_getEmployee(
                 new String[]{master},
                 "whichsys=?");
         Log.i("gongpengming", "emList.size()=" + emList.size());
         List<Friend> friends = new ArrayList<>();
+        for (int i = 0; i < emList.size(); i++) {//企业通讯人员
+           // friends.add(EnterChatAction(emList.get(i)));
+            String fId = String.valueOf(emList.get(i).getEm_IMID());
+
+            for (int j = 0; j < friend.size(); j++) {//IM好友
+                if (fId.equals(friend.get(j).getUserId())) {  //当有重复
+                    //改昵称
+                    friend.get(j).setNickName(emList.get(i).getEM_NAME());
+                    break;
+                } else if ((j == (friend.size() - 1)) && !(fId.equals(friend.get(j).getUserId()))) {
+                    friends.add(EnterChatAction(emList.get(i)));
+                }
+            }
 
-        for (int i = 0; i < emList.size(); i++) {
-            friends.add(EnterChatAction(emList.get(i)));
-//            String fId = String.valueOf(emList.get(i).getEm_IMID());
-//            for (int j = 0; j < friend.size(); j++) {
-//                if (fId.equals(friend.get(j).getUserId())) {  //当有重复
-//                    break;
-//                } else if ((j == (friend.size() - 1)) && !(fId.equals(friend.get(j).getUserId()))) {
-//                    friends.add(EnterChatAction(emList.get(i)));
-//                }
-//            }
         }
         friend.addAll(friends);
     }
@@ -398,14 +399,14 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     private void goneView(boolean b) {
         if (b) {
             my_data_rl.setVisibility(View.GONE);
-            my_friends_rl.setVisibility(View.GONE);
+           // my_friends_rl.setVisibility(View.GONE);
             my_friend_rl.setVisibility(View.GONE);
-            local_video_rl.setVisibility(View.GONE);
+           // local_video_rl.setVisibility(View.GONE);
         } else {
             my_data_rl.setVisibility(View.VISIBLE);
-            my_friends_rl.setVisibility(View.VISIBLE);
+            //my_friends_rl.setVisibility(View.VISIBLE);
             my_friend_rl.setVisibility(View.VISIBLE);
-            local_video_rl.setVisibility(View.VISIBLE);
+            //local_video_rl.setVisibility(View.VISIBLE);
         }
     }
 
@@ -436,7 +437,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 final List<Friend> friends = FriendDao.getInstance().getFriends(mLoginUserId);
                 Log.i("wang", "friends =" + friends);
                 Log.i("wang", "friends mloginuserid=" + mLoginUserId);
-                friends.clear();
+               // friends.clear();
                 getDataByDB(friends);
                 if (friends != null)
                     Log.i("wang", "friends size()=" + friends.size());

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

@@ -4,8 +4,10 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
 import android.app.ProgressDialog;
+import android.content.ComponentCallbacks;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.LabeledIntent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -25,6 +27,9 @@ import com.loopj.android.http.AsyncHttpClient;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
 import com.nostra13.universalimageloader.core.ImageLoader;
+import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
+import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.tool.SelectAreaActivity;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
@@ -50,6 +55,7 @@ import java.io.FileNotFoundException;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
+import java.util.List;
 
 /**
  * 我的基本资料界面
@@ -125,7 +131,14 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
             rbGrid.setChecked(true);
         }
         mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
-        mNameEdit.setText(mTempData.getNickName());
+        //查询数据库
+        DBManager dbManager=new DBManager(this);
+        String userId= mUser.getUserId();
+        String whichsys= CommonUtil.getSharedPreferences(this, "erp_master");
+        List<EmployeesEntity> entities= dbManager.select_getEmployee(new String[]{userId, whichsys}, "em_imid=? and whichsys=?");
+
+       // mNameEdit.setText(mTempData.getNickName());
+        mNameEdit.setText(entities.get(0).getEM_NAME());
         mCityTv.setText(Area.getProvinceCityString(mTempData.getProvinceId(), mTempData.getCityId()));
         AvatarHelper.getInstance().displayAvatar(mTempData.getUserId(), mAvatarImg, true);
     }

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

@@ -189,8 +189,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         getChinaMaster();
         updateStatus();
 
-
-
     }
 
 //    private void setApl() {

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

@@ -44,7 +44,7 @@
             android:drawableLeft="@drawable/qiyetongxunlu"
             android:drawablePadding="10dp"
             android:gravity="center"
-            android:text="企业通讯录"
+            android:text="企业架构"
             android:textColor="@color/text_main"
             android:textSize="14sp" />
 
@@ -61,10 +61,12 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
+        android:visibility="gone"
         android:background="@color/item_line" />
 
     <RelativeLayout
         android:id="@+id/my_friends_rl"
+        android:visibility="gone"
         style="@style/IMTbleLine_UP">
 
         <TextView
@@ -104,7 +106,7 @@
             android:drawableLeft="@drawable/qunliao"
             android:drawablePadding="10dp"
             android:gravity="center"
-            android:text="我的群组"
+            android:text="商务群"
             android:textColor="@color/text_main"
             android:textSize="14sp" />
 
@@ -125,6 +127,7 @@
 
     <RelativeLayout
         android:id="@+id/local_video_rl"
+        android:visibility="gone"
         style="@style/IMTbleLine_UP">
 
         <TextView

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }