1.修改部分界面字体字号颜色等

2.评论界面增加分割线和快捷回复提示
3.小红花界面第二次重构

.idea/misc.xml

@@ -46,7 +46,10 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_exit_login.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_select_grade.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_select_grade_griditem_divder.xml" value="0.3309002433090024" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/activity_comment_item_divier.xml" value="0.4912109375" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/activity_saffloer_sigin_layout_divier.xml" value="0.4296875" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/activity_saffloer_task_divier.xml" value="0.4912109375" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.4912109375" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/popupwindow_select_grade_selector.xml" value="0.4443359375" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/activity_saffloer_sigin_layout_divier.xml" value="0.4296875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/cusjzplayer_controller_seekbar.xml" value="0.2713541666666667" />
@@ -70,21 +73,22 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.2" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_pay_item.xml" value="0.75" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_record.xml" value="0.33" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer.xml" value="0.25" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer.xml" value="0.4390009606147935" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer_sign_layout_item.xml" value="0.67" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer_window_item.xml" value="0.6294277929155313" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_userinfo_setting.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_video.xml" value="0.18824087245139876" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_web.xml" value="0.2731143552311436" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_comment.xml" value="0.5" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_comment_relayout_item.xml" value="0.25" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_comment.xml" value="1.5" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_comment_relayout_item.xml" value="0.6661807580174927" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_message.xml" value="0.22" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_myfollow.xml" value="1.0" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_myollow.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_myorder.xml" value="0.22" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_record.xml" value="0.4539641943734015" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_record_user.xml" value="0.67" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_safflower.xml" value="0.67" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_safflower.xml" value="0.75" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_safflower_v2.xml" value="0.67" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_slidevideo.xml" value="0.1" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/anim_getfollow.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/curjzplayer_controller.xml" value="0.16" />

app/src/main/java/com/edufound/reader/activity/MainActivity.java

@@ -74,8 +74,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
             String exampleId = uri.getQueryParameter("exampleId");
             String backModel = uri.getQueryParameter("backModel");
             Logger.e("从百度获取的url：" + uri);
-            Logger.e("从百度获取的url-exampleId：" + exampleId);
-            Logger.e("从百度获取的url-backModel：" + backModel);
             if (exampleId == null || exampleId.equals("")) {
 
             } else {

app/src/main/java/com/edufound/reader/activity/SafflowerActivity.java

@@ -44,7 +44,6 @@ public class SafflowerActivity extends BaseMvpActivity<SafflowerPresenter> imple
     @BindView(id = R.id.activity_saffloer_flower_des)
     ImageView mFlowerDes;
 
-
     @BindView(id = R.id.activity_saffloer_window)
     FrameLayout mWindowFrame;
 
@@ -54,6 +53,10 @@ public class SafflowerActivity extends BaseMvpActivity<SafflowerPresenter> imple
     @BindView(id = R.id.activity_saffloer_window_item_layout)
     LinearLayout mWindowItemLayout;
 
+
+    @BindView(id = R.id.activity_saffloer_sign_day)
+    TextView mSignDay;
+
     @Override
     public int getLayoutId() {
         return R.layout.activity_saffloer;
@@ -128,6 +131,7 @@ public class SafflowerActivity extends BaseMvpActivity<SafflowerPresenter> imple
     @Override
     public void getSignInfoSuccess(String signDday) {
         mPresenter.initSignLayout(mSignLayout);
+        mSignDay.setText("已连续签到" + signDday + "天");
     }
 
     @Override
@@ -138,7 +142,7 @@ public class SafflowerActivity extends BaseMvpActivity<SafflowerPresenter> imple
 
     @Override
     public void getDayFlowerSuccess(String count) {
-        mSignDayFollow.setText("小红花 " + count);
+        mSignDayFollow.setText(" " + count);
     }
 
     @Override

app/src/main/java/com/edufound/reader/adapter/SafflowerItemAdapter.java

@@ -33,7 +33,8 @@ public class SafflowerItemAdapter extends RecyclerView.Adapter<SafflowerItemHold
     @NonNull
     @Override
     public SafflowerItemHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
-        return new SafflowerItemHolder(mLayoutInflater.inflate(R.layout.adapter_item_safflower, parent, false));
+//        return new SafflowerItemHolder(mLayoutInflater.inflate(R.layout.adapter_item_safflower, parent, false));
+        return new SafflowerItemHolder(mLayoutInflater.inflate(R.layout.adapter_item_safflower_v2, parent, false));
     }
 
     @Override
@@ -41,10 +42,15 @@ public class SafflowerItemAdapter extends RecyclerView.Adapter<SafflowerItemHold
         holder.mTitle.setText(mListData.get(position).getTask().getTitle());
         holder.mFlowerCount.setText(mListData.get(position).getTask().getAward());
         if (mListData.get(position).getUserTask() == null) {
-            holder.mOverCount.setText("0/" + mListData.get(position).getTask().getJoinAmount());
+            holder.mOverCount.setText("0");
+            holder.mOverFlower.setText("奖励 0");
         } else {
-            holder.mOverCount.setText(mListData.get(position).getUserTask().getCompleteAmount() + "/" + mListData.get(position).getTask().getJoinAmount());
+            holder.mOverCount.setText(mListData.get(position).getUserTask().getCompleteAmount());
+            holder.mOverFlower.setText("奖励 " + Integer.valueOf(mListData.get(position).getUserTask().getCompleteAmount()) * Integer.valueOf(mListData.get(position).getTask().getAward()));
         }
+        holder.mJoinCount.setText("/" + mListData.get(position).getTask().getJoinAmount());
+
+
     }
 
     @Override
