test

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="34"
-    android:versionName="3.4">
+    android:versionCode="35"
+    android:versionName="3.5">
 
     <uses-sdk
         android:minSdkVersion="14"

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

@@ -188,12 +188,18 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 new String[]{master},
                 "whichsys=?");
         List<Friend> friends = new ArrayList<>();
-        boolean isf = false;
+
         for (int i = 0; i < emList.size(); i++) {//企业通讯人员
             // friends.add(EnterChatAction(emList.get(i)));
+            if (mLoginUserId.equals((emList.get(i).getEm_IMID() + ""))) {
+                continue;
+            }
             String fId = String.valueOf(emList.get(i).getEm_IMID());
             if (!ListUtils.isEmpty(friend)) {
                 for (int j = 0; j < friend.size(); j++) {//IM好友
+                    if (mLoginUserId.equals((friend.get(j).getUserId() + ""))) {
+                        continue;
+                    }
                     if (fId.equals(friend.get(j).getUserId())) {  //当有重复
                         //改昵称
                         friend.get(j).setNickName(emList.get(i).getEM_NAME());

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

@@ -73,7 +73,6 @@ public class RoomInfoActivity extends BaseActivity {
     private String mRoomJid;
     private String mLoginUserId;
     private Friend mRoom;
-
     private TextView mNoticeTv;
     private TextView sc_tv;//群消息屏蔽
     private MyGridView mGridView;
@@ -302,7 +301,6 @@ public class RoomInfoActivity extends BaseActivity {
         }
         mAdapter = new GridViewAdapter();
         mGridView.setAdapter(mAdapter);
-
         if (TextUtils.isEmpty(myNickName)) {
             mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
         } else {
@@ -350,7 +348,6 @@ public class RoomInfoActivity extends BaseActivity {
             findViewById(R.id.shield_chat_rl).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {//屏蔽群消息
-
                     if (sc_tv.getText().toString().equals("屏蔽群消息")) {
                         addBlacklist(mRoom);
                         sc_tv.setText("取消屏蔽群消息");
@@ -364,8 +361,8 @@ public class RoomInfoActivity extends BaseActivity {
             add_minus_count = 1;
             findViewById(R.id.room_name_arrow_img).setVisibility(View.INVISIBLE);
             findViewById(R.id.room_desc_arrow_img).setVisibility(View.INVISIBLE);
-            findViewById(R.id.banned_voice_rl).setVisibility(View.INVISIBLE);
-            findViewById(R.id.banned_delete_rl).setVisibility(View.INVISIBLE);
+            findViewById(R.id.banned_voice_rl).setVisibility(View.GONE);
+            findViewById(R.id.banned_delete_rl).setVisibility(View.GONE);
             findViewById(R.id.exit_room_rl).setVisibility(View.VISIBLE);
             findViewById(R.id.room_name_rl).setOnClickListener(null);
             findViewById(R.id.room_desc_rl).setOnClickListener(null);

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

@@ -18,7 +18,7 @@
             android:clickable="true"
             android:drawableLeft="@drawable/btn_back"
             android:gravity="center_vertical"
-            android:text="我的关注"
+            android:text="我的好友"
             android:textColor="@color/white" />
 
         <RadioGroup

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

@@ -61,7 +61,7 @@
                 android:horizontalSpacing="20dp"
                 android:listSelector="#00000000"
                 android:numColumns="5"
-                android:padding="10dp"
+                android:padding="15dp"
                 android:scrollbars="none"
                 android:verticalSpacing="20dp" />
 
@@ -297,10 +297,10 @@
                 android:layout_marginTop="@dimen/line_big">
 
                 <ImageView
-                    android:layout_margin="5dp"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
                     android:layout_centerInParent="true"
+                    android:layout_margin="5dp"
                     android:src="@drawable/exit_rom" />
 
             </RelativeLayout>
@@ -360,6 +360,7 @@
     <com.xzjmyk.pm.activity.view.DataLoadView
         android:id="@+id/data_load_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"
+        android:visibility="gone" />
 
 </RelativeLayout>

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

@@ -70,7 +70,7 @@
                     android:maxWidth="210dp"
                     android:padding="6dp"
                     android:textColor="@color/text_main"
-                    android:textSize="18sp" />
+                    android:textSize="16sp" />
             </LinearLayout>
 
             <ProgressBar

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

@@ -64,7 +64,7 @@
                 android:layout_gravity="center"
                 android:maxWidth="210dp"
                 android:padding="6dp"
-                android:textSize="18sp" />
+                android:textSize="16sp" />
         </LinearLayout>
     </RelativeLayout>
 

build.gradle

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