Selaa lähdekoodia

1.替换男女图片
2.评论黑色透明点击关闭评论
3.他人界面列表刷新
4.影刀测试

FailedToRead 3 vuotta sitten
vanhempi
commit
e41562b2e0
25 muutettua tiedostoa jossa 141 lisäystä ja 60 poistoa
  1. 12 4
      app/src/main/java/com/edufound/reader/activity/CommentActivity.java
  2. 1 1
      app/src/main/java/com/edufound/reader/activity/MessageActivity.java
  3. 8 2
      app/src/main/java/com/edufound/reader/activity/OthersRecordActivity.java
  4. 59 10
      app/src/main/java/com/edufound/reader/activity/RecordActivity.java
  5. 8 4
      app/src/main/java/com/edufound/reader/activity/UserInfoSettingActivity.java
  6. 7 11
      app/src/main/java/com/edufound/reader/application/EApplication.java
  7. 3 1
      app/src/main/java/com/edufound/reader/base/BaseActivity.java
  8. 2 2
      app/src/main/java/com/edufound/reader/botsdk/BotMessageListener.java
  9. 6 7
      app/src/main/java/com/edufound/reader/fragment/MyTabFragment.java
  10. 5 2
      app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java
  11. 2 2
      app/src/main/java/com/edufound/reader/presenter/CommentPresenter.java
  12. 1 1
      app/src/main/java/com/edufound/reader/presenter/MainPresenter.java
  13. 1 1
      app/src/main/java/com/edufound/reader/presenter/MessagePresenter.java
  14. 1 1
      app/src/main/java/com/edufound/reader/presenter/MyCollectionPresenter.java
  15. 1 1
      app/src/main/java/com/edufound/reader/presenter/MyFollowPresenter.java
  16. 4 0
      app/src/main/java/com/edufound/reader/presenter/OthersRecordPresenter.java
  17. 1 1
      app/src/main/java/com/edufound/reader/presenter/PopWindowPresneter.java
  18. 1 0
      app/src/main/java/com/edufound/reader/presenter/RecommendFragmentPresenter.java
  19. 1 1
      app/src/main/java/com/edufound/reader/presenter/RecordPresenter.java
  20. 1 1
      app/src/main/java/com/edufound/reader/support/CrashLogFragment.java
  21. 2 1
      app/src/main/java/com/edufound/reader/util/PermissionsUtil.java
  22. BIN
      app/src/main/res/drawable/activity_userinfo_setting_boy.png
  23. BIN
      app/src/main/res/drawable/activity_userinfo_setting_girl.png
  24. 2 2
      app/src/main/res/layout/activity_comment.xml
  25. 12 4
      app/src/main/res/layout/activity_userinfo_setting.xml

+ 12 - 4
app/src/main/java/com/edufound/reader/activity/CommentActivity.java

@@ -40,7 +40,7 @@ public class CommentActivity extends BaseMvpActivity<CommentPresenter> implement
     Activity mActivity;
 
     @BindView(id = R.id.comment_touch_back)
-    Space mTouchBack;
+    FrameLayout mTouchBack;
 
     @BindView(id = R.id.comment_close_quick)
     ImageView mCloseKuaijie;
