Browse Source

Ui修改3.0

gongpm 9 years ago
parent
commit
9f6a9cfb65
25 changed files with 890 additions and 717 deletions
  1. 6 7
      WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticeMenuActivity.java
  2. 9 3
      WeiChat/src/main/java/com/sk/weichat/ui/erp/adapter/SchedultAdapter.java
  3. 372 366
      WeiChat/src/main/java/com/sk/weichat/ui/groupchat/SelectContactsActivity.java
  4. 2 3
      WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java
  5. 3 8
      WeiChat/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java
  6. BIN
      WeiChat/src/main/res/drawable-hdpi/iconfont_bokexinwen.png
  7. BIN
      WeiChat/src/main/res/drawable-hdpi/iconfont_gonggao.png
  8. BIN
      WeiChat/src/main/res/drawable-hdpi/iconfont_tongzhi.png
  9. BIN
      WeiChat/src/main/res/drawable-hdpi/login_ok.png
  10. BIN
      WeiChat/src/main/res/drawable-hdpi/roominfo_add_btn_pressed.png
  11. BIN
      WeiChat/src/main/res/drawable-hdpi/roominfo_minus_btn_pressed.png
  12. 4 4
      WeiChat/src/main/res/drawable/bg_room_info_add_btn.xml
  13. 4 4
      WeiChat/src/main/res/drawable/bg_room_info_minus_btn.xml
  14. 1 0
      WeiChat/src/main/res/layout/activity_notice_menu.xml
  15. 101 104
      WeiChat/src/main/res/layout/activity_room_info.xml
  16. 7 7
      WeiChat/src/main/res/layout/activity_select_contacts.xml
  17. 65 30
      WeiChat/src/main/res/layout/activity_user_search.xml
  18. 134 23
      WeiChat/src/main/res/layout/dialog_create_muc_room.xml
  19. 136 131
      WeiChat/src/main/res/layout/dy_listview_items_demo_style2.xml
  20. 33 14
      WeiChat/src/main/res/layout/item_room_info_view.xml
  21. 3 6
      WeiChat/src/main/res/layout/task_listview.xml
  22. 4 3
      WeiChat/src/main/res/menu/menu_state.xml
  23. 2 0
      WeiChat/src/main/res/values/dimens.xml
  24. 2 2
      WeiChat/src/main/res/values/strings.xml
  25. 2 2
      WeiChat/src/main/res/values/styles.xml

+ 6 - 7
WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticeMenuActivity.java

@@ -2,9 +2,8 @@ package com.sk.weichat.ui.erp.activity;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Handler;
-import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
@@ -16,11 +15,9 @@ import android.widget.TextView;
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.roamer.slidelistview.SlideBaseAdapter;
 import com.roamer.slidelistview.SlideListView;
-import com.sk.weichat.AppConstant;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
 import com.sk.weichat.bean.Friend;
-import com.sk.weichat.bean.message.MucRoom;
 import com.sk.weichat.bean.message.XmppMessage;
 import com.sk.weichat.broadcast.MsgBroadcast;
 import com.sk.weichat.db.dao.ChatMessageDao;
@@ -29,9 +26,6 @@ import com.sk.weichat.helper.AvatarHelper;
 import com.sk.weichat.sortlist.BaseSortModel;
 import com.sk.weichat.sortlist.PingYinUtil;
 import com.sk.weichat.ui.base.BaseActivity;
-import com.sk.weichat.ui.message.ChatActivity;
-import com.sk.weichat.ui.message.MucChatActivity;
-import com.sk.weichat.ui.message.NewFriendActivity;
 import com.sk.weichat.util.HtmlUtils;
 import com.sk.weichat.util.StringUtils;
 import com.sk.weichat.util.TimeUtils;
