Prechádzať zdrojové kódy

1.修改我的消息逻辑问题
2.修改任务播放窗口问题

FailedToRead 1 rok pred
rodič
commit
25f0554a40

+ 3 - 2
.idea/misc.xml

@@ -142,7 +142,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/slide_video_marqueen_item.xml" value="0.67" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/activity_mycollection.xml" value="0.2542579075425791" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/activity_smallfull_video.xml" value="0.21897810218978103" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/adapter_item_record_authority.xml" value="0.5" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/adapter_item_record_authority.xml" value="0.33" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/fragment_main_character_version_three.xml" value="0.2791970802919708" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_bind_wechat.xml" value="0.2913625304136253" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_cancellation_account.xml" value="0.2913625304136253" />
@@ -166,7 +166,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_item.xml" value="0.21897810218978103" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail.xml" value="0.25" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail_item.xml" value="0.67" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail_item.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_record.xml" value="0.75" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer_sign_layout_item.xml" value="0.75" />
@@ -179,6 +179,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_comment_relayout_item.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_cusview_model_view_c.xml" value="0.75" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_cusview_model_view_g.xml" value="0.9" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_message.xml" value="0.33" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_myorder.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_ranklist.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_record_user.xml" value="1.0" />

+ 0 - 1
app/src/main/java/com/edufound/reader/activity/SmallFullVideoActivity.java

@@ -161,7 +161,6 @@ public class SmallFullVideoActivity extends BaseMvpActivity<SmallFullVideoPresen
 
     @Override
     public void initPage(String index, String data_Json) {
-        Logger.e("data_Json:" + data_Json);
         mPresenter.setInfoPage(into_Page);
         mPresenter.initFragment(Integer.valueOf(index), data_Json);
     }

+ 4 - 0
app/src/main/java/com/edufound/reader/contract/CharacterFragmentContract.java

@@ -16,6 +16,8 @@ import io.reactivex.rxjava3.functions.Consumer;
 public interface CharacterFragmentContract {
     interface Model {
         void getExampleAll(Activity activity, Callback callback);
+
+        void getRecordInfoById(Activity activity, String recordId, Callback callback);
     }
 
     interface View extends BaseView {
@@ -45,5 +47,7 @@ public interface CharacterFragmentContract {
 
         void setVideoMarqueenStatus(int status);
 
+        void getRecordInfoByIdSetCharacter3(String id);
+
     }
 }

+ 4 - 0
app/src/main/java/com/edufound/reader/fragment/CharacterFragment3.java

@@ -175,4 +175,8 @@ public class CharacterFragment3 extends BaseMvpFragment<CharacterFragmentPresent
         mFragmentLayout.removeAllViews();
         mPresenter.onDestory(null, mLinearLayout);
     }
+
+    public CharacterFragmentPresenterVersionThree getPresenter() {
+        return mPresenter;
+    }
 }

+ 2 - 0
app/src/main/java/com/edufound/reader/fragment/MyTabFragment.java

@@ -33,6 +33,7 @@ import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.TimeUtil;
 import com.jakewharton.rxbinding4.view.RxView;
+import com.orhanobut.logger.Logger;
 
 import androidx.annotation.RequiresApi;
 
@@ -249,6 +250,7 @@ public class MyTabFragment extends BaseMvpFragment<MyTabFragmentPresenter> imple
         mHeadUserFans.setText(String.valueOf(bean.getFansAmount()));
         mHeadUserPlayCount.setText(String.valueOf(bean.getPlayAmount()));
         mFlowerCount.setText(String.valueOf(bean.getIntegralAmount()));
