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

WeiChat/src/main/AndroidManifest.xml

@@ -194,7 +194,8 @@
         </activity>
         <activity android:name=".video.VideoRecordActivity" >
         </activity>
-        <activity android:name=".ui.cardcast.CardcastActivity" >
+        <activity android:name=".ui.cardcast.CardcastActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar" >
+
         </activity>
         <activity
             android:name=".ui.me.BasicInfoEditActivity"

WeiChat/src/main/java/com/sk/weichat/adapter/PublicMessageAdapter.java

@@ -64,7 +64,6 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 
  * @项目名称: SkWeiChat-Baidu
  * @包名: com.sk.weichat.adapter
  * @作者:王阳
@@ -77,1086 +76,1106 @@ import java.util.Map;
  */
 public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio, ListenerAudioFragment {
 
-	private Context mContext;
-	private List<PublicMessage> mMessages;
-	private LayoutInflater mInflater;
-
-	private String mLoginUserId;
-	private String mLoginNickName;
-	private ProgressDialog mProgressDialog;
-
-	// 播放音频的记录
-	private ViewHolder mVoicePlayViewHolder;// 当前正在播放的VocieViewHolder
-	private AudioPalyer mAudioPalyer;
-	private String mVoicePlayId = null;
-
-	private Map<String, String> mShowNameMaps;
-	private CommentAdapter mAdapter;
-
-	public void reset() {
-		if (mAudioPalyer != null) {
-			mAudioPalyer.stop();
-		}
-	}
-
-	public PublicMessageAdapter(Context context, List<PublicMessage> messages) {
-		mContext = context;
-		mMessages = messages;
-		mInflater = LayoutInflater.from(mContext);
-		mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
-		mLoginNickName = MyApplication.getInstance().mLoginUser.getNickName();
-		mShowNameMaps = new HashMap<String, String>();
-		mProgressDialog = ProgressDialogUtil.init(mContext, null, mContext.getString(R.string.please_wait));
-		mAudioPalyer = new AudioPalyer();
-		mAudioPalyer.setAudioPlayListener(new AudioPalyer.AudioPlayListener() {
-			@Override
-			public void onSeekComplete() {
-			}
-
-			@Override
-			public void onPrepared() {
-			}
-
-			@Override
-			public void onError() {
-				mVoicePlayId = null;
-				if (mVoicePlayViewHolder != null) {
-					updateVoiceViewHolderIconStatus(false, mVoicePlayViewHolder);
-				}
-				mVoicePlayViewHolder = null;
-			}
-
-			@Override
-			public void onCompletion() {
-				mVoicePlayId = null;
-				if (mVoicePlayViewHolder != null) {
-					updateVoiceViewHolderIconStatus(false, mVoicePlayViewHolder);
-				}
-				mVoicePlayViewHolder = null;
-			}
-
-			@Override
-			public void onBufferingUpdate(int percent) {
-			}
-
-			@Override
-			public void onPreparing() {
-
-			}
-		});
-
-	}
-
-	@Override
-	public int getCount() {
-		return mMessages.size();
-	}
-
-	@Override
-	public Object getItem(int position) {
-		return position;
-	}
-
-	@Override
-	public long getItemId(int position) {
-		return position;
-	}
-
-	@Override
-	public int getViewTypeCount() {
-		return 10;
-	}
-
-	private static final int VIEW_TYPE_NORMAL_TEXT = 0;
-	private static final int VIEW_TYPE_FW_TEXT = 1;
-	private static final int VIEW_TYPE_NORMAL_SINGLE_IMAGE = 2;
-	private static final int VIEW_TYPE_FW_SINGLE_IMAGE = 3;
-	private static final int VIEW_TYPE_NORMAL_MULTI_IMAGE = 4;
-	private static final int VIEW_TYPE_FW_MULTI_IMAGE = 5;
-	private static final int VIEW_TYPE_NORMAL_VOICE = 6;
-	private static final int VIEW_TYPE_FW_VOICE = 7;
-	private static final int VIEW_TYPE_NORMAL_VIDEO = 8;
-	private static final int VIEW_TYPE_FW_VIDEO = 9;
-
-	/**
-	 * @see PublicMessage#getType() <br/>
-	 *      1=文字消息；2=图文消息；3=语音消息； 4=视频消息；5、转载<br/>
-	 *      分的视图类型有： <br/>
-	 *      {@link #VIEW_TYPE_NORMAL_TEXT}0、普通文字消息视图<br/>
-	 *      {@link #VIEW_TYPE_FW_TEXT} 1、转载文字消息视图 <br/>
-	 *      {@link #VIEW_TYPE_NORMAL_SINGLE_IMAGE} 2、普通单张图片的视图<br/>
-	 *      {@link #VIEW_TYPE_FW_SINGLE_IMAGE} 3、转载单张图片的视图<br/>
-	 *      {@link #VIEW_TYPE_NORMAL_MULTI_IMAGE}4、普通多张图片的视图<br/>
-	 *      {@link #VIEW_TYPE_FW_MULTI_IMAGE} 5、转载多张图片的视图<br/>
-	 *      {@link #VIEW_TYPE_NORMAL_VOICE} 6、普通音频视图<br/>
-	 *      {@link #VIEW_TYPE_FW_VOICE} 7、转载音频视图<br/>
-	 *      {@link #VIEW_TYPE_NORMAL_VIDEO}8、普通视频视图<br/>
-	 *      {@link #VIEW_TYPE_FW_VIDEO} 9、转载视频视图<br/>
-	 */
-	@Override
-	public int getItemViewType(int position) {
-		PublicMessage message = mMessages.get(position);
-		boolean fromSelf = message.getSource() == PublicMessage.SOURCE_SELF;
-		Body body = message.getBody();
-		if (body == null) {// 如果为空，那么可能是数据错误，直接返回一个普通的文本视图
-			return VIEW_TYPE_NORMAL_TEXT;
-		}
-		if (body.getType() == PublicMessage.TYPE_TEXT) {// 文本视图
-			if (fromSelf)
-				return VIEW_TYPE_NORMAL_TEXT;
-			else
-				return VIEW_TYPE_FW_TEXT;
-		} else if (body.getType() == PublicMessage.TYPE_IMG) {
-			if (body.getImages() == null || body.getImages().size() <= 1) {// 普通的单张图片的视图
-				if (fromSelf)
-					return VIEW_TYPE_NORMAL_SINGLE_IMAGE;
-				else
-					return VIEW_TYPE_FW_SINGLE_IMAGE;
-			} else {// 普通的多张图片视图
-				if (fromSelf)
-					return VIEW_TYPE_NORMAL_MULTI_IMAGE;
-				else
-					return VIEW_TYPE_FW_MULTI_IMAGE;
-			}
-		} else if (body.getType() == PublicMessage.TYPE_VOICE) {// 普通音频
-			if (fromSelf)
-				return VIEW_TYPE_NORMAL_VOICE;
-			else
-				return VIEW_TYPE_FW_VOICE;
-		} else if (body.getType() == PublicMessage.TYPE_VIDEO) {// 普通视频
-			if (fromSelf)
-				return VIEW_TYPE_NORMAL_VIDEO;
-			else
-				return VIEW_TYPE_FW_VIDEO;
-		} else {// 其他，数据错误
-			return VIEW_TYPE_NORMAL_TEXT;
-		}
-
-	}
-
-	@Override
-	public View getView(final int position, View convertView, ViewGroup parent) {
-		int viewType = getItemViewType(position);
-
-		ViewHolder viewHolder = null;
-		if (convertView == null || ((Integer) convertView.getTag(R.id.tag_key_list_item_type)) != viewType) {
-			convertView = mInflater.inflate(R.layout.p_msg_item_main_body, null);
-			View innerView = null;
-			if (viewType == VIEW_TYPE_NORMAL_TEXT) {
-				viewHolder = new NormalTextHolder();
-			} else if (viewType == VIEW_TYPE_FW_TEXT) {
-				FwTextHolder holder = new FwTextHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_fw_text, null);
-				holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_NORMAL_SINGLE_IMAGE) {
-				NormalSingleImageHolder holder = new NormalSingleImageHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_normal_single_img, null);
-				holder.image_view = (ImageView) innerView.findViewById(R.id.image_view);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_FW_SINGLE_IMAGE) {
-				FwSingleImageHolder holder = new FwSingleImageHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_fw_single_img, null);
-				holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
-				holder.image_view = (ImageView) innerView.findViewById(R.id.image_view);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_NORMAL_MULTI_IMAGE) {
-				NormalMultiImageHolder holder = new NormalMultiImageHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_normal_multi_img, null);
-				holder.grid_view = (MyGridView) innerView.findViewById(R.id.grid_view);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_FW_MULTI_IMAGE) {
-				FwMultiImageHolder holder = new FwMultiImageHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_fw_multi_img, null);
-				holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
-				holder.grid_view = (MyGridView) innerView.findViewById(R.id.grid_view);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_NORMAL_VOICE) {
-				NormalVoiceHolder holder = new NormalVoiceHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_normal_voice, null);
-				holder.img_view = (ImageView) innerView.findViewById(R.id.img_view);
-				holder.voice_action_img = (ImageView) innerView.findViewById(R.id.voice_action_img);
-				holder.voice_desc_tv = (TextView) innerView.findViewById(R.id.voice_desc_tv);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_FW_VOICE) {
-				FwVoiceHolder holder = new FwVoiceHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_fw_voice, null);
-				holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
-				holder.img_view = (ImageView) innerView.findViewById(R.id.img_view);
-				holder.voice_action_img = (ImageView) innerView.findViewById(R.id.voice_action_img);
-				holder.voice_desc_tv = (TextView) innerView.findViewById(R.id.voice_desc_tv);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_NORMAL_VIDEO) {
-				NormalVideoHolder holder = new NormalVideoHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_normal_video, null);
-				holder.video_thumb_img = (ImageView) innerView.findViewById(R.id.video_thumb_img);
-				holder.video_desc_tv = (TextView) innerView.findViewById(R.id.video_desc_tv);
-				viewHolder = holder;
-			} else if (viewType == VIEW_TYPE_FW_VIDEO) {
-				FwVideoHolder holder = new FwVideoHolder();
-				innerView = mInflater.inflate(R.layout.p_msg_item_fw_video, null);
-				holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
-				holder.video_thumb_img = (ImageView) innerView.findViewById(R.id.video_thumb_img);
-				holder.video_desc_tv = (TextView) innerView.findViewById(R.id.video_desc_tv);
-				viewHolder = holder;
-			}
-			viewHolder.avatar_img = (ImageView) convertView.findViewById(R.id.avatar_img);
-			viewHolder.nick_name_tv = (TextView) convertView.findViewById(R.id.nick_name_tv);
-			viewHolder.time_tv = (TextView) convertView.findViewById(R.id.time_tv);
-			viewHolder.body_tv = (TextView) convertView.findViewById(R.id.body_tv);
-			viewHolder.content_fl = (FrameLayout) convertView.findViewById(R.id.content_fl);
-			viewHolder.delete_tv = (TextView) convertView.findViewById(R.id.delete_tv);
-			viewHolder.operation_more_img = (ImageView) convertView.findViewById(R.id.operation_more_img);
-			viewHolder.multi_praise_tv = (TextView) convertView.findViewById(R.id.multi_praise_tv);
-			viewHolder.command_listView = (ListView) convertView.findViewById(R.id.command_listView);
-			if (innerView != null) {
-				viewHolder.content_fl.addView(innerView);
-			}
-			convertView.setTag(R.id.tag_key_list_item_type, viewType);
-			convertView.setTag(R.id.tag_key_list_item_view, viewHolder);
-		} else {
-			viewHolder = (ViewHolder) convertView.getTag(R.id.tag_key_list_item_view);
-		}
-
-		final ViewHolder finalHolder = viewHolder;// 和ViewHolder一样的，只不过用作匿名内部类里面调用需要final
-		// set data
-		final PublicMessage message = mMessages.get(position);
-		if (message == null) {
-			return convertView;
-		}
-		// 设备头像
-		AvatarHelper.getInstance().displayAvatar(message.getUserId(), viewHolder.avatar_img, true);
-		/* 设置昵称 */
-		SpannableStringBuilder nickNamebuilder = new SpannableStringBuilder();
-		final String userId = message.getUserId();
-		String showName = getShowName(userId, message.getNickName());
-
-		UserClickableSpan.setClickableSpan(mContext, nickNamebuilder, showName, message.getUserId());
-		viewHolder.nick_name_tv.setText(nickNamebuilder);
-		viewHolder.nick_name_tv.setLinksClickable(true);
-		viewHolder.nick_name_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
-		// 设置头像的点击事件
-		viewHolder.avatar_img.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if(mContext instanceof BusinessCircleActivity){//防止重复进入
-					return;
-				}
-				Intent intent = new Intent(mContext, BusinessCircleActivity.class);
-				intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
-				intent.putExtra(AppConstant.EXTRA_USER_ID, message.getUserId());
-				intent.putExtra(AppConstant.EXTRA_NICK_NAME, mShowNameMaps.get(userId));
-				mContext.startActivity(intent);
-			}
-		});
-
-		// 获取消息本身的内容
-		Body body = message.getBody();
-		if (body == null) {
-			return convertView;
-		}
-
-		// 是否是转载的
-		boolean isForwarding = message.getSource() == PublicMessage.SOURCE_FORWARDING;
-
-		// 设置body_tv
-		if (TextUtils.isEmpty(body.getText())) {
-			viewHolder.body_tv.setVisibility(View.GONE);
-		} else {
-			viewHolder.body_tv.setVisibility(View.VISIBLE);
-			viewHolder.body_tv.setText(body.getText());
-		}
-		viewHolder.body_tv.setOnLongClickListener(new View.OnLongClickListener() {
-			@Override
-			public boolean onLongClick(View v) {
-				showBodyTextLongClickDialog(finalHolder.body_tv.getText().toString());
-				return true;
-			}
-		});
-
-		// 设置发布时间
-		viewHolder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(mContext, (int) message.getTime()));
-
-		// 设置删除按钮
-		if (userId.equals(mLoginUserId)) {// 是我发的消息
-			viewHolder.delete_tv.setVisibility(View.VISIBLE);
-			viewHolder.delete_tv.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					showDeleteMsgDialog(position);
-				}
-			});
-		} else {
-			viewHolder.delete_tv.setVisibility(View.GONE);
-			viewHolder.delete_tv.setOnClickListener(null);
-		}
-
-		viewHolder.operation_more_img.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				showOperationMorePopWindow(finalHolder.operation_more_img, position);
-			}
-		});
+    private Context mContext;
+    private List<PublicMessage> mMessages;
+    private LayoutInflater mInflater;
+
+    private String mLoginUserId;
+    private String mLoginNickName;
+    private ProgressDialog mProgressDialog;
+
+    // 播放音频的记录
+    private ViewHolder mVoicePlayViewHolder;// 当前正在播放的VocieViewHolder
+    private AudioPalyer mAudioPalyer;
+    private String mVoicePlayId = null;
+
+    private Map<String, String> mShowNameMaps;
+    private CommentAdapter mAdapter;
+
+    public void reset() {
+        if (mAudioPalyer != null) {
+            mAudioPalyer.stop();
+        }
+    }
+
+    public PublicMessageAdapter(Context context, List<PublicMessage> messages) {
+        mContext = context;
+        mMessages = messages;
+        mInflater = LayoutInflater.from(mContext);
+        mLoginUserId = MyApplication.getInstance().mLoginUser.getUserId();
+        mLoginNickName = MyApplication.getInstance().mLoginUser.getNickName();
+        mShowNameMaps = new HashMap<String, String>();
+        mProgressDialog = ProgressDialogUtil.init(mContext, null, mContext.getString(R.string.please_wait));
+        mAudioPalyer = new AudioPalyer();
+        mAudioPalyer.setAudioPlayListener(new AudioPalyer.AudioPlayListener() {
+            @Override
+            public void onSeekComplete() {
+            }
+
+            @Override
+            public void onPrepared() {
+            }
+
+            @Override
+            public void onError() {
+                mVoicePlayId = null;
+                if (mVoicePlayViewHolder != null) {
+                    updateVoiceViewHolderIconStatus(false, mVoicePlayViewHolder);
+                }
+                mVoicePlayViewHolder = null;
+            }
+
+            @Override
+            public void onCompletion() {
+                mVoicePlayId = null;
+                if (mVoicePlayViewHolder != null) {
+                    updateVoiceViewHolderIconStatus(false, mVoicePlayViewHolder);
+                }
+                mVoicePlayViewHolder = null;
+            }
+
+            @Override
+            public void onBufferingUpdate(int percent) {
+            }
+
+            @Override
+            public void onPreparing() {
+
+            }
+        });
+
+    }
+
+    @Override
+    public int getCount() {
+        return mMessages.size();
+    }
+
+    @Override
+    public Object getItem(int position) {
+        return position;
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return 10;
+    }
+
+    private static final int VIEW_TYPE_NORMAL_TEXT = 0;
+    private static final int VIEW_TYPE_FW_TEXT = 1;
+    private static final int VIEW_TYPE_NORMAL_SINGLE_IMAGE = 2;
+    private static final int VIEW_TYPE_FW_SINGLE_IMAGE = 3;
+    private static final int VIEW_TYPE_NORMAL_MULTI_IMAGE = 4;
+    private static final int VIEW_TYPE_FW_MULTI_IMAGE = 5;
+    private static final int VIEW_TYPE_NORMAL_VOICE = 6;
+    private static final int VIEW_TYPE_FW_VOICE = 7;
+    private static final int VIEW_TYPE_NORMAL_VIDEO = 8;
+    private static final int VIEW_TYPE_FW_VIDEO = 9;
+
+    /**
+     * @see PublicMessage#getType() <br/>
+     * 1=文字消息；2=图文消息；3=语音消息； 4=视频消息；5、转载<br/>
+     * 分的视图类型有： <br/>
+     * {@link #VIEW_TYPE_NORMAL_TEXT}0、普通文字消息视图<br/>
+     * {@link #VIEW_TYPE_FW_TEXT} 1、转载文字消息视图 <br/>
+     * {@link #VIEW_TYPE_NORMAL_SINGLE_IMAGE} 2、普通单张图片的视图<br/>
+     * {@link #VIEW_TYPE_FW_SINGLE_IMAGE} 3、转载单张图片的视图<br/>
+     * {@link #VIEW_TYPE_NORMAL_MULTI_IMAGE}4、普通多张图片的视图<br/>
+     * {@link #VIEW_TYPE_FW_MULTI_IMAGE} 5、转载多张图片的视图<br/>
+     * {@link #VIEW_TYPE_NORMAL_VOICE} 6、普通音频视图<br/>
+     * {@link #VIEW_TYPE_FW_VOICE} 7、转载音频视图<br/>
+     * {@link #VIEW_TYPE_NORMAL_VIDEO}8、普通视频视图<br/>
+     * {@link #VIEW_TYPE_FW_VIDEO} 9、转载视频视图<br/>
+     */
+    @Override
+    public int getItemViewType(int position) {
+        PublicMessage message = mMessages.get(position);
+        boolean fromSelf = message.getSource() == PublicMessage.SOURCE_SELF;
+        Body body = message.getBody();
+        if (body == null) {// 如果为空，那么可能是数据错误，直接返回一个普通的文本视图
+            return VIEW_TYPE_NORMAL_TEXT;
+        }
+        if (body.getType() == PublicMessage.TYPE_TEXT) {// 文本视图
+            if (fromSelf)
+                return VIEW_TYPE_NORMAL_TEXT;
+            else
+                return VIEW_TYPE_FW_TEXT;
+        } else if (body.getType() == PublicMessage.TYPE_IMG) {
+            if (body.getImages() == null || body.getImages().size() <= 1) {// 普通的单张图片的视图
+                if (fromSelf)
+                    return VIEW_TYPE_NORMAL_SINGLE_IMAGE;
+                else
+                    return VIEW_TYPE_FW_SINGLE_IMAGE;
+            } else {// 普通的多张图片视图
+                if (fromSelf)
+                    return VIEW_TYPE_NORMAL_MULTI_IMAGE;
+                else
+                    return VIEW_TYPE_FW_MULTI_IMAGE;
+            }
+        } else if (body.getType() == PublicMessage.TYPE_VOICE) {// 普通音频
+            if (fromSelf)
+                return VIEW_TYPE_NORMAL_VOICE;
+            else
+                return VIEW_TYPE_FW_VOICE;
+        } else if (body.getType() == PublicMessage.TYPE_VIDEO) {// 普通视频
+            if (fromSelf)
+                return VIEW_TYPE_NORMAL_VIDEO;
+            else
+                return VIEW_TYPE_FW_VIDEO;
+        } else {// 其他，数据错误
+            return VIEW_TYPE_NORMAL_TEXT;
+        }
+
+    }
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        int viewType = getItemViewType(position);
+        ViewHolder viewHolder = null;
+        if (convertView == null || ((Integer) convertView.getTag(R.id.tag_key_list_item_type)) != viewType) {
+            convertView = mInflater.inflate(R.layout.p_msg_item_main_body, null);
+            View innerView = null;
+            if (viewType == VIEW_TYPE_NORMAL_TEXT) {
+                viewHolder = new NormalTextHolder();
+            } else if (viewType == VIEW_TYPE_FW_TEXT) {
+                FwTextHolder holder = new FwTextHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_fw_text, null);
+                holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_NORMAL_SINGLE_IMAGE) {
+                NormalSingleImageHolder holder = new NormalSingleImageHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_normal_single_img, null);
+                holder.image_view = (ImageView) innerView.findViewById(R.id.image_view);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_FW_SINGLE_IMAGE) {
+                FwSingleImageHolder holder = new FwSingleImageHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_fw_single_img, null);
+                holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
+                holder.image_view = (ImageView) innerView.findViewById(R.id.image_view);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_NORMAL_MULTI_IMAGE) {
+                NormalMultiImageHolder holder = new NormalMultiImageHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_normal_multi_img, null);
+                holder.grid_view = (MyGridView) innerView.findViewById(R.id.grid_view);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_FW_MULTI_IMAGE) {
+                FwMultiImageHolder holder = new FwMultiImageHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_fw_multi_img, null);
+                holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
+                holder.grid_view = (MyGridView) innerView.findViewById(R.id.grid_view);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_NORMAL_VOICE) {
+                NormalVoiceHolder holder = new NormalVoiceHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_normal_voice, null);
+                holder.img_view = (ImageView) innerView.findViewById(R.id.img_view);
+                holder.voice_action_img = (ImageView) innerView.findViewById(R.id.voice_action_img);
+                holder.voice_desc_tv = (TextView) innerView.findViewById(R.id.voice_desc_tv);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_FW_VOICE) {
+                FwVoiceHolder holder = new FwVoiceHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_fw_voice, null);
+                holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
+                holder.img_view = (ImageView) innerView.findViewById(R.id.img_view);
+                holder.voice_action_img = (ImageView) innerView.findViewById(R.id.voice_action_img);
+                holder.voice_desc_tv = (TextView) innerView.findViewById(R.id.voice_desc_tv);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_NORMAL_VIDEO) {
+                NormalVideoHolder holder = new NormalVideoHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_normal_video, null);
+                holder.video_thumb_img = (ImageView) innerView.findViewById(R.id.video_thumb_img);
+                holder.video_desc_tv = (TextView) innerView.findViewById(R.id.video_desc_tv);
+                viewHolder = holder;
+            } else if (viewType == VIEW_TYPE_FW_VIDEO) {
+                FwVideoHolder holder = new FwVideoHolder();
+                innerView = mInflater.inflate(R.layout.p_msg_item_fw_video, null);
+                holder.text_tv = (TextView) innerView.findViewById(R.id.text_tv);
+                holder.video_thumb_img = (ImageView) innerView.findViewById(R.id.video_thumb_img);
+                holder.video_desc_tv = (TextView) innerView.findViewById(R.id.video_desc_tv);
+                viewHolder = holder;
+            }
+            viewHolder.avatar_img = (ImageView) convertView.findViewById(R.id.avatar_img);
+            viewHolder.nick_name_tv = (TextView) convertView.findViewById(R.id.nick_name_tv);
+            viewHolder.time_tv = (TextView) convertView.findViewById(R.id.time_tv);
+            viewHolder.body_tv = (TextView) convertView.findViewById(R.id.body_tv);
+            viewHolder.content_fl = (FrameLayout) convertView.findViewById(R.id.content_fl);
+            viewHolder.delete_tv = (TextView) convertView.findViewById(R.id.delete_tv);
+            viewHolder.operation_more_img = (ImageView) convertView.findViewById(R.id.operation_more_img);
+            viewHolder.multi_praise_tv = (TextView) convertView.findViewById(R.id.multi_praise_tv);
+            viewHolder.command_listView = (ListView) convertView.findViewById(R.id.command_listView);
+            viewHolder.viewLine = convertView.findViewById(R.id.line);
+            if (innerView != null) {
+                viewHolder.content_fl.addView(innerView);
+            }
+            convertView.setTag(R.id.tag_key_list_item_type, viewType);
+            convertView.setTag(R.id.tag_key_list_item_view, viewHolder);
+        } else {
+            viewHolder = (ViewHolder) convertView.getTag(R.id.tag_key_list_item_view);
+        }
+
+//        if (position % 2 == 0) {
+//            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
+//        } else {
+//            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
+//        }
+
+
+        final ViewHolder finalHolder = viewHolder;// 和ViewHolder一样的，只不过用作匿名内部类里面调用需要final
+        // set data
+        final PublicMessage message = mMessages.get(position);
+        if (message == null) {
+            return convertView;
+        }
+        // 设备头像
+        AvatarHelper.getInstance().displayAvatar(message.getUserId(), viewHolder.avatar_img, true);
+        /* 设置昵称 */
+        SpannableStringBuilder nickNamebuilder = new SpannableStringBuilder();
+        final String userId = message.getUserId();
+        String showName = getShowName(userId, message.getNickName());
+
+        UserClickableSpan.setClickableSpan(mContext, nickNamebuilder, showName, message.getUserId());
+        viewHolder.nick_name_tv.setText(nickNamebuilder);
+        viewHolder.nick_name_tv.setLinksClickable(true);
+        viewHolder.nick_name_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
+        // 设置头像的点击事件
+        viewHolder.avatar_img.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mContext instanceof BusinessCircleActivity) {//防止重复进入
+                    return;
+                }
+                Intent intent = new Intent(mContext, BusinessCircleActivity.class);
+                intent.putExtra(AppConstant.EXTRA_CIRCLE_TYPE, AppConstant.CIRCLE_TYPE_PERSONAL_SPACE);
+                intent.putExtra(AppConstant.EXTRA_USER_ID, message.getUserId());
+                intent.putExtra(AppConstant.EXTRA_NICK_NAME, mShowNameMaps.get(userId));
+                mContext.startActivity(intent);
+            }
+        });
+
+        // 获取消息本身的内容
+        Body body = message.getBody();
+        if (body == null) {
+            return convertView;
+        }
+
+        // 是否是转载的
+        boolean isForwarding = message.getSource() == PublicMessage.SOURCE_FORWARDING;
+
+        // 设置body_tv
+        if (TextUtils.isEmpty(body.getText())) {
+            viewHolder.body_tv.setVisibility(View.GONE);
+        } else {
+            viewHolder.body_tv.setVisibility(View.VISIBLE);
+            viewHolder.body_tv.setText(body.getText());
+        }
+        viewHolder.body_tv.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                showBodyTextLongClickDialog(finalHolder.body_tv.getText().toString());
+                return true;
+            }
+        });
+
+        // 设置发布时间
+        viewHolder.time_tv.setText(TimeUtils.getFriendlyTimeDesc(mContext, (int) message.getTime()));
+
+        // 设置删除按钮
+        if (userId.equals(mLoginUserId)) {// 是我发的消息
+            viewHolder.delete_tv.setVisibility(View.VISIBLE);
+            viewHolder.delete_tv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    showDeleteMsgDialog(position);
+                }
+            });
+        } else {
+            viewHolder.delete_tv.setVisibility(View.GONE);
+            viewHolder.delete_tv.setOnClickListener(null);
+        }
+
+        viewHolder.operation_more_img.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                showOperationMorePopWindow(finalHolder.operation_more_img, position);
+            }
+        });
 
 		/* 显示多少人赞过 */
