闪存UI细节优化

raee · raee · commit 0f35f7999cb7 · 2017-11-05T22:39:32.000+08:00
diff --git a/app/src/main/java/com/rae/cnblogs/adapter/MomentAdapter.java b/app/src/main/java/com/rae/cnblogs/adapter/MomentAdapter.java
@@ -130,7 +130,9 @@ public void onBindViewHolder(SimpleViewHolder viewHolder, int position, MomentBe
         holder.authorView.setText(m.getAuthorName());
         holder.dateView.setText(m.getPostTime());
         holder.summaryView.setText(m.getContent());
-        holder.commentView.setText(m.getCommentCount());
+        holder.androidTagView.setVisibility(m.isAndroidClient() ? View.VISIBLE : View.GONE);
+        holder.commentView.setVisibility("0".equals(m.getCommentCount()) ? View.GONE : View.VISIBLE);
+        holder.commentView.setText("0".equals(m.getCommentCount()) ? "" : m.getCommentCount() + "条回复");
     }
 
     private static class ItemDeleteClickListener implements View.OnClickListener {
diff --git a/app/src/main/java/com/rae/cnblogs/fragment/MomentFragment.java b/app/src/main/java/com/rae/cnblogs/fragment/MomentFragment.java
@@ -2,6 +2,7 @@
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.util.Log;
 import android.view.View;
 
 import com.jcodecraeer.xrecyclerview.XRecyclerView;
@@ -210,6 +211,11 @@ public void onDeleteMomentSuccess() {
         AppUI.success(getContext(), R.string.tips_del_moment_success);
     }
 
+    @Override
+    public void onReplyContChanged(int number) {
+        Log.i("rae", "有回复我的；" + number);
+    }
+
     /**
      * 滚动到顶部
      */
diff --git a/app/src/main/java/com/rae/cnblogs/model/MomentHolder.java b/app/src/main/java/com/rae/cnblogs/model/MomentHolder.java
@@ -41,6 +41,7 @@ public class MomentHolder extends SimpleViewHolder {
     public View deleteView; // 删除
     public Button followView; // 关注
     public ImageView thumbView; // 单张图片
+    public View androidTagView; // 客户端标志
 
 
 //    @BindView(R.id.img_blog_list_large_thumb)
@@ -63,6 +64,7 @@ public MomentHolder(View itemView) {
         deleteView = itemView.findViewById(R.id.img_close);
         thumbView = itemView.findViewById(R.id.img_thumb);
         followView = itemView.findViewById(R.id.btn_blogger_follow);
+        androidTagView = itemView.findViewById(R.id.tv_android_tag);
         ButterKnife.bind(this, itemView);
     }
 }
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/IMomentContract.java b/app/src/main/java/com/rae/cnblogs/presenter/IMomentContract.java
@@ -32,5 +32,9 @@ interface View extends IPageView<MomentBean> {
          */
         void onDeleteMomentSuccess();
 
+        /**
+         * 有回复我的消息数量
+         */
+        void onReplyContChanged(int number);
     }
 }
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/impl/MomentPresenterImpl.java b/app/src/main/java/com/rae/cnblogs/presenter/impl/MomentPresenterImpl.java
@@ -12,6 +12,7 @@
 import com.rae.cnblogs.sdk.Empty;
 import com.rae.cnblogs.sdk.api.IMomentApi;
 import com.rae.cnblogs.sdk.bean.MomentBean;