+        Logger.e("bean.getUnreadAmount():-" + bean.getUnreadAmount());
         if (Integer.valueOf(bean.getUnreadAmount()) <= 0) {
             mUnReadIcon.setVisibility(View.INVISIBLE);
         } else {

+ 1 - 0
app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java

@@ -342,6 +342,7 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
             addUiClickListener(mUserReadCountLayout, o -> {
                 mPresenter.getListByExampleId(bean.getUserRead().getExampleId());
             });
+            Logger.e("mUserReadNum:" + bean.getUserRead().getReadAmount());
             mUserReadNum.setText(EfunboxUtil.checkNum10000(bean.getUserRead().getReadAmount()));
         }
         if (bean.getIsFavorites() || bean.getFavoritesBean() != null) {

+ 6 - 0
app/src/main/java/com/edufound/reader/model/CharacterFragmentModel.java

@@ -17,4 +17,10 @@ public class CharacterFragmentModel implements CharacterFragmentContract.Model {
     public void getExampleAll(Activity activity, Callback callback) {
         OkHttpClient.doGetAsync(activity, new HttpInfo.Builder().setUrl(API + "/userRead").addParam("pageNo", String.valueOf(1)).addParam("type", "EXAMPLE").addParam("pageSize", "100000"), callback);
     }
+
+    @Override
+    public void getRecordInfoById(Activity activity, String recordId, Callback callback) {
+        OkHttpClient.doGetAsync(activity, new HttpInfo.Builder().setUrl(API + "/userRead/readInfo/" + recordId + ""), callback);
+    }
+
 }

+ 6 - 1
app/src/main/java/com/edufound/reader/presenter/CharacterFragmentPresenter.java

@@ -136,7 +136,12 @@ public class CharacterFragmentPresenter extends BasePresenter<CharacterFragmentC
 
     @Override
     public void setVideoMarqueenStatus(int status) {
-        
+
+    }
+
+    @Override
+    public void getRecordInfoByIdSetCharacter3(String id) {
+
     }
 
 

+ 24 - 0
app/src/main/java/com/edufound/reader/presenter/CharacterFragmentPresenterVersionThree.java

@@ -210,10 +210,13 @@ public class CharacterFragmentPresenterVersionThree extends BasePresenter<Charac
                 mRecommendFragment.setChangeCharacterListener(new RecommendFragment.ChangeCharacterListener() {
                     @Override
                     public void changeDataList(UserRecordBean list) {
+                        list.getUserRead().setReadAmount(data.get(finalI).getUserRead().getReadAmount());
                         data.remove(finalI);
                         data.add(finalI, list);
+                        mRecommendFragment.setTopStatus(list);
                     }
                 });
+
                 transaction.commit();
 //                mView.getFragmentLayout().setBackgroundColor(Color.RED);
                 linearLayout.removeView(mView.getFragmentLayout());
@@ -244,6 +247,27 @@ public class CharacterFragmentPresenterVersionThree extends BasePresenter<Charac
     }
 
 