@@ -99,12 +99,12 @@ public class CommentActivity extends BaseMvpActivity<CommentPresenter> implement
         addUiClickListener(mSendComment, o -> {
             if (mPresenter.getReCommentId() != null) {
                 //发送评论回复
-                Toast.makeText(getActivity(), "发送评论回复", Toast.LENGTH_SHORT).show();
+//                Toast.makeText(getActivity(), "发送评论回复", Toast.LENGTH_SHORT).show();
                 if (!TextUtils.isEmpty(mCommentEdit.getText().toString().trim())) {
                     mPresenter.doReplyComment(mCommentEdit.getText().toString());
                 }
             } else {
-                Toast.makeText(getActivity(), "发送评论", Toast.LENGTH_SHORT).show();
+//                Toast.makeText(getActivity(), "发送评论", Toast.LENGTH_SHORT).show();
                 if (!TextUtils.isEmpty(mCommentEdit.getText().toString().trim())) {
                     mPresenter.doPosts(mCommentEdit.getText().toString());
                 }
@@ -121,6 +121,14 @@ public class CommentActivity extends BaseMvpActivity<CommentPresenter> implement
             mPresenter.doPosts("还可以,继续努力");
         });
 
+        addUiClickListener(mTouchBack, o -> {
+            Logger.e("backName:" + backName);
+            if (backName.contains("SmallFullVideoActivity")) {
+                mPresenter.sendBackReceiver();
+            }
+            mActivity.finish();
+        });
+
         RxView.focusChanges(mCommentEdit).subscribe(hasFocus -> {
             if (!hasFocus) {
                 InputMethodManager manager = ((InputMethodManager) Consts.getmApplicAtion().getSystemService(Context.INPUT_METHOD_SERVICE));
@@ -210,7 +218,7 @@ public class CommentActivity extends BaseMvpActivity<CommentPresenter> implement
         if (manager != null) {
             manager.hideSoftInputFromWindow(mCommentEdit.getWindowToken(), 0);
         }
-        if(mNoCommentLayout.getVisibility()==View.VISIBLE){
+        if (mNoCommentLayout.getVisibility() == View.VISIBLE) {
             mPresenter.initComment(mRecyclerView, mNoCommentLayout);
         }
 

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

@@ -52,7 +52,7 @@ public class MessageActivity extends BaseMvpActivity<MessagePresenter> implement
             mActivity.finish();
         });
         addUiClickListener(mReadAll, o -> {
-            Toast.makeText(mActivity, "全部已读", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(mActivity, "全部已读", Toast.LENGTH_SHORT).show();
             mPresenter.doReadAllMessage();
         });
         mPresenter.getAllMessage();

+ 8 - 2
app/src/main/java/com/edufound/reader/activity/OthersRecordActivity.java

@@ -120,8 +120,7 @@ public class OthersRecordActivity extends BaseMvpActivity<OthersRecordPresenter>
         intoPage = params.getString("intoPage", "default");
         mOtherId = params.getString("other_uid");
         mPresenter.setBackRecordId(params.getString("record_id"));
-        mPresenter.getOtherRecordList(mOtherId);
-        mPresenter.getOtherUserInfo(mOtherId);
+
     }
 
     @Override
@@ -193,6 +192,13 @@ public class OthersRecordActivity extends BaseMvpActivity<OthersRecordPresenter>
     }
 
     @Override
+    protected void onResume() {
+        super.onResume();
+        mPresenter.getOtherRecordList(mOtherId);
+        mPresenter.getOtherUserInfo(mOtherId);
+    }
+
+    @Override
     public void getOtherRecordSuccess() {
         mPresenter.initGridLayout(mGridLayout, mNoRecordLayout);
     }

+ 59 - 10
app/src/main/java/com/edufound/reader/activity/RecordActivity.java

@@ -1,8 +1,14 @@
 package com.edufound.reader.activity;
 
+import android.Manifest;
 import android.animation.Animator;
 import android.app.Activity;
+import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.graphics.drawable.AnimationDrawable;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.Settings;
 import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -24,11 +30,15 @@ import com.edufound.reader.cusview.RvListJzvdStd;
 import com.edufound.reader.presenter.RecordPresenter;
 import com.edufound.reader.util.Consts;
 import com.edufound.reader.util.EfunboxUtil;
+import com.edufound.reader.util.MMKVUtil;
+import com.edufound.reader.util.PermissionsUtil;
+import com.orhanobut.logger.Logger;
 
 import java.util.HashMap;
 
 import androidx.annotation.NonNull;
-import io.reactivex.rxjava3.annotations.Nullable;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
 
 public class RecordActivity extends BaseMvpActivity<RecordPresenter> implements RecordContract.View {
 
@@ -85,18 +95,35 @@ public class RecordActivity extends BaseMvpActivity<RecordPresenter> implements
             }
         });
         addUiClickListener(mMikeIcon, o -> {
-            if (EfunboxUtil.checkLogin(mActivity)) {
-                if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
-                    if (Consts.getmConstsBaiDuUserBean().getUserInfo().getIsVip() == 1) {
-                        if (isRecordNow) {
-                            refRecordStatus();
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+                    && checkSelfPermission(Manifest.permission.RECORD_AUDIO) != PackageManager.PERMISSION_GRANTED) {
+                Toast.makeText(mActivity, "未获得录音权限", Toast.LENGTH_SHORT).show();
+
+
+                String isgranted = MMKVUtil.getInstance().decodeString("record_granted");
+                if (isgranted == null || isgranted.equals("")) {
+                    //一次都没有出来过
+                    PermissionsUtil.verifyAudioPermissions(this);
+                } else if (isgranted.equals("-1")) {
+                    Uri packageURI = Uri.parse("package:" + mActivity.getPackageName());
+                    Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, packageURI);
+                    startActivity(intent);
+                }
+                return;
+            } else {
+                if (EfunboxUtil.checkLogin(mActivity)) {
+                    if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+                        if (Consts.getmConstsBaiDuUserBean().getUserInfo().getIsVip() == 1) {
+                            if (isRecordNow) {
+                                refRecordStatus();
+                            } else {
+                                startRecordStatus();
+                            }
                         } else {
-                            startRecordStatus();
+                            Toast.makeText(mActivity, "请购买会员后尝试", Toast.LENGTH_SHORT).show();
                         }
-                    } else {
-                        Toast.makeText(mActivity, "请购买会员后尝试", Toast.LENGTH_SHORT).show();
-                    }
 
+                    }
                 }
             }
         });
