1.修改评论出现的bug

2.修改个人中心出现的bug

.idea/misc.xml

@@ -5,6 +5,7 @@
       <map>
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/activity_loginalert_check_selector.xml" value="0.3328125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/activity_record_start_anim.xml" value="0.5" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/first_tip_bg.xml" value="0.361328125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/popup_record_status_over_start_divider.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/popup_window_bind_wechat_qrcode_bg.xml" value="0.5048828125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/exception/drawable/divider.xml" value="0.49609375" />
@@ -17,8 +18,10 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/exception/layout/item_crash_log.xml" value="0.20924574209245742" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/exception/layout/lifecycle_exception.xml" value="0.20924574209245742" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_bg.xml" value="0.4326171875" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_one_bg.xml" value="0.361328125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_one_two.xml" value="0.4326171875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_three_bg.xml" value="0.34609375" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_two_bg.xml" value="0.361328125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/fragment_recommend_rv_round.xml" value="0.32421875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/fragment_recommend_to_record_bg_rotation.xml" value="0.2203125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/fragment_recommend_userhead_round.xml" value="0.26197916666666665" />
@@ -81,7 +84,7 @@
         <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_slidevideo.xml" value="0.14001692047377326" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_slidevideo.xml" value="0.25" />
         <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" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/cusjzplayer_controller.xml" value="0.5029154518950437" />

app/src/activityLoginAlert/drawable/first_tip_bg.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+            android:angle="90"
+            android:endColor="@color/transparent"
+            android:startColor="@color/translucent_background"
+            android:type="linear"></gradient>
+</shape>

app/src/fragmentRecommend/drawable/fragment_recommend_userhead_round.xml

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/transparent" />
-
-    <stroke
-            android:width="1dp"
-            android:color="@color/white" />
-
-    <!--    <padding-->
-    <!--            android:bottom="4dp"-->
-    <!--            android:left="5dp"-->
-    <!--            android:right="5dp"-->
-    <!--            android:top="4dp" />-->
-
-    <corners
-            android:bottomLeftRadius="60dp"
-            android:bottomRightRadius="60dp"
-            android:topLeftRadius="60dp"
-            android:topRightRadius="60dp" />
-</shape>

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

@@ -210,6 +210,10 @@ public class CommentActivity extends BaseMvpActivity<CommentPresenter> implement
         if (manager != null) {
             manager.hideSoftInputFromWindow(mCommentEdit.getWindowToken(), 0);
         }
+        if(mNoCommentLayout.getVisibility()==View.VISIBLE){
+            mPresenter.initComment(mRecyclerView, mNoCommentLayout);
+        }
+
     }
 
     @Override

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

@@ -18,6 +18,7 @@ import com.baidu.duer.bot.directive.payload.AmountInfo;
 import com.baidu.duer.botsdk.BotIntent;
 import com.edufound.reader.R;
 import com.edufound.reader.annotation.BindView;
+import com.edufound.reader.base.BaseActivity;
 import com.edufound.reader.base.BaseMvpActivity;
 import com.edufound.reader.contract.MainContract;
 import com.edufound.reader.popwindow.PopWindowUtil;
@@ -88,7 +89,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
             }
         }
 
-        showFirstTouchView();
 
         //efunbox://com.edufound.reader/main?
     }
@@ -177,6 +177,12 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
 
 
     @Override
+    protected void onStop() {
+        super.onStop();
+        ((BaseActivity) getActivity()).removeFirstTipView();
+    }
+
+    @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         return mPresenter.onKeyDown(keyCode, event);
     }

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