@@ -63,11 +69,15 @@ class SafflowerItemHolder extends RecyclerView.ViewHolder {
     TextView mTitle;
     TextView mFlowerCount;
     TextView mOverCount;
+    TextView mJoinCount;
+    TextView mOverFlower;
 
     public SafflowerItemHolder(@NonNull View itemView) {
         super(itemView);
         mTitle = itemView.findViewById(R.id.adapter_item_safflower_title);
         mFlowerCount = itemView.findViewById(R.id.adapter_item_safflower_redfcount);
         mOverCount = itemView.findViewById(R.id.adapter_item_safflower_overcount);
+        mJoinCount = itemView.findViewById(R.id.adapter_item_safflower_joincount);
+        mOverFlower = itemView.findViewById(R.id.adapter_item_safflower_completeAmount);
     }
 }

app/src/main/java/com/edufound/reader/adapter/SlideVideoAdapter.java

@@ -140,7 +140,7 @@ class VideoHolder extends RecyclerView.ViewHolder {
                 mSwitch.setVisibility(View.VISIBLE);
                 SlideVideoDanMarqueenAdapter adapter = new SlideVideoDanMarqueenAdapter(mContext, bean.getData().getList());
                 mMarqueen.setLayoutManager(new LinearLayoutManager(mContext, LinearLayoutManager.HORIZONTAL, false));
-                mMarqueen.addItemDecoration(new SpacesItemDecoration(SizeUtils.dp2px(mContext, 20)));
+                mMarqueen.addItemDecoration(new SpacesItemDecoration(SizeUtils.dp2px(mContext, 23)));
                 mMarqueen.setAdapter(adapter);
             }
 

app/src/main/java/com/edufound/reader/base/BaseActivity.java

@@ -336,12 +336,12 @@ public abstract class BaseActivity extends AppCompatActivity {
                     ImageView touch = mFirstIntoView.findViewById(R.id.first_touch);
                     FrameLayout.LayoutParams first_params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
                     first_params.gravity = Gravity.RIGHT | Gravity.CENTER;
-                    first_params.rightMargin = SizeUtils.dp2px(Consts.getmApplicAtion().getBaseContext(), 80);
+                    first_params.rightMargin = SizeUtils.dp2px(Consts.getmApplicAtion().getBaseContext(), 30);
                     mFirstIntoView.setLayoutParams(first_params);
                     ObjectAnimator translationYUp = ObjectAnimator.ofFloat(touch, "translationY", 80, -30);
                     ObjectAnimator translationYDown = ObjectAnimator.ofFloat(touch, "translationY", -30, 80);
-                    translationYUp.setDuration(3000);
-                    translationYDown.setDuration(3000);
+                    translationYUp.setDuration(1500);
+                    translationYDown.setDuration(1500);
                     LinearInterpolator interpolator = new LinearInterpolator();
                     translationYUp.setInterpolator(interpolator); //设置匀速旋转，不卡顿
                     translationYDown.setInterpolator(interpolator); //设置匀速旋转，不卡顿

app/src/main/java/com/edufound/reader/presenter/RecommendFragmentPresenter.java

@@ -382,15 +382,12 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
         }
         //获取当前显示的View 的数据
         int childCount = rv.getChildCount();