@@ -109,6 +136,11 @@ public class RecordActivity extends BaseMvpActivity<RecordPresenter> implements
     }
 
     @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+    }
+
+    @Override
     public void onGetDisconnect() {
 
     }
@@ -212,4 +244,21 @@ public class RecordActivity extends BaseMvpActivity<RecordPresenter> implements
         mBack.setVisibility(visibility);
         ((ViewGroup) mDemonsFrame.getParent()).setVisibility(visibility);
     }
+
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (requestCode == PermissionsUtil.GET_RECODE_AUDIO) {
+            Logger.e("grantResults[0]:" + grantResults[0]);
+            if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                //获取成功
+                MMKVUtil.getInstance().encode("record_granted", "1");
+            } else if (grantResults[0] == -1) {
+                //获取失败
+                MMKVUtil.getInstance().encode("record_granted", "-1");
+
+            }
+        }
+    }
 }

+ 8 - 4
app/src/main/java/com/edufound/reader/activity/UserInfoSettingActivity.java

@@ -74,6 +74,8 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
     TextView mGrade;
     @BindView(id = R.id.activity_userinfo_setting_userhead)
     ImageView mUserHead;
+    @BindView(id = R.id.activity_userinfo_setting_userhead_num)
+    TextView mUserNum;
 
 
     @Override
@@ -223,7 +225,7 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
 
                 @Override
                 public void clickSubmit(Object object) {
-                    Toast.makeText(getActivity(), "选择了:" + EfunboxUtil.getEnumByCNGrade(object.toString()), Toast.LENGTH_SHORT).show();
+//                    Toast.makeText(getActivity(), "选择了:" + EfunboxUtil.getEnumByCNGrade(object.toString()), Toast.LENGTH_SHORT).show();
                     Consts.getmConstsUserBean().setGrade(EfunboxUtil.getEnumByCNGrade(object.toString()));
                     mPresenter.upadteMyInfo(Consts.getmConstsUserBean());
                 }
@@ -260,7 +262,9 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
                 return false;
             }
         });
-
+        if (Consts.getmConstsBaiDuUserBean() != null) {
+            mUserNum.setText("账号:" + Consts.getmConstsBaiDuUserBean().getUserInfo().getUserId());
+        }
         mPresenter.getMyInfo();
     }
 
@@ -320,12 +324,12 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
             //男孩子
             mGenderMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_true_bg);
             mGenderFeMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_bg);