@@ -88,10 +88,15 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
         mPresenter = new UserInfoSettingPresenter();
         mPresenter.attachView(this);
         addUiClickListener(mBack, o -> {
+            mNickName.clearFocus();
             hideSoftInput();
             mActivity.finish();
         });
         addUiClickListener(mLoginOut, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             PopWindowUtil.showExitLoginWindow(mActivity, getRootView(), new PopUtilClickListener() {
                 @Override
                 public void clickCancel() {
@@ -106,11 +111,19 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
             });
         });
         addUiClickListener(mPrivServices, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             Intent intent = new Intent(getActivity(), WebActivity.class);
             intent.putExtra("loadUrl", Consts.getPrivServiceUrl());
             getActivity().startActivity(intent);
         });
         addUiClickListener(mAgreementServices, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             Intent intent = new Intent(getActivity(), WebActivity.class);
             intent.putExtra("loadUrl", Consts.getAgreementServicesUrl());
             getActivity().startActivity(intent);
@@ -126,6 +139,10 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
             mLoginOut.setVisibility(View.VISIBLE);
         }
         addUiClickListener(mCancellationLayout, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             PopWindowUtil.showCancellationAccountWindow(mActivity, getRootView(), new PopUtilClickListener() {
                 @Override
                 public void clickCancel() {
@@ -140,6 +157,10 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
         });
 
         addUiClickListener(mBindWeChat, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             PopWindowUtil.showBindWeChatWindow(mActivity, getRootView(), new PopUtilClickListener() {
                 @Override
                 public void clickCancel() {
@@ -153,7 +174,10 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
             });
         });
         addUiClickListener(mSwitchLayout, o -> {
-
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
 //            BotRegisterListener.BaiDuLogin();
             if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
                 //百度渠道调用百度的授权
@@ -166,6 +190,10 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
         });
 
         addUiClickListener(mGenderMale, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             mGenderMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_true_bg);
             mGenderFeMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_bg);
             Consts.getmConstsUserBean().setGender("1");
@@ -173,12 +201,20 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
 
         });
         addUiClickListener(mGenderFeMale, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             mGenderMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_bg);
             mGenderFeMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_true_bg);
             Consts.getmConstsUserBean().setGender("0");
             mPresenter.upadteMyInfo(Consts.getmConstsUserBean());
         });
         addUiClickListener(mGrade, o -> {
+            if (mNickName.hasFocus()) {
+                mNickName.clearFocus();
+                return;
+            }
             PopWindowUtil.showSelectGradeWindow(getActivity(), getRootView(), EfunboxUtil.getIndexGradeByEnum(mPresenter.getGradeEnum()), new PopUtilClickListener() {
                 @Override
                 public void clickCancel() {

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

@@ -84,7 +84,7 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
     @Override
     public void onViewDetachedFromWindow(@NonNull VideoHolder holder) {
         super.onViewDetachedFromWindow(holder);
-        holder.mSwitch.setChecked(false);
+//        holder.mSwitch.setChecked(false);
     }
 
     @Override

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

@@ -15,6 +15,7 @@ import android.os.Bundle;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.LayoutInflater;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -80,6 +81,8 @@ public abstract class BaseActivity extends AppCompatActivity {
     //Gson
     Gson mGson;
 
+    View mFirstIntoView;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -285,27 +288,47 @@ public abstract class BaseActivity extends AppCompatActivity {
 
 
     public void showFirstTouchView() {
-        View touchview = LayoutInflater.from(this).inflate(R.layout.first_tip, null);
-        ImageView touch = touchview.findViewById(R.id.first_touch);
+        mFirstIntoView = LayoutInflater.from(this).inflate(R.layout.first_tip, null);
+        ImageView touch = mFirstIntoView.findViewById(R.id.first_touch);
         FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.gravity = Gravity.RIGHT;
-        params.rightMargin = SizeUtils.dp2px(Consts.getmApplicAtion().getBaseContext(), 30);
-        touchview.setLayoutParams(params);
-        ObjectAnimator mRotationImgAnim = ObjectAnimator.ofFloat(touch, "translationY", 0, -150);
-        mRotationImgAnim.setDuration(300);
+        params.gravity = Gravity.RIGHT | Gravity.CENTER;
+        params.rightMargin = SizeUtils.dp2px(Consts.getmApplicAtion().getBaseContext(), 80);
+        mFirstIntoView.setLayoutParams(params);
+        ObjectAnimator translationYUp = ObjectAnimator.ofFloat(touch, "translationY", 80, -30);
+        ObjectAnimator translationYDown = ObjectAnimator.ofFloat(touch, "translationY", -30, 80);
+        translationYUp.setDuration(3000);
+        translationYDown.setDuration(3000);
         LinearInterpolator interpolator = new LinearInterpolator();
-        mRotationImgAnim.setInterpolator(interpolator); //设置匀速旋转，不卡顿 icon_anim.start();
-        getRootView().addView(touchview);
+        translationYUp.setInterpolator(interpolator); //设置匀速旋转，不卡顿
+        translationYDown.setInterpolator(interpolator); //设置匀速旋转，不卡顿
+        getRootView().addView(mFirstIntoView);
         AnimatorSet animatorSet = new AnimatorSet();
-//        animatorSet.addListener(new AnimatorListenerAdapter() {
-//            @Override
-//            public void onAnimationEnd(Animator animation) {
-//                super.onAnimationEnd(animation);
-//                getRootView().removeView(touchview);
-//            }
-//        });
+        animatorSet.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                animatorSet.start();
+
+            }
+        });
+        mFirstIntoView.setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+                animatorSet.pause();
+                removeFirstTipView();
+                return true;
+            }
+        });
+        animatorSet.playSequentially(translationYUp, translationYDown);
         animatorSet.start();
-//
+    }
+
+
+    public void removeFirstTipView() {
+        if (mFirstIntoView != null) {
+            getRootView().removeView(mFirstIntoView);
+            mFirstIntoView = null;
+        }
     }
 
 
@@ -529,11 +552,11 @@ public abstract class BaseActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
-            if (!Consts.getIsNeedLogin()) {
-                BotRegisterListener.getBaiDuVipInfo();
-            }
-        }
+//        if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+//            if (!Consts.getIsNeedLogin()) {
+//                BotRegisterListener.getBaiDuVipInfo();
+//            }
+//        }
     }
 
     ShowFollowReceiver.ShowFollow showFollow = new ShowFollowReceiver.ShowFollow() {

app/src/main/java/com/edufound/reader/contract/RecommendFragmentContract.java

@@ -43,6 +43,8 @@ public interface RecommendFragmentContract {
 
         String getDataJson();
 
+        void showFirstIntoView();
+
     }
 
     interface Presenter {

app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java

@@ -29,6 +29,7 @@ import com.edufound.reader.presenter.RecommendFragmentPresenter;
 import com.edufound.reader.util.Consts;
 import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
+import com.edufound.reader.util.MMKVUtil;
 import com.orhanobut.logger.Logger;
 
 import java.util.HashMap;
@@ -130,6 +131,7 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         animatorSet.play(mToRecordScaleXAnim).with(mToRecordScaleYAnim);
         animatorSet.start();
         mPresenter.setIntoPage(intoPage);
+
     }
 
     @Override
@@ -328,6 +330,18 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         return mDataJson;
     }
 
