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

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

@@ -192,12 +192,15 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         for (int i = 0; i < emList.size(); i++) {//企业通讯人员
             // friends.add(EnterChatAction(emList.get(i)));
             if (mLoginUserId.equals((emList.get(i).getEm_IMID() + ""))) {
+                Log.i("gongpengming", "存在相同" + emList.get(i).getEM_NAME());
                 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() + ""))) {
+                        Log.i("gongpengming", "mLoginUserId存在相同" + emList.get(i).getEM_NAME());
+                        friend.remove(j);
                         continue;
                     }
                     if (fId.equals(friend.get(j).getUserId())) {  //当有重复

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

@@ -94,6 +94,7 @@ public class RoomInfoActivity extends BaseActivity {
     private boolean mXmppBind;
     private CoreService mCoreService;
     public final static String ROOM_NAME = "ROOMNAME";
+    private Button btnExit;
 
     @Override
 
@@ -155,7 +156,7 @@ public class RoomInfoActivity extends BaseActivity {
                 loadMembers();
             }
         });
-
+        btnExit = (Button) findViewById(R.id.btn_exit);
         mGridView.setOnTouchListener(new View.OnTouchListener() {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
@@ -299,7 +300,7 @@ public class RoomInfoActivity extends BaseActivity {
                 mMembers.add(0, my);
             }
         }
-        mAdapter = new GridViewAdapter();
+        mAdapter = new GridViewAdapter(mMembers, mucRoom.getUserId());
         mGridView.setAdapter(mAdapter);
         if (TextUtils.isEmpty(myNickName)) {
             mNickNameTv.setText(MyApplication.getInstance().mLoginUser.getNickName());
@@ -308,13 +309,24 @@ public class RoomInfoActivity extends BaseActivity {
         }
 
         if (mucRoom.getUserId().equals(mLoginUserId)) {// 我是创建者
+            if (btnExit == null) {
+                btnExit = (Button) findViewById(R.id.btn_exit);
+            }
+            Log.i("gongpengming", "mucRoom.getUserId()=" + mucRoom.getUserId());
             add_minus_count = 2;
+            btnExit.setText("删除商务群");
             findViewById(R.id.room_name_arrow_img).setVisibility(View.VISIBLE);
             findViewById(R.id.room_desc_arrow_img).setVisibility(View.VISIBLE);
             findViewById(R.id.banned_voice_rl).setVisibility(View.VISIBLE);
-            findViewById(R.id.banned_delete_rl).setVisibility(View.VISIBLE);
-            findViewById(R.id.exit_room_rl).setVisibility(View.GONE);
-
+            findViewById(R.id.banned_delete_rl).setVisibility(View.GONE);
+            findViewById(R.id.exit_room_rl).setVisibility(View.VISIBLE);
+            btnExit.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Log.i("gongpengming", "删除商务群");
+                    deleteRoom(mRoom);
+                }
+            });
             findViewById(R.id.room_name_rl).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -341,6 +353,7 @@ public class RoomInfoActivity extends BaseActivity {
             findViewById(R.id.banned_delete_rl).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {//删除群房间
+                    Log.i("gongpengming", "删除群房间");
                     deleteRoom(mRoom);
                 }
             });
@@ -358,6 +371,10 @@ public class RoomInfoActivity extends BaseActivity {
                 }
             });
         } else {
+            if (btnExit == null) {
+                btnExit = (Button) findViewById(R.id.btn_exit);
+            }
+            btnExit.setText("退出商务群");
             add_minus_count = 1;
             findViewById(R.id.room_name_arrow_img).setVisibility(View.INVISIBLE);
             findViewById(R.id.room_desc_arrow_img).setVisibility(View.INVISIBLE);
@@ -368,12 +385,8 @@ public class RoomInfoActivity extends BaseActivity {
             findViewById(R.id.room_desc_rl).setOnClickListener(null);
             findViewById(R.id.banned_voice_rl).setOnClickListener(null);
             findViewById(R.id.banned_delete_rl).setOnClickListener(null);
-            findViewById(R.id.exit_room_rl).setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {//成员退出房间
-                    deleteRoom(mRoom);
-                }
-            });
+
+
             findViewById(R.id.shield_chat_rl).setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {//屏蔽群消息
@@ -387,7 +400,13 @@ public class RoomInfoActivity extends BaseActivity {
                 }
             });
         }