-            mUserHead.setImageResource(R.drawable.activity_userinfo_setting_boy);
+            GlideUtils.loadImage(getActivity(), R.drawable.activity_userinfo_setting_boy, mUserHead);
         } else if (bean.getGender().equals("0")) {
             //女孩子
             mGenderMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_bg);
             mGenderFeMale.setBackgroundResource(R.drawable.activity_userinfo_setting_item_sex_true_bg);
-            mUserHead.setImageResource(R.drawable.activity_userinfo_setting_girl);
+            GlideUtils.loadImage(getActivity(), R.drawable.activity_userinfo_setting_girl, mUserHead);
         }
         if (bean.getAvatar() == null || bean.getAvatar().equals("")) {
         } else {

+ 7 - 11
app/src/main/java/com/edufound/reader/application/EApplication.java

@@ -16,6 +16,7 @@ import com.baidu.duer.botsdk.BotSdk;
 import com.baidu.duer.botsdk.util.HeartBeatReporter;
 import com.edufound.reader.BuildConfig;
 import com.edufound.reader.R;
+import com.edufound.reader.activity.CrashDialogActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.botsdk.BotConstants;
 import com.edufound.reader.botsdk.BotMessageListener;
@@ -52,12 +53,12 @@ public class EApplication extends Application {
     public void onCreate() {
         super.onCreate();
         try {
-            Consts.setIsDebug(true);
+            Consts.setIsDebug(false);
             Consts.setmApplicAtion(this);
 
             //初始化异常监听
 //            CrashHandler.getInstance().init(this);
-//            initException();
+            initException();
 
             XmlPullParserFactory.newInstance().setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
 
@@ -205,16 +206,11 @@ public class EApplication extends Application {
                     Intent intent = new Intent(Consts.getmApplicAtion(), DebugSafeModeTipActivity.class);
                     intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                     startActivity(intent);
+                } else {
+                    Intent intent = new Intent(Consts.getmApplicAtion(), CrashDialogActivity.class);
+                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    startActivity(intent);
                 }
-//                if (BuildConfig.DEBUG) {
-//                    Intent intent = new Intent(Consts.getmApplicAtion(), DebugSafeModeTipActivity.class);
-//                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                    startActivity(intent);
-//                } else {
-//                    Intent intent = new Intent(Consts.getmApplicAtion(), DebugSafeModeTipActivity.class);
-//                    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-//                    startActivity(intent);
-//                }
             }
 
             @Override

+ 3 - 1
app/src/main/java/com/edufound/reader/base/BaseActivity.java

@@ -102,7 +102,7 @@ public abstract class BaseActivity extends AppCompatActivity {
         }
         mGson = new Gson();
         //获取录音权限
-        PermissionsUtil.verifyAudioPermissions(this);
+//        PermissionsUtil.verifyAudioPermissions(this);
         if (Consts.getScreenSize() == null) {
             DisplayMetrics outMetrics = new DisplayMetrics();
             getWindowManager().getDefaultDisplay().getMetrics(outMetrics);
@@ -321,6 +321,8 @@ public abstract class BaseActivity extends AppCompatActivity {
         });
         animatorSet.playSequentially(translationYUp, translationYDown);
         animatorSet.start();
+        MMKVUtil.getInstance().encode("first_into", false);
+       
     }
 
 

+ 2 - 2
app/src/main/java/com/edufound/reader/botsdk/BotMessageListener.java

@@ -129,11 +129,11 @@ public class BotMessageListener implements IBotMessageListener {
 
     @Override
     public void onRegisterFailed(int i) {
-        Toast.makeText(Consts.getmApplicAtion(), "注册失败", Toast.LENGTH_LONG).show();
+//        Toast.makeText(Consts.getmApplicAtion(), "注册失败", Toast.LENGTH_LONG).show();
     }
 
     @Override
     public void onRegisterSucceed() {
-        Toast.makeText(Consts.getmApplicAtion(), "注册百度sdk成功", Toast.LENGTH_LONG).show();
+//        Toast.makeText(Consts.getmApplicAtion(), "注册百度sdk成功", Toast.LENGTH_LONG).show();
     }
 }

+ 6 - 7
app/src/main/java/com/edufound/reader/fragment/MyTabFragment.java

@@ -154,35 +154,34 @@ public class MyTabFragment extends BaseMvpFragment<MyTabFragmentPresenter> imple
 //            Toast.makeText(getActivity(), "click 设置", Toast.LENGTH_SHORT).show();
 //        });
         addUiClick(mHeadUserVip, o -> {
-            Toast.makeText(getActivity(), "click vip", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(getActivity(), "click vip", Toast.LENGTH_SHORT).show();
 //            toNextActivity(PayActivity.class);
             BotRegisterListener.payBaiDuVip();
 
         });
         addUiClick(mHeadUserRedFlower, o -> {
-            Toast.makeText(getActivity(), "click 小红花", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(getActivity(), "click 小红花", Toast.LENGTH_SHORT).show();
             toNextActivity(SafflowerActivity.class);
         });
         addUiClick(mHeadUserMyAttention, o -> {
-            Toast.makeText(getActivity(), "click 我的关注", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(getActivity(), "click 我的关注", Toast.LENGTH_SHORT).show();
             toNextActivity(MyFollowActivity.class);
         });
         addUiClick(mHeadUserMyCollection, o -> {
-            Toast.makeText(getActivity(), "click 我的收藏", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(getActivity(), "click 我的收藏", Toast.LENGTH_SHORT).show();
             toNextActivity(MyCollectionActivity.class);
         });
         addUiClick(mHeadUserMessage, o -> {
-            Toast.makeText(getActivity(), "click 消息通知", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(getActivity(), "click 消息通知", Toast.LENGTH_SHORT).show();
             toNextActivity(MessageActivity.class);
 
         });
         addUiClick(mHeadUserCustomerService, o -> {
-            Toast.makeText(getActivity(), "click 联系客服", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(getActivity(), "click 联系客服", Toast.LENGTH_SHORT).show();
             toNextActivity(CustomerServiceActivity.class);
         });
         addUiClick(mUserLayout, o -> {
             Bundle bundle = new Bundle();
-            bundle.putString("index", "123123123");
             toNextActivity(UserInfoSettingActivity.class, bundle);
         });
 

+ 5 - 2
app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java

@@ -164,6 +164,9 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
 
         addUiClickListener(mToRecordLayout, o -> {
             if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+                if (Consts.getmConstsBaiDuUserBean() == null) {
+                    return;
+                }
                 if (Consts.getmConstsBaiDuUserBean().getUserInfo().getIsVip() == 1) {
                     Bundle bundle = new Bundle();
                     bundle.putString("exampleId", mPresenter.getCurVideoExampleId().toString());
@@ -242,9 +245,9 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         if (bean.getUser().getAvatar() == null || bean.getUser().getAvatar().equals("")) {
             if (bean.getUser().getGender().equals("1")) {
                 //男
-                GlideUtils.loadCircleImage(getActivity(), R.drawable.activity_userinfo_setting_boy, mUserHead);
+                GlideUtils.loadImage(getActivity(), R.drawable.activity_userinfo_setting_boy, mUserHead);
             } else {
-                GlideUtils.loadCircleImage(getActivity(), R.drawable.activity_userinfo_setting_girl, mUserHead);
+                GlideUtils.loadImage(getActivity(), R.drawable.activity_userinfo_setting_girl, mUserHead);
             }
         } else {
             GlideUtils.loadCircleImage(getActivity(), bean.getUser().getAvatar(), mUserHead);

+ 2 - 2
app/src/main/java/com/edufound/reader/presenter/CommentPresenter.java

@@ -94,7 +94,7 @@ public class CommentPresenter extends BasePresenter<CommentContract.View> implem
         if (mDataList != null && mDataList.size() >= commentSize) {
             loadOver = true;
             Logger.e("commentSize:" + commentSize + "---mDataList.size():" + mDataList.size());
-            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
             return;
         }
 
@@ -103,7 +103,7 @@ public class CommentPresenter extends BasePresenter<CommentContract.View> implem
         mModel.getCommentAll(mView.getActivity(), exampleId, pageIndex, new Callback() {
             @Override
             public void onSuccess(HttpInfo info) throws IOException {
-                Toast.makeText(mView.getActivity(), "获取评论成功", Toast.LENGTH_SHORT).show();
+//                Toast.makeText(mView.getActivity(), "获取评论成功", Toast.LENGTH_SHORT).show();
                 HttpResultBean<HttpResultDataListBean<CommentListReplyBean>> bean = info.getRetDetail(new TypeToken<HttpResultBean<HttpResultDataListBean<CommentListReplyBean>>>() {
                 }.getType());
                 if (mDataList == null || mDataList.size() <= 0) {

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

@@ -157,7 +157,7 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
 
             @Override
             public void clickSubmit(Object object) {
-                Toast.makeText(mView.getActivity(), "选择了:" + EfunboxUtil.getEnumByCNGrade(object.toString()), Toast.LENGTH_SHORT).show();
+//                Toast.makeText(mView.getActivity(), "选择了:" + EfunboxUtil.getEnumByCNGrade(object.toString()), Toast.LENGTH_SHORT).show();
                 MMKVUtil.getInstance().encode(MMKVEncodeKey.USER_GRADE, EfunboxUtil.getEnumByCNGrade(object.toString()));
             }
         });

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

@@ -77,7 +77,7 @@ public class MessagePresenter extends BasePresenter<MessageContract.View> implem
     public void getAllMessage() {
         if (mDataList != null && mDataList.size() >= mTotalSize) {
             loadOver = true;
-            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
             return;
         }
         mModel.getAllMessage(mView.getActivity(), String.valueOf(mPageIndex), new Callback() {

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

@@ -114,7 +114,7 @@ public class MyCollectionPresenter extends BasePresenter<MyCollectionContract.Vi
     public void getFavoritesData() {
         if (mDataList != null && mDataList.size() >= mTotalSize) {
             loadOver = true;
-            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
             return;
         }
         mModel.getFavorites(mView.getActivity(), mPageIndex, new Callback() {

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

@@ -112,7 +112,7 @@ public class MyFollowPresenter extends BasePresenter<MyFollowContract.View> impl
         Logger.e("getFollowAll");
         if (mDataList != null && mDataList.size() >= mTotalSize) {
             loadOver = true;
-            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
+//            Toast.makeText(mView.getActivity(), "没有更多了", Toast.LENGTH_SHORT).show();
             return;
         }
         mModel.getFollowAll(mView.getActivity(), mPageIndex, new Callback() {

+ 4 - 0
app/src/main/java/com/edufound/reader/presenter/OthersRecordPresenter.java

@@ -62,7 +62,11 @@ public class OthersRecordPresenter extends BasePresenter<OthersRecordContract.Vi
 
     @Override
     public void initGridLayout(GridLayout gridLayout, FrameLayout norecordlayout) {
+        gridLayout.removeAllViews();
         gridLayout.setRowCount(2);
+        onceLoadCount = 10;
+        mListStart = 0;
+        mListEnd = onceLoadCount;
         setGridData(gridLayout, norecordlayout);
     }
 

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

@@ -218,7 +218,7 @@ public class PopWindowPresneter {
                                                 @Override
                                                 public void onClick(View view) {
                                                     PopWindowUtil.hidePopupWindow();
-                                                    Toast.makeText(context, "去听听(首页->我的tab)", Toast.LENGTH_SHORT).show();
+//                                                    Toast.makeText(context, "去听听(首页->我的tab)", Toast.LENGTH_SHORT).show();
                                                     for (int i = 0; i < EApplication.mActivityList.size(); i++) {
                                                         EApplication.mActivityList.get(i).finish();
                                                     }

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

@@ -143,6 +143,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
 //                    Logger.e("mCurrentPosition == position..return了");
 //                    return;
 //                }
+                ((BaseActivity) mView.getActivity()).removeFirstTipView();
                 autoPlayVideo(rv);
                 mCurrentPosition = position;
                 if (mCurrentPosition == 0) {

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

@@ -255,7 +255,7 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
         PopWindowUtil.showRecordStatusWindow(mView.getActivity(), mView.getRootView(), bean, userread, new PopupRecordStatusListener() {
             @Override
             public void clickReRecord() {
-                Toast.makeText(mView.getActivity(), "重新录制", Toast.LENGTH_SHORT).show();
+//                Toast.makeText(mView.getActivity(), "重新录制", Toast.LENGTH_SHORT).show();
                 PopWindowUtil.hidePopupWindow();
                 mView.startRecordStatus();
             }

+ 1 - 1
app/src/main/java/com/edufound/reader/support/CrashLogFragment.java

@@ -222,7 +222,7 @@ public class CrashLogFragment extends Fragment {
                         String log = ((String) v.getTag());
                         ClipboardManager cmb = (ClipboardManager) v.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
                         cmb.setText(log);
-                        Toast.makeText(v.getContext(), "已经复制到粘贴板", Toast.LENGTH_SHORT).show();
+//                        Toast.makeText(v.getContext(), "已经复制到粘贴板", Toast.LENGTH_SHORT).show();
                     }
                 });
             }

+ 2 - 1
app/src/main/java/com/edufound/reader/util/PermissionsUtil.java

@@ -9,10 +9,11 @@ import com.orhanobut.logger.Logger;
 import androidx.core.app.ActivityCompat;
 
 public class PermissionsUtil {
-    private static int GET_RECODE_AUDIO = 1;
+    public static int GET_RECODE_AUDIO = 1;
     private static String[] PERMISSION_AUDIO = new String[]{Manifest.permission.RECORD_AUDIO};
 
     public static void verifyAudioPermissions(Activity activity) {
+        Logger.e("获取录音权限");
         int permission = ActivityCompat.checkSelfPermission(activity, Manifest.permission.RECORD_AUDIO);
         if (permission != PackageManager.PERMISSION_GRANTED) {
             Logger.e("获取录音权限:permission != PackageManager.PERMISSION_GRANTED");

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


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


+ 2 - 2
app/src/main/res/layout/activity_comment.xml

@@ -27,11 +27,11 @@
                 android:focusableInTouchMode="true"
                 android:orientation="horizontal">
 
-            <Space
+            <FrameLayout
                     android:id="@+id/comment_touch_back"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_weight="2"></Space>
+                    android:layout_weight="2"></FrameLayout>
 
             <FrameLayout
                     android:layout_width="0dp"

+ 12 - 4
app/src/main/res/layout/activity_userinfo_setting.xml

@@ -86,22 +86,30 @@
 
                                 <com.edufound.reader.cusview.RoundFrameLayout
                                         android:layout_width="260dp"
-                                        android:layout_height="260dp"
+                                        android:layout_height="230dp"
                                         android:layout_gravity="right|center"
-                                        android:background="#FCF0A6"
                                         roundframelayout:radio="40">
 
                                     <FrameLayout
                                             android:layout_width="188dp"
                                             android:layout_height="188dp"
-                                            android:layout_gravity="center">
+                                            android:layout_gravity="center|top">
 
                                         <ImageView
                                                 android:id="@+id/activity_userinfo_setting_userhead"
                                                 android:layout_width="match_parent"
                                                 android:layout_height="match_parent"
-                                                android:src="@color/red"></ImageView>
+                                                android:layout_gravity="center|top"></ImageView>
+
                                     </FrameLayout>
+
+                                    <TextView
+                                            android:id="@+id/activity_userinfo_setting_userhead_num"
+                                            android:layout_width="wrap_content"
+                                            android:layout_height="wrap_content"
+                                            android:layout_gravity="center|bottom"
+                                            android:text="123123123"
+                                            android:textSize="20dp"></TextView>
                                 </com.edufound.reader.cusview.RoundFrameLayout>
                             </FrameLayout>