+    @Override
+    public void getRecordInfoByIdSetCharacter3(String id) {
+        if (mView == null) {
+            return;
+        }
+        mModel.getRecordInfoById(mView.getActivity(), id, new Callback() {
+            @Override
+            public void onSuccess(HttpInfo info) throws IOException {
+                HttpResultBean<UserRecordBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserRecordBean>>() {
+                }.getType());
+                mRecommendFragment.getChangeCharacterListener().changeDataList(bean.getData());
+            }
+
+            @Override
+            public void onFailure(HttpInfo info) throws IOException {
+                Logger.e("获取单独的失敗了:" + info.getRetDetail());
+            }
+        });
+
+    }
+
     Handler mCharacterHandler = new Handler(new Handler.Callback() {
         @Override
         public boolean handleMessage(Message msg) {

+ 11 - 0
app/src/main/java/com/edufound/reader/presenter/MainPresenter.java

@@ -449,17 +449,28 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
 
     @Override
     public void refRecordById(String id) {
+        Logger.e("重新刷新播放的视频");
+        Logger.e("重新刷新播放的视频mRadioCheckIndex:" + mRadioCheckIndex);
         switch (mRadioCheckIndex) {
             case 2:
                 if (mRecommendFragment != null) {
                     mRecommendFragment.getPresenter().getRecordInfoById(id);
                 }
                 break;
+
             case 3:
                 if (mFollowFragment != null) {
                     mFollowFragment.getPresenter().getRecordInfoById(id);
                 }
                 break;
+
+            case 4:
+                if (mCharacterFragment != null) {
+                    Logger.e("mRecommendFragment!=null,下面调用方法");
+                    mCharacterFragment.getPresenter().getRecordInfoByIdSetCharacter3(id);
+                    Logger.e("mRecommendFragment!=null,上面调用方法");
+                }
+                break;
         }
 
     }

+ 11 - 0
app/src/main/java/com/edufound/reader/presenter/MessagePresenter.java

@@ -131,10 +131,21 @@ public class MessagePresenter extends BasePresenter<MessageContract.View> implem
         mModel.doReadAllMessage(mView.getActivity(), new Callback() {
             @Override
             public void onSuccess(HttpInfo info) throws IOException {
+                Logger.e("全部已读:" + info.getRetDetail());
+                for (int i = 0; i < mDataList.size(); i++) {
+                    mDataList.get(i).setStatus("DISABLE");
+                }
+                mView.getRootView().post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mMessageItemAdapter.notifyDataSetChanged();
+                    }
+                });
             }
 
             @Override
             public void onFailure(HttpInfo info) throws IOException {
+                Logger.e("全部已读失败:" + info.getRetDetail());
             }
         });
     }

+ 6 - 6
app/src/main/java/com/edufound/reader/presenter/RecommendFragmentPresenter.java

@@ -11,9 +11,12 @@ import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.Toast;
 
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.edufound.reader.R;
 import com.edufound.reader.activity.SmallFullVideoActivity;
-import com.edufound.reader.activity.WebActivity;
 import com.edufound.reader.adapter.SlideVideoAdapter;
 import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.base.BaseActivity;
@@ -25,7 +28,6 @@ import com.edufound.reader.bean.HttpResultDataListBean;
 import com.edufound.reader.bean.ThroughType;
 import com.edufound.reader.bean.UserRecordBean;
 import com.edufound.reader.contract.RecommendFragmentContract;
-import com.edufound.reader.cusview.AutoPollRecyclerView;
 import com.edufound.reader.cusview.CusToast;
 import com.edufound.reader.cusview.RvListJzvdStd;
 import com.edufound.reader.model.RecommendFragmentModel;
@@ -50,13 +52,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.OrientationHelper;
-import androidx.recyclerview.widget.RecyclerView;
-
 import cn.jzvd.Jzvd;
 import cn.jzvd.JzvdStd;
 
+
 public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentContract.View> implements RecommendFragmentContract.Presenter {
 
     Context mContext;
@@ -419,6 +418,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
 
     }
 
