修复bug，修改视图

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

@@ -244,7 +244,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		int id = item.getItemId();
-		if (id == R.id.send_text || id == R.id.send_image || id == R.id.send_audio || id == R.id.send_video) {
+		if (id == R.id.send_text || id == R.id.send_image ||  id == R.id.send_video) {
 			Intent intent = new Intent();
 			switch (id) {
 			case R.id.send_text:// 发文字
@@ -255,9 +255,9 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 				intent.setClass(BusinessCircleActivity.this, SendShuoshuoActivity.class);
 				intent.putExtra("type", 1);
 				break;
-			case R.id.send_audio:// 发语音
-				intent.setClass(BusinessCircleActivity.this, SendAudioActivity.class);
-				break;
+//			case R.id.send_audio:// 发语音
+//				intent.setClass(BusinessCircleActivity.this, SendAudioActivity.class);
+//				break;
 			case R.id.send_video:// 发视频
 				intent.setClass(BusinessCircleActivity.this, SendVideoActivity.class);
 				break;

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

@@ -83,7 +83,7 @@ public class RoomInfoActivity extends BaseActivity {
     private TextView mNickNameTv;
     private TextView mCreateTime;
     private DataLoadView mDataLoadView;
-
+    private List<MucRoomMember> gridmembers;
     private List<MucRoomMember> mMembers;
     private GridViewAdapter mAdapter;
 
@@ -172,10 +172,11 @@ public class RoomInfoActivity extends BaseActivity {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 if (add_minus_count == 1) {
-                    if (position == mMembers.size() - 1) {
+                    if (gridmembers == null) return;
+                    if (position == gridmembers.size() - 1) {
                         List<String> existIds = new ArrayList<String>();
-                        for (int i = 0; i < mMembers.size() - 1; i++) {
-                            existIds.add(mMembers.get(i).getUserId());
+                        for (int i = 0; i < gridmembers.size() - 1; i++) {
+                            existIds.add(gridmembers.get(i).getUserId());
                         }
                         // 去添加人
                         Intent intent = new Intent(RoomInfoActivity.this, AddContactsActivity.class);
@@ -187,7 +188,7 @@ public class RoomInfoActivity extends BaseActivity {
                         startActivityForResult(intent, 1);
                     } else {
                         if (!doDel && !doBannedVoice) {
-                            MucRoomMember member = mMembers.get(position);
+                            MucRoomMember member = gridmembers.get(position);
                             if (member != null) {
                                 Intent intent = new Intent(RoomInfoActivity.this, BasicInfoActivity.class);
                                 intent.putExtra(AppConstant.EXTRA_USER_ID, member.getUserId());
@@ -196,10 +197,10 @@ public class RoomInfoActivity extends BaseActivity {
                         }
                     }
                 } else if (add_minus_count == 2) {
-                    if (position == mMembers.size() - 2) {
+                    if (position == gridmembers.size() - 2) {
                         List<String> existIds = new ArrayList<String>();
-                        for (int i = 0; i < mMembers.size() - 2; i++) {
-                            existIds.add(mMembers.get(i).getUserId());
+                        for (int i = 0; i < gridmembers.size() - 2; i++) {
+                            existIds.add(gridmembers.get(i).getUserId());
                         }
                         // 去添加人
                         Intent intent = new Intent(RoomInfoActivity.this, AddContactsActivity.class);
@@ -209,13 +210,13 @@ public class RoomInfoActivity extends BaseActivity {
                         intent.putExtra("roomDes", mRoomDescTv.getText().toString());
                         intent.putExtra("exist_ids", JSON.toJSONString(existIds));
                         startActivityForResult(intent, 1);
-                    } else if (position == mMembers.size() - 1) {
+                    } else if (position == gridmembers.size() - 1) {
                         // delete
                         doDel = true;
                         mAdapter.notifyDataSetInvalidated();
                     } else {
                         if (!doDel && !doBannedVoice) {
-                            MucRoomMember member = mMembers.get(position);
+                            MucRoomMember member = gridmembers.get(position);
                             if (member != null) {
                                 Intent intent = new Intent(RoomInfoActivity.this, BasicInfoActivity.class);
                                 intent.putExtra(AppConstant.EXTRA_USER_ID, member.getUserId());
@@ -550,6 +551,7 @@ public class RoomInfoActivity extends BaseActivity {
             if (id.equals(mLoginUserId))
                 members.add(new MucRoomMember());
             this.members.addAll(members);
+            gridmembers=this.members;
         }
 
         @Override

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

@@ -22,12 +22,12 @@
             android:layout_width="fill_parent"
             android:layout_height="fill_parent"
             android:layout_centerVertical="true"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
             android:background="@drawable/search_input"
             android:drawableLeft="@drawable/search"
             android:drawableRight="@drawable/search_clear"
             android:hint="@string/search"
-            android:layout_marginRight="10dp"
-            android:layout_marginLeft="10dp"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
             android:textSize="15sp" />
@@ -37,17 +37,27 @@
         android:id="@+id/my_data_rl"
         style="@style/IMTbleLine_UP">
 
+        <ImageView
+            android:id="@+id/avatar_img1"
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:layout_centerVertical="true"
+            android:contentDescription="@string/app_name"
+            android:src="@drawable/qiyetongxunlu" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/qiyetongxunlu"
+            android:layout_marginLeft="12dp"
+            android:layout_toRightOf="@+id/avatar_img1"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="企业架构"
             android:textColor="@color/text_main"
             android:textSize="14sp" />
 
+
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -61,13 +71,13 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="@dimen/line"
-        android:visibility="gone"
-        android:background="@color/item_line" />
+        android:background="@color/item_line"
+        android:visibility="gone" />
 
     <RelativeLayout
         android:id="@+id/my_friends_rl"
-        android:visibility="gone"
-        style="@style/IMTbleLine_UP">
+        style="@style/IMTbleLine_UP"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"
@@ -99,11 +109,20 @@
         android:id="@+id/my_friend_rl"
         style="@style/IMTbleLine_UP">
 
+        <ImageView
+            android:id="@+id/avatar_img"
+            android:layout_width="38dp"
+            android:layout_height="38dp"
+            android:layout_centerVertical="true"
+            android:contentDescription="@string/app_name"
+            android:src="@drawable/qunliao" />
+
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/qunliao"
+            android:layout_marginLeft="12dp"
+            android:layout_toRightOf="@+id/avatar_img"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="商务群"
@@ -127,8 +146,8 @@
 
     <RelativeLayout
         android:id="@+id/local_video_rl"
-        android:visibility="gone"
-        style="@style/IMTbleLine_UP">
+        style="@style/IMTbleLine_UP"
+        android:visibility="gone">
 
         <TextView
             android:layout_width="wrap_content"

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

@@ -32,8 +32,8 @@
 
         <Button
             android:id="@+id/btn_del"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
             android:layout_gravity="top|left"
             android:background="@drawable/bg_item_del" />
     </RelativeLayout>

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

@@ -10,8 +10,8 @@
     <dimen name="item_height">60.0dip</dimen>
     <dimen name="item_me_height">80.0dip</dimen>
     <dimen name="bar_height">80.0dip</dimen>
-    <dimen name="item_img_height">45.0dip</dimen>
-    <dimen name="item_img_width">45.0dip</dimen>
+    <dimen name="item_img_height">38dp</dimen>
+    <dimen name="item_img_width">38dp</dimen>
     <dimen name="LargestTextSize">30.0dip</dimen>
     <dimen name="BigerTextSize">24.0dip</dimen>
     <dimen name="BigTextSize">17.0dip</dimen>