-        Logger.e("childCount:" + childCount);
         //获取最后一具 Item 对应的View
         View childAt = rv.getChildAt(childCount - 1);
         //获取当前军舰中显示的最后一个 Item 的位置  Postion
         int childLayoutPosition = rv.getChildLayoutPosition(childAt);
         mView.setTopStatus(mDataList.get(childLayoutPosition));
         RvListJzvdStd player = rv.getChildAt(0).findViewById(R.id.slidevideo_video);
-        Logger.e("player==null:" + (player == null));
-        Logger.e("player==player.state:" + player.state);
         if (player != null) {
             if (player.state == Jzvd.STATE_PLAYING) {
                 //正在播放
@@ -425,7 +422,6 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
 
 
     public void scrollToNextFunction(RecyclerView rv, boolean needScroll) {
-        Logger.e("needScroll:" + needScroll);
         //获取当前显示的View 的数据
         int childCount = rv.getChildCount();
         //获取最后一具 Item 对应的View

app/src/main/java/com/edufound/reader/presenter/SafflowerPresenter.java

@@ -1,6 +1,7 @@
 package com.edufound.reader.presenter;
 
 import android.content.Intent;
+import android.graphics.Rect;
 import android.os.Build;
 import android.os.Message;
 import android.view.Gravity;
@@ -16,7 +17,6 @@ import com.edufound.reader.adapter.SafflowerItemAdapter;
 import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.base.BasePresenter;
 import com.edufound.reader.bean.HttpResultBean;
-import com.edufound.reader.bean.HttpResultDataListBean;
 import com.edufound.reader.bean.SignInfoBean;
 import com.edufound.reader.bean.TaskBean;
 import com.edufound.reader.contract.SafflowerContract;
@@ -32,11 +32,9 @@ import com.orhanobut.logger.Logger;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Handler;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
-import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -88,12 +86,8 @@ public class SafflowerPresenter extends BasePresenter<SafflowerContract.View> im
         }
 //        rv.setVisibility(View.VISIBLE);
         mSafflowerItemAdapter = new SafflowerItemAdapter(mView.getActivity(), mDataList);
-        GridLayoutManager gridLayoutManager = new GridLayoutManager(mView.getActivity(), 2);
-        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
-        rv.addItemDecoration(new MyCollectionItemDecoration(
-                SizeUtils.dp2px(mView.getActivity(), 20f),
-                SizeUtils.dp2px(mView.getActivity(), 20)));
-        rv.setLayoutManager(gridLayoutManager);
+        rv.addItemDecoration(new SpacesItemDecoration(SizeUtils.dp2px(mView.getActivity(), 10)));
+        rv.setLayoutManager(new LinearLayoutManager(mView.getActivity(), LinearLayoutManager.HORIZONTAL, false));
         rv.setAdapter(mSafflowerItemAdapter);
 
     }
@@ -171,6 +165,7 @@ public class SafflowerPresenter extends BasePresenter<SafflowerContract.View> im
     public void initWindowItem(LinearLayout layout) {
         LayoutInflater inflater = LayoutInflater.from(mView.getActivity());
         if (mDesList.size() > 0) {
+            layout.removeAllViews();
             mDesList.forEach((item) -> {
                 LinearLayout itemlayout = (LinearLayout) inflater.inflate(R.layout.activity_saffloer_window_item, null);
                 ((TextView) itemlayout.findViewById(R.id.activity_saffloer_window_item_text)).setText(item);
@@ -203,7 +198,9 @@ public class SafflowerPresenter extends BasePresenter<SafflowerContract.View> im
         public boolean handleMessage(@NonNull Message message) {
             switch (message.what) {
                 case 1:
-
+                    if (mDesList.size() > 0) {
+                        return true;
+                    }
                     mDataList.forEach((item) -> {
                         mDesList.add(item.getTask().getTitle() + "奖励" + item.getTask().getSort() + "朵小红花，" + "每日" + item.getTask().getJoinAmount() + "次上限");
                     });
@@ -212,4 +209,20 @@ public class SafflowerPresenter extends BasePresenter<SafflowerContract.View> im
             return false;
         }
     });
+
+    class SpacesItemDecoration extends RecyclerView.ItemDecoration {
+        private int space;
+
+        public SpacesItemDecoration(int space) {
+            this.space = space;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            outRect.left = space;
+            outRect.right = space;
+//        outRect.bottom = space;
+            // Add top margin only for the first item to avoid double space between items
+        }
+    }
 }

app/src/main/res/drawable/activity_comment_item_divier.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+    <size
+            android:width="10dp"
+            android:height="1dp" />
+    <solid android:color="#eeeeee" />
+</shape>

app/src/main/res/drawable/activity_saffloer_task_divier.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="@color/transparent" />
+    <size android:height="15dp" />
+</shape>

app/src/main/res/layout/activity_comment.xml

@@ -97,8 +97,9 @@
                             android:id="@+id/comment_quick_layout"
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
-                            android:layout_weight="1.5"
-                            android:background="@color/aliceblue">
+                            android:layout_weight="1.8"
+                            android:background="@color/aliceblue"
+                            android:paddingTop="10dp">
 
                         <LinearLayout
                                 android:layout_width="match_parent"
@@ -119,7 +120,7 @@
                                         android:paddingLeft="20dp"
                                         android:text="留下你的赞美，鼓励一下。"
                                         android:textColor="@color/black"
-                                        android:textSize="28dp"></TextView>
+                                        android:textSize="26dp"></TextView>
 
                                 <ImageView
                                         android:id="@+id/comment_close_quick"
@@ -134,12 +135,14 @@
                             <LinearLayout
                                     android:layout_width="match_parent"
                                     android:layout_height="0dp"
+                                    android:layout_gravity="center"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
                                     android:layout_weight="1"
                                     android:divider="@drawable/main_left_tab_divider"
                                     android:orientation="horizontal"
                                     android:paddingLeft="20dp"
                                     android:paddingRight="20dp"
-                                    android:paddingBottom="20dp"
                                     android:showDividers="middle">
 
                                 <FrameLayout
@@ -197,6 +200,14 @@
                             </LinearLayout>
                         </LinearLayout>
 
+
+                        <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center|top"
+                                android:layout_marginLeft="30dp"
+                                android:background="@drawable/comment_quick_layout_tip"></ImageView>
+
                     </FrameLayout>
 
                     <FrameLayout

app/src/main/res/layout/activity_saffloer.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:roundframelayout="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -22,7 +23,6 @@
             android:layout_width="1280dp"
             android:layout_height="720dp"
             android:orientation="vertical"
-            android:visibility="invisible"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="h,16:9"
             app:layout_constraintEnd_toEndOf="parent"
@@ -30,8 +30,8 @@
             app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
-                android:layout_width="1184dp"
-                android:layout_height="630dp"
+                android:layout_width="1206dp"
+                android:layout_height="680dp"
                 android:layout_gravity="center"
                 android:background="@drawable/activity_safflower_bg"
                 android:orientation="vertical">
@@ -39,65 +39,101 @@
             <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1.6">
+                    android:layout_weight="1.4">
 
                 <FrameLayout
                         android:id="@+id/textView4"
-                        android:layout_width="256dp"
-                        android:layout_height="48dp"
+                        android:layout_width="203dp"
+                        android:layout_height="46dp"
                         android:layout_marginTop="44dp"
                         android:layout_marginBottom="250dp"
                         android:gravity="center"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.58"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.32">
+                        app:layout_constraintVertical_bias="0.52">
 
-                    <com.edufound.reader.cusview.RoundFrameLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="15dp"
-                            android:layout_gravity="bottom"
-                            android:background="#369F60"></com.edufound.reader.cusview.RoundFrameLayout>
 
                     <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
                             android:layout_gravity="center"
+                            android:background="@drawable/activity_saffloer_follow_bg"
                             android:gravity="center"
                             android:orientation="horizontal">
 
+                        <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:scaleX="0.9"
+                                android:scaleY="0.9"
+                                android:src="@drawable/anim_red_follow"></ImageView>
+
                         <TextView
                                 android:id="@+id/activity_saffloer_follow"
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
-                                android:text="小红花 0"
-                                android:textColor="@color/white"
-                                android:textSize="34dp"></TextView>
+                                android:gravity="center"
+                                android:text="0"
+                                android:textColor="#F65641"
+                                android:textSize="23.4dp"
+                                android:textStyle="bold"></TextView>
                     </LinearLayout>
 
 
                 </FrameLayout>
 
 
-                <LinearLayout
-                        android:id="@+id/activity_saffloer_sign_layout"
+                <com.edufound.reader.cusview.RoundFrameLayout
                         android:layout_width="match_parent"
-                        android:layout_height="140dp"
-                        android:layout_marginLeft="100dp"
-                        android:layout_marginTop="20dp"
-                        android:layout_marginRight="100dp"
+                        android:layout_height="211dp"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="60dp"
+                        android:layout_marginTop="100dp"
+                        android:layout_marginRight="60dp"
+                        android:background="#F1F9F4"
                         android:divider="@drawable/activity_saffloer_sigin_layout_divier"
-                        android:dividerPadding="69dp"
-                        android:orientation="horizontal"
-                        android:showDividers="middle"
+                        android:gravity="center"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.71000004">
+                        app:layout_constraintVertical_bias="0.71000004"
+                        roundframelayout:radio="30">
 
-                </LinearLayout>
+                    <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:orientation="vertical">
+
+                        <TextView
+                                android:id="@+id/activity_saffloer_sign_day"
+                                android:layout_width="match_parent"
+                                android:layout_height="40dp"
+                                android:layout_gravity="center|top"
+                                android:layout_marginTop="16dp"
+                                android:gravity="center"
+                                android:text="已连续签到0天"
+                                android:textSize="28dp"></TextView>
+
+
+                        <LinearLayout
+                                android:id="@+id/activity_saffloer_sign_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_marginLeft="70dp"
+                                android:layout_marginTop="16dp"
+                                android:layout_marginRight="70dp"
+                                android:divider="@drawable/activity_saffloer_sigin_layout_divier"
+                                android:dividerPadding="97dp"
+                                android:orientation="horizontal"
+                                android:showDividers="middle">
+
+                        </LinearLayout>
+                    </FrameLayout>
+                </com.edufound.reader.cusview.RoundFrameLayout>
 
 
             </androidx.constraintlayout.widget.ConstraintLayout>
@@ -114,10 +150,11 @@
                 <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/activity_saffloer_recyclerview"
                         android:layout_width="match_parent"
-                        android:layout_height="135dp"
+                        android:layout_height="match_parent"
                         android:layout_gravity="center"
-                        android:layout_marginLeft="13dp"
-                        android:layout_marginRight="14dp"></androidx.recyclerview.widget.RecyclerView>
+                        android:layout_marginLeft="50dp"
+                        android:layout_marginRight="50dp"
+                        android:layout_marginBottom="50dp"></androidx.recyclerview.widget.RecyclerView>
             </LinearLayout>
         </LinearLayout>
 
@@ -149,6 +186,7 @@
             android:layout_width="1280dp"
             android:layout_height="720dp"
             android:orientation="vertical"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintDimensionRatio="h,16:9"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/adapter_item_comment.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/white"
@@ -7,132 +7,154 @@
         android:focusableInTouchMode="true"
         android:orientation="horizontal">
 
-    <FrameLayout
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:paddingTop="30dp">
-
-        <ImageView
-                android:id="@+id/adapter_item_comment_item_userhead"
-                android:layout_width="96dp"
-                android:layout_height="96dp"
-                android:layout_gravity="top|right"
-                android:layout_marginTop="10dp"
-                android:layout_marginRight="10dp"
-                android:alpha="0.6"
-                android:scaleType="fitXY"
-                android:src="@color/translucent_background"></ImageView>
-    </FrameLayout>
-
-    <FrameLayout
-            android:layout_width="0dp"
+    <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="4">
-
-        <LinearLayout
-                android:layout_width="match_parent"
+            android:background="@color/white"
+            android:clickable="true"
+            android:focusableInTouchMode="true"
+            android:orientation="horizontal">
+
+        <FrameLayout
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:paddingTop="30dp">
+
+            <ImageView
+                    android:id="@+id/adapter_item_comment_item_userhead"
+                    android:layout_width="96dp"
+                    android:layout_height="96dp"
+                    android:layout_gravity="top|right"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginRight="10dp"
+                    android:alpha="0.6"
+                    android:scaleType="fitXY"
+                    android:src="@color/translucent_background"></ImageView>
+        </FrameLayout>
+
+        <FrameLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:padding="30dp">
-
-            <TextView
-                    android:id="@+id/adapter_item_comment_item_nickname"
-                    android:layout_width="match_parent"
-                    android:layout_height="41dp"
-                    android:alpha="0.8"
-                    android:gravity="center|left"
-                    android:text="昵称：喔喔奶糖"
-                    android:textColor="#000000"
-                    android:textSize="29dp"></TextView>
-
-            <TextView
-                    android:id="@+id/adapter_item_comment_item_comment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:alpha="0.8"
-                    android:gravity="center|left"
-                    android:text="太棒啦，可以当播音主持啦。太棒啦，可以当播音主持啦。太棒啦"
-                    android:textColor="#000000"
-                    android:textSize="30dp"></TextView>
-
-            <Space
-                    android:layout_width="match_parent"
-                    android:layout_height="23dp"></Space>
+                android:layout_weight="4">
 
             <LinearLayout
-                    android:id="@+id/adapter_item_comment_item_relayout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="20dp"
-                    android:background="#F7F7F7"
                     android:orientation="vertical"
-                    android:padding="20dp"></LinearLayout>
-
+                    android:padding="30dp">
 
-            <FrameLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="60dp"
-                    android:paddingTop="20dp"
-                    android:paddingRight="20dp">
+                <TextView
+                        android:id="@+id/adapter_item_comment_item_nickname"
+                        android:layout_width="match_parent"
+                        android:layout_height="41dp"
+                        android:alpha="0.8"
+                        android:gravity="center|left"
+                        android:text="昵称：喔喔奶糖"
+                        android:textColor="#000000"
+                        android:textSize="26dp"></TextView>
+
+                <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="6dp"></Space>
 
                 <TextView
-                        android:id="@+id/adapter_item_comment_item_time"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/adapter_item_comment_item_comment"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center|left"
-                        android:text="12-17 12:51"
-                        android:textSize="29dp"></TextView>
-
-                <LinearLayout
-                        android:id="@+id/adapter_item_comment_item_comment_thumb_layout"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:orientation="horizontal">
-
-                    <ImageView
-                            android:id="@+id/adapter_item_comment_item_comment_thumb_layout_img_status"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:layout_gravity="center"
-                            android:src="@drawable/adapter_item_comment_item_thumb_false"></ImageView>
+                        android:gravity="center|left"
+                        android:text="太棒啦，可以当播音主持啦。太棒啦，可以当播音主持啦。太棒啦"
+                        android:textColor="#666666"
+                        android:textSize="24dp"></TextView>
 
-                    <TextView
-                            android:id="@+id/adapter_item_comment_item_comment_thumb_layout_thumbnum"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginBottom="3dp"
-                            android:text="点赞数"
-                            android:textSize="29dp"></TextView>
-                </LinearLayout>
+                <Space
+                        android:layout_width="match_parent"
+                        android:layout_height="23dp"></Space>
 
                 <LinearLayout
-                        android:id="@+id/adapter_item_comment_item_comment_recomment_layout"
-                        android:layout_width="wrap_content"
+                        android:id="@+id/adapter_item_comment_item_relayout"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center|right"
-                        android:orientation="horizontal">
+                        android:background="#F7F7F7"
+                        android:orientation="vertical"
+                        android:padding="20dp"></LinearLayout>
 
-                    <ImageView
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:layout_gravity="center"
-                            android:src="@drawable/adapter_item_comment_item_recomment"></ImageView>
+
+                <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="60dp"
+                        android:paddingTop="20dp"
+                        android:paddingRight="20dp">
 
                     <TextView
+                            android:id="@+id/adapter_item_comment_item_time"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            android:layout_gravity="center|left"
+                            android:text="12-17 12:51"
+                            android:textSize="22dp"></TextView>
+
+                    <LinearLayout
+                            android:id="@+id/adapter_item_comment_item_comment_thumb_layout"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
                             android:layout_gravity="center"
-                            android:layout_marginLeft="10dp"
-                            android:layout_marginBottom="3dp"
-                            android:text="回复"
-                            android:textSize="29dp"></TextView>
-                </LinearLayout>
-            </FrameLayout>
-        </LinearLayout>
-
-    </FrameLayout>
-</LinearLayout>
+                            android:orientation="horizontal">
+
+                        <ImageView
+                                android:id="@+id/adapter_item_comment_item_comment_thumb_layout_img_status"
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_gravity="center"
+                                android:scaleX="0.9"
+                                android:scaleY="0.9"
+                                android:src="@drawable/adapter_item_comment_item_thumb_false"></ImageView>
+
+                        <TextView
+                                android:id="@+id/adapter_item_comment_item_comment_thumb_layout_thumbnum"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginBottom="3dp"
+                                android:text="点赞数"
+                                android:textSize="22dp"></TextView>
+                    </LinearLayout>
+
+                    <LinearLayout
+                            android:id="@+id/adapter_item_comment_item_comment_recomment_layout"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center|right"
+                            android:orientation="horizontal">
+
+                        <ImageView
+                                android:layout_width="40dp"
+                                android:layout_height="40dp"
+                                android:layout_gravity="center"
+                                android:scaleX="0.9"
+                                android:scaleY="0.9"
+                                android:src="@drawable/adapter_item_comment_item_recomment"></ImageView>
+
+                        <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:layout_marginLeft="10dp"
+                                android:layout_marginBottom="3dp"
+                                android:text="回复"
+                                android:textSize="22dp"></TextView>
+                    </LinearLayout>
+                </FrameLayout>
+            </LinearLayout>
+
+        </FrameLayout>
+    </LinearLayout>
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="110dp"
+            android:background="#eeeeee"></FrameLayout>
+</FrameLayout>

app/src/main/res/layout/adapter_item_comment_relayout_item.xml

@@ -10,12 +10,12 @@
             android:layout_height="wrap_content"
             android:text="蜡笔小新："
             android:textColor="#638AAC"
-            android:textSize="29dp"></TextView>
+            android:textSize="22dp"></TextView>
 
     <TextView
             android:id="@+id/adapter_item_comment_item_relayout_comment"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="我也要继续努力"
-            android:textSize="30dp"></TextView>
+            android:textSize="22dp"></TextView>
 </LinearLayout>

app/src/main/res/layout/adapter_item_safflower_v2.xml

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.edufound.reader.cusview.RoundFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:roundframelayout="http://schemas.android.com/apk/res-auto"
+        android:layout_width="201dp"
+        android:layout_height="230dp"
+        android:layout_gravity="center"
+        android:background="#F1F9F4"
+        roundframelayout:radio="30">
+
+    <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:divider="@drawable/activity_saffloer_task_divier"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:showDividers="middle">
+
+        <TextView
+                android:id="@+id/adapter_item_safflower_title"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:text="留下作品"
+                android:textColor="#333333"
+                android:textSize="26dp"></TextView>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+            <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/anim_red_follow"></ImageView>
+
+            <TextView
+                    android:id="@+id/adapter_item_safflower_redfcount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="+10"
+                    android:textColor="#F5536B"
+                    android:textSize="24dp"></TextView>
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="已完成 "
+                    android:textSize="26dp"></TextView>
+
+            <TextView
+                    android:id="@+id/adapter_item_safflower_overcount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="5"
+                    android:textColor="#F5536B"
+                    android:textSize="26dp"></TextView>
+
+            <TextView
+                    android:id="@+id/adapter_item_safflower_joincount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="/5"
+                    android:textColor="#666666"
+                    android:textSize="26dp"></TextView>
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+
+            <TextView
+                    android:id="@+id/adapter_item_safflower_completeAmount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:gravity="center"
+                    android:text="奖励50"
+                    android:textColor="#666666"
+                    android:textSize="24dp"></TextView>
+        </LinearLayout>
+    </LinearLayout>
+
+</com.edufound.reader.cusview.RoundFrameLayout>

app/src/main/res/layout/first_tip.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:scaleX="0.7"
+        android:scaleY="0.7">
 
     <FrameLayout
             android:layout_width="wrap_content"