+    @Override
+    public void showFirstIntoView() {
+        boolean isFirst = (boolean) MMKVUtil.getInstance().decode("first_into", true);
+        if (isFirst) {
+            //是第一次进入
+            ((BaseActivity) getActivity()).showFirstTouchView();
+            MMKVUtil.getInstance().encode("first_into", false);
+        } else {
+            //不是第一次进入了
+        }
+    }
+
 
     @Override
     public void onDestroy() {

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

@@ -56,6 +56,8 @@ public class CommentPresenter extends BasePresenter<CommentContract.View> implem
             rv.setVisibility(View.GONE);
             return;
         }
+        noCommentLayout.setVisibility(View.GONE);
+        rv.setVisibility(View.VISIBLE);
         mCommentItemAdapter = new CommentItemAdapter(mView.getActivity(), mDataList);
         LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mView.getActivity());
         linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
@@ -144,6 +146,10 @@ public class CommentPresenter extends BasePresenter<CommentContract.View> implem
                 mView.getRootView().post(new Runnable() {
                     @Override
                     public void run() {
+                        if (mCommentItemAdapter == null) {
+                            mCommentItemAdapter = new CommentItemAdapter(mView.getActivity(), mDataList);
+
+                        }
                         mCommentItemAdapter.notifyDataSetChanged();
                         mView.moveRecyclearView(0);
                         Logger.e("之前的--commentSize:" + commentSize);

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

@@ -106,6 +106,7 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
 
 
     void changeFragmentLayout(Fragment fragment) {
+        ((BaseActivity) mView.getActivity()).removeFirstTipView();
         FragmentTransaction transaction = mFragmentManager.beginTransaction();
         transaction.addToBackStack(null);
         transaction.replace(R.id.main_fragment_layout, fragment);

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

@@ -122,6 +122,8 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
         TextView commentAmount = view.findViewById(R.id.adapter_item_record_user_comment_num);
         TextView favoritesAmount = view.findViewById(R.id.adapter_item_record_user_start_num);
         FrameLayout checkLayout = view.findViewById(R.id.adapter_item_record_user_examine_layout);
+        ImageView examineIcon = view.findViewById(R.id.adapter_item_record_user_examine_icon);
+        ImageView examineDel = view.findViewById(R.id.adapter_item_record_user_examine_fail_del_icon);
 //        GlideUtils.loadRoundCircleImage(mContext, reader.getCoverImg(), imgIcon, SizeUtils.dp2px(mContext, 20));
         GlideUtils.loadImage(mContext, reader.getCoverImg(), imgIcon);
         if (reader.getTitle().length() > 4) {
@@ -133,15 +135,45 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
         likeAmount.setText(EfunboxUtil.checkNum10000(reader.getLikeAmount()));
         commentAmount.setText(EfunboxUtil.checkNum10000(reader.getCommentAmount()));
         favoritesAmount.setText(EfunboxUtil.checkNum10000(reader.getFavoritesAmount()));
-        if (!reader.getStatus().equals("CHECK")) {
+        if (reader.getStatus().equals("CHECK")) {
+            //审核中
+//            checkLayout.setVisibility(View.GONE);
+            examineDel.setVisibility(View.GONE);
+        } else if (reader.getStatus().equals("NORMAL") || reader.getStatus().equals("DISABLE")) {
+            //正常
             checkLayout.setVisibility(View.GONE);
+        } else if (reader.getStatus().equals("CHECK_FAILED")) {
+            //审核失败
+            GlideUtils.loadImage(mView.getActivity(), R.drawable.adapter_item_record_examine_fail, examineIcon);
         }
-//        if (index < 10) {
-//            //测试用
-//            checkLayout.setVisibility(View.GONE);
-//            imgPriv.setImageResource(R.drawable.adapter_item_record_pub);
-//        }
-        mView.addUiClick(imgDel, o -> {
+
+        Animator.AnimatorListener animListener = new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animator) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animator) {
+                gridLayout.removeView(view);
+                mView.loadMoreItem();
+                mDataList.remove(index);
+                mView.setRecordSize(mDataList.size());
+                changeMyRecordStatusById("{\"id\": " + reader.getId() + ", \t\"status\": \"DEL\" }");
+
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animator) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animator) {
+
+            }
+        };
+        mView.addUiClick(examineDel, o -> {
             PopWindowUtil.showRecordRemovedWindow(mContext, mView.getRootView(), new PopUtilClickListener() {
                 @Override
                 public void clickCancel() {
@@ -150,32 +182,21 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
 
                 @Override
                 public void clickSubmit(Object object) {
-                    view.animate().scaleY(0).scaleX(0).setDuration(200).setListener(new Animator.AnimatorListener() {
-                        @Override
-                        public void onAnimationStart(Animator animator) {
-
-                        }
-
-                        @Override
-                        public void onAnimationEnd(Animator animator) {
-                            gridLayout.removeView(view);
-                            mView.loadMoreItem();
-                            mDataList.remove(index);
-                            mView.setRecordSize(mDataList.size());
-                            changeMyRecordStatusById("{\"id\": " + reader.getId() + ", \t\"status\": \"DEL\" }");
+                    view.animate().scaleY(0).scaleX(0).setDuration(200).setListener(animListener).start();
 
-                        }
-
-                        @Override
-                        public void onAnimationCancel(Animator animator) {
-
-                        }
+                }
+            });
+        });
+        mView.addUiClick(imgDel, o -> {
+            PopWindowUtil.showRecordRemovedWindow(mContext, mView.getRootView(), new PopUtilClickListener() {
+                @Override
+                public void clickCancel() {
 
-                        @Override
-                        public void onAnimationRepeat(Animator animator) {
+                }
 
-                        }
-                    }).start();
+                @Override
+                public void clickSubmit(Object object) {
+                    view.animate().scaleY(0).scaleX(0).setDuration(200).setListener(animListener).start();
 
                 }
             });
@@ -358,7 +379,6 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
                         mUserFragmentHandler.removeMessages(MyTabFragmentModel.GET_CHECK_NUM);
                     }
                 } else if (Integer.valueOf(bean.getData()) > 0) {
-                    Logger.e("还有审核中的");
                     mUserFragmentHandler.removeMessages(MyTabFragmentModel.GET_CHECK_NUM);
                     isNedRef = true;
                     mUserFragmentHandler.sendEmptyMessageDelayed(MyTabFragmentModel.GET_CHECK_NUM, 5000);
@@ -380,6 +400,9 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
     @Override
     public void fragmentResume() {
         if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+            if (Consts.getmConstsBaiDuUserBean() == null) {
+                return;
+            }
             if (Consts.getmConstsBaiDuUserBean().getUserInfo().getIsVip() == 1) {
                 //是VIP
                 mView.getIsBuySuccess(TimeUtil.getDateFromSeconds(String.valueOf(Consts.getmConstsBaiDuUserBean().getUserInfo().getEndTimestamp())));

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

@@ -102,6 +102,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
             initVideoDate(rv, startPosition);
             mTotalSize = mDataList.size();
             mView.getRootView().setVisibility(View.VISIBLE);
+            mView.showFirstIntoView();
             mView.getRootView().post(new Runnable() {
                 @Override
                 public void run() {
@@ -110,6 +111,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
             });
         }
 
+
     }
 
 
@@ -245,6 +247,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
                         mAdapter.notifyDataSetChanged();
                         mPageIndex++;
                         mView.getRootView().setVisibility(View.VISIBLE);
+                        mView.showFirstIntoView();
                     }
 
 
@@ -377,6 +380,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
                         mAdapter.notifyDataSetChanged();
                         mPageIndex++;
                         mView.getRootView().setVisibility(View.VISIBLE);
+                        mView.showFirstIntoView();
                     }
 
 

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

@@ -20,6 +20,7 @@ import com.edufound.reader.bean.TaskBean;
 import com.edufound.reader.contract.SafflowerContract;
 import com.edufound.reader.model.SafflowerModel;
 import com.edufound.reader.receiver.BackPageReceiver;
+import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.google.gson.reflect.TypeToken;
 import com.okhttplib.HttpInfo;
@@ -54,12 +55,14 @@ public class SafflowerPresenter extends BasePresenter<SafflowerContract.View> im
         if (mSignList != null && mSignList.size() > 0) {
             for (int i = 0; i < mSignList.size(); i++) {
                 View view = LayoutInflater.from(mView.getActivity()).inflate(R.layout.activity_saffloer_sign_layout_item, null);
+                ImageView status = view.findViewById(R.id.activity_saffloer_sign_layout_item_status);
                 TextView date = view.findViewById(R.id.activity_saffloer_sign_layout_item_date);
                 ImageView isSign = view.findViewById(R.id.activity_saffloer_sign_layout_item_issign);
                 TextView count = view.findViewById(R.id.activity_saffloer_sign_layout_item_count);
                 date.setText(mSignList.get(i).getDate());
                 if (!mSignList.get(i).isSign()) {
                     isSign.setVisibility(View.INVISIBLE);
+                    GlideUtils.loadImage(mView.getActivity(), R.drawable.activity_saffloer_sign_layout_item_false, status);
                 }
                 count.setText("+" + mSignList.get(i).getCount());
                 LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1);

app/src/main/java/com/edufound/reader/util/GlideUtils.java

@@ -48,6 +48,22 @@ public class GlideUtils {
 
     }
 
+
+    /**
+     * 加载图片(默认)
+     *
+     * @param context   上下文
+     * @param resid     资源id
+     * @param imageView ImageView
+     */
+    public static void loadImage(Context context, int resid, ImageView imageView) {
+        RequestOptions options = new RequestOptions()
+                .placeholder(placeholderImage) //占位图
+                .error(errorImage);            //错误图
+        Glide.with(context).load(resid).apply(options).into(imageView);
+
+    }
+
     /**
      * 指定图片大小;使用override()方法指定了一个图片的尺寸。
      * Glide现在只会将图片加载成width*height像素的尺寸，而不会管你的ImageView的大小是多少了。

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

@@ -202,11 +202,28 @@
                 android:background="@color/black"
                 android:clickable="false"></FrameLayout>
 
-        <ImageView
-                android:layout_width="110dp"
-                android:layout_height="110dp"
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:src="@drawable/adapter_item_record_examine"></ImageView>
+                android:layout_marginTop="10dp"
+                android:gravity="center"
+                android:orientation="vertical">
+
+            <ImageView
+                    android:id="@+id/adapter_item_record_user_examine_icon"
+                    android:layout_width="110dp"
+                    android:layout_height="110dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/adapter_item_record_examine"></ImageView>
+
+            <ImageView
+                    android:id="@+id/adapter_item_record_user_examine_fail_del_icon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="60dp"
+                    android:src="@drawable/adapter_item_record_examine_fail_del"></ImageView>
+        </LinearLayout>
     </FrameLayout>
 
 </com.edufound.reader.cusview.RoundFrameLayout>

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

@@ -32,7 +32,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center"
                 android:layout_weight="2"
-                android:checked="false"
+                android:checked="true"
                 android:gravity="center"
                 android:switchMinWidth="40dp"
                 android:switchPadding="15dp"

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

@@ -6,7 +6,9 @@
     <FrameLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/red">
+            android:background="@drawable/first_tip_bg"
+            android:paddingTop="20dp"
+            android:paddingBottom="20dp">
 
         <ImageView
                 android:layout_width="100dp"