+import com.rae.swift.Rx;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -48,6 +49,25 @@ protected Observable<List<MomentBean>> onCreateObserver(int page) {
     public void start() {
         super.start();
         mPageObservable.start();
+
+        // 查询回复我的数量
+        if (isLogin()) {
+            createObservable(mMomentApi.queryReplyCount(System.currentTimeMillis()))
+                    .subscribe(new ApiDefaultObserver<String>() {
+                        @Override
+                        protected void onError(String message) {
+
+                        }
+
+                        @Override
+                        protected void accept(String s) {
+                            int number = Rx.parseInt(s);
+                            if (number > 0) {
+                                mView.onReplyContChanged(number);
+                            }
+                        }
+                    });
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/rae/cnblogs/presenter/impl/PostMomentPresenterImpl.java b/app/src/main/java/com/rae/cnblogs/presenter/impl/PostMomentPresenterImpl.java
@@ -74,6 +74,10 @@ public boolean post() {
             mView.onPostMomentInProgress();
             return false;
         } else {
+
+            // 加上客户端标志
+            content = "[来自Android客户端] " + content;
+
             createObservable(mMomentApi.publish(content, 1))
                     .subscribe(new ApiDefaultObserver<Empty>() {
                         @Override
diff --git a/app/src/main/res/drawable-xxhdpi/ic_moment_post.png b/app/src/main/res/drawable-xxhdpi/ic_moment_post.png
diff --git a/app/src/main/res/layout/fm_sns.xml b/app/src/main/res/layout/fm_sns.xml
@@ -46,13 +46,15 @@
 
             </android.support.design.widget.DesignTabLayout>
 
-            <TextView
+            <ImageView
                 android:id="@+id/tv_post"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignParentEnd="true"
                 android:layout_alignParentRight="true"
-                android:padding="12dp"
-                android:text="发布"/>
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/default_margin"
+                android:src="@drawable/ic_moment_post"/>
 
         </RelativeLayout>
     </android.support.v7.widget.Toolbar>
diff --git a/app/src/main/res/layout/item_moment_list.xml b/app/src/main/res/layout/item_moment_list.xml
@@ -1,35 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="4dp"
+    android:layout_marginBottom="1dp"
     android:background="@drawable/bg_blog_item_selector"
     android:foreground="?selectableItemBackground"
     android:orientation="vertical"
-    android:paddingBottom="@dimen/default_margin"
+    android:paddingBottom="12dp"
     android:paddingLeft="@dimen/default_margin"
     android:paddingRight="@dimen/default_margin"
-    android:paddingTop="@dimen/default_margin">
+    android:paddingTop="18dp">
 
-    <ImageButton
+    <ImageView
         android:id="@+id/img_close"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
         android:layout_alignParentRight="true"
         android:background="@android:color/transparent"
-        android:scaleType="center"
+        android:padding="8dp"
+        android:scaleType="fitCenter"
         android:src="@drawable/ic_close"/>
 
-    <com.makeramen.roundedimageview.RoundedImageView
+    <ImageView
         android:id="@+id/img_blog_avatar"
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:layout_marginRight="12dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/bg_user_avatar"
-        app:riv_corner_radius="4dp"/>
+        android:src="@drawable/bg_user_avatar"/>
 
 
     <com.rae.cnblogs.widget.RaeTextView
@@ -40,7 +39,7 @@
         android:layout_alignTop="@+id/img_blog_avatar"
         android:layout_toRightOf="@+id/img_blog_avatar"
         android:text="RAE"
-        android:textColor="@color/ph2"
+        android:textColor="@color/moment_author"
         android:textSize="@dimen/h2"/>
 
     <com.rae.cnblogs.widget.RaeTextView
@@ -53,7 +52,7 @@
         android:gravity="bottom"
         android:text="今天18:30"
         android:textAlignment="gravity"
-        android:textColor="@color/ph3"
+        android:textColor="#767676"
         android:textSize="11sp"/>
 
     <com.rae.cnblogs.widget.RaeTextView
@@ -94,12 +93,31 @@
         android:layout_below="@+id/img_thumb"
         android:layout_marginTop="18dp"
         android:layout_toRightOf="@+id/img_blog_avatar"
-        android:drawableLeft="@drawable/ic_comment_min"
-        android:drawablePadding="7dp"
-        android:gravity="center"
-        android:text="0"
-        android:textColor="@color/ph2"
-        android:textSize="@dimen/h2"/>
+        android:drawableLeft="@drawable/ic_moment_comment"
+        android:drawablePadding="6dp"
+        android:gravity="center_vertical|end"
+        android:minWidth="45dp"
+        android:text="0条回复"
+        android:textColor="#c4c4c4"
+        android:textSize="@dimen/h3"/>
+
+    <TextView
+        android:id="@+id/tv_android_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/tv_blog_comment"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/img_thumb"
+        android:text="客户端"
+        android:textColor="@color/dividerColor"
+        android:textSize="@dimen/h3"/>
+
+    <!--    <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_below="@+id/tv_blog_comment"
+            android:layout_marginTop="12dp"
+            android:background="@color/dividerPrimary"/>-->
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -13,6 +13,7 @@
     <color name="dividerColor">#dedede</color>
     <color name="ph1">#2d2d2d</color>
     <color name="ph2">#595959</color>
+    <color name="moment_author">#576b95</color>
     <color name="ph3">#929292</color>
     <color name="ph4">#999999</color>
     <color name="default_background">#f9f9f9</color>
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/api/ApiUrls.java b/sdk/src/main/java/com/rae/cnblogs/sdk/api/ApiUrls.java
@@ -118,6 +118,9 @@ final class ApiUrls {
     // 闪存-发表评论
     static final String API_MOMENT_POST_COMMENT = "https://ing.cnblogs.com/ajax/ing/PostComment";
 
+    // 闪存-回复我的数量
+    static final String API_MOMENT_REPLY_COUNT = "https://ing.cnblogs.com/ajax/ing/UnviewedReplyToMeCount";
+
     // 上传图片
     static final String API_POST_IMAGE = "https://upload.cnblogs.com/imageuploader/processupload?host=www.cnblogs.com";
 
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/api/IMomentApi.java b/sdk/src/main/java/com/rae/cnblogs/sdk/api/IMomentApi.java
@@ -63,6 +63,14 @@ public interface IMomentApi {
     @Parser(MomentDelParser.class)
     Observable<Empty> deleteMoment(@Field("ingId") String ingId);
 
+    /**
+     * 获取回复我的数量
+     */
+    @POST(ApiUrls.API_MOMENT_REPLY_COUNT)
+    @FormUrlEncoded
+    @Headers({JsonBody.XHR})
+    Observable<String> queryReplyCount(@Field("_") long timestamp);
+
     /**
      * 发表闪存评论
      *
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/bean/MomentBean.java b/sdk/src/main/java/com/rae/cnblogs/sdk/bean/MomentBean.java
@@ -37,6 +37,9 @@ public class MomentBean implements Parcelable {
     // 源地址
     private String sourceUrl;
 
+    // 是否发自于Android客户端
+    private  boolean isAndroidClient;
+
     // 评论列表
     private List<MomentCommentBean> commentList;
 
@@ -91,6 +94,14 @@ public void setAuthorName(String authorName) {
         this.authorName = authorName;
     }
 
+    public boolean isAndroidClient() {
+        return isAndroidClient;
+    }
+
+    public void setAndroidClient(boolean androidClient) {
+        isAndroidClient = androidClient;
+    }
+
     public String getUserAlias() {
         return userAlias;
     }
@@ -151,6 +162,7 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(this.content);
         dest.writeString(this.userAlias);
         dest.writeString(this.sourceUrl);
+        dest.writeByte(this.isAndroidClient ? (byte) 1 : (byte) 0);
         dest.writeTypedList(this.commentList);
         dest.writeStringList(this.imageList);
     }
@@ -165,6 +177,7 @@ protected MomentBean(Parcel in) {
         this.content = in.readString();
         this.userAlias = in.readString();
         this.sourceUrl = in.readString();
+        this.isAndroidClient = in.readByte() != 0;
         this.commentList = in.createTypedArrayList(MomentCommentBean.CREATOR);
         this.imageList = in.createStringArrayList();
     }
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/converter/TextResponseBodyConverter.java b/sdk/src/main/java/com/rae/cnblogs/sdk/converter/TextResponseBodyConverter.java
@@ -77,6 +77,7 @@ private boolean ignoreLogin() {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public T convert(ResponseBody value) throws IOException {
         // 解析
         String text = value.string();
@@ -88,8 +89,9 @@ public T convert(ResponseBody value) throws IOException {
         if (text.startsWith("{") || text.startsWith("[")) {
             // 解析JSON
             return json2Entity(text);
+        } else if (type == String.class) {
+            return (T) text;
         }
-
         return html2Entity(text);
     }
 
diff --git a/sdk/src/main/java/com/rae/cnblogs/sdk/parser/MomentParser.java b/sdk/src/main/java/com/rae/cnblogs/sdk/parser/MomentParser.java
@@ -30,6 +30,7 @@ public List<MomentBean> parse(Document doc, String html) throws IOException {
 
         Elements elements = doc.select("#feed_list li");
 
+        final String androidTag = "[来自Android客户端]";
         for (Element element : elements) {
             MomentBean m = new MomentBean();
             String id = ApiUtils.getNumber(element.select(".feed_body").attr("id"));
@@ -45,6 +46,7 @@ public List<MomentBean> parse(Document doc, String html) throws IOException {
             m.setBlogApp(ApiUtils.getBlogApp(element.select(".ing-author").attr("href"))); // blogApp
             m.setSourceUrl(ApiUtils.getUrl(element.select(".ing-author").attr("href")).replace("home", "ing") + "status/" + id); // blogApp
 
+
             // 解析评论
             m.setCommentList(mMomentCommentHelper.parse(element));
 
@@ -53,6 +55,7 @@ public List<MomentBean> parse(Document doc, String html) throws IOException {
             String content = m.getContent();
             int startIndex = content.indexOf("#img");
             int endIndex = content.indexOf("#end");
+
             if (startIndex > 0 && endIndex > 0) {
                 String json = content.substring(startIndex + 4, endIndex);
                 try {
@@ -70,6 +73,14 @@ public List<MomentBean> parse(Document doc, String html) throws IOException {
                 }
             }
 
+            // Android标签处理
+            if (m.getContent().contains(androidTag) || (startIndex > 0 && endIndex > 0)) {
+                // 来自安卓客户端
+                m.setAndroidClient(true);
+                // 去除标签
+                m.setContent(m.getContent().replace(androidTag, ""));
+            }
+
             result.add(m);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@ public class MomentHolder extends SimpleViewHolder {`
`41`	`41`	`public View deleteView; // 删除`
`42`	`42`	`public Button followView; // 关注`
`43`	`43`	`public ImageView thumbView; // 单张图片`
	`44`	`+ public View androidTagView; // 客户端标志`
`44`	`45`
`45`	`46`
`46`	`47`	`// @BindView(R.id.img_blog_list_large_thumb)`
`@@ -63,6 +64,7 @@ public MomentHolder(View itemView) {`
`63`	`64`	`deleteView = itemView.findViewById(R.id.img_close);`
`64`	`65`	`thumbView = itemView.findViewById(R.id.img_thumb);`
`65`	`66`	`followView = itemView.findViewById(R.id.btn_blogger_follow);`
	`67`	`+ androidTagView = itemView.findViewById(R.id.tv_android_tag);`
`66`	`68`	`ButterKnife.bind(this, itemView);`
`67`	`69`	`}`
`68`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,9 @@ interface View extends IPageView<MomentBean> {`
`32`	`32`	`*/`
`33`	`33`	`void onDeleteMomentSuccess();`
`34`	`34`
	`35`	`+ /**`
	`36`	`+ * 有回复我的消息数量`
	`37`	`+ */`
	`38`	`+ void onReplyContChanged(int number);`
`35`	`39`	`}`
`36`	`40`	`}`