-
+        findViewById(R.id.exit_room_rl).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {//成员退出房间
+                Log.i("gongpengming", "成员退出房间");
+                deleteRoom(mRoom);
+            }
+        });
         findViewById(R.id.nick_name_rl).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -510,11 +529,32 @@ public class RoomInfoActivity extends BaseActivity {
     private boolean doDel = false;
     private boolean doBannedVoice = false;
 
+
     private class GridViewAdapter extends BaseAdapter {
 
+        private final List<MucRoomMember> members;
+
+        public GridViewAdapter(List<MucRoomMember> members, String id) {
+            boolean isf = false;
+            this.members = new ArrayList<>();
+            for (int i = 0; i < members.size(); i++) {
+                if (members.get(i).getUserId().equals(id)) {//如果是群主
+                    if (!isf) {
+                        isf = true;
+                    } else {
+                        members.remove(i);
+                    }
+                }
+            }
+            members.add(new MucRoomMember());
+            if (id.equals(mLoginUserId))
+                members.add(new MucRoomMember());
+            this.members.addAll(members);
+        }
+
         @Override
         public int getCount() {
-            return mMembers.size();
+            return members.size();
         }
 
         @Override
@@ -534,16 +574,17 @@ public class RoomInfoActivity extends BaseActivity {
             TextView tvName = (TextView) view.findViewById(R.id.tv_name);
             Button button = (Button) view.findViewById(R.id.btn_del);
 
-            if (position > mMembers.size() - (add_minus_count + 1)) {
+
+            if (position > members.size() - (add_minus_count + 1)) {
                 if (add_minus_count == 1) {
-                    if (position == mMembers.size() - 1) {
+                    if (position == members.size() - 1) {
                         imageView.setBackgroundResource(R.drawable.bg_room_info_add_btn);
                     }
                 } else {
-                    if (position == mMembers.size() - 2) {
+                    if (position == members.size() - 2) {
                         imageView.setBackgroundResource(R.drawable.bg_room_info_add_btn);
                     }
-                    if (position == mMembers.size() - 1) {
+                    if (position == members.size() - 1) {
                         imageView.setBackgroundResource(R.drawable.bg_room_info_minus_btn);
                     }
                 }
@@ -556,8 +597,8 @@ public class RoomInfoActivity extends BaseActivity {
                 }
             } else {
                 // String id=ChatJID.getID(mOccupants.get(position).getJid());
-                tvName.setText(mMembers.get(position).getNickName());
-                AvatarHelper.getInstance().displayAvatar(mMembers.get(position).getUserId(), imageView, true);
+                tvName.setText(members.get(position).getNickName());
+                AvatarHelper.getInstance().displayAvatar(members.get(position).getUserId(), imageView, true);
                 if (doDel | doBannedVoice) {
                     button.setVisibility(View.VISIBLE);
                 } else {
@@ -573,17 +614,17 @@ public class RoomInfoActivity extends BaseActivity {
                             return;
                         }
                         if (doDel) {
-                            if (mMembers.get(position).getUserId().equals(mLoginUserId)) {
+                            if (members.get(position).getUserId().equals(mLoginUserId)) {
                                 ToastUtil.showToast(mContext, R.string.can_not_remove_self);
                                 return;
                             }
-                            deleteMember(position, mMembers.get(position).getUserId());
+                            deleteMember(position, members.get(position).getUserId());
                         } else if (doBannedVoice) {
-                            if (mMembers.get(position).getUserId().equals(mLoginUserId)) {
+                            if (members.get(position).getUserId().equals(mLoginUserId)) {
                                 ToastUtil.showToast(mContext, R.string.can_not_banned_self);
                                 return;
                             }
-                            showBanndedVoiceDialog(position, mMembers.get(position).getUserId());
+                            showBanndedVoiceDialog(position, members.get(position).getUserId());
                         }
 
                     }

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

@@ -57,11 +57,11 @@
                 android:layout_marginTop="@dimen/line_min"
                 android:background="@color/item_color1"
                 android:cacheColorHint="#00000000"
-                android:gravity="fill"
+                android:gravity="center_horizontal"
                 android:horizontalSpacing="20dp"
                 android:listSelector="#00000000"
                 android:numColumns="5"
-                android:padding="15dp"
+                android:padding="10dp"
                 android:scrollbars="none"
                 android:verticalSpacing="20dp" />
 
@@ -290,21 +290,6 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
-
-            <RelativeLayout
-                android:id="@+id/exit_room_rl"
-                style="@style/IMTbleLine_UP"
-                android:layout_marginTop="@dimen/line_big">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_centerInParent="true"
-                    android:layout_margin="5dp"
-                    android:src="@drawable/exit_rom" />
-
-            </RelativeLayout>
-
             <RelativeLayout
                 android:id="@+id/banned_voice_rl"
                 style="@style/IMTbleLine"
@@ -330,10 +315,37 @@
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
+            <RelativeLayout
+                android:id="@+id/exit_room_rl"
+                style="@style/IMTbleLine_UP"
+                android:layout_marginTop="@dimen/line_big">
+
+                <Button
+                    android:id="@+id/btn_exit"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginLeft="15dp"
+                    android:layout_marginRight="15dp"
+                    android:background="@drawable/bg_btn"
+                    android:text="退出商务群"
+                    android:textColor="@color/white"
+                    android:textSize="15sp" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:layout_margin="5dp"
+                    android:src="@drawable/exit_rom"
+                    android:visibility="gone" />
+
+            </RelativeLayout>
+
             <RelativeLayout
                 android:id="@+id/banned_delete_rl"
                 style="@style/IMTbleLine"
-                android:layout_marginTop="@dimen/line_min">
+                android:layout_marginTop="@dimen/line_min"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/banned_delete_room_text"

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="70.0dip"
+    android:layout_width="65.0dip"
     android:layout_height="70.0dip"
     android:background="@android:color/transparent">
 
@@ -16,7 +16,6 @@
             android:layout_marginLeft="8dp"
             android:layout_marginRight="8dp"
             android:layout_marginTop="8dp"
-
             android:background="@drawable/avatar_normal" />
 
 

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'
     }
 }