-		List<Praise> praises = message.getPraises();
-		if (praises != null && praises.size() > 0) {
-			viewHolder.multi_praise_tv.setVisibility(View.VISIBLE);
-			SpannableStringBuilder builder = new SpannableStringBuilder();
-			for (int i = 0; i < praises.size(); i++) {
-				String praiseName = getShowName(praises.get(i).getUserId(), praises.get(i).getNickName());
-				UserClickableSpan.setClickableSpan(mContext, builder, praiseName, praises.get(i).getUserId());
-				if (i < praises.size() - 1)
-					builder.append("、");
-			}
-			if (message.getPraise() > praises.size()) {
-				builder.append("...");
-			}
-			viewHolder.multi_praise_tv.setText(builder);
-		} else {
-			viewHolder.multi_praise_tv.setVisibility(View.GONE);
-			viewHolder.multi_praise_tv.setText("");
-		}
-		viewHolder.multi_praise_tv.setLinksClickable(true);
-		viewHolder.multi_praise_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
-
-		/* 设置回复 */
-		final List<Comment> comments = message.getComments();
-		if (comments != null && comments.size() > 0) {
-			viewHolder.command_listView.setVisibility(View.VISIBLE);
-			mAdapter = new CommentAdapter(position, comments);
-			viewHolder.command_listView.setAdapter(mAdapter);
-		} else {
-			viewHolder.command_listView.setVisibility(View.GONE);
-			viewHolder.command_listView.setAdapter(null);
-		}
-
-		// //////////////////上面是公用的部分，下面是每个Type不同的部分/////////////////////////////////////////
-		// 转载的消息会有一个转载人和text
-		SpannableStringBuilder forwardingBuilder = null;
-		if (isForwarding) {// 转载的那个人和说的话
-			forwardingBuilder = new SpannableStringBuilder();
-			String forwardName = getShowName(message.getFowardUserId(), message.getFowardNickname());
-			UserClickableSpan.setClickableSpan(mContext, forwardingBuilder, forwardName, message.getFowardUserId());
-			if (!TextUtils.isEmpty(message.getFowardText())) {
-				forwardingBuilder.append(" : ");
-				forwardingBuilder.append(message.getFowardText());
-			}
-		}
-
-		if (viewType == VIEW_TYPE_NORMAL_TEXT) {
-			viewHolder.content_fl.setVisibility(View.GONE);// 因为有个MarginTop
-															// 5dp，所以没内容的时候隐藏，免得中间间隔有点大
-		} else if (viewType == VIEW_TYPE_FW_TEXT) {
-			TextView text_tv = ((FwTextHolder) viewHolder).text_tv;
-			text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
-		} else if (viewType == VIEW_TYPE_NORMAL_SINGLE_IMAGE) {
-			ImageView image_view = ((NormalSingleImageHolder) viewHolder).image_view;
-			String url = message.getFirstImageOriginal();
-			if (!TextUtils.isEmpty(url)) {
-				ImageLoader.getInstance().displayImage(url, image_view);
-				image_view.setOnClickListener(new SingleImageClickListener(url));
-			} else {
-				image_view.setImageBitmap(null);
-			}
-		} else if (viewType == VIEW_TYPE_FW_SINGLE_IMAGE) {
-			TextView text_tv = ((FwSingleImageHolder) viewHolder).text_tv;
-			ImageView image_view = ((FwSingleImageHolder) viewHolder).image_view;
-			text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
-
-			String url = message.getFirstImageOriginal();
-			if (!TextUtils.isEmpty(url)) {
-				ImageLoader.getInstance().displayImage(url, image_view);
-				image_view.setOnClickListener(new SingleImageClickListener(url));
-			} else {
-				image_view.setImageBitmap(null);
-			}
-
-		} else if (viewType == VIEW_TYPE_NORMAL_MULTI_IMAGE) {
-			MyGridView grid_view = ((NormalMultiImageHolder) viewHolder).grid_view;
-			if (body.getImages() != null) {
-				grid_view.setAdapter(new ImagesInnerGridViewAdapter(mContext, body.getImages()));
-				grid_view.setOnItemClickListener(new MultipleImagesClickListener(body.getImages()));
-			} else {
-				grid_view.setAdapter(null);
-			}
-
-		} else if (viewType == VIEW_TYPE_FW_MULTI_IMAGE) {
-			TextView text_tv = ((FwMultiImageHolder) viewHolder).text_tv;
-			MyGridView grid_view = ((FwMultiImageHolder) viewHolder).grid_view;
-			text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
-			if (body.getImages() != null) {
-				grid_view.setAdapter(new ImagesInnerGridViewAdapter(mContext, body.getImages()));
-				grid_view.setOnItemClickListener(new MultipleImagesClickListener(body.getImages()));
-			} else {
-				grid_view.setAdapter(null);
-			}
-		} else if (viewType == VIEW_TYPE_NORMAL_VOICE) {
-			final NormalVoiceHolder holder = (NormalVoiceHolder) viewHolder;
-			if (mVoicePlayId == null || !mVoicePlayId.equals(message.getMessageId())) {// 处于非播放状态
-				holder.voice_action_img.setImageResource(R.drawable.feed_main_player_play);
-			} else {
-				holder.voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
-			}
-			holder.voice_action_img.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					play(holder, message);
-				}
-			});
-
-			String imageUrl = message.getFirstImageOriginal();
-			if (TextUtils.isEmpty(imageUrl)) {
-				AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.img_view, false);
-				holder.img_view.setOnClickListener(
-						new SingleImageClickListener(AvatarHelper.getAvatarUrl(message.getUserId(), false)));
-			} else {
-				ImageLoader.getInstance().displayImage(imageUrl, holder.img_view);
-				holder.img_view.setOnClickListener(new SingleImageClickListener(imageUrl));
-			}
-
-		} else if (viewType == VIEW_TYPE_FW_VOICE) {
-			final FwVoiceHolder holder = (FwVoiceHolder) viewHolder;
-			holder.text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
-
-			if (mVoicePlayId == null || !mVoicePlayId.equals(message.getMessageId())) {// 处于非播放状态
-				holder.voice_action_img.setImageResource(R.drawable.feed_main_player_play);
-			} else {
-				holder.voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
-			}
-			holder.voice_action_img.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					play(holder, message);
-				}
-			});
-
-			String imageUrl = message.getFirstImageOriginal();
-			if (TextUtils.isEmpty(imageUrl)) {
-				AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.img_view, false);
-				holder.img_view.setOnClickListener(
-						new SingleImageClickListener(AvatarHelper.getAvatarUrl(message.getUserId(), false)));
-			} else {
-				ImageLoader.getInstance().displayImage(imageUrl, holder.img_view);
-				holder.img_view.setOnClickListener(new SingleImageClickListener(imageUrl));
-			}
-
-		} else if (viewType == VIEW_TYPE_NORMAL_VIDEO) {
-			NormalVideoHolder holder = (NormalVideoHolder) viewHolder;
-
-			String imageUrl = message.getFirstImageOriginal();
-			if (TextUtils.isEmpty(imageUrl)) {
-				AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.video_thumb_img, false);
-			} else {
-				ImageLoader.getInstance().displayImage(imageUrl, holder.video_thumb_img);
-			}
-
-			// holder.video_desc_tv.setText();
-		} else if (viewType == VIEW_TYPE_FW_VIDEO) {
-			FwVideoHolder holder = (FwVideoHolder) viewHolder;
-			holder.text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
-
-			String imageUrl = message.getFirstImageOriginal();
-			if (TextUtils.isEmpty(imageUrl)) {
-				AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.video_thumb_img, false);
-			} else {
-				ImageLoader.getInstance().displayImage(imageUrl, holder.video_thumb_img);
-			}
-		}
-
-		return convertView;
-	}
-
-	class ViewHolder {
-		ImageView avatar_img;
-		TextView nick_name_tv;
-		TextView time_tv;
-		TextView body_tv;
-		FrameLayout content_fl;
-		TextView delete_tv;
-		ImageView operation_more_img;
-		TextView multi_praise_tv;
-		ListView command_listView;
-	}
-
-	/* 普通的Text */
-	class NormalTextHolder extends ViewHolder {
-	}
-
-	/* 转载的Text */
-	class FwTextHolder extends ViewHolder {
-		TextView text_tv;
-	}
-
-	/* 普通的单张图片 */
-	class NormalSingleImageHolder extends ViewHolder {
-		ImageView image_view;
-	}
-
-	/* 转载的单张图片 */
-	class FwSingleImageHolder extends ViewHolder {
-		TextView text_tv;
-		ImageView image_view;
-	}
-
-	/* 普通的多张图片 */
-	class NormalMultiImageHolder extends ViewHolder {
-		MyGridView grid_view;
-	}
-
-	/* 转载的多张图片 */
-	class FwMultiImageHolder extends ViewHolder {
-		TextView text_tv;
-		MyGridView grid_view;
-	}
-
-	/* 普通的音频 */
-	class NormalVoiceHolder extends ViewHolder {
-		ImageView img_view;
-		ImageView voice_action_img;
-		TextView voice_desc_tv;
-	}
-
-	/* 转载的音频 */
-	class FwVoiceHolder extends ViewHolder {
-		TextView text_tv;
-		ImageView img_view;
-		ImageView voice_action_img;
-		TextView voice_desc_tv;
-	}
-
-	/* 普通的视频 */
-	class NormalVideoHolder extends ViewHolder {
-		ImageView video_thumb_img;
-		TextView video_desc_tv;
-	}
-
-	/* 转载的视频 */
-	class FwVideoHolder extends ViewHolder {
-		TextView text_tv;
-		ImageView video_thumb_img;
-		TextView video_desc_tv;
-	}
-
-	public class CommentAdapter extends BaseAdapter {
-		private int messagePosition;
-		private List<Comment> datas;
-
-		public CommentAdapter(int messagePosition, List<Comment> datas) {
-			this.messagePosition = messagePosition;
-			this.datas = datas;
-		}
-
-		@Override
-		public int getCount() {
-			return datas.size();
-		}
-
-		@Override
-		public Object getItem(int position) {
-			return position;
-		}
-
-		@Override
-		public long getItemId(int position) {
-			return position;
-		}
-
-		@Override
-		public View getView(final int position, View convertView, ViewGroup parent) {
-			ViewHolder holder = null;
-			if (convertView == null) {
-				holder = new ViewHolder();
-				convertView = LayoutInflater.from(mContext).inflate(R.layout.p_msg_comment_list_item, null);
-				holder.text_view = (TextView) convertView.findViewById(R.id.text_view);
-				convertView.setTag(holder);
-			} else {
-				holder = (ViewHolder) convertView.getTag();
-			}
-			final Comment comment = datas.get(position);
-			SpannableStringBuilder builder = new SpannableStringBuilder();
-			String showName = getShowName(comment.getUserId(), comment.getNickName());
-			UserClickableSpan.setClickableSpan(mContext, builder, showName, comment.getUserId());// 设置评论者的ClickSpanned
-
-			if (!TextUtils.isEmpty(comment.getToUserId()) && !TextUtils.isEmpty(comment.getToNickname())) {
-				builder.append(mContext.getString(R.string.replay));
-				String toShowName = getShowName(comment.getToUserId(), comment.getToNickname());
-				UserClickableSpan.setClickableSpan(mContext, builder, toShowName, comment.getToUserId());// 设置被评论者的ClickSpanned
-			}
-
-			builder.append(":");
-			// 设置评论内容
-			String commentBody = comment.getBody();
-			if (!TextUtils.isEmpty(commentBody)) {
-				commentBody = StringUtils.replaceSpecialChar(comment.getBody());
-				CharSequence charSequence = HtmlUtils.transform200SpanString(commentBody.replaceAll("\n", "\r\n"),
-						true);
-				builder.append(charSequence);
-			}
-			holder.text_view.setText(builder);
-			holder.text_view.setLinksClickable(true);
-			holder.text_view.setMovementMethod(LinkMovementClickMethod.getInstance());
-
-			holder.text_view.setOnClickListener(new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					if (comment.getUserId().equals(mLoginUserId)) {// 如果消息是我发的，那么就弹出删除和复制的对话框
-						showCommentLongClickDialog(messagePosition, position, CommentAdapter.this);
-					} else {// 弹出回复的框
-						String toShowName = getShowName(comment.getUserId(), comment.getNickName());
-						// 懒得写回调的，直接强转，以后如果不适用，可以写个接口回调
-						if (mContext instanceof BusinessCircleActivity) {
-							((BusinessCircleActivity) mContext).showCommentEnterView(messagePosition,
-									comment.getUserId(), comment.getNickName(), toShowName);
-
-						} else {
-							((MainActivity) mContext).getBusinessCircleFragment().showCommentEnterView(messagePosition,
-									comment.getUserId(), comment.getNickName(), toShowName);
-						}
-						// show(messagePosition, comment.getUserId(),
-						// comment.getNickName(),toShowName);
-					}
-				}
-			});
-
-			holder.text_view.setOnLongClickListener(new View.OnLongClickListener() {
-				@Override
-				public boolean onLongClick(View v) {
-					showCommentLongClickDialog(messagePosition, position, CommentAdapter.this);
-					return true;
-				}
-			});
-
-			return convertView;
-		}
-
-		class ViewHolder {
-			TextView text_view;
-		}
-
-	}
-
-	/*
-	 * 回调接口的编写 暂时没有用上
-	 * 
-	 */
-	public showCEView ceView;
-
-	public void setShowCEViewListener(showCEView ceView) {
-		this.ceView = ceView;
-	}
-
-	public void show(int messagePosition, String toUserId, String toNickname, String toShowName) {
-		BusinessCircleFragment fra = new BusinessCircleFragment();
-		// BusinessCircleActivity fra=new BusinessCircleActivity();
-		setShowCEViewListener(fra);
-		if (ceView != null) {
-			ceView.showView(messagePosition, toUserId, toNickname, toShowName);
-
-		}
-	}
-
-	private class SingleImageClickListener implements View.OnClickListener {
-		private String url;
-
-		public SingleImageClickListener(String url) {
-			this.url = url;
-		}
-
-		@Override
-		public void onClick(View v) {
-			Intent intent = new Intent(mContext, SingleImagePreviewActivity.class);
-			intent.putExtra(AppConstant.EXTRA_IMAGE_URI, url);
-			mContext.startActivity(intent);
-		}
-
-	}
-
-	private class MultipleImagesClickListener implements AdapterView.OnItemClickListener {
-		private List<Resource> images;
-
-		public MultipleImagesClickListener(List<Resource> images) {
-			this.images = images;
-		}
-
-		@Override
-		public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-			if (images == null || images.size() <= 0) {
-				return;
-			}
-			ArrayList<String> lists = new ArrayList<String>();
-			for (int i = 0; i < images.size(); i++) {
-				lists.add(images.get(i).getOriginalUrl());
-			}
-			Intent intent = new Intent(mContext, MultiImagePreviewActivity.class);
-			intent.putExtra(AppConstant.EXTRA_IMAGES, lists);
-			intent.putExtra(AppConstant.EXTRA_POSITION, position);
-			intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
-			mContext.startActivity(intent);
-		}
-
-	}
-
-	public static String ToDBC(String input) {
-		char[] c = input.toCharArray();
-		for (int i = 0; i < c.length; i++) {
-			if (c[i] == 12288) {
-				c[i] = (char) 32;
-				continue;
-			}
-			if (c[i] > 65280 && c[i] < 65375)
-				c[i] = (char) (c[i] - 65248);
-		}
-		return new String(c);
-	}
-
-	private String getShowName(String userId, String defaultName) {
-		String showName = null;
-		if (!mShowNameMaps.containsKey(userId)) {
-			if (userId.equals(mLoginUserId)) {
-				mShowNameMaps.put(userId, mLoginNickName);
-			} else {
-				Friend friend = FriendDao.getInstance().getFriend(mLoginUserId, userId);
-				if (friend != null) {
-					mShowNameMaps.put(userId, friend.getShowName());
-				}
-			}
-		}
-		showName = mShowNameMaps.get(userId);
-		if (TextUtils.isEmpty(showName)) {
-			showName = defaultName;
-			mShowNameMaps.put(userId, showName);
-		}
-		return showName;
-	}
-
-	/* 操作事件 */
-	private void showDeleteMsgDialog(final int position) {
-		new AlertDialog.Builder(mContext).setTitle(R.string.prompt_title).setMessage(R.string.delete_prompt)
-				.setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						deleteMsg(position);
-					}
-				}).setNegativeButton(R.string.cancel, null).create().show();
-	}
-
-	private void deleteMsg(final int position) {
-		final PublicMessage message = mMessages.get(position);
-		if (message == null) {
-			return;
-		}
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("messageId", message.getMessageId());
-		ProgressDialogUtil.show(mProgressDialog);
-		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(
-				MyApplication.getInstance().getConfig().CIRCLE_MSG_DELETE, new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ProgressDialogUtil.dismiss(mProgressDialog);
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<Void>() {
-					@Override
-					public void onResponse(ObjectResult<Void> result) {
-						boolean success = Result.defaultParser(mContext, result, true);
-						if (success) {
-							CircleMessageDao.getInstance().deleteMessage(message.getMessageId());// 删除数据库的记录（如果存在的话）
-							mMessages.remove(position);
-							notifyDataSetChanged();
-						}
-						ProgressDialogUtil.dismiss(mProgressDialog);
-					}
-				}, Void.class, params);
-		((BaseActivity) mContext).addDefaultRequest(request);
-	}
-
-	private void showBodyTextLongClickDialog(final String text) {
-		CharSequence[] items = new CharSequence[] { mContext.getString(R.string.copy) };
-		new AlertDialog.Builder(mContext).setItems(items, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				switch (which) {
-				case 0:// 复制文字
-					SystemUtil.copyText(mContext, text);
-					break;
-				}
-			}
-		}).setCancelable(true).create().show();
-	}
-
-	private void showCommentLongClickDialog(final int messagePosition, final int commentPosition,
-			final CommentAdapter adapter) {
-		if (messagePosition < 0 || messagePosition >= mMessages.size()) {
-			return;
-		}
-		final PublicMessage message = mMessages.get(messagePosition);
-		if (message == null) {
-			return;
-		}
-		final List<Comment> comments = message.getComments();
-		if (comments == null) {
-			return;
-		}
-		if (commentPosition < 0 || commentPosition >= comments.size()) {
-			return;
-		}
-		final Comment comment = comments.get(commentPosition);
-
-		CharSequence[] items;
-		if (comment.getUserId().equals(mLoginUserId) || message.getUserId().equals(mLoginUserId)) {// 我的评论，或者我的消息，那么我就可以删除
-			items = new CharSequence[] { mContext.getString(R.string.copy), mContext.getString(R.string.delete) };
-		} else {
-			items = new CharSequence[] { mContext.getString(R.string.copy) };
-		}
-
-		new AlertDialog.Builder(mContext).setItems(items, new DialogInterface.OnClickListener() {
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				switch (which) {
-				case 0:// 复制文字
-					if (TextUtils.isEmpty(comment.getBody())) {
-						return;
-					}
-					SystemUtil.copyText(mContext, comment.getBody());
-					break;
-				case 1:
-					deleteComment(message.getMessageId(), comment.getCommentId(), comments, commentPosition, adapter);
-					break;
-				}
-			}
-		}).setCancelable(true).create().show();
-	}
-
-	/**
-	 * 删除一条回复
-	 */
-	private void deleteComment(String messageId, String commentId, final List<Comment> comments,
-			final int commentPosition, final CommentAdapter adapter) {
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("messageId", messageId);
-		params.put("commentId", commentId);
-		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(
-				MyApplication.getInstance().getConfig().MSG_COMMENT_DELETE, new ErrorListener() {
-					@Override
-					public void onErrorResponse(VolleyError arg0) {
-						ToastUtil.showErrorNet(mContext);
-					}
-				}, new StringJsonObjectRequest.Listener<Void>() {
-
-					@Override
-					public void onResponse(ObjectResult<Void> result) {
-						boolean success = Result.defaultParser(mContext, result, true);
-						if (success) {
-							comments.remove(commentPosition);
-							adapter.notifyDataSetChanged();
-						}
-					}
-				}, Void.class, params);
-		((BaseActivity) mContext).addDefaultRequest(request);
-	}
-
-	/* 点击更多操作弹出的对话框 */
-	private OperationMorePopWindow mOperationMorePop;
-
-	private void showOperationMorePopWindow(View anchowView, final int position) {
-		if (mOperationMorePop == null) {
-			mOperationMorePop = new OperationMorePopWindow((Activity) mContext);
-			mOperationMorePop.setOperationMoreListener(new OperationMorePopWindow.OperationMoreListener() {
-				@Override
-				public void onPraise(int messagePosition, boolean isPraise) {
-					praiseOrCancle(messagePosition, isPraise);
-				}
-
-				@Override
-				public void onGift(int messagePosition) {
-
-				}
-
-				@Override
-				public void onComment(int messagePosition) {
-					// 懒得写回调的，直接强转，以后如果不适用，可以写个接口回调
-					if (mContext instanceof BusinessCircleActivity) {
-						((BusinessCircleActivity) mContext).showCommentEnterView(messagePosition, null, null, null);
-					} else {
-						// 这里当处于的是一个fragment中时,我们让他评论的时候直接跳到详情页去评论
-						PublicMessage message = mMessages.get(messagePosition);
-						Intent intent = new Intent(mContext, PMsgDetailActivity.class);
-						intent.putExtra("public_message", message);
-						mContext.startActivity(intent);
-					}
-					// 这里有问题,所以暂不使用回调接口实现
-					// show(messagePosition,null, null, null);
-				}
-			});
-		}
-		PublicMessage message = mMessages.get(position);
-		if (message == null) {
-			return;
-		}
-		mOperationMorePop.show(anchowView, position, message.getIsPraise() == 1 ? false : true);
-	}
-
-	/**
-	 * 赞或者取消赞
-	 * 
-	 * @param messageId
-	 * @param isPraise
-	 */
-	private void praiseOrCancle(final int position, final boolean isPraise) {
-		final PublicMessage message = mMessages.get(position);
-		if (message == null) {
-			return;
-		}
-
-		HashMap<String, String> params = new HashMap<String, String>();
-		params.put("access_token", MyApplication.getInstance().mAccessToken);
-		params.put("messageId", message.getMessageId());
-		String requestUrl = null;
-		if (isPraise) {
-			requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_ADD;
-		} else {
-			requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_DELETE;
-		}
-
-		StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(requestUrl, new ErrorListener() {
-			@Override
-			public void onErrorResponse(VolleyError arg0) {
-				ToastUtil.showErrorNet(mContext);
-			}
-		}, new StringJsonObjectRequest.Listener<Void>() {
-
-			@Override
-			public void onResponse(ObjectResult<Void> result) {
-				boolean success = Result.defaultParser(mContext, result, true);
-				if (success) {
-					message.setIsPraise(isPraise ? 1 : 0);
-					List<Praise> praises = message.getPraises();
-					if (praises == null) {
-						praises = new ArrayList<Praise>();
-						message.setPraises(praises);
-					}
-					int praiseCount = message.getPraise();
-					if (isPraise) {// 代表我点赞
-						// 消息实体的改变
-						Praise praise = new Praise();
-						praise.setUserId(mLoginUserId);
-						praise.setNickName(mLoginNickName);
-						praises.add(0, praise);
-						praiseCount++;
-						message.setPraise(praiseCount);
-					} else {// 取消我的赞
-						// 消息实体的改变
-						for (int i = 0; i < praises.size(); i++) {
-							if (mLoginUserId.equals(praises.get(i).getUserId())) {
-								praises.remove(i);
-								praiseCount--;
-								message.setPraise(praiseCount);
-								break;
-							}
-						}
-					}
-					notifyDataSetChanged();
-				}
-			}
-		}, Void.class, params);
-		((BaseActivity) mContext).addDefaultRequest(request);
-	}
-
-	/**
-	 * 停止播放声音
-	 */
-	private void stopVoice() {
-		Log.d("wang", "stopVoice");
-		if (mAudioPalyer != null) {
-			mAudioPalyer.stop();
-		}
-	}
-	private void stopVoiceIDE() {
-		Log.d("wang", "stopVoiceIDE");
-		if (mAudioPalyer != null) {
-			mAudioPalyer.release();
-		}
-	}
-	/********************** 播放声音 ***********************************/
-	/**
-	 * 
-	 * @param status
-	 * @param viewHolder
-	 * @param msg_id
-	 */
-	private void play(ViewHolder viewHolder, PublicMessage message) {
-		String voiceUrl = message.getFirstAudio();
-
-		if (mVoicePlayId == null) {// 没有在播放
-			try {
-				mAudioPalyer.play(voiceUrl);
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			mVoicePlayId = message.getMessageId();
-			updateVoiceViewHolderIconStatus(true, viewHolder);
-			mVoicePlayViewHolder = viewHolder;
-		} else {
-			if (mVoicePlayId == message.getMessageId()) {
-				mAudioPalyer.stop();
-				mVoicePlayId = null;
-				updateVoiceViewHolderIconStatus(false, viewHolder);
-				mVoicePlayViewHolder = null;
-			} else {// 正在播放别的， 在播放这个
-				mAudioPalyer.stop();
-				mVoicePlayId = null;
-				if (mVoicePlayViewHolder != null) {
-					updateVoiceViewHolderIconStatus(false, mVoicePlayViewHolder);
-				}
-				try {
-					mAudioPalyer.play(voiceUrl);
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-
-				mVoicePlayId = message.getMessageId();
-				updateVoiceViewHolderIconStatus(true, viewHolder);
-				mVoicePlayViewHolder = viewHolder;
-			}
-
-		}
-
-	}
-
-	private void updateVoiceViewHolderIconStatus(boolean play, ViewHolder viewHolder) {
-		if (viewHolder instanceof NormalVoiceHolder) {// 普通音频
-			if (play) {
-				((NormalVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
-			} else {
-				((NormalVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_play);
-			}
-		} else {// 转载音频
-			if (play) {
-				((FwVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
-			} else {
-				((FwVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_play);
-			}
-		}
-	}
-
-	/**
-	 * 节口回调的方法
-	 */
-	@Override
-	public void ideChange() {
-		stopVoice();
-	}
-
-	/**
-	 * 节口回调的方法,
-	 */
-	@Override
-	public void ideChangeFragment() {
+        List<Praise> praises = message.getPraises();
+        if (praises != null && praises.size() > 0) {
+            viewHolder.multi_praise_tv.setVisibility(View.VISIBLE);
+            SpannableStringBuilder builder = new SpannableStringBuilder();
+            for (int i = 0; i < praises.size(); i++) {
+                String praiseName = getShowName(praises.get(i).getUserId(), praises.get(i).getNickName());
+                UserClickableSpan.setClickableSpan(mContext, builder, praiseName, praises.get(i).getUserId());
+                if (i < praises.size() - 1)
+                    builder.append("、");
+            }
+            if (message.getPraise() > praises.size()) {
+                builder.append("...");
+            }
+            viewHolder.multi_praise_tv.setText(builder);
+            if (viewHolder.multi_praise_tv.getLineCount() > 0) {
+                ViewGroup.LayoutParams p = viewHolder.multi_praise_tv.getLayoutParams();
+                p.height = viewHolder.multi_praise_tv.getHeight() * viewHolder.multi_praise_tv.getLineCount();
+                viewHolder.multi_praise_tv.setLayoutParams(p);
+
+            }
+            Log.i("gongpengming", viewHolder.multi_praise_tv.getLineCount() + "行数");
+//            if (viewHolder.multi_praise_tv.getLineCount()>1)
+        } else {
+            viewHolder.multi_praise_tv.setVisibility(View.GONE);
+            viewHolder.multi_praise_tv.setText("");
+        }
+        viewHolder.multi_praise_tv.setLinksClickable(true);
+        viewHolder.multi_praise_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
+            /* 设置回复 */
+        final List<Comment> comments = message.getComments();
+        if ((praises != null && praises.size() > 0) || (comments != null && comments.size() > 0)) {
+            viewHolder.viewLine.setVisibility(View.GONE);
+        } else {
+            viewHolder.viewLine.setVisibility(View.GONE);
+        }
+        if (comments != null && comments.size() > 0) {
+            viewHolder.command_listView.setVisibility(View.VISIBLE);
+            mAdapter = new CommentAdapter(position, comments);
+            viewHolder.command_listView.setAdapter(mAdapter);
+        } else {
+            viewHolder.command_listView.setVisibility(View.GONE);
+            viewHolder.command_listView.setAdapter(null);
+        }
+
+        // //////////////////上面是公用的部分，下面是每个Type不同的部分/////////////////////////////////////////
+        // 转载的消息会有一个转载人和text
+        SpannableStringBuilder forwardingBuilder = null;
+        if (isForwarding) {// 转载的那个人和说的话
+            forwardingBuilder = new SpannableStringBuilder();
+            String forwardName = getShowName(message.getFowardUserId(), message.getFowardNickname());
+            UserClickableSpan.setClickableSpan(mContext, forwardingBuilder, forwardName, message.getFowardUserId());
+            if (!TextUtils.isEmpty(message.getFowardText())) {
+                forwardingBuilder.append(" : ");
+                forwardingBuilder.append(message.getFowardText());
+            }
+        }
+
+        if (viewType == VIEW_TYPE_NORMAL_TEXT) {
+            viewHolder.content_fl.setVisibility(View.GONE);// 因为有个MarginTop
+            // 5dp，所以没内容的时候隐藏，免得中间间隔有点大
+        } else if (viewType == VIEW_TYPE_FW_TEXT) {
+            TextView text_tv = ((FwTextHolder) viewHolder).text_tv;
+            text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
+        } else if (viewType == VIEW_TYPE_NORMAL_SINGLE_IMAGE) {
+            ImageView image_view = ((NormalSingleImageHolder) viewHolder).image_view;
+            String url = message.getFirstImageOriginal();
+            if (!TextUtils.isEmpty(url)) {
+                ImageLoader.getInstance().displayImage(url, image_view);
+                image_view.setOnClickListener(new SingleImageClickListener(url));
+            } else {
+                image_view.setImageBitmap(null);
+            }
+        } else if (viewType == VIEW_TYPE_FW_SINGLE_IMAGE) {
+            TextView text_tv = ((FwSingleImageHolder) viewHolder).text_tv;
+            ImageView image_view = ((FwSingleImageHolder) viewHolder).image_view;
+            text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
+
+            String url = message.getFirstImageOriginal();
+            if (!TextUtils.isEmpty(url)) {
+                ImageLoader.getInstance().displayImage(url, image_view);
+                image_view.setOnClickListener(new SingleImageClickListener(url));
+            } else {
+                image_view.setImageBitmap(null);
+            }
+
+        } else if (viewType == VIEW_TYPE_NORMAL_MULTI_IMAGE) {
+            MyGridView grid_view = ((NormalMultiImageHolder) viewHolder).grid_view;
+            if (body.getImages() != null) {
+                grid_view.setAdapter(new ImagesInnerGridViewAdapter(mContext, body.getImages()));
+                grid_view.setOnItemClickListener(new MultipleImagesClickListener(body.getImages()));
+            } else {
+                grid_view.setAdapter(null);
+            }
+
+        } else if (viewType == VIEW_TYPE_FW_MULTI_IMAGE) {
+            TextView text_tv = ((FwMultiImageHolder) viewHolder).text_tv;
+            MyGridView grid_view = ((FwMultiImageHolder) viewHolder).grid_view;
+            text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
+            if (body.getImages() != null) {
+                grid_view.setAdapter(new ImagesInnerGridViewAdapter(mContext, body.getImages()));
+                grid_view.setOnItemClickListener(new MultipleImagesClickListener(body.getImages()));
+            } else {
+                grid_view.setAdapter(null);
+            }
+        } else if (viewType == VIEW_TYPE_NORMAL_VOICE) {
+            final NormalVoiceHolder holder = (NormalVoiceHolder) viewHolder;
+            if (mVoicePlayId == null || !mVoicePlayId.equals(message.getMessageId())) {// 处于非播放状态
+                holder.voice_action_img.setImageResource(R.drawable.feed_main_player_play);
+            } else {
+                holder.voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
+            }
+            holder.voice_action_img.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    play(holder, message);
+                }
+            });
+
+            String imageUrl = message.getFirstImageOriginal();
+            if (TextUtils.isEmpty(imageUrl)) {
+                AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.img_view, false);
+                holder.img_view.setOnClickListener(
+                        new SingleImageClickListener(AvatarHelper.getAvatarUrl(message.getUserId(), false)));
+            } else {
+                ImageLoader.getInstance().displayImage(imageUrl, holder.img_view);
+                holder.img_view.setOnClickListener(new SingleImageClickListener(imageUrl));
+            }
+
+        } else if (viewType == VIEW_TYPE_FW_VOICE) {
+            final FwVoiceHolder holder = (FwVoiceHolder) viewHolder;
+            holder.text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
+
+            if (mVoicePlayId == null || !mVoicePlayId.equals(message.getMessageId())) {// 处于非播放状态
+                holder.voice_action_img.setImageResource(R.drawable.feed_main_player_play);
+            } else {
+                holder.voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
+            }
+            holder.voice_action_img.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    play(holder, message);
+                }
+            });
+
+            String imageUrl = message.getFirstImageOriginal();
+            if (TextUtils.isEmpty(imageUrl)) {
+                AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.img_view, false);
+                holder.img_view.setOnClickListener(
+                        new SingleImageClickListener(AvatarHelper.getAvatarUrl(message.getUserId(), false)));
+            } else {
+                ImageLoader.getInstance().displayImage(imageUrl, holder.img_view);
+                holder.img_view.setOnClickListener(new SingleImageClickListener(imageUrl));
+            }
+
+        } else if (viewType == VIEW_TYPE_NORMAL_VIDEO) {
+            NormalVideoHolder holder = (NormalVideoHolder) viewHolder;
+
+            String imageUrl = message.getFirstImageOriginal();
+            if (TextUtils.isEmpty(imageUrl)) {
+                AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.video_thumb_img, false);
+            } else {
+                ImageLoader.getInstance().displayImage(imageUrl, holder.video_thumb_img);
+            }
+
+            // holder.video_desc_tv.setText();
+        } else if (viewType == VIEW_TYPE_FW_VIDEO) {
+            FwVideoHolder holder = (FwVideoHolder) viewHolder;
+            holder.text_tv.setText(forwardingBuilder != null ? forwardingBuilder : "");
+
+            String imageUrl = message.getFirstImageOriginal();
+            if (TextUtils.isEmpty(imageUrl)) {
+                AvatarHelper.getInstance().displayAvatar(message.getUserId(), holder.video_thumb_img, false);
+            } else {
+                ImageLoader.getInstance().displayImage(imageUrl, holder.video_thumb_img);
+            }
+        }
+
+        return convertView;
+    }
+
+    class ViewHolder {
+        View viewLine;
+        ImageView avatar_img;
+        TextView nick_name_tv;
+        TextView time_tv;
+        TextView body_tv;
+        FrameLayout content_fl;
+        TextView delete_tv;
+        ImageView operation_more_img;
+        TextView multi_praise_tv;
+        ListView command_listView;
+    }
+
+    /* 普通的Text */
+    class NormalTextHolder extends ViewHolder {
+    }
+
+    /* 转载的Text */
+    class FwTextHolder extends ViewHolder {
+        TextView text_tv;
+    }
+
+    /* 普通的单张图片 */
+    class NormalSingleImageHolder extends ViewHolder {
+        ImageView image_view;
+    }
+
+    /* 转载的单张图片 */
+    class FwSingleImageHolder extends ViewHolder {
+        TextView text_tv;
+        ImageView image_view;
+    }
+
+    /* 普通的多张图片 */
+    class NormalMultiImageHolder extends ViewHolder {
+        MyGridView grid_view;
+    }
+
+    /* 转载的多张图片 */
+    class FwMultiImageHolder extends ViewHolder {
+        TextView text_tv;
+        MyGridView grid_view;
+    }
+
+    /* 普通的音频 */
+    class NormalVoiceHolder extends ViewHolder {
+        ImageView img_view;
+        ImageView voice_action_img;
+        TextView voice_desc_tv;
+    }
+
+    /* 转载的音频 */
+    class FwVoiceHolder extends ViewHolder {
+        TextView text_tv;
+        ImageView img_view;
+        ImageView voice_action_img;
+        TextView voice_desc_tv;
+    }
+
+    /* 普通的视频 */
+    class NormalVideoHolder extends ViewHolder {
+        ImageView video_thumb_img;
+        TextView video_desc_tv;
+    }
+
+    /* 转载的视频 */
+    class FwVideoHolder extends ViewHolder {
+        TextView text_tv;
+        ImageView video_thumb_img;
+        TextView video_desc_tv;
+    }
+
+    public class CommentAdapter extends BaseAdapter {
+        private int messagePosition;
+        private List<Comment> datas;
+
+        public CommentAdapter(int messagePosition, List<Comment> datas) {
+            this.messagePosition = messagePosition;
+            this.datas = datas;
+        }
+
+        @Override
+        public int getCount() {
+            return datas.size();
+        }
+
+        @Override
+        public Object getItem(int position) {
+            return position;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            return position;
+        }
+
+        @Override
+        public View getView(final int position, View convertView, ViewGroup parent) {
+            ViewHolder holder = null;
+            if (convertView == null) {
+                holder = new ViewHolder();
+                convertView = LayoutInflater.from(mContext).inflate(R.layout.p_msg_comment_list_item, null);
+                holder.text_view = (TextView) convertView.findViewById(R.id.text_view);
+                convertView.setTag(holder);
+            } else {
+                holder = (ViewHolder) convertView.getTag();
+            }
+            final Comment comment = datas.get(position);
+            SpannableStringBuilder builder = new SpannableStringBuilder();
+            String showName = getShowName(comment.getUserId(), comment.getNickName());
+            UserClickableSpan.setClickableSpan(mContext, builder, showName, comment.getUserId());// 设置评论者的ClickSpanned
+
+            if (!TextUtils.isEmpty(comment.getToUserId()) && !TextUtils.isEmpty(comment.getToNickname())) {
+                builder.append(mContext.getString(R.string.replay));
+                String toShowName = getShowName(comment.getToUserId(), comment.getToNickname());
+                UserClickableSpan.setClickableSpan(mContext, builder, toShowName, comment.getToUserId());// 设置被评论者的ClickSpanned
+            }
+
+            builder.append(":");
+            // 设置评论内容
+            String commentBody = comment.getBody();
+            if (!TextUtils.isEmpty(commentBody)) {
+                commentBody = StringUtils.replaceSpecialChar(comment.getBody());
+                CharSequence charSequence = HtmlUtils.transform200SpanString(commentBody.replaceAll("\n", "\r\n"),
+                        true);
+                builder.append(charSequence);
+            }
+            holder.text_view.setText(builder);
+            holder.text_view.setLinksClickable(true);
+            holder.text_view.setMovementMethod(LinkMovementClickMethod.getInstance());
+
+            holder.text_view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (comment.getUserId().equals(mLoginUserId)) {// 如果消息是我发的，那么就弹出删除和复制的对话框
+                        showCommentLongClickDialog(messagePosition, position, CommentAdapter.this);
+                    } else {// 弹出回复的框
+                        String toShowName = getShowName(comment.getUserId(), comment.getNickName());
+                        // 懒得写回调的，直接强转，以后如果不适用，可以写个接口回调
+                        if (mContext instanceof BusinessCircleActivity) {
+                            ((BusinessCircleActivity) mContext).showCommentEnterView(messagePosition,
+                                    comment.getUserId(), comment.getNickName(), toShowName);
+
+                        } else {
+                            ((MainActivity) mContext).getBusinessCircleFragment().showCommentEnterView(messagePosition,
+                                    comment.getUserId(), comment.getNickName(), toShowName);
+                        }
+                        // show(messagePosition, comment.getUserId(),
+                        // comment.getNickName(),toShowName);
+                    }
+                }
+            });
+
+            holder.text_view.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    showCommentLongClickDialog(messagePosition, position, CommentAdapter.this);
+                    return true;
+                }
+            });
+
+            return convertView;
+        }
+
+        class ViewHolder {
+            TextView text_view;
+        }
+
+    }
+
+    /*
+     * 回调接口的编写 暂时没有用上
+     *
+     */
+    public showCEView ceView;
+
+    public void setShowCEViewListener(showCEView ceView) {
+        this.ceView = ceView;
+    }
+
+    public void show(int messagePosition, String toUserId, String toNickname, String toShowName) {
+        BusinessCircleFragment fra = new BusinessCircleFragment();
+        // BusinessCircleActivity fra=new BusinessCircleActivity();
+        setShowCEViewListener(fra);
+        if (ceView != null) {
+            ceView.showView(messagePosition, toUserId, toNickname, toShowName);
+
+        }
+    }
+
+    private class SingleImageClickListener implements View.OnClickListener {
+        private String url;
+
+        public SingleImageClickListener(String url) {
+            this.url = url;
+        }
+
+        @Override
+        public void onClick(View v) {
+            Intent intent = new Intent(mContext, SingleImagePreviewActivity.class);
+            intent.putExtra(AppConstant.EXTRA_IMAGE_URI, url);
+            mContext.startActivity(intent);
+        }
+
+    }
+
+    private class MultipleImagesClickListener implements AdapterView.OnItemClickListener {
+        private List<Resource> images;
+
+        public MultipleImagesClickListener(List<Resource> images) {
+            this.images = images;
+        }
+
+        @Override
+        public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+            if (images == null || images.size() <= 0) {
+                return;
+            }
+            ArrayList<String> lists = new ArrayList<String>();
+            for (int i = 0; i < images.size(); i++) {
+                lists.add(images.get(i).getOriginalUrl());
+            }
+            Intent intent = new Intent(mContext, MultiImagePreviewActivity.class);
+            intent.putExtra(AppConstant.EXTRA_IMAGES, lists);
+            intent.putExtra(AppConstant.EXTRA_POSITION, position);
+            intent.putExtra(AppConstant.EXTRA_CHANGE_SELECTED, false);
+            mContext.startActivity(intent);
+        }
+
+    }
+
+    public static String ToDBC(String input) {
+        char[] c = input.toCharArray();
+        for (int i = 0; i < c.length; i++) {
+            if (c[i] == 12288) {
+                c[i] = (char) 32;
+                continue;
+            }
+            if (c[i] > 65280 && c[i] < 65375)
+                c[i] = (char) (c[i] - 65248);
+        }
+        return new String(c);
+    }
+
+    private String getShowName(String userId, String defaultName) {
+        String showName = null;
+        if (!mShowNameMaps.containsKey(userId)) {
+            if (userId.equals(mLoginUserId)) {
+                mShowNameMaps.put(userId, mLoginNickName);
+            } else {
+                Friend friend = FriendDao.getInstance().getFriend(mLoginUserId, userId);
+                if (friend != null) {
+                    mShowNameMaps.put(userId, friend.getShowName());
+                }
+            }
+        }
+        showName = mShowNameMaps.get(userId);
+        if (TextUtils.isEmpty(showName)) {
+            showName = defaultName;
+            mShowNameMaps.put(userId, showName);
+        }
+        return showName;
+    }
+
+    /* 操作事件 */
+    private void showDeleteMsgDialog(final int position) {
+        new AlertDialog.Builder(mContext).setTitle(R.string.prompt_title).setMessage(R.string.delete_prompt)
+                .setPositiveButton(R.string.sure, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        deleteMsg(position);
+                    }
+                }).setNegativeButton(R.string.cancel, null).create().show();
+    }
+
+    private void deleteMsg(final int position) {
+        final PublicMessage message = mMessages.get(position);
+        if (message == null) {
+            return;
+        }
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("messageId", message.getMessageId());
+        ProgressDialogUtil.show(mProgressDialog);
+        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(
+                MyApplication.getInstance().getConfig().CIRCLE_MSG_DELETE, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ProgressDialogUtil.dismiss(mProgressDialog);
+                ToastUtil.showErrorNet(mContext);
+            }
+        }, new StringJsonObjectRequest.Listener<Void>() {
+            @Override
+            public void onResponse(ObjectResult<Void> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    CircleMessageDao.getInstance().deleteMessage(message.getMessageId());// 删除数据库的记录（如果存在的话）
+                    mMessages.remove(position);
+                    notifyDataSetChanged();
+                }
+                ProgressDialogUtil.dismiss(mProgressDialog);
+            }
+        }, Void.class, params);
+        ((BaseActivity) mContext).addDefaultRequest(request);
+    }
+
+    private void showBodyTextLongClickDialog(final String text) {
+        CharSequence[] items = new CharSequence[]{mContext.getString(R.string.copy)};
+        new AlertDialog.Builder(mContext).setItems(items, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                switch (which) {
+                    case 0:// 复制文字
+                        SystemUtil.copyText(mContext, text);
+                        break;
+                }
+            }
+        }).setCancelable(true).create().show();
+    }
+
+    private void showCommentLongClickDialog(final int messagePosition, final int commentPosition,
+                                            final CommentAdapter adapter) {
+        if (messagePosition < 0 || messagePosition >= mMessages.size()) {
+            return;
+        }
+        final PublicMessage message = mMessages.get(messagePosition);
+        if (message == null) {
+            return;
+        }
+        final List<Comment> comments = message.getComments();
+        if (comments == null) {
+            return;
+        }
+        if (commentPosition < 0 || commentPosition >= comments.size()) {
+            return;
+        }
+        final Comment comment = comments.get(commentPosition);
+
+        CharSequence[] items;
+        if (comment.getUserId().equals(mLoginUserId) || message.getUserId().equals(mLoginUserId)) {// 我的评论，或者我的消息，那么我就可以删除
+            items = new CharSequence[]{mContext.getString(R.string.copy), mContext.getString(R.string.delete)};
+        } else {
+            items = new CharSequence[]{mContext.getString(R.string.copy)};
+        }
+
+        new AlertDialog.Builder(mContext).setItems(items, new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                switch (which) {
+                    case 0:// 复制文字
+                        if (TextUtils.isEmpty(comment.getBody())) {
+                            return;
+                        }
+                        SystemUtil.copyText(mContext, comment.getBody());
+                        break;
+                    case 1:
+                        deleteComment(message.getMessageId(), comment.getCommentId(), comments, commentPosition, adapter);
+                        break;
+                }
+            }
+        }).setCancelable(true).create().show();
+    }
+
+    /**
+     * 删除一条回复
+     */
+    private void deleteComment(String messageId, String commentId, final List<Comment> comments,
+                               final int commentPosition, final CommentAdapter adapter) {
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("messageId", messageId);
+        params.put("commentId", commentId);
+        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(
+                MyApplication.getInstance().getConfig().MSG_COMMENT_DELETE, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ToastUtil.showErrorNet(mContext);
+            }
+        }, new StringJsonObjectRequest.Listener<Void>() {
+
+            @Override
+            public void onResponse(ObjectResult<Void> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    comments.remove(commentPosition);
+                    adapter.notifyDataSetChanged();
+                }
+            }
+        }, Void.class, params);
+        ((BaseActivity) mContext).addDefaultRequest(request);
+    }
+
+    /* 点击更多操作弹出的对话框 */
+    private OperationMorePopWindow mOperationMorePop;
+
+    private void showOperationMorePopWindow(View anchowView, final int position) {
+        if (mOperationMorePop == null) {
+            mOperationMorePop = new OperationMorePopWindow((Activity) mContext);
+            mOperationMorePop.setOperationMoreListener(new OperationMorePopWindow.OperationMoreListener() {
+                @Override
+                public void onPraise(int messagePosition, boolean isPraise) {
+                    praiseOrCancle(messagePosition, isPraise);
+                }
+
+                @Override
+                public void onGift(int messagePosition) {
+
+                }
+
+                @Override
+                public void onComment(int messagePosition) {
+                    // 懒得写回调的，直接强转，以后如果不适用，可以写个接口回调
+                    if (mContext instanceof BusinessCircleActivity) {
+                        ((BusinessCircleActivity) mContext).showCommentEnterView(messagePosition, null, null, null);
+                    } else {
+                        // 这里当处于的是一个fragment中时,我们让他评论的时候直接跳到详情页去评论
+                        PublicMessage message = mMessages.get(messagePosition);
+                        Intent intent = new Intent(mContext, PMsgDetailActivity.class);
+                        intent.putExtra("public_message", message);
+                        mContext.startActivity(intent);
+                    }
+                    // 这里有问题,所以暂不使用回调接口实现
+                    // show(messagePosition,null, null, null);
+                }
+            });
+        }
+        PublicMessage message = mMessages.get(position);
+        if (message == null) {
+            return;
+        }
+        mOperationMorePop.show(anchowView, position, message.getIsPraise() == 1 ? false : true);
+    }
+
+    /**
+     * 赞或者取消赞
+     *
+     * @param
+     * @param isPraise
+     */
+    private void praiseOrCancle(final int position, final boolean isPraise) {
+        final PublicMessage message = mMessages.get(position);
+        if (message == null) {
+            return;
+        }
+
+        HashMap<String, String> params = new HashMap<String, String>();
+        params.put("access_token", MyApplication.getInstance().mAccessToken);
+        params.put("messageId", message.getMessageId());
+        String requestUrl = null;
+        if (isPraise) {
+            requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_ADD;
+        } else {
+            requestUrl = MyApplication.getInstance().getConfig().MSG_PRAISE_DELETE;
+        }
+
+        StringJsonObjectRequest<Void> request = new StringJsonObjectRequest<Void>(requestUrl, new ErrorListener() {
+            @Override
+            public void onErrorResponse(VolleyError arg0) {
+                ToastUtil.showErrorNet(mContext);
+            }
+        }, new StringJsonObjectRequest.Listener<Void>() {
+
+            @Override
+            public void onResponse(ObjectResult<Void> result) {
+                boolean success = Result.defaultParser(mContext, result, true);
+                if (success) {
+                    message.setIsPraise(isPraise ? 1 : 0);
+                    List<Praise> praises = message.getPraises();
+                    if (praises == null) {
+                        praises = new ArrayList<Praise>();
+                        message.setPraises(praises);
+                    }
+                    int praiseCount = message.getPraise();
+                    if (isPraise) {// 代表我点赞
+                        // 消息实体的改变
+                        Praise praise = new Praise();
+                        praise.setUserId(mLoginUserId);
+                        praise.setNickName(mLoginNickName);
+                        praises.add(0, praise);
+                        praiseCount++;
+                        message.setPraise(praiseCount);
+                    } else {// 取消我的赞
+                        // 消息实体的改变
+                        for (int i = 0; i < praises.size(); i++) {
+                            if (mLoginUserId.equals(praises.get(i).getUserId())) {
+                                praises.remove(i);
+                                praiseCount--;
+                                message.setPraise(praiseCount);
+                                break;
+                            }
+                        }
+                    }
+                    notifyDataSetChanged();
+                }
+            }
+        }, Void.class, params);
+        ((BaseActivity) mContext).addDefaultRequest(request);
+    }
+
+    /**
+     * 停止播放声音
+     */
+    private void stopVoice() {
+        Log.d("wang", "stopVoice");
+        if (mAudioPalyer != null) {
+            mAudioPalyer.stop();
+        }
+    }
+
+    private void stopVoiceIDE() {
+        Log.d("wang", "stopVoiceIDE");
+        if (mAudioPalyer != null) {
+            mAudioPalyer.release();
+        }
+    }
+    /********************** 播放声音 ***********************************/
+    /**
+     * @param
+     * @param viewHolder
+     * @param
+     */
+    private void play(ViewHolder viewHolder, PublicMessage message) {
+        String voiceUrl = message.getFirstAudio();
+
+        if (mVoicePlayId == null) {// 没有在播放
+            try {
+                mAudioPalyer.play(voiceUrl);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+            mVoicePlayId = message.getMessageId();
+            updateVoiceViewHolderIconStatus(true, viewHolder);
+            mVoicePlayViewHolder = viewHolder;
+        } else {
+            if (mVoicePlayId == message.getMessageId()) {
+                mAudioPalyer.stop();
+                mVoicePlayId = null;
+                updateVoiceViewHolderIconStatus(false, viewHolder);
+                mVoicePlayViewHolder = null;
+            } else {// 正在播放别的， 在播放这个
+                mAudioPalyer.stop();
+                mVoicePlayId = null;
+                if (mVoicePlayViewHolder != null) {
+                    updateVoiceViewHolderIconStatus(false, mVoicePlayViewHolder);
+                }
+                try {
+                    mAudioPalyer.play(voiceUrl);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+                mVoicePlayId = message.getMessageId();
+                updateVoiceViewHolderIconStatus(true, viewHolder);
+                mVoicePlayViewHolder = viewHolder;
+            }
+
+        }
+
+    }
+
+    private void updateVoiceViewHolderIconStatus(boolean play, ViewHolder viewHolder) {
+        if (viewHolder instanceof NormalVoiceHolder) {// 普通音频
+            if (play) {
+                ((NormalVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
+            } else {
+                ((NormalVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_play);
+            }
+        } else {// 转载音频
+            if (play) {
+                ((FwVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_pause);
+            } else {
+                ((FwVoiceHolder) viewHolder).voice_action_img.setImageResource(R.drawable.feed_main_player_play);
+            }
+        }
+    }
+
+    /**
+     * 节口回调的方法
+     */
+    @Override
+    public void ideChange() {
+        stopVoice();
+    }
+
+    /**
+     * 节口回调的方法,
+     */
+    @Override
+    public void ideChangeFragment() {
 //		stopVoiceIDE();
-		
-	}
+
+    }
 
 }

WeiChat/src/main/java/com/sk/weichat/ui/MainActivity.java

@@ -154,6 +154,12 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
             mImStatus = mCoreService.isAuthenticated() ? AuthStateListener.AUTH_STATE_SUCCESS : AuthStateListener.AUTH_STATE_NOT;
         }
     };
+
+
+
+    private void hineColor(){
+
+    }
     /**
      * @desc:主页菜单入口
      * @author：Administrator on 2016/1/26 10:03
@@ -295,6 +301,7 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
                 cancelUserCheckIfExist();
                 startActivity(new Intent(MainActivity.this, LoginActivity.class));
                 // mFindRb.setChecked(true);
+                MainActivity.this.finish();
                 removeNeedUserFragment(false);
 
             } else if (action.equals(LoginHelper.ACTION_CONFLICT)) {

WeiChat/src/main/java/com/sk/weichat/ui/cardcast/CardcastActivity.java

@@ -1,5 +1,6 @@
 package com.sk.weichat.ui.cardcast;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -9,9 +10,12 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBar.Tab;
+import android.view.View;
+import android.widget.RadioButton;
 
 import com.sk.weichat.R;
 import com.sk.weichat.bean.message.NewFriendMessage;
@@ -22,8 +26,6 @@ import com.sk.weichat.xmpp.CoreService.CoreServiceBinder;
 
 /**
  * 我的名片盒
- *
- *
  */
 @SuppressWarnings("deprecation")
 public class CardcastActivity extends BaseActivity {
@@ -34,38 +36,91 @@ public class CardcastActivity extends BaseActivity {
 
     private boolean mBind;
     private CoreService mXmppService;
+    private RadioButton btnG;
+    private RadioButton btnAG;
+    private FriendFragment friendFragment;
+    private AttentionFragment attentionFragment;
+    private RoomFragment roomFragment;
+    private FragmentTransaction bt;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // setup action bar for tabs
-        ActionBar actionBar = getSupportActionBar();
-
-        actionBar.setTitle(R.string.my_friend);
-
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-
-        mFriend = new TabListener<FriendFragment>(this, "friend", FriendFragment.class);
-        mAttention = new TabListener<AttentionFragment>(this, "attention", AttentionFragment.class);
-        mRoom = new TabListener<RoomFragment>(this, "room", RoomFragment.class);
-        int index = 0;
-        if (savedInstanceState != null) {
-            mFriend.setFragment(getSupportFragmentManager().findFragmentByTag("friend"));
-            mAttention.setFragment(getSupportFragmentManager().findFragmentByTag("attention"));
-            mRoom.setFragment(getSupportFragmentManager().findFragmentByTag("room"));
-            index = savedInstanceState.getInt("index", 0);
-        }
-        Tab tab = actionBar.newTab().setText(R.string.focus_on_each_other).setTabListener(mFriend);
-        actionBar.addTab(tab);
-
-        tab = actionBar.newTab().setText(R.string.unilateral_attention).setTabListener(mAttention);
-        actionBar.addTab(tab);
-        tab = actionBar.newTab().setText(R.string.focus_room).setTabListener(mRoom);
-        actionBar.addTab(tab);
-        actionBar.setSelectedNavigationItem(index);
+        setContentView(R.layout.activity_cardast);
+//        ActionBar actionBar = getSupportActionBar();
+
+//        actionBar.setTitle(R.string.my_friend);
+//        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+
+//        mFriend = new TabListener<FriendFragment>(this, "friend", FriendFragment.class);
+//        mAttention = new TabListener<AttentionFragment>(this, "attention", AttentionFragment.class);
+//        mRoom = new TabListener<RoomFragment>(this, "room", RoomFragment.class);
+//        int index = 0;
+//        if (savedInstanceState != null) {
+//            mFriend.setFragment(getSupportFragmentManager().findFragmentByTag("friend"));
+//            mAttention.setFragment(getSupportFragmentManager().findFragmentByTag("attention"));
+//            mRoom.setFragment(getSupportFragmentManager().findFragmentByTag("room"));
+//            index = savedInstanceState.getInt("index", 0);
+//        }
+        roomFragment = new RoomFragment();
+        friendFragment = new FriendFragment();
+        attentionFragment = new AttentionFragment();
+        btnG = (RadioButton) findViewById(R.id.btn_guanzu);
+        btnAG = (RadioButton) findViewById(R.id.btn_aguanzu);
+        FragmentManager fm = getSupportFragmentManager();
+        bt = fm.beginTransaction();
+        bt.add(R.id.fl, friendFragment);
+        bt.add(R.id.fl, attentionFragment);
+        bt.hide(roomFragment);
+        bt.commit();
+        findViewById(R.id.tv_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CardcastActivity.this.finish();
+            }
+        });
+        btnG.setOnClickListener(new View.OnClickListener() {
+            @SuppressLint("NewApi")
+            @Override
+            public void onClick(View view) {
+                btnG.setClickable(false);
+                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu_pass));
+                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu));
+                btnAG.setClickable(true);
+                bt = getSupportFragmentManager().beginTransaction();
+                bt.show(friendFragment);
+                bt.hide(attentionFragment);
+                bt.commit();
 
-        registerReceiver(mUpdateReceiver, CardcastUiUpdateUtil.getUpdateActionFilter());
-        mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
+            }
+        });
+        btnAG.setOnClickListener(new View.OnClickListener() {
+            @SuppressLint("NewApi")
+            @Override
+            public void onClick(View view) {
+                btnAG.setClickable(false);
+                btnG.setClickable(true);
+                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu));
+                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu_pass));
+                bt = getSupportFragmentManager().beginTransaction();
+                bt.show(attentionFragment);
+                bt.hide(friendFragment);
+                bt.commit();
+            }
+        });
+
+//        Tab tab = actionBar.newTab().setText(R.string.focus_on_each_other).setTabListener(mFriend);
+//        actionBar.addTab(tab);
+//
+//        tab = actionBar.newTab().setText(R.string.unilateral_attention).setTabListener(mAttention);
+//        actionBar.addTab(tab);
+//        tab = actionBar.newTab().setText(R.string.focus_room).setTabListener(mRoom);
+//        actionBar.addTab(tab);
+//        actionBar.setSelectedNavigationItem(index);
+
+//        registerReceiver(mUpdateReceiver, CardcastUiUpdateUtil.getUpdateActionFilter());
+//        mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
     }
 
     @Override