@@ -212,6 +206,11 @@ public class NoticeMenuActivity extends BaseActivity {
 
             final Friend friend = mFriendList.get(position).getBean();
 
+            if (position%2==0){
+                convertView.setBackgroundColor(getResources().getColor(R.color.item_color1));
+            }
+
+
             if (friend.getRoomFlag() == 0) {// 这是单个人
                 if (friend.getUserId().equals(Friend.ID_SYSTEM_MESSAGE)) {// 系统消息的头像
                     avatar_img.setImageResource(R.drawable.im_notice);

+ 9 - 3
WeiChat/src/main/java/com/sk/weichat/ui/erp/adapter/SchedultAdapter.java

@@ -1,8 +1,5 @@
 package com.sk.weichat.ui.erp.adapter;
 
-import java.text.SimpleDateFormat;
-import java.util.List;
-
 import android.content.Context;
 import android.text.Html;
 import android.view.LayoutInflater;
@@ -17,6 +14,9 @@ import com.sk.weichat.R;
 import com.sk.weichat.ui.erp.entity.AllProcess;
 import com.sk.weichat.ui.erp.util.ObjectUtils;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
 
 /**
  * @注释:待办事宜
@@ -79,6 +79,12 @@ public class SchedultAdapter extends BaseAdapter {
         } else {
             store = (Store) view.getTag();
         }
+
+        if (position % 2 == 0) {
+            view.setBackgroundColor(context.getResources().getColor(R.color.item_color1));
+        } else {
+            view.setBackgroundColor(context.getResources().getColor(R.color.item_color2));
+        }
         if (fields_object.getTypecode().equals("pagingrelease")) {// 知会
             String pTextView3Str = "发起人:<font color='#990000'>"
                     + fields_object.getRecorder() + "</font>";

+ 372 - 366
WeiChat/src/main/java/com/sk/weichat/ui/groupchat/SelectContactsActivity.java

@@ -17,7 +17,6 @@ import android.widget.AdapterView;
 import android.widget.BaseAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
-import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -31,10 +30,12 @@ import com.sk.weichat.R;
 import com.sk.weichat.bean.Area;
 import com.sk.weichat.bean.Friend;
 import com.sk.weichat.bean.MucRoomSimple;
+import com.sk.weichat.bean.User;
 import com.sk.weichat.bean.message.MucRoom;
 import com.sk.weichat.broadcast.CardcastUiUpdateUtil;
 import com.sk.weichat.broadcast.MucgroupUpdateUtil;
 import com.sk.weichat.db.dao.FriendDao;
+import com.sk.weichat.db.dao.UserDao;
 import com.sk.weichat.helper.AvatarHelper;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.message.MucChatActivity;
@@ -44,6 +45,7 @@ import com.sk.weichat.util.ProgressDialogUtil;
 import com.sk.weichat.util.TimeUtils;
 import com.sk.weichat.util.ToastUtil;
 import com.sk.weichat.util.ViewHolder;
+import com.sk.weichat.view.ClearEditText;
 import com.sk.weichat.view.HorizontalListView;
 import com.sk.weichat.volley.ObjectResult;
 import com.sk.weichat.volley.Result;
@@ -57,7 +59,6 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
  * @项目名称: SkWeiChat-Baidu
  * @包名: com.sk.weichat.ui.groupchat
  * @作者:王阳
@@ -70,368 +71,373 @@ import java.util.Map;
  */
 public class SelectContactsActivity extends BaseActivity {
 
-	private final int LAST_ICON = -1;
-
-	private ListView mListView;
-	private HorizontalListView mHorizontalListView;
-	private Button mOkBtn;
-
-	private List<Friend> mFriendList;
-	private ListViewAdapter mAdapter;
-	private List<Integer> mSelectPositions;
-	private HorListViewAdapter mHorAdapter;
-	public ProgressDialog mProgressDialog;
-
-	private String mLoginUserId;
-	private boolean mBind;
-	private CoreService mXmppService;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_select_contacts);
-		mFriendList = new ArrayList<Friend>();
-		mAdapter = new ListViewAdapter();
-		mSelectPositions = new ArrayList<Integer>();
-		mSelectPositions.add(LAST_ICON);// 增加一个虚线框的位置
-		mHorAdapter = new HorListViewAdapter();
-		mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-		initView();
-
-		mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
-	}
-
-	private ServiceConnection mServiceConnection = new ServiceConnection() {
-		@Override
-		public void onServiceDisconnected(ComponentName name) {
-			mXmppService = null;
-		}
-
-		@Override
-		public void onServiceConnected(ComponentName name, IBinder service) {
-			mXmppService = ((CoreServiceBinder) service).getService();
-		}
-	};
-
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		if (mBind) {
-			unbindService(mServiceConnection);
-		}
-	}
-
-	private void initView() {
-		getSupportActionBar().setTitle(R.string.select_contacts);
-		mListView = (ListView) findViewById(R.id.list_view);
-		mHorizontalListView = (HorizontalListView) findViewById(R.id.horizontal_list_view);
-		mOkBtn = (Button) findViewById(R.id.ok_btn);
-		mListView.setAdapter(mAdapter);
-		mHorizontalListView.setAdapter(mHorAdapter);
-		mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
-
-		mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
-				if (hasSelected(position)) {
-					removeSelect(position);
-				} else {
-					addSelect(position);
-				}
-			}
-		});
-
-		mHorizontalListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-			@Override
-			public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
-				if (position == mSelectPositions.size() - 1) {
-					return;
-				}
-				mSelectPositions.remove(position);
-				mAdapter.notifyDataSetInvalidated();
-				mHorAdapter.notifyDataSetInvalidated();
-				mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
-			}
-		});
-
-		mOkBtn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				showCreateGroupChatDialog();
-			}
-		});
-
-		mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait), false, false);
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		loadData();
-	}
-
-	private void loadData() {
-		List<Friend> userInfos = FriendDao.getInstance().getAllContacts(mLoginUserId);
-		if (userInfos != null) {
-			mFriendList.clear();
-			mFriendList.addAll(userInfos);
-			mAdapter.notifyDataSetChanged();
-		}
-	}
-
-	private void addSelect(int position) {
-		if (!hasSelected(position)) {
-			mSelectPositions.add(0, position);
-			mAdapter.notifyDataSetInvalidated();
-			mHorAdapter.notifyDataSetInvalidated();
-			mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
-		}
-	}
-
-	private boolean hasSelected(int position) {
-		for (int i = 0; i < mSelectPositions.size(); i++) {
-			if (mSelectPositions.get(i) == position) {
-				return true;
-			} else if (i == mSelectPositions.size() - 1) {
-				return false;
-			}
-		}
-		return false;
-	}
-
-	private void removeSelect(int position) {
-		mSelectPositions.remove(Integer.valueOf(position));
-		mAdapter.notifyDataSetInvalidated();
-		mHorAdapter.notifyDataSetInvalidated();
-		mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
-	}
-
-
-
-
-	private class ListViewAdapter extends BaseAdapter {
-		@Override
-		public int getCount() {
-			return mFriendList.size();
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return mFriendList.get(position);
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			if (convertView == null) {
-				convertView = LayoutInflater.from(mContext).inflate(R.layout.row_select_contacts, parent, false);
-			}
-			ImageView avatarImg = ViewHolder.get(convertView, R.id.avatar_img);
-			TextView userNameTv = ViewHolder.get(convertView, R.id.user_name_tv);
-			CheckBox checkBox = ViewHolder.get(convertView, R.id.check_box);
-			AvatarHelper.getInstance().displayAvatar(mFriendList.get(position).getUserId(), avatarImg, true);
-			userNameTv.setText(mFriendList.get(position).getNickName());
-			checkBox.setChecked(false);
-			if (mSelectPositions.contains(Integer.valueOf(position))) {
-				checkBox.setChecked(true);
-			}
-			return convertView;
-		}
-
-	}
-
-	private class HorListViewAdapter extends BaseAdapter {
-		@Override
-		public int getCount() {
-			return mSelectPositions.size();
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return mSelectPositions.get(position);
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public View getView(int position, View convertView, ViewGroup parent) {
-			if (convertView == null) {
-				convertView = new ImageView(mContext);
-				int size = DisplayUtil.dip2px(mContext, 37);
-				AbsListView.LayoutParams param = new AbsListView.LayoutParams(size, size);
-				convertView.setLayoutParams(param);
-			}
-			ImageView imageView = (ImageView) convertView;
-			int selectPosition = mSelectPositions.get(position);
-			if (selectPosition == -1) {
-				imageView.setImageResource(R.drawable.dot_avatar);
-			} else {
-				if (selectPosition >= 0 && selectPosition < mFriendList.size()) {
-					AvatarHelper.getInstance().displayAvatar(mFriendList.get(selectPosition).getUserId(), imageView,
-							true);
-				}
-			}
-			return convertView;
-		}
-	}
-
-	
-	private void showCreateGroupChatDialog() {
-		if (mXmppService == null || !mXmppService.isMucEnable()) {
-			ToastUtil.showToast(mContext, R.string.service_start_failed);
-			return;
-		}
-		View rootView = LayoutInflater.from(mContext).inflate(R.layout.dialog_create_muc_room, null);
-		final EditText roomNameEdit = (EditText) rootView.findViewById(R.id.room_name_edit);
-		// final EditText roomSubjectEdit = (EditText)
-		// rootView.findViewById(R.id.room_subject_edit);
-		final EditText roomDescEdit = (EditText) rootView.findViewById(R.id.room_desc_edit);
-		final Button sure_btn = (Button) rootView.findViewById(R.id.sure_btn);
-
-		ToastUtil.addEditTextNumChanged(SelectContactsActivity.this, roomNameEdit, 8);// 设置EditText的字数限制
-		ToastUtil.addEditTextNumChanged(SelectContactsActivity.this, roomDescEdit, 20);
-
-		final AlertDialog dialog = new AlertDialog.Builder(this).setTitle(R.string.create_room).setView(rootView)
-				.create();
-		sure_btn.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				String roomName = roomNameEdit.getText().toString().trim();//防止空,或者输入空格
-				if (TextUtils.isEmpty(roomName)) {
-					ToastUtil.showToast(mContext, R.string.room_name_empty_error);
-					return;
-				}
-				// String roomSubject = roomSubjectEdit.getText().toString();
-				String roomDesc = roomDescEdit.getText().toString();
-				if (TextUtils.isEmpty(roomName)) {
-					ToastUtil.showToast(mContext, R.string.room_des_empty_error);
-					return;
-				}
-				createGroupChat(roomName, null, roomDesc);
-				dialog.dismiss();
-			}
-		});
-		dialog.show();
-	}
-
-	private void createGroupChat(final String roomName, String roomSubject, final String roomDesc) {
-		String nickName = MyApplication.getInstance().mLoginUser.getNickName();
-		final String roomJid = mXmppService.createMucRoom(nickName, roomName, roomSubject, roomDesc);
-		if (TextUtils.isEmpty(roomJid)) {
-			ToastUtil.showToast(mContext, R.string.create_room_failed);
-			return;
-		}
-
-		Map<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("jid", roomJid);
-		params.put("name", roomName);
-		params.put("desc", roomDesc);
-		params.put("countryId", String.valueOf(Area.getDefaultCountyId()));// 国家Id
-
-		Area area = Area.getDefaultProvince();
-		if (area != null) {
-			params.put("provinceId", String.valueOf(area.getId()));// 省份Id
-		}
-		area = Area.getDefaultCity();
-		if (area != null) {
-			params.put("cityId", String.valueOf(area.getId()));// 城市Id
-			area = Area.getDefaultDistrict(area.getId());
-			if (area != null) {
-				params.put("areaId", String.valueOf(area.getId()));// 城市Id
-			}
-		}
-
-		double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
-		double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
-		if (latitude != 0)
-			params.put("latitude", String.valueOf(latitude));
-		if (longitude != 0)
-			params.put("longitude", String.valueOf(longitude));
-
-		List<String> inviteUsers = new ArrayList<String>();
-		// 邀请好友
-		for (int i = 0; i < mSelectPositions.size(); i++) {
-			if (mSelectPositions.get(i) == -1) {
-				continue;
-			}
-			String userId = mFriendList.get(mSelectPositions.get(i)).getUserId();
-			inviteUsers.add(userId);
-		}
-		params.put("text", JSON.toJSONString(inviteUsers));
-
-		ProgressDialogUtil.show(mProgressDialog);
-		StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(mConfig.ROOM_ADD,
-				new Response.ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<MucRoom>() {
-					@Override
-					public void onResponse(ObjectResult<MucRoom> result) {
-						boolean parserResult = Result.defaultParser(mContext, result, true);
-						if (parserResult && result.getData() != null) {
-							createRoomSuccess(result.getData().getId(), roomJid, roomName, roomDesc);
-						}
-						ProgressDialogUtil.dismiss(mProgressDialog);
-					}
-				}, MucRoom.class, params);
-		addDefaultRequest(request);
-	}
-
-	private void createRoomSuccess(String roomId, String roomJid, String roomName, String roomDesc) {
-		Friend friend = new Friend();// 将房间也存为好友
-		friend.setOwnerId(mLoginUserId);
-		friend.setUserId(roomJid);
-		friend.setNickName(roomName);
-		friend.setDescription(roomDesc);
-		friend.setRoomFlag(1);
-		friend.setRoomId(roomId);
-		friend.setRoomCreateUserId(mLoginUserId);
-		// timeSend作为取群聊离线消息的标志,所以要在这里设置一个初始值
-		friend.setTimeSend(TimeUtils.sk_time_current_time());
-		friend.setStatus(Friend.STATUS_FRIEND);
-		FriendDao.getInstance().createOrUpdateFriend(friend);
-		// 更新名片盒(可能需要更新)
-		CardcastUiUpdateUtil.broadcastUpdateUi(this);
-		// 更新群聊界面
-		MucgroupUpdateUtil.broadcastUpdateUi(this);
-
-		MucRoomSimple mucRoomSimple = new MucRoomSimple();
-		mucRoomSimple.setId(roomId);
-		mucRoomSimple.setJid(roomJid);
-		mucRoomSimple.setName(roomName);
-		mucRoomSimple.setDesc(roomDesc);
-		mucRoomSimple.setUserId(mLoginUserId);
-		mucRoomSimple.setTimeSend(TimeUtils.sk_time_current_time());
-		String reason = JSON.toJSONString(mucRoomSimple);
-		Log.d("roamer", "reason:" + reason);
-		// 邀请好友
-		String[] noticeFriendList=new String[mSelectPositions.size()];
-		for (int i = 0; i < mSelectPositions.size(); i++) {
-			if (mSelectPositions.get(i) == -1) {
-				continue;
-			}
-			String firendUserId = mFriendList.get(mSelectPositions.get(i)).getUserId();
-			noticeFriendList[i]=firendUserId;
-			mXmppService.invite(roomJid, firendUserId, reason);
-		}
-
-		Intent intent = new Intent(this, MucChatActivity.class);
-		intent.putExtra(AppConstant.EXTRA_USER_ID, roomJid);
-		intent.putExtra(AppConstant.EXTRA_NICK_NAME, roomName);
-		intent.putExtra(AppConstant.EXTRA_IS_GROUP_CHAT, true);
-		intent.putExtra(Constants.GROUP_JOIN_NOTICE,noticeFriendList);
-		startActivity(intent);
-		finish();
-	}
+    private final int LAST_ICON = -1;
+
+    private ListView mListView;
+    private HorizontalListView mHorizontalListView;
+    private Button mOkBtn;
+
+    private List<Friend> mFriendList;
+    private ListViewAdapter mAdapter;
+    private List<Integer> mSelectPositions;
+    private HorListViewAdapter mHorAdapter;
+    public ProgressDialog mProgressDialog;
+
+    private String mLoginUserId;
+    private boolean mBind;
+    private CoreService mXmppService;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_contacts);
+        mFriendList = new ArrayList<Friend>();
+        mAdapter = new ListViewAdapter();
+        mSelectPositions = new ArrayList<Integer>();
+        mSelectPositions.add(LAST_ICON);// 增加一个虚线框的位置
+        mHorAdapter = new HorListViewAdapter();
+        mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        initView();
+
+        mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
+    }
+
+    private ServiceConnection mServiceConnection = new ServiceConnection() {
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mXmppService = null;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mXmppService = ((CoreServiceBinder) service).getService();
+        }
+    };
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mBind) {
+            unbindService(mServiceConnection);
+        }
+    }
+
+    private void initView() {
+        getSupportActionBar().setTitle(R.string.select_contacts);
+        mListView = (ListView) findViewById(R.id.list_view);
+        mHorizontalListView = (HorizontalListView) findViewById(R.id.horizontal_list_view);
+        mOkBtn = (Button) findViewById(R.id.ok_btn);
+        mListView.setAdapter(mAdapter);
+        mHorizontalListView.setAdapter(mHorAdapter);
+        mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
+
+        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
+                if (hasSelected(position)) {
+                    removeSelect(position);
+                } else {
+                    addSelect(position);
+                }
+            }
+        });
+
+        mHorizontalListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> arg0, View arg1, int position, long arg3) {
+                if (position == mSelectPositions.size() - 1) {
+                    return;
+                }
+                mSelectPositions.remove(position);
+                mAdapter.notifyDataSetInvalidated();
+                mHorAdapter.notifyDataSetInvalidated();
+                mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
+            }
+        });
+
+        mOkBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showCreateGroupChatDialog();
+            }
+        });
+
+        mProgressDialog = ProgressDialogUtil.init(mContext, null, getString(R.string.please_wait), false, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        loadData();
+    }
+
+    private void loadData() {
+        List<Friend> userInfos = FriendDao.getInstance().getAllContacts(mLoginUserId);
+        if (userInfos != null) {
+            mFriendList.clear();
+            mFriendList.addAll(userInfos);
+            mAdapter.notifyDataSetChanged();
+        }
+    }
+
+    private void addSelect(int position) {
+        if (!hasSelected(position)) {
+            mSelectPositions.add(0, position);
+            mAdapter.notifyDataSetInvalidated();
+            mHorAdapter.notifyDataSetInvalidated();
+            mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
+        }
+    }
+
+    private boolean hasSelected(int position) {
+        for (int i = 0; i < mSelectPositions.size(); i++) {
+            if (mSelectPositions.get(i) == position) {
+                return true;
+            } else if (i == mSelectPositions.size() - 1) {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    private void removeSelect(int position) {
+        mSelectPositions.remove(Integer.valueOf(position));
+        mAdapter.notifyDataSetInvalidated();
+        mHorAdapter.notifyDataSetInvalidated();
+        mOkBtn.setText(getString(R.string.add_chat_ok_btn, mSelectPositions.size() - 1));
+    }
+
+
+    private class ListViewAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return mFriendList.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mFriendList.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = LayoutInflater.from(mContext).inflate(R.layout.row_select_contacts, parent, false);
+            }
+            ImageView avatarImg = ViewHolder.get(convertView, R.id.avatar_img);
+            TextView userNameTv = ViewHolder.get(convertView, R.id.user_name_tv);
+            CheckBox checkBox = ViewHolder.get(convertView, R.id.check_box);
+            AvatarHelper.getInstance().displayAvatar(mFriendList.get(position).getUserId(), avatarImg, true);
+            userNameTv.setText(mFriendList.get(position).getNickName());
+            checkBox.setChecked(false);
+            if (mSelectPositions.contains(Integer.valueOf(position))) {
+                checkBox.setChecked(true);
+            }
+            return convertView;
+        }
+
+    }
+
+    private class HorListViewAdapter extends BaseAdapter {
+        @Override
+        public int getCount() {
+            return mSelectPositions.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return mSelectPositions.get(position);
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            if (convertView == null) {
+                convertView = new ImageView(mContext);
+                int size = DisplayUtil.dip2px(mContext, 37);
+                AbsListView.LayoutParams param = new AbsListView.LayoutParams(size, size);
+                convertView.setLayoutParams(param);
+            }
+            ImageView imageView = (ImageView) convertView;
+            int selectPosition = mSelectPositions.get(position);
+            if (selectPosition == -1) {
+                imageView.setImageResource(R.drawable.dot_avatar);
+            } else {
+                if (selectPosition >= 0 && selectPosition < mFriendList.size()) {
+                    AvatarHelper.getInstance().displayAvatar(mFriendList.get(selectPosition).getUserId(), imageView,
+                            true);
+                }
+            }
+            return convertView;
+        }
+    }
+
+
+    private void showCreateGroupChatDialog() {
+
+        if (mXmppService == null || !mXmppService.isMucEnable()) {
+            ToastUtil.showToast(mContext, R.string.service_start_failed);
+            return;
+        }
+        View rootView = LayoutInflater.from(mContext).inflate(R.layout.dialog_create_muc_room, null);
+        final ClearEditText roomNameEdit = (ClearEditText) rootView.findViewById(R.id.room_name_edit);
+        TextView tvName = (TextView) rootView.findViewById(R.id.creater_name);
+        TextView tvNum = (TextView) rootView.findViewById(R.id.tv_num);
+        User user = UserDao.getInstance().getUserByUserId(mLoginUserId);
+        tvNum.setText(mSelectPositions.size()+"/1000");
+        tvName.setText(MyApplication.getInstance().mLoginUser.getNickName());
+        // final EditText roomSubjectEdit = (EditText)
+        // rootView.findViewById(R.id.room_subject_edit);
+        final ClearEditText roomDescEdit = (ClearEditText) rootView.findViewById(R.id.room_desc_edit);
+        final ImageView sure_btn = (ImageView) rootView.findViewById(R.id.sure_btn);
+
+        ToastUtil.addEditTextNumChanged(SelectContactsActivity.this, roomNameEdit, 8);// 设置EditText的字数限制
+        ToastUtil.addEditTextNumChanged(SelectContactsActivity.this, roomDescEdit, 20);
+
+        final AlertDialog dialog = new AlertDialog.Builder(this).setTitle(R.string.create_room).setView(rootView)
+                .create();
+
+        sure_btn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                String roomName = roomNameEdit.getText().toString().trim();//防止空,或者输入空格
+                if (TextUtils.isEmpty(roomName)) {
+                    ToastUtil.showToast(mContext, R.string.room_name_empty_error);
+                    return;
+                }
+                // String roomSubject = roomSubjectEdit.getText().toString();
+                String roomDesc = roomDescEdit.getText().toString();
+                if (TextUtils.isEmpty(roomName)) {
+                    ToastUtil.showToast(mContext, R.string.room_des_empty_error);
+                    return;
+                }
+                createGroupChat(roomName, null, roomDesc);
+                dialog.dismiss();
+            }
+        });
+        dialog.show();
+    }
+
+    private void createGroupChat(final String roomName, String roomSubject, final String roomDesc) {
+        String nickName = MyApplication.getInstance().mLoginUser.getNickName();
+        final String roomJid = mXmppService.createMucRoom(nickName, roomName, roomSubject, roomDesc);
+        if (TextUtils.isEmpty(roomJid)) {
+            ToastUtil.showToast(mContext, R.string.create_room_failed);
+            return;
+        }
+
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("jid", roomJid);
+        params.put("name", roomName);
+        params.put("desc", roomDesc);
+        params.put("countryId", String.valueOf(Area.getDefaultCountyId()));// 国家Id
+
+        Area area = Area.getDefaultProvince();
+        if (area != null) {
+            params.put("provinceId", String.valueOf(area.getId()));// 省份Id
+        }
+        area = Area.getDefaultCity();
+        if (area != null) {
+            params.put("cityId", String.valueOf(area.getId()));// 城市Id
+            area = Area.getDefaultDistrict(area.getId());
+            if (area != null) {
+                params.put("areaId", String.valueOf(area.getId()));// 城市Id
+            }
+        }
+
+        double latitude = MyApplication.getInstance().getBdLocationHelper().getLatitude();
+        double longitude = MyApplication.getInstance().getBdLocationHelper().getLongitude();
+        if (latitude != 0)
+            params.put("latitude", String.valueOf(latitude));
+        if (longitude != 0)
+            params.put("longitude", String.valueOf(longitude));
+
+        List<String> inviteUsers = new ArrayList<String>();
+        // 邀请好友
+        for (int i = 0; i < mSelectPositions.size(); i++) {
+            if (mSelectPositions.get(i) == -1) {
+                continue;
+            }
+            String userId = mFriendList.get(mSelectPositions.get(i)).getUserId();
+            inviteUsers.add(userId);
+        }
+        params.put("text", JSON.toJSONString(inviteUsers));
+
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<MucRoom> request = new StringJsonObjectRequest<MucRoom>(mConfig.ROOM_ADD,
+                new Response.ErrorListener() {
+                    @Override
+                    public void onErrorResponse(VolleyError arg0) {
+                        ProgressDialogUtil.dismiss(mProgressDialog);
+                        ToastUtil.showErrorNet(mContext);
+                    }
+                }, new StringJsonObjectRequest.Listener<MucRoom>() {
+            @Override
+            public void onResponse(ObjectResult<MucRoom> result) {
+                boolean parserResult = Result.defaultParser(mContext, result, true);
+                if (parserResult && result.getData() != null) {
+                    createRoomSuccess(result.getData().getId(), roomJid, roomName, roomDesc);
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, MucRoom.class, params);
+        addDefaultRequest(request);
+    }
+
+    private void createRoomSuccess(String roomId, String roomJid, String roomName, String roomDesc) {
+        Friend friend = new Friend();// 将房间也存为好友
+        friend.setOwnerId(mLoginUserId);
+        friend.setUserId(roomJid);
+        friend.setNickName(roomName);
+        friend.setDescription(roomDesc);
+        friend.setRoomFlag(1);
+        friend.setRoomId(roomId);
+        friend.setRoomCreateUserId(mLoginUserId);
+        // timeSend作为取群聊离线消息的标志,所以要在这里设置一个初始值
+        friend.setTimeSend(TimeUtils.sk_time_current_time());
+        friend.setStatus(Friend.STATUS_FRIEND);
+        FriendDao.getInstance().createOrUpdateFriend(friend);
+        // 更新名片盒(可能需要更新)
+        CardcastUiUpdateUtil.broadcastUpdateUi(this);
+        // 更新群聊界面
+        MucgroupUpdateUtil.broadcastUpdateUi(this);
+
+        MucRoomSimple mucRoomSimple = new MucRoomSimple();
+        mucRoomSimple.setId(roomId);
+        mucRoomSimple.setJid(roomJid);
+        mucRoomSimple.setName(roomName);
+        mucRoomSimple.setDesc(roomDesc);
+        mucRoomSimple.setUserId(mLoginUserId);
+        mucRoomSimple.setTimeSend(TimeUtils.sk_time_current_time());
+        String reason = JSON.toJSONString(mucRoomSimple);
+        Log.d("roamer", "reason:" + reason);
+        // 邀请好友
+        String[] noticeFriendList = new String[mSelectPositions.size()];
+        for (int i = 0; i < mSelectPositions.size(); i++) {
+            if (mSelectPositions.get(i) == -1) {
+                continue;
+            }
+            String firendUserId = mFriendList.get(mSelectPositions.get(i)).getUserId();
+            noticeFriendList[i] = firendUserId;
+            mXmppService.invite(roomJid, firendUserId, reason);
+        }
+
+        Intent intent = new Intent(this, MucChatActivity.class);
+        intent.putExtra(AppConstant.EXTRA_USER_ID, roomJid);
+        intent.putExtra(AppConstant.EXTRA_NICK_NAME, roomName);
+        intent.putExtra(AppConstant.EXTRA_IS_GROUP_CHAT, true);
+        intent.putExtra(Constants.GROUP_JOIN_NOTICE, noticeFriendList);
+        startActivity(intent);
+        finish();
+    }
 }

+ 2 - 3
WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java

@@ -61,7 +61,6 @@ import com.sk.weichat.util.ProgressDialogUtil;
 import com.sk.weichat.util.StringUtils;
 import com.sk.weichat.util.TimeUtils;
 import com.sk.weichat.util.ToastUtil;
-import com.sk.weichat.util.ViewAlphaUtil;
 import com.sk.weichat.util.ViewHolder;
 import com.sk.weichat.view.ClearEditText;
 import com.sk.weichat.view.PullToRefreshSlideListView;
@@ -488,7 +487,7 @@ public class MessageFragment extends EasyFragment {
 
             if (friend.getRoomFlag() == 0) {// 这是单个人
                 if (friend.getUserId().equals(Friend.ID_SYSTEM_MESSAGE)) {// 系统消息的头像
-                    avatar_img.setImageResource(R.drawable.home_image_03_u);
+                    avatar_img.setImageResource(R.drawable.system_img);
                 } else if (friend.getUserId().equals(Friend.ID_NEW_FRIEND_MESSAGE)) {// 新朋友的头像
                     avatar_img.setImageResource(R.drawable.friend_u);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_PROCESS)) { //待办
@@ -498,7 +497,7 @@ public class MessageFragment extends EasyFragment {
                 } else if (friend.getUserId().equals(Friend.ID_ERP_ZHIHUI)) {
                     avatar_img.setImageResource(R.drawable.home_image_03_u);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_NEWS)) {
-                    avatar_img.setImageResource(R.drawable.iconfont_bokexinwen);
+                        avatar_img.setImageResource(R.drawable.iconfont_bokexinwen);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_NOTICE)) {
                     avatar_img.setImageResource(R.drawable.iconfont_tongzhi);
                 } else if (friend.getUserId().equals(Friend.ID_ERP_GONGGAO)) {

+ 3 - 8
WeiChat/src/main/java/com/sk/weichat/ui/message/RoomInfoActivity.java

@@ -24,7 +24,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
-import com.android.volley.Response;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
 import com.sk.weichat.AppConstant;
@@ -34,21 +33,14 @@ import com.sk.weichat.bean.Friend;
 import com.sk.weichat.bean.message.MucRoom;
 import com.sk.weichat.bean.message.MucRoom.Notice;
 import com.sk.weichat.bean.message.MucRoomMember;
-import com.sk.weichat.bean.message.NewFriendMessage;
-import com.sk.weichat.bean.message.XmppMessage;
 import com.sk.weichat.broadcast.MsgBroadcast;
 import com.sk.weichat.db.dao.ChatMessageDao;
 import com.sk.weichat.db.dao.FriendDao;
 import com.sk.weichat.helper.AvatarHelper;
-import com.sk.weichat.helper.FriendHelper;
-import com.sk.weichat.sortlist.BaseSortModel;
 import com.sk.weichat.ui.base.BaseActivity;
-import com.sk.weichat.ui.cardcast.CardcastActivity;
 import com.sk.weichat.ui.circle.BasicInfoActivity;
 import com.sk.weichat.ui.erp.activity.CommonFragmentActivity;
-import com.sk.weichat.ui.erp.activity.CompanyContactsActivity;
 import com.sk.weichat.ui.erp.net.ViewUtil;
-import com.sk.weichat.ui.erp.util.CommonUtil;
 import com.sk.weichat.util.DateFormatUtil;
 import com.sk.weichat.util.ProgressDialogUtil;
 import com.sk.weichat.util.TimeUtils;
@@ -542,6 +534,7 @@ public class RoomInfoActivity extends BaseActivity {
         public View getView(final int position, View convertView, ViewGroup parent) {
             View view = LayoutInflater.from(RoomInfoActivity.this).inflate(R.layout.item_room_info_view, parent, false);
             ImageView imageView = (ImageView) view.findViewById(R.id.content);
+            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)) {
@@ -558,6 +551,7 @@ public class RoomInfoActivity extends BaseActivity {
                     }
                 }
                 button.setVisibility(View.GONE);
+
                 if (doDel | doBannedVoice) {
                     view.setVisibility(View.GONE);
                 } else {
@@ -565,6 +559,7 @@ 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);
                 if (doDel | doBannedVoice) {
                     button.setVisibility(View.VISIBLE);

BIN
WeiChat/src/main/res/drawable-hdpi/iconfont_bokexinwen.png


BIN
WeiChat/src/main/res/drawable-hdpi/iconfont_gonggao.png


BIN
WeiChat/src/main/res/drawable-hdpi/iconfont_tongzhi.png


BIN
WeiChat/src/main/res/drawable-hdpi/login_ok.png


BIN
WeiChat/src/main/res/drawable-hdpi/roominfo_add_btn_pressed.png


BIN
WeiChat/src/main/res/drawable-hdpi/roominfo_minus_btn_pressed.png


+ 4 - 4
WeiChat/src/main/res/drawable/bg_room_info_add_btn.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/roominfo_add_btn_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/roominfo_add_btn_pressed" />
-    <item android:state_pressed="true" android:drawable="@drawable/roominfo_add_btn_pressed" />
-    <item android:drawable="@drawable/roominfo_add_btn_normal" />
+    <item android:state_focused="true" android:drawable="@drawable/roominfo_add_btn_normal" />
+    <item android:state_selected="true" android:drawable="@drawable/roominfo_add_btn_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/roominfo_add_btn_normal" />
+    <item android:drawable="@drawable/roominfo_add_btn_pressed" />
 </selector>

+ 4 - 4
WeiChat/src/main/res/drawable/bg_room_info_minus_btn.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector
   xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_focused="true" android:drawable="@drawable/roominfo_minus_btn_pressed" />
-    <item android:state_selected="true" android:drawable="@drawable/roominfo_minus_btn_pressed" />
-    <item android:state_pressed="true" android:drawable="@drawable/roominfo_minus_btn_pressed" />
-    <item android:drawable="@drawable/roominfo_minus_btn_normal" />
+    <item android:state_focused="true" android:drawable="@drawable/roominfo_minus_btn_normal" />
+    <item android:state_selected="true" android:drawable="@drawable/roominfo_minus_btn_normal" />
+    <item android:state_pressed="true" android:drawable="@drawable/roominfo_minus_btn_normal" />
+    <item android:drawable="@drawable/roominfo_minus_btn_pressed" />
 </selector>

+ 1 - 0
WeiChat/src/main/res/layout/activity_notice_menu.xml

@@ -4,6 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
     tools:context="com.sk.weichat.ui.erp.activity.NoticeMenuActivity">
     <com.sk.weichat.view.PullToRefreshSlideListView
         android:id="@+id/pull_refresh_list"

+ 101 - 104
WeiChat/src/main/res/layout/activity_room_info.xml

@@ -1,22 +1,22 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_main">
 
     <ScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:padding="9dp" >
+            android:orientation="vertical">
 
             <RelativeLayout
                 android:id="@+id/notice_rl"
-                style="@style/IMTbleLine_UP" >
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:id="@+id/notice_text"
@@ -25,14 +25,14 @@
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/notice"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
                 <TextView
                     android:id="@+id/notice_tv"
                     style="@style/IMTbleLine_TextValue"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginTop="3dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="10dp"
                     android:layout_toLeftOf="@+id/notice_arrow_img"
                     android:layout_toRightOf="@+id/notice_text"
                     android:gravity="left"
@@ -41,10 +41,11 @@
 
                 <ImageView
                     android:id="@+id/notice_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:alpha="0.26"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
@@ -53,19 +54,21 @@
                 android:id="@+id/grid_view"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
+                android:layout_marginTop="@dimen/line_min"
+                android:background="@color/item_color1"
                 android:cacheColorHint="#00000000"
                 android:gravity="fill"
                 android:horizontalSpacing="20dp"
                 android:listSelector="#00000000"
-                android:numColumns="4"
+                android:numColumns="5"
                 android:padding="10dp"
                 android:scrollbars="none"
                 android:verticalSpacing="20dp" />
 
             <RelativeLayout
                 android:id="@+id/room_name_rl"
-                style="@style/IMTbleLine_UP"
-                android:layout_marginTop="9dp" >
+                style="@style/IMTbleLine"
+                android:layout_marginTop="@dimen/line_min">
 
                 <TextView
                     android:id="@+id/room_name_text"
@@ -74,60 +77,64 @@
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/room_name"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
                 <TextView
                     android:id="@+id/room_name_tv"
                     style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/room_name_arrow_img"
                     android:layout_toRightOf="@+id/room_name_text"
-                    android:textColor="@color/dark_dark_grey" />
+                    android:textColor="@color/text_hine" />
 
                 <ImageView
                     android:id="@+id/room_name_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:alpha="0.26"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/room_desc_rl"
-                style="@style/IMTbleLine_UP" >
+                style="@style/IMTbleLine"
+                android:layout_marginTop="@dimen/line_min">
 
                 <TextView
                     android:id="@+id/room_desc_text"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/room_desc"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
                 <TextView
                     android:id="@+id/room_desc_tv"
                     style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/room_desc_arrow_img"
                     android:layout_toRightOf="@+id/room_desc_text"
-                    android:textColor="@color/dark_dark_grey" />
+                    android:textColor="@color/text_hine" />
 
                 <ImageView
                     android:id="@+id/room_desc_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:alpha="0.26"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/creator_rl"
-                style="@style/IMTbleLine_UP" >
+                style="@style/IMTbleLine"
+                android:layout_marginTop="@dimen/line_min">
 
                 <TextView
                     android:id="@+id/creator_text"
@@ -136,8 +143,8 @@
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/creator"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
                 <TextView
                     android:id="@+id/creator_tv"
@@ -148,40 +155,38 @@
 
                 <ImageView
                     android:id="@+id/creator_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:alpha="0.26"
                     android:background="@drawable/set_list_next"
-                    android:contentDescription="@string/app_name"
-                    android:visibility="invisible" />
+                    android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            
-            <RelativeLayout 
+
+            <RelativeLayout
                 android:id="@+id/create_time_rl"
-                style="@style/IMTbleLine_UP"
-                >
-                
-                <TextView 
+                style="@style/IMTbleLine"
+                android:layout_marginTop="@dimen/line_min">
+
+                <TextView
                     android:id="@+id/create_time_text"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/create_time"
-                    android:textColor="@color/black"
-                    android:textSize="14sp"
-                    />
-                
-                <TextView 
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
                     android:id="@+id/create_timer"
-                     style="@style/IMTbleLine_TextValue"
+                    style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/create_time_image"
                     android:layout_toRightOf="@+id/create_time_text"
-                    android:textColor="@color/dark_dark_grey"
-                    />
-                
-                <ImageView 
+                    android:textColor="@color/dark_dark_grey" />
+
+                <ImageView
                     android:id="@+id/create_time_image"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -189,14 +194,14 @@
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name"
-                    android:visibility="invisible"
-                    />
-                
+                    android:visibility="invisible" />
+
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/count_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine"
+                android:layout_marginTop="@dimen/line_min">
 
                 <TextView
                     android:id="@+id/count_text"
@@ -205,20 +210,20 @@
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/people_count"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
                 <TextView
                     android:id="@+id/count_tv"
                     style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/count_arrow_img"
                     android:layout_toRightOf="@+id/count_text"
-                    android:textColor="@color/dark_dark_grey" />
+                    android:textColor="@color/text_hine" />
 
                 <ImageView
                     android:id="@+id/count_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"
@@ -229,7 +234,7 @@
             <RelativeLayout
                 android:id="@+id/nick_name_rl"
                 style="@style/IMTbleLine"
-                android:layout_marginTop="9dp" >
+                android:layout_marginTop="@dimen/line_min">
 
                 <TextView
                     android:id="@+id/nick_name_text"
@@ -238,31 +243,33 @@
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/my_nick_name"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
                 <TextView
                     android:id="@+id/nick_name_tv"
                     style="@style/IMTbleLine_TextValue"
                     android:layout_toLeftOf="@+id/nick_name_arrow_img"
                     android:layout_toRightOf="@+id/nick_name_text"
-                    android:textColor="@color/dark_dark_grey" />
+                    android:textColor="@color/text_hine" />
 
                 <ImageView
                     android:id="@+id/nick_name_arrow_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:alpha="0.26"
                     android:background="@drawable/set_list_next"
                     android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            
-            <RelativeLayout 
+
+            <RelativeLayout
                 android:id="@+id/shield_chat_rl"
-                style="@style/IMTbleLine_UP"
-                >
-                <TextView 
+                style="@style/IMTbleLine"
+                android:layout_marginTop="@dimen/line_min">
+
+                <TextView
                     android:id="@+id/shield_chat_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -270,49 +277,38 @@
                     android:gravity="center"
                     android:text="@string/shield_chat"
                     android:textColor="@color/black"
-                    android:textSize="14sp"
-                    />
-                
-                <ImageView 
+                    android:textSize="14sp" />
+
+                <ImageView
                     android:id="@+id/shield_chat_image"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
+                    android:alpha="0.26"
                     android:background="@drawable/set_list_next"
-                    android:contentDescription="@string/app_name"
-                    />    
+                    android:contentDescription="@string/app_name" />
             </RelativeLayout>
 
+
             <RelativeLayout
                 android:id="@+id/exit_room_rl"
                 style="@style/IMTbleLine_UP"
-                >
-                <TextView
-                    android:id="@+id/exit_room_text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:gravity="center"
-                    android:text="@string/banned_exit_room"
-                    android:textColor="@color/black"
-                    android:textSize="14sp"
-                    />
+                android:layout_marginTop="@dimen/line_big">
 
                 <ImageView
+                    android:layout_margin="5dp"
                     android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/set_list_next"
-                    android:contentDescription="@string/app_name"
-                    />
+                    android:layout_height="match_parent"
+                    android:layout_centerInParent="true"
+                    android:src="@drawable/exit_rom" />
+
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/banned_voice_rl"
                 style="@style/IMTbleLine"
-                android:layout_marginTop="9dp" >
+                android:layout_marginTop="@dimen/line_min">
 
                 <TextView
                     android:id="@+id/banned_voice_text"
@@ -321,13 +317,13 @@
                     android:layout_centerVertical="true"
                     android:gravity="center"
                     android:text="@string/banned_voice"
-                    android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textColor="@color/text_main"
+                    android:textSize="@dimen/text_main" />
 
                 <ImageView
                     android:id="@+id/banned_voice_img"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"
@@ -336,7 +332,8 @@
 
             <RelativeLayout
                 android:id="@+id/banned_delete_rl"
-                style="@style/IMTbleLine">
+                style="@style/IMTbleLine"
+                android:layout_marginTop="@dimen/line_min">
 
                 <TextView
                     android:id="@+id/banned_delete_room_text"
@@ -346,11 +343,11 @@
                     android:gravity="center"
                     android:text="@string/banned_delete_room"
                     android:textColor="@color/black"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_main" />
 
                 <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
+                    android:layout_width="@dimen/next_width"
+                    android:layout_height="@dimen/next_height"
                     android:layout_alignParentRight="true"
                     android:layout_centerVertical="true"
                     android:background="@drawable/set_list_next"

+ 7 - 7
WeiChat/src/main/res/layout/activity_select_contacts.xml

@@ -1,7 +1,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:background="@drawable/bg_main">
 
     <ListView
         android:id="@+id/list_view"
@@ -17,30 +18,29 @@
         android:layout_width="fill_parent"
         android:layout_height="55dp"
         android:layout_alignParentBottom="true"
-        android:background="@drawable/mmfooter_bg_white"
+        android:background="@color/item_color1"
         android:paddingBottom="7dp"
         android:paddingLeft="7dp"
         android:paddingRight="1dp"
-        android:paddingTop="7dp" >
+        android:paddingTop="7dp">
 
         <Button
             android:id="@+id/ok_btn"
-            style="@style/IMButton.Orange"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
+            android:background="#ef7f46"
             android:focusable="true"
             android:gravity="center"
             android:minHeight="40dp"
             android:minWidth="75.0dip"
             android:padding="5dp"
             android:text="@string/add_chat_ok_btn"
-            android:textColor="@color/white"
+            android:textColor="@color/text_main"
             android:textSize="@dimen/NormalTextSize" />
 
-        <com.sk.weichat.view.HorizontalListView
-            xmlns:widget="http://schemas.android.com/apk/res-auto"
+        <com.sk.weichat.view.HorizontalListView xmlns:widget="http://schemas.android.com/apk/res-auto"
             android:id="@+id/horizontal_list_view"
             android:layout_width="fill_parent"
             android:layout_height="37dp"

+ 65 - 30
WeiChat/src/main/res/layout/activity_user_search.xml

@@ -4,30 +4,38 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_below="@+id/top_title_bar"
-    android:background="@color/normal_bg" >
+    android:background="@drawable/bg_main">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/keyword_rl"
-            style="@style/IMTbleLine_UP" >
+            style="@style/IMTbleLine">
 
             <TextView
                 android:id="@+id/keyword_text"
-                style="@style/IMTbleLine_TextKey"
-                android:text="@string/keyword" />
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="18dp"
+                android:layout_marginRight="18dp"
+                android:gravity="center_vertical"
+                android:text="称    昵"
+                android:textSize="18sp" />
+            <!--style="@style/IMTbleLine_TextValue"-->
 
             <com.sk.weichat.view.ClearEditText
                 android:id="@+id/keyword_edit"
-                style="@style/IMTbleLine_TextValue"
+                android:layout_width="250dp"
+                android:layout_height="40dp"
+                android:layout_centerVertical="true"
                 android:layout_toLeftOf="@+id/keyword_arrow_img"
                 android:layout_toRightOf="@+id/keyword_text"
-                android:background="@null"
+                android:background="@color/item_color2"
                 android:drawablePadding="5dp"
-                android:hint="@string/please_input_keyword"
+                android:hint="输入名称"
                 android:inputType="text" />
 
             <ImageView
@@ -39,15 +47,20 @@
 
         <RelativeLayout
             android:id="@+id/sex_rl"
-            style="@style/IMTbleLine_UP" >
+            style="@style/IMTbleLine"
+            android:layout_marginTop="@dimen/line_min">
 
             <TextView
                 android:id="@+id/sex_text"
-                style="@style/IMTbleLine_TextKey"
-                android:drawablePadding="5dp"
-                android:text="@string/sex" />
-
-            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="18dp"
+                android:layout_marginRight="18dp"
+                android:gravity="center_vertical"
+                android:text="性    别"
+                android:textSize="18sp" />
+
+                <TextView
                 android:id="@+id/sex_tv"
                 style="@style/IMTbleLine_TextValue"
                 android:layout_toLeftOf="@+id/sex_arrow_img"
@@ -61,12 +74,18 @@
 
         <RelativeLayout
             android:id="@+id/min_age_rl"
-            style="@style/IMTbleLine_UP" >
+            style="@style/IMTbleLine"
+            android:layout_marginTop="@dimen/line_min">
 
             <TextView
                 android:id="@+id/min_age_text"
-                style="@style/IMTbleLine_TextKey"
-                android:text="@string/min_age" />
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="18dp"
+                android:layout_marginRight="18dp"
+                android:gravity="center_vertical"
+                android:text="@string/min_age"
+                android:textSize="18sp" />
 
             <com.sk.weichat.view.ClearEditText
                 android:id="@+id/min_age_edit"
@@ -86,12 +105,18 @@
 
         <RelativeLayout
             android:id="@+id/max_age_rl"
-            style="@style/IMTbleLine_UP" >
+            style="@style/IMTbleLine"
+            android:layout_marginTop="@dimen/line_min">
 
             <TextView
                 android:id="@+id/max_age_text"
-                style="@style/IMTbleLine_TextKey"
-                android:text="@string/max_age" />
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="18dp"
+                android:layout_marginRight="18dp"
+                android:gravity="center_vertical"
+                android:text="@string/max_age"
+                android:textSize="18sp" />
 
             <com.sk.weichat.view.ClearEditText
                 android:id="@+id/max_age_edit"
@@ -111,12 +136,18 @@
 
         <RelativeLayout
             android:id="@+id/show_time_rl"
-            style="@style/IMTbleLine" >
+            style="@style/IMTbleLine"
+            android:layout_marginTop="@dimen/line_min">
 
             <TextView
                 android:id="@+id/show_time_text"
-                style="@style/IMTbleLine_TextKey"
-                android:text="@string/show_time" />
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="18dp"
+                android:layout_marginRight="18dp"
+                android:gravity="center_vertical"
+                android:text="@string/show_time"
+                android:textSize="18sp" />
 
             <TextView
                 android:id="@+id/show_time_tv"
@@ -130,14 +161,18 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <Button
-            android:id="@+id/search_btn"
-            style="@style/IMButton.Orange"
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_marginLeft="9dp"
-            android:layout_marginRight="9dp"
-            android:layout_marginTop="9dp"
-            android:text="@string/search" />
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/search_btn"
+                android:layout_width="300dp"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="@dimen/line_big"
+                android:src="@drawable/search_btn" />
+        </RelativeLayout>
     </LinearLayout>
 
 </ScrollView>

+ 134 - 23
WeiChat/src/main/res/layout/dialog_create_muc_room.xml

@@ -1,34 +1,145 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="5dp" >
+    android:background="@color/item_color2">
 
-    <EditText
-        android:id="@+id/room_name_edit"
+    <RelativeLayout
+        android:id="@+id/rl_room_name"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/please_input_room_name"
-        android:lines="2"
-        android:maxLines="2" />
+        android:layout_height="@dimen/item_height"
+        android:layout_marginTop="3dp"
+        android:background="@color/item_color1">
 
-    <EditText
-        android:id="@+id/room_desc_edit"
+        <TextView
+            android:id="@+id/tv_room_name"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="18dp"
+            android:layout_marginRight="18dp"
+            android:gravity="center_vertical"
+            android:text="房间名称"
+            android:textSize="@dimen/text_main" />
+
+        <com.sk.weichat.view.ClearEditText
+            android:id="@+id/room_name_edit"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="18dp"
+            android:layout_toRightOf="@+id/tv_room_name"
+            android:background="@color/item_color2"
+            android:drawablePadding="5dp"
+            android:hint="输入名称"
+            android:inputType="text"
+            android:textSize="@dimen/text_hine" />
+
+
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/rl_room_doc"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:hint="@string/please_input_room_desc"
-        android:lines="2" />
+        android:layout_height="@dimen/item_height"
+        android:layout_below="@id/rl_room_name"
+        android:layout_marginTop="@dimen/line_min"
+        android:background="@color/item_color1">
+
+        <TextView
+            android:id="@+id/tv_room_doc"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="18dp"
+            android:layout_marginRight="18dp"
+            android:gravity="center_vertical"
+            android:text="房间说明"
+            android:textSize="@dimen/text_main"
+
+            />
+
+        <com.sk.weichat.view.ClearEditText
+            android:id="@+id/room_desc_edit"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_centerVertical="true"
+            android:layout_marginRight="18dp"
+            android:layout_toRightOf="@+id/tv_room_doc"
+            android:background="@color/item_color2"
+            android:drawablePadding="5dp"
+            android:hint="输入说明"
+            android:inputType="text"
+
+            android:textSize="@dimen/text_hine" />
+
+
+    </RelativeLayout>
 
-    <Button
+    <RelativeLayout
+        android:id="@+id/creater"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:layout_below="@+id/rl_room_doc"
+        android:layout_marginTop="@dimen/line_min"
+        android:background="@color/item_color1">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="18dp"
+            android:layout_marginRight="18dp"
+            android:gravity="center_vertical"
+            android:text="创  建  者"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/creater_name"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="18dp"
+            android:layout_marginRight="18dp"
+            android:gravity="center_vertical"
+            android:text=" 周兵"
+            android:textSize="@dimen/text_hine" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/num"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/item_height"
+        android:layout_below="@+id/creater"
+        android:layout_marginTop="@dimen/line_min"
+        android:background="@color/item_color1">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="18dp"
+            android:layout_marginRight="18dp"
+            android:gravity="center_vertical"
+            android:text="人       数"
+            android:textSize="@dimen/text_main" />
+
+        <TextView
+            android:id="@+id/tv_num"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:layout_marginLeft="18dp"
+            android:layout_marginRight="18dp"
+            android:gravity="center_vertical"
+            android:text="0/0"
+            android:textSize="@dimen/text_hine" />
+    </RelativeLayout>
+
+    <ImageView
         android:id="@+id/sure_btn"
-        style="@style/IMButton.Orange"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="5dp"
-        android:hint="@string/sure"
-        android:textColor="@color/white" />
+        android:layout_height="40dp"
+        android:layout_below="@+id/num"
+        android:layout_margin="@dimen/line_big"
+        android:clickable="true"
+        android:src="@drawable/login_ok" />
+
 
-</LinearLayout>
+</RelativeLayout>

+ 136 - 131
WeiChat/src/main/res/layout/dy_listview_items_demo_style2.xml

@@ -1,139 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/card_background_white"
-    android:footerDividersEnabled="false"
-    android:orientation="vertical" >
+    android:layout_height="90dp"
+    android:footerDividersEnabled="false">
+
+    <ImageView
+        android:id="@+id/img_next"
+        android:layout_width="@dimen/next_width"
+        android:layout_height="@dimen/next_height"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_marginRight="10dp"
+        android:alpha="0.26"
+        android:src="@drawable/set_list_next" />
+
+
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="2dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_marginTop="2dp"
-        android:background="@drawable/list_whrite_green_selector"
-        android:orientation="horizontal" >
-        <LinearLayout
-            android:id="@+id/dy_listview_linear"
+        android:layout_height="match_parent"
+        android:layout_toLeftOf="@+id/img_next"
+        android:orientation="vertical"
+        android:paddingBottom="3dp"
+        android:paddingLeft="10dp"
+        android:paddingRight="10dp"
+        android:paddingTop="3dp">
+
+        <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="3"
-            android:orientation="vertical" >
-            <RelativeLayout
-                android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <TextView
+                android:id="@+id/tv_name"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="0dp"
-                android:layout_marginLeft="15dp"
-                android:layout_marginRight="15dp"
-                android:layout_marginTop="5dp"
-                android:orientation="vertical" >
-                  <TextView
-                      android:id="@+id/tv_name"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:gravity="center_vertical"
-                      android:padding="3dp"
-                      android:text="编号:"
-                      android:textColor="@color/black"
-                      android:textSize="15sp" />
-                <TextView
-                    android:id="@+id/TextView01"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:layout_toRightOf="@+id/tv_name"
-                    android:padding="3dp"
-                    android:text="请购单维护作业"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-                                 <TextView
-                     android:id="@+id/tv_taskid"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:layout_below="@+id/TextView01"
-                     android:gravity="center_vertical"
-                     android:padding="3dp"
-                     android:text="名称:"
-                     android:textColor="@color/black"
-                     android:textSize="15sp" />
-                <TextView
-                    android:id="@+id/TextView02"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/TextView01"
-                    android:gravity="center_vertical"
-                    android:padding="3dp"
-                    android:layout_toRightOf="@+id/tv_taskid"
-                    android:text="PR14090048"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-                 <TextView
-                     android:id="@+id/tv_task_status"
-                     android:layout_width="wrap_content"
-                     android:layout_height="wrap_content"
-                     android:layout_alignParentRight="true"
-                     android:gravity="center_vertical"
-                     android:padding="3dp"
-                     android:text="状态"
-                     android:textColor="@color/yellow_home"
-                     android:textSize="15sp" />
-            </RelativeLayout>
-            <RelativeLayout
-                android:layout_width="match_parent"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="编号:"
+                android:textColor="@color/black"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/TextView01"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"
-                android:layout_marginLeft="15dp"
-                android:layout_marginRight="15dp"
-                android:orientation="vertical" >
-                    <TextView
-                    android:id="@+id/tv_emcode"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="3dp"
-                    android:text="发起人:"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-                <TextView
-                    android:id="@+id/TextView03"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="3dp"
-                    android:layout_toRightOf="@+id/tv_emcode"
-                    android:text="周袁"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-                  <TextView
-                    android:id="@+id/tv_tasktime"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:layout_below="@+id/TextView03"
-                    android:padding="3dp"
-                    android:text="时间:"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-                <TextView
-                    android:id="@+id/TextView04"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@+id/tv_tasktime"
-                    android:gravity="center_vertical"
-                    android:layout_below="@+id/TextView03"
-                    android:padding="3dp"
-                    android:text="2014-10-10 16:23:12"
-                    android:textColor="@color/black"
-                    android:textSize="15sp" />
-                <ImageView 
-                    android:id="@+id/iv_website"
-                    android:layout_alignParentRight="true"
-                    android:layout_below="@+id/TextView03"
-                    android:background="@drawable/iconfont_website"
-                    android:layout_width="25dp"
-                    android:layout_height="25dp"/>
-            </RelativeLayout>
-        </LinearLayout>
+                android:layout_toRightOf="@+id/tv_name"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="请购单维护作业"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
+
+            <TextView
+                android:id="@+id/tv_task_status"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="状态"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <TextView
+                android:id="@+id/tv_taskid"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="名称:"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/TextView02"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_taskid"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="PR14090048"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
+
+            <ImageView
+                android:id="@+id/iv_website"
+                android:layout_width="25dp"
+                android:layout_height="25dp"
+                android:layout_alignParentRight="true"
+                android:background="@drawable/iconfont_website" />
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+            <TextView
+                android:id="@+id/tv_emcode"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="发起人:"
+                android:textColor="@color/text_main"
+                android:textSize="@dimen/text_main" />
+
+            <TextView
+                android:id="@+id/TextView03"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_toRightOf="@+id/tv_emcode"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="周袁"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
+
+            <TextView
+                android:id="@+id/TextView04"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentRight="true"
+                android:gravity="center_vertical"
+                android:padding="3dp"
+                android:text="2014-10-10 16:23:12"
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
+        </RelativeLayout>
+
+
     </LinearLayout>
-</LinearLayout>
+
+
+</RelativeLayout>

+ 33 - 14
WeiChat/src/main/res/layout/item_room_info_view.xml

@@ -2,21 +2,40 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="70.0dip"
     android:layout_height="70.0dip"
-    android:background="@android:color/transparent" >
+    android:background="@android:color/transparent">
 
-    <ImageView
-        android:id="@+id/content"
-        android:layout_width="55.0dip"
-        android:layout_height="55.0dip"
-        android:layout_gravity="center"
-        android:layout_margin="8dp"
-        android:background="@drawable/avatar_normal" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
-    <Button
-        android:id="@+id/btn_del"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="top|left"
-        android:background="@drawable/bg_item_del" />
+        <ImageView
+            android:id="@+id/content"
+            android:layout_width="47.0dip"
+            android:layout_height="47.0dip"
+            android:layout_gravity="center"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:layout_marginTop="8dp"
 
+            android:background="@drawable/avatar_normal" />
+
+
+        <TextView
+            android:layout_marginTop="1dp"
+            android:id="@+id/tv_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/content"
+            android:gravity="center_horizontal"
+            android:textColor="@color/text_hine"
+            android:textSize="10sp" />
+
+
+        <Button
+            android:id="@+id/btn_del"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top|left"
+            android:background="@drawable/bg_item_del" />
+    </RelativeLayout>
 </FrameLayout>

+ 3 - 6
WeiChat/src/main/res/layout/task_listview.xml

@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@drawable/bg_main"
     android:layout_height="match_parent">
-    <LinearLayout android:id="@+id/tv_dispaly_top"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"/>
+
      <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:layout_below="@+id/tv_dispaly_top"
         android:id="@+id/listview_schedult"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#EFEFEF"
+         android:background="@drawable/bg_main"
         android:divider="@null"
         android:dividerHeight="10dp"
         android:listSelector="#00000000"
         android:fadingEdge="none"
-        android:padding="5dp"
         android:scrollbars="none" >
     </com.handmark.pulltorefresh.library.PullToRefreshListView>
 </RelativeLayout>

+ 4 - 3
WeiChat/src/main/res/menu/menu_state.xml

@@ -5,7 +5,8 @@
     tools:context="com.sk.weichat.ui.erp.activity.TaskActivity">
     <item
         android:id="@+id/reset"
-        android:title="@string/add"
-        android:icon="@drawable/iconfont_white"
-        app:showAsAction="ifRoom"/>
+        android:title="筛选"
+        app:showAsAction="ifRoom" />
+    <!--android:icon="@drawable/iconfont_white"-->
+
 </menu>

+ 2 - 0
WeiChat/src/main/res/values/dimens.xml

@@ -1,5 +1,7 @@
 <resources>
     <dimen name="next_width">10.0dip</dimen>
+    <dimen name="line_big">7.0dip</dimen>
+    <dimen name="line_min">2.0dip</dimen>
     <dimen name="next_height">20.0dip</dimen>
     <dimen name="text_main">17.0dip</dimen>
     <dimen name="text_hine">14.0dip</dimen>

+ 2 - 2
WeiChat/src/main/res/values/strings.xml

@@ -191,7 +191,7 @@
     <string name="say_hello_default">嘿,你好!</string>
     <!-- 附近模块 -->
     <string name="keyword">关键字</string>
-    <string name="sex">性别</string>
+    <string name="sex">性    别</string>
     <string name="min_age">最小年龄</string>
     <string name="max_age">最大年龄</string>
     <string name="show_time">出现时间</string>
@@ -260,7 +260,7 @@
     <!-- RoomInfoActivity -->
     <string name="room_info">房间信息</string>
     <string name="room_name">房间名称</string>
-    <string name="notice">公告</string>
+    <string name="notice">群内公告</string>
     <string name="room_desc">房间说明</string>
     <string name="creator">创建者</string>
     <string name="people_count">成员上限</string>

+ 2 - 2
WeiChat/src/main/res/values/styles.xml

@@ -199,8 +199,8 @@
     </style>
 
     <style name="IMTbleLine_ArrowImg">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">@dimen/next_width</item>
+        <item name="android:layout_height">@dimen/next_height</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:background">@drawable/set_list_next</item>