Client:同步adt版至studio版

TommyLemon · TommyLemon · commit d5aa50e8efb1 · 2017-04-12T10:06:59.000+08:00
diff --git a/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/model/MomentItem.java b/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/model/MomentItem.java
@@ -116,11 +116,20 @@ public MomentItem setMoment(Moment moment) {
 		return this;
 	}
 
-	//	@NonNull
+	@NonNull
 	public List<User> getUserList() {
-		//		if (userList == null) {
-		//			userList = new ArrayList<>();
-		//		}
+		if (userList == null) {
+			userList = new ArrayList<User>();
+			List<Long> list = getPraiseUserIdList();
+			if (list != null) {
+				User u;
+				for (Long id : list) {
+					u = new User(id);
+					u.setName("" + id);
+					userList.add(u);
+				}
+			}
+		}
 		return userList;
 	}
 	public MomentItem setUserList(List<User> userList) {
diff --git a/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/util/HttpRequest.java b/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/util/HttpRequest.java
@@ -460,7 +460,7 @@ public static void getMomentList(int range, long id, com.alibaba.fastjson.JSONOb
 				.setColumn(COLUMNS_USER_SIMPLE));
 
 
-		request.add(commentItem.toArray(10, 0, CommentItem.class.getSimpleName()));
+		request.add(commentItem.toArray(6, 0, CommentItem.class.getSimpleName()));
 //		request.put("commentCount@", "/CommentItem[]/total");
 		//comment >>>>>>>>>>>>>>>>>>
 
diff --git a/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/view/MomentView.java b/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/view/MomentView.java
@@ -185,7 +185,7 @@ public void bindView(MomentItem data_){
 		// 图片
 		setPicture(moment.getPictureList());
 		// 点赞
-		setPraise(data.getIsPraised(), data.getUserList(), data.getPraiseUserIdList());
+		setPraise(data.getIsPraised(), data.getUserList());
 		// 评论
 		setComment(data.getCommentItemList());
 
@@ -202,22 +202,12 @@ public void bindView(MomentItem data_){
 	 * @param joined
 	 * @param list
 	 */
-	private void setPraise(boolean joined, List<User> userList, List<Long> list) {
+	private void setPraise(boolean joined, List<User> userList) {
 		ivMomentViewPraise.setImageResource(joined ? R.drawable.praised : R.drawable.praise);
-
-		if (userList == null || userList.isEmpty()) {
-			if (list != null) {
-				userList = new ArrayList<User>();
-				User u;
-				for (Long id : list) {
-					u = new User(id);
-					u.setName("" + id);
-					userList.add(u);
-				}
-			}
-		}
 		llMomentViewPraise.setVisibility(userList == null || userList.isEmpty() ? View.GONE : View.VISIBLE);
-		tvMomentViewPraise.setView(userList);
+		if (llMomentViewPraise.getVisibility() == View.VISIBLE) {
+			tvMomentViewPraise.setView(userList);
+		}
 	}
 
 	private boolean showComment = true;
@@ -257,7 +247,7 @@ public void onCommentClick(CommentItem item, int position, int index, boolean is
 			});
 			commentContainerView.tvCommentContainerViewMore.setOnClickListener(this);
 
-			commentContainerView.setMaxShowCount(9);
+			commentContainerView.setMaxShowCount(5);
 		}
 
 		commentContainerView.bindView(list);
diff --git a/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/view/PraiseTextView.java b/APIJSON(Android)/APIJSON(AndroidStudio)/APIJSONApp/app/src/main/java/apijson/demo/client/view/PraiseTextView.java
@@ -18,7 +18,6 @@
 import java.util.List;
 
 import zuo.biao.library.util.CommonUtil;
-import zuo.biao.library.util.StringUtil;
 import android.app.Activity;
 import android.content.Context;
 import android.text.SpannableString;
@@ -59,18 +58,18 @@ public PraiseTextView(Context context, AttributeSet attrs, int defStyle) {
 	/**设置View
 	 * @param comment
 	 */
-	public void setView(List<User> list_) {
-		if (list_ == null || list_.isEmpty()) {
+	public void setView(List<User> list) {
+		if (list == null || list.isEmpty()) {
 			setText("");
 			return;
 		}
-		//去除无效User
-		List<User> list = new ArrayList<User>();
-		for (User user: list_) {
-			if (user != null && StringUtil.isNotEmpty(user.getName(), true)) {
-				list.add(user);
-			}
-		}
+		//		//影响列表滚动流畅度，去除无效User
+		//		List<User> list = new ArrayList<User>();
+		//		for (User user: list_) {
+		//			if (user != null && StringUtil.isNotEmpty(user.getName(), true)) {
+		//				list.add(user);
+		//			}
+		//		}
 		int count = list == null ? 0 : list.size();
 		if (count > 9) {
 			list = list.subList(0, 9);
@@ -84,10 +83,10 @@ public void setView(List<User> list_) {
 		for (int i = 0; i < list.size(); i++) {
 			user = list.get(i);
 			dividerIndexes.add(content.length());
-			content += (i <= 0 ? "" : "、") + user.getName();
+			content += (i <= 0 ? "" : "、") + (user == null ? " " : user.getName());
 		}
 		dividerIndexes.add(content.length());//最后一个
-		
+
 		//空格保证多行时不会点击空白处总是响应最后一个
 		SpannableString msp = new SpannableString(content + (count <= 9 ? " " : " 等觉得很赞"));//" + count + "人觉得很赞"));
 
@@ -115,7 +114,8 @@ public void onNameClick(int index, View widget, User user) {
 		if (listener != null) {
 			listener.onNameClick(index, widget, user);
 		} else {
-			CommonUtil.toActivity((Activity) getContext(), UserActivity.createIntent(getContext(), user.getId()));	
+			CommonUtil.toActivity((Activity) getContext(), UserActivity.createIntent(
+					getContext(), user == null ? 0 : user.getId()));	
 		}
 	}
 