@@ -95,8 +150,9 @@ public class CardcastActivity extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        unregisterReceiver(mUpdateReceiver);
+
         if (mBind) {
+            unregisterReceiver(mUpdateReceiver);
             unbindService(mServiceConnection);
         }
     }

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/ErpMenActivity.java

@@ -34,13 +34,13 @@ public class ErpMenActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fragment_tool_layout);
         ViewUtils.inject(this);
-        ct=this;
+        ct = this;
         initData();
     }
 
     private void initData() {
         getSupportActionBar().setTitle("工作");
-        menus=new ArrayList<String>();
+        menus = new ArrayList<String>();
 //        menus.add("销售订单");
 //        menus.add("报价单");
         menus.add("请假单");
@@ -48,7 +48,7 @@ public class ErpMenActivity extends BaseActivity {
         menus.add("加班申请");
         menus.add("特殊考勤");
         menus.add("查询与统计");
-        adapter=new DetailItemAdapter(this, menus);
+        adapter = new DetailItemAdapter(this, menus);
         lv_tool.setAdapter(adapter);
 
 //        lv_tool.setOnItemLongClickListener(new OnItemLongClickListener() {
@@ -86,30 +86,30 @@ public class ErpMenActivity extends BaseActivity {
 
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                DetailItemAdapter.ListItem item=(DetailItemAdapter.ListItem) view.getTag();
-                String tag=item.menu_name.getText().toString();
+                DetailItemAdapter.ListItem item = (DetailItemAdapter.ListItem) view.getTag();
+                String tag = item.menu_name.getText().toString();
                 int falg = 0;
 
 
-                if("销售订单".equals(tag)){
+                if ("销售订单".equals(tag)) {
                     falg = 0;
                 }
-                if("报价单".equals(tag)){
+                if ("报价单".equals(tag)) {
                     falg = 1;
                 }
-                if("请假单".equals(tag)){
+                if ("请假单".equals(tag)) {
                     falg = 2;
                 }
-                if("出差单".equals(tag)){
+                if ("出差单".equals(tag)) {
                     falg = 3;
                 }
-                if("加班申请".equals(tag)){
+                if ("加班申请".equals(tag)) {
                     falg = 4;
                 }
-                if("特殊考勤".equals(tag)){
+                if ("特殊考勤".equals(tag)) {
                     falg = 5;
                 }
-                if("查询与统计".equals(tag)){
+                if ("查询与统计".equals(tag)) {
                     falg = 6;
                 }
 
@@ -179,38 +179,35 @@ public class ErpMenActivity extends BaseActivity {
                 }
 
 
-
             }
         });
     }
 
 
-
-    public class DetailItemAdapter extends BaseAdapter {;
+    public class DetailItemAdapter extends BaseAdapter {
+        ;
         private Context ct;
-        private List<String> menus=new ArrayList<>();
+        private List<String> menus = new ArrayList<>();
         private LayoutInflater inflater;
 
-        public DetailItemAdapter(Context ct,List<String> menus) {;
-            this.ct=ct;
-            this.menus=menus;
+        public DetailItemAdapter(Context ct, List<String> menus) {
+            ;
+            this.ct = ct;
+            this.menus = menus;
             this.inflater = LayoutInflater.from(ct);
         }
 
 
-
         public List<String> getMenus() {
             return menus;
         }
 
 
-
         public void setMenus(List<String> menus) {
             this.menus = menus;
         }
 
 
-
         @Override
         public int getCount() {
             return menus.size();
@@ -228,18 +225,22 @@ public class ErpMenActivity extends BaseActivity {
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            ListItem item=null;
-            if (convertView==null) {
-                convertView =inflater.inflate(R.layout.item_weixin_listview, parent,false);
-                item=new ListItem();
-                item.menu_name=(TextView) convertView.findViewById(R.id.tv_menu_name);
+            ListItem item = null;
+            if (convertView == null) {
+                convertView = inflater.inflate(R.layout.item_weixin_listview, parent, false);
+                item = new ListItem();
+                item.menu_name = (TextView) convertView.findViewById(R.id.tv_menu_name);
 //                item.badge=new BadgeView(ct, item.menu_name);
                 convertView.setTag(item);
-            }else{
+            } else {
 
-                item=(ListItem) convertView.getTag();
+                item = (ListItem) convertView.getTag();
+            }
+            if (position % 2 == 0) {
+                convertView.setBackgroundColor(getResources().getColor(R.color.item_color1));
+            } else {
+                convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
             }
-
             item.menu_name.setText(menus.get(position));
 //            item.badge.setText(String.valueOf(position));
 //            item.badge.setBadgeBackgroundColor(Color
@@ -250,7 +251,7 @@ public class ErpMenActivity extends BaseActivity {
             return convertView;
         }
 
-        class ListItem{
+        class ListItem {
             TextView menu_name;
 //            BadgeView badge;
         }

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NewsTwoActivity.java

@@ -29,8 +29,8 @@ import com.sk.weichat.ui.erp.model.NewsEntity;
 import com.sk.weichat.ui.erp.net.ViewUtil;
 import com.sk.weichat.ui.erp.util.CommonUtil;
 import com.sk.weichat.ui.erp.util.Constants;
+import com.sk.weichat.ui.erp.util.ObjectUtils;
 import com.sk.weichat.ui.erp.view.EmptyLayout;
-import com.sk.weichat.util.ToastUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -174,10 +174,10 @@ public class NewsTwoActivity extends BaseActivity {
 
             if (position % 2 == 0) {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color1));
-                model.img.setImageResource(R.drawable.notice_img_1);
+
             } else {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
-                model.img.setImageResource(R.drawable.notice_img_2);
+
             }
             List<NewsEntity.Data> datas = newsEntities.getData();
 //			model.tv_title.setText(datas.get(position).getNE_THEME());
@@ -188,16 +188,16 @@ public class NewsTwoActivity extends BaseActivity {
             model.tv_author.setText("作者:" + datas.get(position).getNE_RELEASER());
             model.id = datas.get(position).getNE_ID();
 
-//			if (!ObjectUtils.isEquals(datas.get(position).getSTATUS(),null)){
-//			if (((int) datas.get(position).getSTATUS()) != -1) {
-//				model.tv_hasRead.setText("未读");
-//			} else {
-//				if (((int) datas.get(position).getSTATUS()) == -1) {
-//					model.tv_hasRead.setText("已读");
-//				}
-//			}}else{
-//				model.tv_hasRead.setText("未读");
-//			}
+			if (!ObjectUtils.isEquals(datas.get(position).getSTATUS(),null)){
+			if (((int) datas.get(position).getSTATUS()) != -1) {
+                model.img.setImageResource(R.drawable.notice_img_1);
+			} else {
+				if (((int) datas.get(position).getSTATUS()) == -1) {
+                    model.img.setImageResource(R.drawable.notice_img_2);
+				}
+			}}else{
+                model.img.setImageResource(R.drawable.notice_img_1);
+			}
             return convertView;
         }
 

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/NoticesActivity.java

@@ -27,6 +27,7 @@ import com.sk.weichat.ui.erp.model.NoticeEntity;
 import com.sk.weichat.ui.erp.net.ViewUtil;
 import com.sk.weichat.ui.erp.util.CommonUtil;
 import com.sk.weichat.ui.erp.util.Constants;
+import com.sk.weichat.ui.erp.util.ObjectUtils;
 import com.sk.weichat.ui.erp.util.StringUtils;
 import com.sk.weichat.ui.erp.view.EmptyLayout;
 
@@ -180,7 +181,7 @@ public class NoticesActivity extends BaseActivity {
             if (convertView == null) {
                 convertView = inflater.inflate(R.layout.item_card_notice, parent, false);
                 model = new ItemModel();
-                model.img= (ImageView) convertView.findViewById(R.id.img);
+                model.img = (ImageView) convertView.findViewById(R.id.img);
 //				model.tv_title=(TextView) convertView.findViewById(R.id.tv_title);
                 model.tv_time = (TextView) convertView.findViewById(R.id.tv_time);
 //				model.tv_count=(TextView) convertView.findViewById(R.id.tv_count);
@@ -192,35 +193,30 @@ public class NoticesActivity extends BaseActivity {
                 model = (ItemModel) convertView.getTag();
             }
 
-            if (position%2==0){
+            if (position % 2 == 0) {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color1));
-                model.img.setImageResource( R.drawable.notice_img_1);
-            }else{
+            } else {
                 convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
-                model.img.setImageResource(R.drawable.notice_img_2);
             }
 
             List<NoticeEntity.Data> datas = newsEntities.getData();
 //			model.tv_title.setText(datas.get(position).getNO_TITLE());
             model.tv_time.setText(CommonUtil.transferLongToDate("yyyy-MM-dd HH:mm:ss",
                     datas.get(position).getNO_APPTIME()));
-            model.tv_theme.setText( datas.get(position).getNO_TITLE());
+            model.tv_theme.setText(datas.get(position).getNO_TITLE());
             model.tv_author.setText(datas.get(position).getNO_APPROVER());
             model.id = datas.get(position).getNO_ID();
-//			if(!ObjectUtils.isEquals(datas.get(position).getSTATUS(),null)){
-//				if (((int)datas.get(position).getSTATUS())!=-1)
-//				{
-//					model.tv_hasRead.setText("未读");}
-//				else{
-//					if (((int)datas.get(position).getSTATUS())==-1)
-//					{
-//						model.tv_hasRead.setText("已读");
-//					}
-//				}
-//			}
-//			else{
-//				model.tv_hasRead.setText("未读");
-//			}
+            if (!ObjectUtils.isEquals(datas.get(position).getSTATUS(), null)) {
+                if (((int) datas.get(position).getSTATUS()) != -1) {
+                    model.img.setImageResource(R.drawable.notice_img_1);
+                } else {
+                    if (((int) datas.get(position).getSTATUS()) == -1) {
+                        model.img.setImageResource(R.drawable.notice_img_2);
+                    }
+                }
+            } else {
+                model.img.setImageResource(R.drawable.notice_img_1);
+            }
 //			model.tv_count.setVisibility(View.GONE);
             return convertView;
         }

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/WorkExtraActivity.java

@@ -1,27 +1,17 @@
 package com.sk.weichat.ui.erp.activity;
 
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.os.PersistableBundle;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import com.andreabaccega.widget.FormEditText;
 import com.lidroid.xutils.ViewUtils;
@@ -39,6 +29,14 @@ import com.sk.weichat.ui.erp.view.CustomProgressDialog;
 import com.sk.weichat.ui.erp.view.DateTimePickerDialog;
 import com.sk.weichat.ui.erp.view.SingleDialog;
 
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author :LiuJie 2015年7月16日 上午11:04:30
  * @注释:加班申请
@@ -87,8 +85,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
     @ViewInject(R.id.bt_update)
     private Button bt_update;
 
-    @ViewInject(R.id.ly_bottom_save)
-    private LinearLayout ly_bottom_save;
+
     @ViewInject(R.id.ly_bottom_handler)
     private LinearLayout ly_bottom_handler;
 
@@ -135,7 +132,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
                             bt_update.setEnabled(true);
                             bt_update.setTextColor(getResources().getColor(
                                     R.color.black));
-                            ly_bottom_save.setVisibility(View.GONE);
+                            bt_save.setVisibility(View.GONE);
                             ly_bottom_handler.setVisibility(View.VISIBLE);
                             getPanelId(va_id);//再次发起请求
                         }
@@ -242,8 +239,10 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
                         List<ExtraWorkItems> items = FlexJsonUtil.fromJsonArray(
                                 FlexJsonUtil.toJson(map.get("detailDatas")),
                                 ExtraWorkItems.class);
+
                         initDataFromServer(leaveEntities, items);
                     } catch (Exception e) {
+                        Log.i("gongpengming", e.getMessage());
                         ViewUtil.ShowMessageTitle(ct, "数据解析异常");
                     }
                     break;
@@ -291,8 +290,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         }
     };
 
-    private void initDataFromServer(List<ExtraWork> leaveEntities,
-                                    List<ExtraWorkItems> items) {
+    private void initDataFromServer(List<ExtraWork> leaveEntities, List<ExtraWorkItems> items) {
         if (leaveEntities.isEmpty()) {
             return;
         }
@@ -311,7 +309,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
             et_extra_count.setText("" + items.get(0).getWod_count());
             et_extra_company.setText(items.get(0).getWod_empname());
             wo_id = items.get(0).getWod_id();
-            Wo_recorder=items.get(0).getWod_empcode();
+            Wo_recorder = items.get(0).getWod_empcode();
             if (!StringUtils.isEmpty(status)) {
                 if ("已提交".equals(status)) {
                     bt_commit.setTextColor(getResources().getColor(R.color.gray));
@@ -329,7 +327,8 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         }
         va_code = leaveEntities.get(0).getWo_code();
         va_id = leaveEntities.get(0).getWo_id();
-        ly_bottom_save.setVisibility(View.GONE);
+
+        bt_save.setVisibility(View.GONE);
         ly_bottom_handler.setVisibility(View.VISIBLE);
     }
 
@@ -432,11 +431,15 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
                     }
                 }
                 break;
-            case R.id.bt_add:
+            case R.id.bt_add:   //新增
                 httpAdd();
+            if (bt_add.isEnabled()){
 
+            }else {
+
+            }
                 break;
-            case R.id.bt_commit:
+            case R.id.bt_commit://提交
                 httpCommit();
                 break;
             case R.id.bt_uncommit:
@@ -581,7 +584,8 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         return items;
     }
 
-    private String  Wo_recorder;//录入人  为空的时候，就取本地
+    private String Wo_recorder;//录入人  为空的时候，就取本地
+
     /**
      * @return
      */
@@ -589,9 +593,9 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         ExtraWork entity = new ExtraWork();
         entity.setWo_code(va_code);
         entity.setWo_id(va_id);
-        if(StringUtils.isEmpty(Wo_recorder)) {//防止更新其它人,导致变换录入人
+        if (StringUtils.isEmpty(Wo_recorder)) {//防止更新其它人,导致变换录入人
             entity.setWo_emcode(CommonUtil.getSharedPreferences(ct, "erp_username"));
-        }else{
+        } else {
             entity.setWo_emcode(Wo_recorder);
         }
         entity.setWo_emname(et_extra_company.getText().toString());
@@ -604,11 +608,11 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         // entity.setWo_remark(et_extra_remark.getText().toString());
         entity.setWo_status("在录入");
         entity.setWo_statuscode("ENTERING");
-        if(StringUtils.isEmpty(Wo_recorder)){
+        if (StringUtils.isEmpty(Wo_recorder)) {
             entity.setWo_recorder(CommonUtil.getSharedPreferences(ct, "erp_emname"));
-          }else{
+        } else {
             entity.setWo_recorder(Wo_recorder);
-         }
+        }
         entity.setWo_auditstatus("未处理");
         return entity;
     }
@@ -624,7 +628,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         et_extra_count.setText("");
         et_extra_remark.setText("");
         editclik();
-        ly_bottom_save.setVisibility(View.VISIBLE);
+        bt_save.setVisibility(View.VISIBLE);
         ly_bottom_handler.setVisibility(View.GONE);
     }
 
@@ -722,8 +726,7 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
                 .fromJson(msg.getData().getString("result"))
                 .get("exceptionInfo").toString();
         ViewUtil.ShowMessageTitle(ct, message);
-        bt_commit.setTextColor(getResources().getColor(R.color.grey));
-        bt_uncommit.setTextColor(getResources().getColor(R.color.black));
+
     }
 
     /**
@@ -736,15 +739,12 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
                 .fromJson(msg.getData().getString("result"))
                 .get("exceptionInfo").toString();
         ViewUtil.ShowMessageTitle(ct, message);
-        bt_commit.setTextColor(getResources().getColor(R.color.grey));
         bt_commit.setEnabled(false);
         bt_uncommit.setTextColor(getResources().getColor(R.color.black));
         bt_uncommit.setEnabled(true);
         bt_update.setTextColor(getResources().getColor(R.color.grey));
         bt_update.setEnabled(false);
     }
-
-
     public void editnoclik() {
         et_extra_company.setEnabled(false);
         et_extra_type.setEnabled(false);
@@ -755,7 +755,6 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         et_extra_starttime.setEnabled(false);
         et_extra_remark.setEnabled(false);
     }
-
     public void editclik() {
         et_extra_company.setEnabled(true);
         et_extra_type.setEnabled(true);
@@ -766,8 +765,6 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         et_extra_starttime.setEnabled(true);
         et_extra_remark.setEnabled(true);
     }
-
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
@@ -783,7 +780,6 @@ public class WorkExtraActivity extends BaseActivity implements OnClickListener {
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
-
     public void loadDataForServer(String field, int what) {
         Log.i("leave", "what=" + what);
         String url = Constants.getAppBaseUrl(ct) + "mobile/common/getCombo.action";

WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/ChartListFragment.java

@@ -1,12 +1,22 @@
 package com.sk.weichat.ui.erp.fragment;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.ExpandableListView;
+import android.widget.ExpandableListView.OnChildClickListener;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -23,23 +33,13 @@ import com.sk.weichat.ui.erp.util.StringUtils;
 import com.sk.weichat.ui.erp.view.CustomProgressDialog;
 import com.sk.weichat.ui.erp.view.EmptyLayout;
 
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.BaseExpandableListAdapter;
-import android.widget.ExpandableListView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.ExpandableListView.OnChildClickListener;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author :LiuJie 2015年11月11日 上午10:31:45
@@ -227,9 +227,14 @@ public class ChartListFragment extends Fragment implements OnClickListener {
 
 		@Override
 		public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
-			convertView = (RelativeLayout) RelativeLayout.inflate(ct, R.layout.act_menu_group, null);
+			convertView =   RelativeLayout.inflate(ct, R.layout.act_menu_group, null);
 			TextView grouptitle = (TextView) convertView.findViewById(R.id.tv_group_title);
 			grouptitle.setText(list.get(groupPosition).getTitle());
+			if (groupPosition%2==0){
+				convertView.setBackgroundColor(ct.getResources().getColor(R.color.item_color1));
+			}else{
+				convertView.setBackgroundColor(ct.getResources().getColor(R.color.item_color2));
+			}
 			return convertView;
 		}
 

WeiChat/src/main/java/com/sk/weichat/ui/me/BasicInfoEditActivity.java

@@ -15,6 +15,7 @@ import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.RadioButton;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -61,10 +62,10 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     // widget
     private ImageView mAvatarImg;
     private EditText mNameEdit;
-    private TextView mSexTv;
     private TextView mBirthdayTv;
     private TextView mCityTv;
     private Button mNextStepBtn;
+    private RadioButton rbBoy,rbGrid;
     // Temp
     private User mTempData;
     // 选择头像的数据
@@ -90,7 +91,11 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
         getSupportActionBar().setTitle(R.string.basic_info);
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNameEdit = (EditText) findViewById(R.id.name_edit);
-        mSexTv = (TextView) findViewById(R.id.sex_tv);
+        rbBoy= (RadioButton) findViewById(R.id.rb_boy);
+        rbGrid= (RadioButton) findViewById(R.id.rb_grid);
+
+
+
         mBirthdayTv = (TextView) findViewById(R.id.birthday_tv);
         mCityTv = (TextView) findViewById(R.id.city_tv);
         mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
@@ -112,9 +117,12 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
             e.printStackTrace();
         }
         if (mTempData.getSex() == 1) {
-            mSexTv.setText(R.string.sex_man);
+            rbBoy.setChecked(true);
+
+
         } else {
-            mSexTv.setText(R.string.sex_woman);
+
+            rbGrid.setChecked(true);
         }
         mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
         mNameEdit.setText(mTempData.getNickName());
@@ -129,7 +137,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
                 showSelectAvatarDialog();
                 break;
             case R.id.sex_select_rl:
-                showSelectSexDialog();
+//                showSelectSexDialog();
                 break;
             case R.id.birthday_select_rl:
                 showSelectBirthdayDialog();
@@ -244,10 +252,10 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
                             mTempData.setSex(1);
-                            mSexTv.setText(R.string.sex_man);
+//                            mSexTv.setText(R.string.sex_man);
                         } else {
                             mTempData.setSex(0);
-                            mSexTv.setText(R.string.sex_woman);
+//                            mSexTv.setText(R.string.sex_woman);
                         }
                         dialog.dismiss();
                     }
@@ -277,6 +285,15 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     }
 
     private void next() {
+
+        if (rbBoy.isChecked()){
+            mTempData.setSex(1);
+            Log.i("gongpengming","选择男的");
+        }else{
+            mTempData.setSex(0);
+            Log.i("gongpengming","选择女的");
+        }
+
         if (!MyApplication.getInstance().isNetworkActive()) {
             ToastUtil.showToast(this, R.string.net_exception);
             return;

WeiChat/src/main/java/com/sk/weichat/ui/me/SettingActivity.java

@@ -6,7 +6,6 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -16,8 +15,6 @@ import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.R;
-import com.sk.weichat.bean.User;
-import com.sk.weichat.db.dao.UserDao;
 import com.sk.weichat.db.dao.VideoFileDao;
 import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.sp.UserSp;
@@ -69,18 +66,17 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         cb_task_reply.setOnCheckedChangeListener(new SwitchView.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(View view, boolean isChecked) {
-                if (isChecked){
-                    Log.i("gongpengming","点击了开启推送");
+                if (isChecked) {
                     PreferenceUtils.putInt(MyApplication.getInstance(), MainActivity.BAIDU_PUSH, 1);
                     PushManager.resumeWork(MyApplication.getInstance());
-                }else {
+                } else {
                     PushManager.stopWork(MyApplication.getInstance());
                     PreferenceUtils.putInt(MyApplication.getInstance(), MainActivity.BAIDU_PUSH, 0);
                 }
             }
         });
 
- 
+
         mExitBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -104,10 +100,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
                     public void onClick(DialogInterface dialog, int which) {
                         UserSp.getInstance(mContext).clearUserInfo();
                         LoginHelper.broadcastLogout(mContext);
-
-                        String userId = UserSp.getInstance(SettingActivity.this).getUserId("");
-                     User mLastLoginUser = UserDao.getInstance().getUserByUserId(userId);
-                        Log.i("gongpengming","userName="+mLastLoginUser.getPassword()+"userName="+mLastLoginUser.getTelephone());
+                        SettingActivity.this.finish();
                     }
                 }).create().show();
     }

WeiChat/src/main/java/com/sk/weichat/view/ButtonEnabled.java

@@ -0,0 +1,38 @@
+package com.sk.weichat.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.Button;
+
+/**
+ * Created by 123 on 2016/4/19.
+ */
+public class ButtonEnabled extends Button implements View.OnClickListener {
+    public ButtonEnabled(Context context) {
+        super(context);
+    }
+
+    public ButtonEnabled(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+    }
+
+    public ButtonEnabled(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+
+    }
+
+
+    @Override
+    public void onClick(View view) {
+       if (this.isEnabled()){
+
+       }else{
+
+       }
+    }
+    interface OnEnabledListener{
+//        public void
+    }
+}

WeiChat/src/main/java/com/sk/weichat/view/OperationMorePopWindow.java

@@ -89,6 +89,7 @@ public class OperationMorePopWindow {
 		}else{
 			mPraiseTv.setText(R.string.cancel_praise);
 		}
+
 		mPopupWindow.showAsDropDown(anchowView, -mOperationMorePopWidth - 10, -(mOperationMorePopHeight + anchowView.getHeight()) / 2);
 	}
 

WeiChat/src/main/res/color/main_tab_btn_text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:color="@color/text_main" android:state_checked="true" />
+    <item android:color="@color/bar_pass" android:state_checked="true" />
     <item android:color="@color/text_hine" />
 
 </selector>

WeiChat/src/main/res/drawable/bg_aguanzu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/aguanzu_pass" android:state_pressed="true" />
+    <item android:drawable="@drawable/aguanzu_pass" android:state_checkable="false" />
+    <item android:drawable="@drawable/aguanzu_pass" android:state_checked="true" />
+    <item android:drawable="@drawable/aguanzu" android:state_checked="false" />
+    <item android:drawable="@drawable/aguanzu" android:state_checkable="true" />
+    <item android:drawable="@drawable/aguanzu"   />
+</selector>

WeiChat/src/main/res/drawable/bg_bay.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/boy_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/boy"/>
+</selector>

WeiChat/src/main/res/drawable/bg_grid.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/grid_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/grid"/>
+</selector>

WeiChat/src/main/res/drawable/bg_guanzu.xml

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

WeiChat/src/main/res/drawable/tab_textcolor.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/bar_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@color/text_hine"/>
+</selector>

WeiChat/src/main/res/drawable/work_add.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+<item android:drawable="@drawable/work_add_pass" android:state_pressed="true"/>
+    <item android:drawable="@drawable/work_add_nopass" android:state_pressed="false"/>
+    <item android:drawable="@drawable/work_add_nopass"/>
+</selector>

WeiChat/src/main/res/drawable/work_push.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/work_push_pass" android:state_pressed="true"/>
+    <item android:drawable="@drawable/work_push_nopass" android:state_pressed="false"/>
+    <item android:drawable="@drawable/work_push_nopass"/>
+</selector>

WeiChat/src/main/res/drawable/work_undata.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/work_undata_pass" android:state_pressed="true"/>
+    <item android:drawable="@drawable/work_undata_nopass" android:state_pressed="false"/>
+    <item android:drawable="@drawable/work_undata_nopass"/>
+</selector>

WeiChat/src/main/res/drawable/work_unpush.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/work_unpush_pass" android:state_pressed="true"/>
+    <item android:drawable="@drawable/work_unpush_unpass" android:state_pressed="false"/>
+    <item android:drawable="@drawable/work_unpush_unpass"/>
+</selector>

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

@@ -2,249 +2,228 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="#f2f2f2"
-        android:fillViewport="true" >
+        android:fillViewport="true">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/ly_head_display"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_no"
                     style="@style/form_relative_customer"
-                    android:visibility="gone" >
+                    android:visibility="gone">
+
                     <ImageView
                         android:id="@+id/iv_order_no"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_order_no" />
+
                     <TextView
                         android:id="@+id/TextView01"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_order_no"
                         android:layout_toRightOf="@+id/iv_order_no"
                         android:text="单据编号:" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_no"
                         style="@style/form_relative_right_text"
-                        editTextFormExample:testType="nocheck" >
-                    </com.andreabaccega.widget.FormEditText>
+                        editTextFormExample:testType="nocheck"></com.andreabaccega.widget.FormEditText>
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_company"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_image"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_find_bule" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_title"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_image"
-                        android:layout_toRightOf="@+id/iv_set_image"
-                        android:text="申请人" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                        android:text="申  请  人" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_company"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_leave_mankind"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_imagemankind"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_class_bule" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_leave_mankind"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_imagemankind"
-                        android:layout_toRightOf="@+id/iv_set_imagemankind"
+
                         android:text="人员类型：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_mankind"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                   <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_type"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_extra_deparment"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_extra_deparment"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_extra_deparment"
-                        android:layout_toRightOf="@+id/iv_extra_deparment"
+
                         android:text="加班类型:" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_type"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                   <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_count"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_extra_count"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_extra_count"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_extra_count"
-                        android:layout_toRightOf="@+id/iv_extra_count"
+
                         android:text="加班时数:" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_count"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_task"
-                    android:visibility="gone"
-                    style="@style/form_relative_customer" >
+                    style="@style/form_relative_customer"
+                    android:visibility="gone">
+
                     <ImageView
                         android:id="@+id/iv_set_i"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_write_bule" />
+
                     <TextView
                         android:id="@+id/tv_set_t"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_i"
                         android:layout_toRightOf="@+id/iv_set_i"
                         android:text="是否全天:" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_isallday"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_starttime"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_starttime"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/iconfont_time" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_starttime"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_starttime"
-                        android:layout_toRightOf="@+id/iv_set_starttime"
+
                         android:text="起始时间:" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_starttime"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                 <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_endtime"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_endtime"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/iconfont_time" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_set_endtime"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_endtime"
-                        android:layout_toRightOf="@+id/iv_set_endtime"
+
                         android:text="截止时间:" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_endtime"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_remark"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_imag"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_order_no" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_pushid"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_imag"
-                        android:layout_toRightOf="@+id/iv_set_imag"
+
                         android:text="加班原因：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_remark"
                         style="@style/form_relative_right_text"
                         android:height="60dp"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
             </LinearLayout>
-            <LinearLayout
-                android:id="@+id/ly_bottom_save"
-                style="@style/form_linear_customer" >
-                <Button
-                    android:id="@+id/bt_save"
-                    style="@style/from_button_base_white"
-                    android:text="保存" >
-                </Button>
-            </LinearLayout>
+
+            <Button
+                android:id="@+id/bt_save"
+                style="@style/from_button_base_bule"
+                android:text="保存" />
+
             <LinearLayout
                 android:id="@+id/ly_bottom_handler"
                 style="@style/form_linear_customer"
                 android:orientation="horizontal"
-                android:visibility="gone" >
+                android:paddingLeft="5dp"
+                android:paddingRight="5dp">
+                <!--android:background="@drawable/work_add"-->
                 <Button
                     android:id="@+id/bt_add"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
-                    android:text="新增" />
-                <ImageView
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="7dp"
-                    android:layout_marginTop="7dp"
-                    android:src="@color/lightgrey" />
+                    android:text="新 增" />
+
+                <!-- android:background="@drawable/work_push" -->
                 <Button
                     android:id="@+id/bt_commit"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="提交" />
-                <ImageView
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="7dp"
-                    android:layout_marginTop="7dp"
-                    android:src="@color/lightgrey" />
+
+                <!-- android:background="@drawable/work_unpush"-->
                 <Button
                     android:id="@+id/bt_uncommit"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="反提交" />
-                <ImageView
-                    android:layout_width="1dp"
-                    android:layout_height="match_parent"
-                    android:layout_marginBottom="7dp"
-                    android:layout_marginTop="7dp"
-                    android:src="@color/lightgrey" />
+
+                <!-- android:background="@drawable/work_undata" -->
                 <Button
                     android:id="@+id/bt_update"
                     style="@style/from_button_base_white"

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

@@ -3,16 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/yellow_home" />
+
     <ExpandableListView
         android:id="@+id/m_list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="#ffffff"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_main"
         android:cacheColorHint="#00000000"
-        android:listSelector="#00000000" >
-    </ExpandableListView>
+        android:listSelector="#00000000" />
 </LinearLayout>

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

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="110dp"
-    android:background="@drawable/ry_setting_selector"
-    android:orientation="vertical" >
+    android:layout_height="@dimen/item_height"
+     >
     <TextView
         android:id="@+id/tv_group_title"
-        style="@style/text_black_18"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/item_height"
         android:layout_centerVertical="true"
-        android:layout_marginBottom="20dp"
+        android:gravity="center_vertical"
         android:layout_marginLeft="30dp"
-        android:layout_marginTop="20dp"
         android:text="组名" />
 </RelativeLayout>

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

@@ -22,7 +22,7 @@
                     android:layout_width="160dp"
                     android:layout_height="160dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="10dp"
                     android:background="@drawable/account_avatar_bg"
                     android:contentDescription="@string/app_name"
                     android:paddingBottom="5.0dip"
@@ -33,7 +33,7 @@
 
                 <RelativeLayout
                     style="@style/IMTbleLine"
-                    android:layout_marginTop="20dp">
+                    android:layout_marginTop="10dp">
 
                     <TextView
                         android:id="@+id/name_text"
@@ -54,13 +54,10 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-<View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/sex_rl"
-                    style="@style/IMTbleLine">
+                    style="@style/IMTbleLine_UP">
 
                     <TextView
                         android:id="@+id/sex_text"
@@ -81,10 +78,7 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/birthday_rl"
                     style="@style/IMTbleLine">
@@ -108,13 +102,10 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/city_rl"
-                    style="@style/IMTbleLine">
+                    style="@style/IMTbleLine_UP">
 
                     <TextView
                         android:id="@+id/city_text"
@@ -135,10 +126,7 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/tel_rl"
                     style="@style/IMTbleLine">
@@ -191,6 +179,7 @@
 
         <com.sk.weichat.view.DataLoadView
             android:id="@+id/data_load_view"
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </RelativeLayout>

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

@@ -2,23 +2,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_main"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ScrollView
         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:orientation="vertical">
 
             <ImageView
                 android:id="@+id/avatar_img"
                 android:layout_width="90.0dip"
                 android:layout_height="90.0dip"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/account_avatar_bg"
                 android:contentDescription="@string/app_name"
                 android:paddingBottom="5.0dip"
@@ -29,7 +29,7 @@
 
             <RelativeLayout
                 style="@style/IMTbleLine"
-                android:layout_marginTop="20dp" >
+                android:layout_marginTop="10dp">
 
                 <TextView
                     android:id="@+id/name_text"
@@ -53,13 +53,11 @@
                     android:contentDescription="@string/app_name"
                     android:visibility="invisible" />
             </RelativeLayout>
-<View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="@color/item_line"/>
+
+
             <RelativeLayout
                 android:id="@+id/sex_select_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine_UP">
 
                 <TextView
                     android:id="@+id/sex_text"
@@ -68,24 +66,47 @@
                     android:drawablePadding="5dp"
                     android:text="@string/sex_align" />
 
-                <TextView
-                    android:id="@+id/sex_tv"
-                    style="@style/IMTbleLine_TextValue"
-                    android:layout_toLeftOf="@+id/sex_arrow_img"
-                    android:layout_toRightOf="@+id/sex_text" />
+                <RadioGroup
+                    android:layout_width="150dp"
+                    android:layout_height="30dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_grid"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:checked="true"
+                        android:drawableRight="@drawable/bg_grid" />
+
+                    <RadioButton
+                        android:id="@+id/rb_boy"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableLeft="@drawable/bg_bay"
+                        android:button="@null" />
+
+                </RadioGroup>
+
+
+                <!--<TextView-->
+                <!--android:id="@+id/sex_tv"-->
+                <!--style="@style/IMTbleLine_TextValue"-->
+                <!--android:layout_toLeftOf="@+id/sex_arrow_img"-->
+                <!--android:layout_toRightOf="@+id/sex_text" />-->
+
 
-                <ImageView
-                    android:id="@+id/sex_arrow_img"
-                    style="@style/IMTbleLine_ArrowImg"
-                    android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/item_line"/>
+
+
             <RelativeLayout
                 android:id="@+id/birthday_select_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:id="@+id/birthday_text"
@@ -97,21 +118,22 @@
                 <TextView
                     android:id="@+id/birthday_tv"
                     style="@style/IMTbleLine_TextValue"
+                    android:layout_marginRight="5dp"
                     android:layout_toLeftOf="@+id/birthday_arrow_img"
-                    android:layout_toRightOf="@+id/birthday_text" />
+                    android:layout_toRightOf="@+id/birthday_text"
+                    android:background="@null"
+                     />
 
                 <ImageView
-                    android:id="@+id/birthday_arrow_img"
-                    style="@style/IMTbleLine_ArrowImg"
-                    android:contentDescription="@string/app_name" />
+                android:id="@+id/birthday_arrow_img"
+                style="@style/IMTbleLine_ArrowImg"
+                android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/item_line"/>
+
+
             <RelativeLayout
                 android:id="@+id/city_select_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine_UP">
 
                 <TextView
                     android:id="@+id/city_text"
@@ -134,18 +156,17 @@
 
             <Button
                 android:id="@+id/next_step_btn"
-              android:background="@drawable/bg_btn"
                 android:layout_width="fill_parent"
                 android:layout_height="50dp"
                 android:layout_marginBottom="9dp"
                 android:layout_marginLeft="40dp"
                 android:layout_marginRight="40dp"
                 android:layout_marginTop="9dp"
+                android:background="@drawable/bg_btn"
                 android:gravity="center"
-                android:textSize="@dimen/text_main"
-                android:text="确    定"
+                android:text="更    新"
                 android:textColor="@color/white"
-                />
+                android:textSize="@dimen/text_main" />
         </LinearLayout>
     </ScrollView>
 

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

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/antionbarcolor">
+
+        <TextView
+            android:id="@+id/tv_back"
+            android:clickable="true"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="15dp"
+            android:drawableLeft="@drawable/btn_back"
+            android:gravity="center_vertical"
+            android:text="我的关注"
+            android:textColor="@color/white" />
+
+        <RadioGroup
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/btn_guanzu"
+                android:layout_width="70dp"
+                android:layout_height="35dp"
+                android:background="@drawable/aguanzu_pass"
+                android:button="@null"
+                android:clickable="false" />
+
+            <RadioButton
+                android:id="@+id/btn_aguanzu"
+                android:layout_width="70dp"
+                android:layout_height="35dp"
+                android:layout_toRightOf="@+id/btn_guanzu"
+                android:background="@drawable/guanzu"
+                android:button="@null"
+                android:clickable="true" />
+        </RadioGroup>
+    </RelativeLayout>
+
+    <FrameLayout
+        android:id="@+id/fl"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/top" />
+</RelativeLayout>

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

@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
+    android:background="@drawable/login_bg"
     android:orientation="vertical">
 
     <ImageView
@@ -16,31 +16,34 @@
         android:layout_marginLeft="9dp"
         android:layout_marginRight="9dp"
         android:layout_marginTop="9dp"
-        android:background="@color/item_color2"
+        android:background="@color/wirtehine"
         android:drawableLeft="@drawable/login_user_name"
         android:hint="@string/please_input_phone_number"
         android:inputType="phone" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp" />
+
     <com.sk.weichat.view.ClearEditText
         android:id="@+id/password_edit"
         style="@style/IMLineEditPass"
         android:layout_marginLeft="9dp"
         android:layout_marginRight="9dp"
-        android:background="@color/item_color2"
+        android:background="@color/wirtehine"
         android:drawableLeft="@drawable/loginpw"
         android:hint="@string/please_input_password" />
 
     <Button
         android:id="@+id/login_btn"
-        android:layout_height="50dp"
-    android:background="@drawable/bg_btn"
         android:layout_width="match_parent"
+        android:layout_height="50dp"
         android:layout_marginLeft="40dp"
         android:layout_marginRight="40dp"
         android:layout_marginTop="10dp"
-        android:textColor="@color/white"
+        android:background="@drawable/bg_btn"
         android:text="登  录"
-      />
+        android:textColor="@color/white" />
 
     <RelativeLayout
         android:layout_width="match_parent"

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

@@ -143,8 +143,10 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginTop="@dimen/line_big"
                 android:background="@color/item_line"/>
             <RelativeLayout
+
                 android:id="@+id/about_us_rl"
                 style="@style/IMTbleLine">
 

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

@@ -3,327 +3,316 @@
     xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/bg_main"
-        android:fillViewport="true" >
+        android:fillViewport="true">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/ly_head_display"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_no"
                     style="@style/form_relative_customer"
-                    android:visibility="gone" >
+                    android:visibility="gone">
+
                     <ImageView
                         android:id="@+id/iv_order_no"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_order_no" />
+
                     <TextView
                         android:id="@+id/TextView01"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_order_no"
                         android:layout_toRightOf="@+id/iv_order_no"
                         android:text="单据编号：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_no"
                         style="@style/form_relative_right_text"
-                        editTextFormExample:testType="nocheck" >
-                    </com.andreabaccega.widget.FormEditText>
+                        editTextFormExample:testType="nocheck"></com.andreabaccega.widget.FormEditText>
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
-                    android:background="@color/item_color1"
                     android:id="@+id/ry_extra_encode"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_image"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_find_bule" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_title"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_image"
-                        android:layout_toRightOf="@+id/iv_set_image"
-                        android:text="申请人：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                        android:text="申  请  人：" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_trave_linkman"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_deparment"
                     style="@style/form_relative_customer"
-                    android:visibility="gone" >
+                    android:visibility="gone">
+
                     <ImageView
                         android:id="@+id/iv_extra_deparment"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_deperment" />
+
                     <TextView
                         android:id="@+id/tv_extra_deparment"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_extra_deparment"
                         android:layout_toRightOf="@+id/iv_extra_deparment"
                         android:text="部门：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_deparment"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_type"
-                    android:background="@color/item_color2"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_extra_type"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_trave_type"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_extra_type"
-                        android:layout_toRightOf="@+id/iv_extra_type"
+
                         android:text="人员类型：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_trave_type"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
-                    android:background="@color/item_color1"
                     android:id="@+id/ry_leader_no"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_imag"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_order_no" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_pushid"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_imag"
-                        android:layout_toRightOf="@+id/iv_set_imag"
+
                         android:text="预计天数：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_trave_address"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
-                    android:background="@color/item_color2"
                     android:id="@+id/ry_leader_name"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_ima"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment_name" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_set_tit"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_ima"
-                        android:layout_toRightOf="@+id/iv_set_ima"
+
                         android:text="出差事由：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_trave_route"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                 <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
-                    android:background="@color/item_color1"
                     android:id="@+id/ry_traffic"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_traffic"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment_name" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_traffic"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_traffic"
-                        android:layout_toRightOf="@+id/iv_set_traffic"
-                        android:text="目的地：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                        android:text="目  的  地：" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_trave_traffic"
                         style="@style/form_relative_right_text"
-                        whatever:testType="nocheck"
                         whatever:testErrorString="@string/error_only_numeric_digits_allowed"
-                         />
+                        whatever:testType="nocheck" />
                 </RelativeLayout>
-                 <ImageView style="@style/app_comm_list_line_gray" />
-                 <RelativeLayout
-                     android:background="@color/item_color2"
+
+
+                <RelativeLayout
                     android:id="@+id/ry_stay"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_stay"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment_name" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_set_stay"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_stay"
-                        android:layout_toRightOf="@+id/iv_set_stay"
+
                         android:text="接洽对象：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_trave_stay"
                         style="@style/form_relative_right_text"
-                        whatever:testType="nocheck"
-						 />
+                        whatever:testType="nocheck" />
                 </RelativeLayout>
-                 <ImageView style="@style/app_comm_list_line_gray" />
-                 <RelativeLayout
-                     android:background="@color/item_color1"
+
+
+                <RelativeLayout
                     android:id="@+id/ry_relations"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_relations"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment_name" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_relations"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_relations"
-                        android:layout_toRightOf="@+id/iv_set_relations"
+
                         android:text="工作项目：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_trave_relations"
                         style="@style/form_relative_right_text"
-                         whatever:testType="nocheck"
-						 />
+                        whatever:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_reason_say"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_i"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_write_bule" />
+                    style="@style/form_relative_customer">
+
                     <TextView
                         android:id="@+id/tv_set_t"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_i"
-                        android:layout_toRightOf="@+id/iv_set_i"
-                        android:text="考勤：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+
+                        android:text=" 考    勤 ：" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_sign"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_display"
-                style="@style/form_linear_customer" >
+
+                style="@style/form_linear_customer">
+
                 <RelativeLayout
-                    android:background="@color/item_color1"
                     android:id="@+id/ry_extra_startdate"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_startdate"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/iconfont_time" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_startdate"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_startdate"
-                        android:layout_toRightOf="@+id/iv_set_startdate"
+
                         android:text="起始日期：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_starttime"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
+
                 <ImageView style="@style/app_comm_list_line_gray" />
-                 <RelativeLayout
-                     android:background="@color/item_color2"
+
+                <RelativeLayout
                     android:id="@+id/ry_extra_endtime"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_endtime"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/iconfont_time" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_set_endtime"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_endtime"
-                        android:layout_toRightOf="@+id/iv_set_endtime"
+
                         android:text="截止日期：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_endtime"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_save"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <Button
                     android:id="@+id/bt_save"
+                    style="@style/from_button_base_bule"
                     android:layout_marginLeft="40dp"
                     android:layout_marginRight="40dp"
+                    android:layout_marginTop="20dp"
                     android:background="@drawable/bg_btn"
-                    style="@style/from_button_base_white"
-                    android:text="保存" >
-                </Button>
+                    android:text="保存"/>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_handler"
                 style="@style/form_linear_customer"
+                android:layout_marginTop="20dp"
                 android:orientation="horizontal"
-                android:visibility="gone" >
+                android:visibility="gone">
+
                 <Button
                     android:id="@+id/bt_add"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="新增" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_commit"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="提交" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_uncommit"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="反提交" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_update"
                     style="@style/from_button_base_white"

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

@@ -3,230 +3,226 @@
     xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical" >
+    android:orientation="vertical">
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#f2f2f2"
-        android:fillViewport="true" >
+        android:background="@drawable/bg_main"
+        android:fillViewport="true">
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
+
             <LinearLayout
                 android:id="@+id/ly_head_display"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_no"
                     style="@style/form_relative_customer"
-                    android:visibility="gone" >
+                    android:visibility="gone">
+
                     <ImageView
                         android:id="@+id/iv_order_no"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_order_no" />
+
                     <TextView
                         android:id="@+id/TextView01"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_order_no"
                         android:layout_toRightOf="@+id/iv_order_no"
                         android:text="单据编号：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_no"
                         style="@style/form_relative_right_text"
-                        editTextFormExample:testType="nocheck" >
-                    </com.andreabaccega.widget.FormEditText>
+                        editTextFormExample:testType="nocheck"/>
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_encode"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_image"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_find_bule" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_title"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_image"
-                        android:layout_toRightOf="@+id/iv_set_image"
-                        android:text="员工：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                        android:text="  员    工 ：" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_encode"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_deparment"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_extra_deparment"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_deperment" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_extra_deparment"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_extra_deparment"
                         android:layout_toRightOf="@+id/iv_extra_deparment"
-                        android:text="部门：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+                        android:text="  部    门 ：" />
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_deparment"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_leader_no"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_imag"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_order_no" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_pushid"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_imag"
-                        android:layout_toRightOf="@+id/iv_set_imag"
+
                         android:text="员工类型：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leader_no"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
                 <RelativeLayout
                     android:id="@+id/ry_leader_name"
                     style="@style/form_relative_customer"
-                    android:visibility="gone" >
+                    android:visibility="gone">
+
                     <ImageView
                         android:id="@+id/iv_set_ima"
                         style="@style/form_relative_left_image"
                         android:src="@drawable/icon_deperment_name" />
+
                     <TextView
                         android:id="@+id/tv_set_tit"
                         style="@style/form_relative_left_text"
                         android:layout_toEndOf="@+id/iv_set_ima"
                         android:layout_toRightOf="@+id/iv_set_ima"
                         android:text="责任人名称：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leader_name"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_reason"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_im"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_date_bule" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_set_ti"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_im"
-                        android:layout_toRightOf="@+id/iv_set_im"
+
                         android:text="事由类型：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_resaon"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_reason_say"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_i"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_write_bule" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_t"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_i"
-                        android:layout_toRightOf="@+id/iv_set_i"
+
                         android:text="事由说明：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_resaon_say"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_display"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_date"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/iconfont_time" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color2">
+
                     <TextView
                         android:id="@+id/tv_set_"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_"
-                        android:layout_toRightOf="@+id/iv_set_"
+
                         android:text="开始时间：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_date"
                         style="@style/form_relative_right_text"
                         editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
-                <ImageView style="@style/app_comm_list_line_gray" />
+
                 <RelativeLayout
                     android:id="@+id/ry_extra_time"
-                    style="@style/form_relative_customer" >
-                    <ImageView
-                        android:id="@+id/iv_set_mail"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_time_bule" />
+                    style="@style/form_relative_customer"
+                    android:background="@color/item_color1">
+
                     <TextView
                         android:id="@+id/tv_set_mail"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_mail"
-                        android:layout_toRightOf="@+id/iv_set_mail"
+
                         android:text="结束时间：" />
-                    <com.andreabaccega.widget.FormEditText
-                        xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
+
+                    <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_extra_time"
                         style="@style/form_relative_right_text"
                         editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_save"
-                style="@style/form_linear_customer" >
+                style="@style/form_linear_customer">
+
                 <Button
                     android:id="@+id/bt_extra_save"
-                    style="@style/from_button_base_white"
+                    style="@style/from_button_base_bule"
                     android:text="保存" />
             </LinearLayout>
+
             <LinearLayout
                 android:id="@+id/ly_bottom_handler"
                 style="@style/form_linear_customer"
                 android:orientation="horizontal"
-                android:visibility="gone" >
+                android:visibility="gone">
+
                 <Button
                     android:id="@+id/bt_add"
                     style="@style/from_button_base_white"
                     android:layout_weight="1"
                     android:text="新增" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_commit"
                     style="@style/from_button_base_white"
@@ -234,24 +230,28 @@
                     android:layout_marginRight="5dp"
                     android:layout_weight="1"
                     android:text="提交" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_uncommit"
                     style="@style/from_button_base_white"
                     android:layout_marginRight="5dp"
                     android:layout_weight="1"
                     android:text="反提交" />
+
                 <ImageView
                     android:layout_width="1dp"
                     android:layout_height="match_parent"
                     android:layout_marginBottom="7dp"
                     android:layout_marginTop="7dp"
                     android:src="@color/lightgrey" />
+
                 <Button
                     android:id="@+id/bt_update"
                     style="@style/from_button_base_white"

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

@@ -3,12 +3,12 @@
     xmlns:whatever="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/bg_main"
     android:orientation="vertical">
 
     <com.sk.weichat.ui.erp.view.CustomerScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#f2f2f2"
         android:fillViewport="true">
 
         <LinearLayout
@@ -19,8 +19,7 @@
             <LinearLayout
                 android:id="@+id/ly_head_display"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@drawable/bg_main"
+                android:layout_height="wrap_content"
                 android:orientation="vertical">
 
                 <RelativeLayout
@@ -28,17 +27,13 @@
                     style="@style/form_relative_customer"
                     android:background="@color/item_color1">
 
-                    <ImageView
-                        android:id="@+id/iv_set_image"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_find_green" />
 
                     <TextView
                         android:id="@+id/tv_leave_man"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_image"
-                        android:layout_toRightOf="@+id/iv_set_image"
-                        android:text="请假人：" />
+                        android:text="请  假  人："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_man"
@@ -46,24 +41,20 @@
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
 
-                <ImageView style="@style/app_comm_list_line_gray" />
+                <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_mankind"
                     style="@style/form_relative_customer"
                     android:background="@color/item_color2">
 
-                    <ImageView
-                        android:id="@+id/iv_set_imagemankind"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_class_bule" />
 
                     <TextView
                         android:id="@+id/tv_leave_mankind"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_imagemankind"
-                        android:layout_toRightOf="@+id/iv_set_imagemankind"
-                        android:text="人员类型：" />
+                        android:text="人员类型："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_mankind"
@@ -76,16 +67,10 @@
                     style="@style/form_relative_customer"
                     android:visibility="gone">
 
-                    <ImageView
-                        android:id="@+id/iv_set_imag"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_selection_bule" />
 
                     <TextView
                         android:id="@+id/tv_leave_type"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_imag"
-                        android:layout_toRightOf="@+id/iv_set_imag"
                         android:text="请假类型：" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
@@ -95,24 +80,21 @@
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
 
-                <ImageView style="@style/app_comm_list_line_gray" />
+                <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_category"
                     style="@style/form_relative_customer"
                     android:background="@color/item_color1">
 
-                    <ImageView
-                        android:id="@+id/iv_set_ima"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_class_bule" />
 
                     <TextView
                         android:id="@+id/tv_leave_category"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_ima"
-                        android:layout_toRightOf="@+id/iv_set_ima"
-                        android:text="假期类别：" />
+
+                        android:text="假期类别："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_category"
@@ -120,24 +102,20 @@
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
 
-                <ImageView style="@style/app_comm_list_line_gray" />
+                <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_set_website"
                     style="@style/form_relative_customer"
                     android:background="@color/item_color2">
 
-                    <ImageView
-                        android:id="@+id/iv_leave_days"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_date_bule" />
 
                     <TextView
                         android:id="@+id/tv_iv_leave_days"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_leave_days"
-                        android:layout_toRightOf="@+id/iv_leave_days"
-                        android:text="请假天数：" />
+                        android:text="请假天数："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_days"
@@ -147,78 +125,65 @@
                         whatever:testType="regexp" />
                 </RelativeLayout>
 
-                <ImageView style="@style/app_comm_list_line_gray" />
+                <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_hours"
                     style="@style/form_relative_customer"
                     android:background="@color/item_color1">
 
-                    <ImageView
-                        android:id="@+id/iv_set_mail"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_time_bule" />
 
                     <TextView
                         android:id="@+id/tv_leave_hours"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_mail"
-                        android:layout_toRightOf="@+id/iv_set_mail"
-                        android:text="请假时数：" />
+
+                        android:text="请假时数："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_hours"
                         style="@style/form_relative_right_text"
+
                         whatever:customRegexp="^(([0-9])|([0-9]+\\.?[0-9]+))$"
                         whatever:testErrorString="@string/error_only_numeric_digits_allowed"
                         whatever:testType="regexp" />
                 </RelativeLayout>
 
-                <ImageView style="@style/app_comm_list_line_gray" />
+                <!--<ImageView style="@style/app_comm_list_line_gray" />-->
 
                 <RelativeLayout
                     android:id="@+id/ry_leave_reason"
                     style="@style/form_relative_customer"
                     android:background="@color/item_color2">
 
-                    <ImageView
-                        android:id="@+id/iv_set_i"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/icon_write_green" />
 
                     <TextView
                         android:id="@+id/tv_leave_reason"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_i"
-                        android:layout_toRightOf="@+id/iv_set_i"
-                        android:text="请假原因：" />
+                        android:text="请假原因："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/et_leave_reason"
                         style="@style/form_relative_right_text"
                         editTextFormExample:testType="nocheck" />
                 </RelativeLayout>
-            </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/ly_bottom_display"
-                style="@style/form_linear_customer">
 
                 <RelativeLayout
                     android:id="@+id/ry_set_startTime"
+                    android:background="@color/item_color1"
                     style="@style/form_relative_customer">
 
-                    <ImageView
-                        android:id="@+id/iv_set_"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/iconfont_time" />
 
                     <TextView
                         android:id="@+id/tv_set_"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_set_"
-                        android:layout_toRightOf="@+id/iv_set_"
-                        android:text="开始时间：" />
+                        android:text="开始时间："
+                        android:textColor="@color/text_main"
+                        android:textSize="@dimen/text_main" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
                         android:id="@+id/tv_start_time"
@@ -227,22 +192,18 @@
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
 
-                <ImageView style="@style/app_comm_list_line_gray" />
+
 
                 <RelativeLayout
                     android:id="@+id/ry_set_endTime"
+                    android:background="@color/item_color2"
                     style="@style/form_relative_customer">
 
-                    <ImageView
-                        android:id="@+id/iv_date"
-                        style="@style/form_relative_left_image"
-                        android:src="@drawable/iconfont_time" />
-
                     <TextView
                         android:id="@+id/tv_date_gh"
+                        android:textSize="@dimen/text_main"
+                        android:textColor="@color/text_main"
                         style="@style/form_relative_left_text"
-                        android:layout_toEndOf="@+id/iv_date"
-                        android:layout_toRightOf="@+id/iv_date"
                         android:text="结束时间：" />
 
                     <com.andreabaccega.widget.FormEditText xmlns:editTextFormExample="http://schemas.android.com/apk/res-auto"
@@ -251,6 +212,13 @@
                         editTextFormExample:customFormat="yyyy-MM-dd HH:mm"
                         editTextFormExample:testType="date" />
                 </RelativeLayout>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ly_bottom_display"
+                style="@style/form_linear_customer">
+
             </LinearLayout>
 
             <LinearLayout
@@ -259,8 +227,8 @@
 
                 <Button
                     android:id="@+id/bt_save"
-                    style="@style/from_button_base_white"
-                    android:text="保存"></Button>
+                    style="@style/from_button_base_bule"
+                    android:text="提  交"/>
             </LinearLayout>
 
             <LinearLayout

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

@@ -19,8 +19,10 @@
             style="@style/IMTabButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:checked="true"
             android:drawableTop="@drawable/tab_job_bg"
             android:text="@string/message" />
+        <!--<item name="android:textColor">@drawable/tab_textcolor</item>-->
 
         <TextView
             android:id="@+id/main_tab_one_tv"
@@ -39,7 +41,7 @@
         android:layout_width="0dip"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="@null" >
+         >
 
         <RadioButton
             android:id="@+id/main_tab_two"

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

@@ -3,12 +3,14 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:descendantFocusability="blocksDescendants"
-    android:padding="3dp" >
+    android:padding="3dp">
 
     <TextView
         android:id="@+id/text_view"
-        android:background="@drawable/text_click_bg"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content"
+        android:background="@drawable/text_click_bg"
+        android:textColor="@color/text_hine"
+        android:textSize="@dimen/text_min" />
 
 </LinearLayout>

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

@@ -28,28 +28,32 @@
             android:background="@drawable/user_nick_name_bg"
             android:gravity="center_vertical"
             android:singleLine="true"
-            android:textSize="@dimen/BigTextSize"
+            android:textSize="@dimen/text_main"
+            android:textColor="@color/text_main"
+            android:text="texts"
             android:textStyle="bold" />
 
         <TextView
             android:id="@+id/body_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginLeft="5dp"
             android:background="@drawable/text_click_bg"
-            android:textColor="@color/black"
-            android:textSize="@dimen/BigTextSize" />
+            android:textColor="@color/text_hine"
+            android:text="ss"
+            android:textSize="@dimen/text_hine" />
 
         <FrameLayout
             android:id="@+id/content_fl"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp" />
+            android:layout_marginTop="8dp" />
 
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
+            android:layout_marginTop="15dp"
             android:gravity="center_vertical"
             android:orientation="horizontal" >
 
@@ -60,21 +64,22 @@
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:gravity="center_vertical"
-                android:textColor="@color/dark_grey"
-                android:textSize="@dimen/NormalTextSize" />
+                android:textColor="@color/text_hine"
+                android:text="ss"
+                android:textSize="@dimen/text_min" />
 
             <TextView
                 android:id="@+id/delete_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="10dp"
+                android:layout_marginLeft="8dp"
                 android:layout_toRightOf="@+id/time_tv"
                 android:background="@drawable/text_click_bg"
                 android:gravity="center"
                 android:text="@string/delete"
                 android:textColor="@color/link_nick_name_color"
-                android:textSize="@dimen/NormalTextSize" />
+                android:textSize="@dimen/text_min" />
 
             <ImageView
                 android:id="@+id/operation_more_img"
@@ -85,20 +90,27 @@
                 android:background="@drawable/operation_more_bg"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
-
+        <View
+            android:id="@+id/line"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="5dp"
+            android:background="@color/item_line"/>
         <TextView
             android:id="@+id/multi_praise_tv"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/user_nick_name_bg"
-            android:drawableLeft="@drawable/icon_nice_press"
-            android:textSize="@dimen/BigTextSize" />
+            android:layout_height="18dp"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/praise_bg"
+            android:drawableLeft="@drawable/likes"
+            android:textSize="@dimen/text_min" />
 
         <com.sk.weichat.view.MyListView
             android:id="@+id/command_listView"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
+            android:background="@color/pop_bg"
             android:layout_marginTop="5dp" />
     </LinearLayout>
 

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

@@ -1,49 +1,49 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@drawable/black_bg"
+    android:background="@color/pop_bg"
     android:gravity="center"
     android:orientation="horizontal"
-    android:padding="1dp" >
+    android:padding="1dp">
 
     <TextView
         android:id="@+id/praise_tv"
         android:layout_width="60dp"
         android:layout_height="35dp"
-        android:background="@drawable/operation_text_click_bg"
         android:gravity="center"
+        android:drawableLeft="@drawable/like"
         android:text="@string/praise"
         android:textColor="@color/white"
-        android:textSize="@dimen/NormalTextSize" />
+        android:textSize="@dimen/text_hine" />
 
     <View
         android:layout_width="1px"
-        android:layout_height="25dp"
-        android:background="@color/dark_grey" />
+        android:layout_height="35dp"
+        android:background="@color/white" />
 
     <TextView
         android:id="@+id/comment_tv"
         android:layout_width="60dp"
         android:layout_height="35dp"
-        android:background="@drawable/operation_text_click_bg"
         android:gravity="center"
+        android:drawableLeft="@drawable/sead"
         android:text="@string/comment"
         android:textColor="@color/white"
-        android:textSize="@dimen/NormalTextSize" />
+        android:textSize="@dimen/text_hine" />
 
     <View
         android:layout_width="1px"
-        android:layout_height="25dp"
-        android:background="@color/dark_grey" />
+        android:layout_height="35dp"
+        android:background="@color/white" />
 
     <TextView
         android:id="@+id/gift_tv"
         android:layout_width="60dp"
         android:layout_height="35dp"
-        android:background="@drawable/operation_text_click_bg"
+        android:drawableLeft="@drawable/dele"
         android:gravity="center"
         android:text="@string/send_gift"
         android:textColor="@color/white"
-        android:textSize="@dimen/NormalTextSize" />
+        android:textSize="@dimen/text_hine" />
 
 </LinearLayout>

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--by gongpengming-->
+    <!--by gongpengming-->pop_bg
     <color name="item_color1">#30a0a0a0</color>
+    <color name="pop_bg">#aeaeae</color>
     <color name="item_color2">@color/white</color>
     <color name="item_text">#cca0a0a0</color>
     <color name="item_line">#BCBBC0</color>
@@ -10,6 +11,7 @@
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>
     <color name="text_hine">#575757</color>
+    <color name="bar_pass">#7bb4dc</color>
     <color name="bar_color">#e6e6e6</color>
     <color name="bg_main">@color/white</color>
     <color name="refresh">@color/black</color>

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

@@ -3,9 +3,9 @@
     <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>
-
+    <dimen name="text_main">17.0sp</dimen>
+    <dimen name="text_hine">14.0sp</dimen>
+    <dimen name="text_min">12.0sp</dimen>
     <dimen name="item_height">60.0dip</dimen>
     <dimen name="item_me_height">80.0dip</dimen>
     <dimen name="bar_height">80.0dip</dimen>

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

@@ -266,24 +266,22 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:background">@android:color/transparent</item>
     </style>
-
+    <!--<item name="android:layout_marginTop">20dp</item>-->
+    <!--        <item name="android:layout_marginBottom">15dp</item>-->
     <style name="form_linear_customer">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginLeft">5dp</item>
-        <item name="android:layout_marginRight">5dp</item>
-        <item name="android:layout_marginTop">20dp</item>
-        <item name="android:layout_marginBottom">15dp</item>
         <item name="android:background">@drawable/ry_setting_selector</item>
         <item name="android:orientation">vertical</item>
     </style>
 
     <style name="form_relative_right_text">
-        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_marginRight">20dp</item>
+        <item name="android:layout_marginLeft">150dp</item>
         <item name="android:background">@drawable/shape_from_edit</item>
         <item name="android:gravity">left</item>
         <item name="android:maxWidth">290dp</item>
@@ -348,7 +346,6 @@
     <style name="form_relative_customer">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">@drawable/ry_setting_selector</item>
         <item name="android:clickable">true</item>
     </style>
 
@@ -421,9 +418,10 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:layout_marginLeft">10dp</item>
+        <item name="android:layout_marginLeft">20dp</item>
         <item name="android:gravity">right</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/text_main</item>
+        <item name="android:textSize">@dimen/text_main</item>
     </style>
 
     <style name="app_comm_list_line_gray">
@@ -434,13 +432,22 @@
         <item name="android:background">@drawable/line</item>
         <item name="android:contentDescription">@string/app_name</item>
     </style>
-
     <style name="from_button_base_white">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">45dp</item>
-
-        <item name="android:textSize">16sp</item>
-        <item name="android:background">@drawable/ry_setting_selector</item>
+        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:textSize">@dimen/text_main</item>
+        <item name="android:textColor">@color/text_main</item>
+    </style>
+    <style name="from_button_base_bule">
+        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">45dp</item>
+        <item name="android:textSize">@dimen/text_main</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:layout_marginLeft">40dp</item>
+        <item name="android:layout_marginRight">40dp</item>
+        <item name="android:background">@drawable/bg_btn</item>
     </style>
 
     <style name="item_relative_style_tv">