+
     @Override
     public void getMyFollowAllVideo() {
         if (mDataList != null && mDataList.size() >= mTotalSize) {

+ 1 - 0
app/src/main/java/com/edufound/reader/presenter/TmailPayPresenter.java

@@ -150,6 +150,7 @@ public class TmailPayPresenter extends BasePresenter<TmailPayContract.View> impl
         holder.mTitle.setText(mPayResult.get(position).getTitle());
         holder.mPayMoney.setText(String.valueOf(Double.parseDouble(mPayResult.get(position).getPrice()) / 100));
         holder.mRecommend.setVisibility(View.VISIBLE);
+        holder.mOriginPrice.setText("原价¥ " + String.valueOf(Double.parseDouble(mPayResult.get(position).getOriginPrice()) / 100));
         if (mPayResult.get(position).getPayType().equals("YEAR")) {
             holder.mConstraintLayoutBg.setBackgroundResource(R.drawable.activity_pay_tmail_item_year);
         } else if (mPayResult.get(position).getPayType().equals("MONTH")) {

+ 3 - 0
app/src/main/java/com/edufound/reader/util/EfunboxUtil.java

@@ -268,6 +268,9 @@ public class EfunboxUtil {
 
 
     public static String checkNum10000(String num) {
+        if (TextUtils.isEmpty(num)) {
+            return "0";
+        }
         if (Float.valueOf(num) > 10000f) {
             float a = Float.parseFloat(num) / 10000;
             DecimalFormat decimalFormat = new DecimalFormat("#.#");

BIN
app/src/main/res/drawable/fragment_user_no_message.png


BIN
app/src/main/res/drawable/read_icon.png


+ 53 - 53
app/src/main/res/layout/activity_message.xml

@@ -1,82 +1,82 @@
 <?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:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
 
     <FrameLayout
-            android:id="@+id/background"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="#70C1FF"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"></FrameLayout>
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#70C1FF"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"></FrameLayout>
 
 
     <LinearLayout
-            android:layout_width="1280dp"
-            android:layout_height="720dp"
-            android:gravity="center"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintDimensionRatio="h,16:9"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+        android:layout_width="1280dp"
+        android:layout_height="720dp"
+        android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="h,16:9"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
             <ImageView
-                    android:id="@+id/activity_message_back"
-                    android:layout_width="77dp"
-                    android:layout_height="77dp"
-                    android:layout_marginLeft="32dp"
-                    android:layout_marginTop="20dp"
-                    android:src="@drawable/main_back"></ImageView>
+                android:id="@+id/activity_message_back"
+                android:layout_width="77dp"
+                android:layout_height="77dp"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/main_back"></ImageView>
 
 
             <FrameLayout
-                    android:id="@+id/activity_message_readall"
-                    android:layout_width="182dp"
-                    android:layout_height="70dp"
-                    android:layout_gravity="right|top"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginRight="40dp">
+                android:id="@+id/activity_message_readall"
+                android:layout_width="182dp"
+                android:layout_height="70dp"
+                android:layout_gravity="right|top"
+                android:layout_marginTop="20dp"
+                android:layout_marginRight="40dp">
 
                 <ImageView
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:background="@drawable/message_btn_bg"></ImageView>
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:background="@drawable/message_btn_bg"></ImageView>
             </FrameLayout>
 
         </FrameLayout>
 
         <FrameLayout
-                android:layout_width="952dp"
-                android:layout_height="0dp"
-                android:layout_gravity="center"
-                android:layout_weight="6">
+            android:layout_width="952dp"
+            android:layout_height="0dp"
+            android:layout_gravity="center"
+            android:layout_weight="6">
 
             <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/message_recyclerview"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"></androidx.recyclerview.widget.RecyclerView>
+                android:id="@+id/message_recyclerview"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_gravity="center"></androidx.recyclerview.widget.RecyclerView>
 
             <ImageView
-                    android:id="@+id/message_nomessage"
-                    android:layout_width="320dp"
-                    android:layout_height="320dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/fragment_user_no_record"
-                    android:visibility="gone"></ImageView>
+                android:id="@+id/message_nomessage"
+                android:layout_width="320dp"
+                android:layout_height="320dp"
+                android:layout_gravity="center"
+                android:src="@drawable/fragment_user_no_message"
+                android:visibility="gone"></ImageView>
         </FrameLayout>
 
     </LinearLayout>

+ 50 - 52
app/src/main/res/layout/adapter_item_message.xml

@@ -1,71 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:roundframelayout="http://schemas.android.com/apk/res-auto"
-        android:layout_width="952dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginBottom="40dp"
-        android:gravity="center"
-        android:orientation="vertical">
+    xmlns:roundframelayout="http://schemas.android.com/apk/res-auto"
+    android:layout_width="952dp"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:layout_marginBottom="40dp"
+    android:gravity="center"
+    android:orientation="vertical">
 
     <TextView
-            android:id="@+id/adapter_item_message_time"
-            android:layout_width="match_parent"
-            android:layout_height="34dp"
-            android:text="2020年 11月20日 17:30"
-            android:textColor="@color/white"
-            android:textSize="28dp"></TextView>
+        android:id="@+id/adapter_item_message_time"
+        android:layout_width="match_parent"
+        android:layout_height="34dp"
+        android:text="2020年 11月20日 17:30"
+        android:textColor="@color/white"
+        android:textSize="28dp"></TextView>
 
     <com.edufound.reader.cusview.RoundFrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="21dp"
-            android:background="@color/white"
-            android:paddingBottom="20dp">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="21dp"
+        android:background="@color/white"
+        android:paddingBottom="20dp">
 
         <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-            <com.edufound.reader.cusview.RoundFrameLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginTop="12dp"
-                    roundframelayout:radio="30">
+            <FrameLayout
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_marginLeft="12dp"
+                android:layout_marginTop="12dp">
 
                 <ImageView
-                        android:id="@+id/adapter_item_message_isnew"
-                        android:layout_width="18dp"
-                        android:layout_height="18dp"
-
-                        android:src="@color/red"></ImageView>
-            </com.edufound.reader.cusview.RoundFrameLayout>
+                    android:id="@+id/adapter_item_message_isnew"
+                    android:layout_width="18dp"
+                    android:layout_height="18dp"
+                    android:src="@drawable/read_icon"></ImageView>
+            </FrameLayout>
 
 
             <TextView
-                    android:id="@+id/adapter_item_message_content"
-                    android:layout_width="898dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:lineSpacingMultiplier="1.5"
-                    android:text=""
-                    android:textColor="#333333"
-                    android:textSize="30dp"></TextView>
+                android:id="@+id/adapter_item_message_content"
+                android:layout_width="898dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:lineSpacingMultiplier="1.5"
+                android:text=""
+                android:textColor="#333333"
+                android:textSize="30dp"></TextView>
 
             <TextView
-                    android:id="@+id/adapter_item_message_loadall"
-                    android:layout_width="wrap_content"
-                    android:layout_height="34dp"
-                    android:layout_gravity="right|top"
-                    android:layout_marginRight="20dp"
-                    android:alpha="0.6"
-                    android:gravity="center|top"
-                    android:text="全部 >"
-                    android:textColor="#1097FF"
-                    android:textSize="28dp"
-                    android:textStyle="bold"></TextView>
+                android:id="@+id/adapter_item_message_loadall"
+                android:layout_width="wrap_content"
+                android:layout_height="34dp"
+                android:layout_gravity="right|top"
+                android:layout_marginRight="20dp"
+                android:alpha="0.6"
+                android:gravity="center|top"
+                android:text="全部 >"
+                android:textColor="#1097FF"
+                android:textSize="28dp"
+                android:textStyle="bold"></TextView>
         </LinearLayout>
     </com.edufound.reader.cusview.RoundFrameLayout>
 </LinearLayout>

+ 3 - 4
app/src/main/res/layout/fragment_main_user.xml

@@ -287,16 +287,15 @@
                                 android:layout_height="match_parent"
                                 android:src="@drawable/fragment_my_message_notification"></ImageView>
 
-                            <com.edufound.reader.cusview.RoundFrameLayout
+                            <FrameLayout
                                 android:id="@+id/fragment_main_user_unread_icon"
                                 android:layout_width="11dp"
                                 android:layout_height="11dp"
                                 android:layout_gravity="right|top"
                                 android:layout_marginTop="10dp"
                                 android:layout_marginRight="10dp"
-                                android:background="@color/red"
-                                android:visibility="invisible"
-                                roundframelayout:radio="30"></com.edufound.reader.cusview.RoundFrameLayout>
+                                android:background="@drawable/read_icon"
+                                android:visibility="invisible"></FrameLayout>
                         </FrameLayout>
 
                         <ImageView