1.修改部分业务逻辑

2.增加点击活动post

.idea/misc.xml

@@ -135,6 +135,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="0.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/popupwindow_myorder.xml" value="0.2871046228710462" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/popupwindow_record_remove.xml" value="0.2913625304136253" />
+        <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_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.9846547314578005" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_bind_wechat.xml" value="0.2913625304136253" />
@@ -150,6 +151,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/drawable/main_left_tab_recommend_selector.xml" value="0.2185" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_alert_login.xml" value="0.33" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_comment.xml" value="0.1873479318734793" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_crash_dialog.xml" value="0.28345498783454987" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_event_pay_item.xml" value="0.75" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_main.xml" value="0.16" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_misound_pay.xml" value="0.25669099756691" />

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.edufound.reader"
         minSdkVersion 23 //>23导致无法直接签名
         targetSdkVersion 30
-        versionCode 21
-        versionName "2.1"
+        versionCode 22
+        versionName "2.2"
         flavorDimensions "versionCode"
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2006"]//添加一个默认渠道号
         ndk {

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

@@ -234,7 +234,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
             mExitApp.setLayoutParams(exitParams);
         }
         int defaultIndex = getIntent().getIntExtra("defaultIndex", defaultValue);
-        Logger.e("defaultIndex:" + defaultIndex);
         mRadioGroupTab.postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -283,20 +282,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
     @Override
     protected void onScreenUserPresent() {
         super.onScreenUserPresent();
-        if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())) {
-//            //义方渠道在手机
-//            Intent intent = new Intent(mActivity, TestActivity.class);
-//            startActivity(intent);
-//
-//            for (int i = 0; i < EApplication.mActivityList.size(); i++) {
-//                EApplication.mActivityList.get(i).finish();
-//            }
-
-        }
-
-//        Intent intent = new Intent(getActivity(), MainActivity.class);
-//        intent.putExtra("defaultIndex", 1);
-//        startActivity(intent);
     }
 
     @Override

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

@@ -3,6 +3,7 @@ package com.edufound.reader.activity;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 import android.widget.ImageView;
 
@@ -178,7 +179,11 @@ public class SmallFullVideoActivity extends BaseMvpActivity<SmallFullVideoPresen
         into_Page = "";
         data_Json = "";
         Bundle params = intent.getBundleExtra("params_bundle");
-        into_Page = params.getString("intoPage");
+        if (!TextUtils.isEmpty(params.getString("intoPage"))) {
+            into_Page = params.getString("intoPage");
+        } else {
+            into_Page = "default";
+        }
         Logger.e("into_Page:" + into_Page);
         data_Json = params.getString("dataJson");
         Logger.e("data_Json:" + data_Json);

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

@@ -63,7 +63,6 @@ public class SplashActivity extends BaseMvpActivity<SplashPresenter> implements
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        Logger.e("splash被关闭了");
         mPresenter.detachView();
     }
 }

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

@@ -158,6 +158,8 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
                     });
                 }
             });
+        } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.MISOUND.getChannelCode())){
+            mBindPhoneNumLayout.setVisibility(View.GONE);
         }
         addUiClickListener(mLoginOut, o -> {
             Logger.e("mLoginOut");

app/src/main/java/com/edufound/reader/application/EApplication.java

@@ -28,6 +28,7 @@ import com.edufound.reader.support.DebugSafeModeTipActivity;
 import com.edufound.reader.support.DebugSafeModeUI;
 import com.edufound.reader.util.Cockroach;
 import com.edufound.reader.util.Consts;
+import com.edufound.reader.util.CrashHandler;
 import com.edufound.reader.util.DeviceUuidFactory;
 import com.edufound.reader.util.ExceptionHandler;
 import com.edufound.reader.util.OkHttpClient;
@@ -62,7 +63,7 @@ public class EApplication extends Application {
 
             //初始化异常监听
 //            CrashHandler.getInstance().init(this);
-//            initException();
+            initException();
 
             XmlPullParserFactory.newInstance().setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
 
@@ -169,10 +170,6 @@ public class EApplication extends Application {
             activityAount--;
             if (activityAount == 0) {
                 isForeground = false;
-//                ToastUtil.showToast("app后台了");
-                if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())) {
-                    killAppProcess(Consts.getmApplicAtion());
-                }
             }
         }
 
@@ -196,8 +193,8 @@ public class EApplication extends Application {
                 new Handler(Looper.getMainLooper()).post(new Runnable() {
                     @Override
                     public void run() {
-//                        toast.setText(R.string.safe_mode_excep_tips);
-//                        toast.show();
+                        toast.setText("Cockroach.install:onUncaughtExceptionHappened");
+                        toast.show();
                     }
                 });
             }

app/src/main/java/com/edufound/reader/bean/ChannelCodeEnum.java

@@ -7,16 +7,19 @@ public enum ChannelCodeEnum {
         }
     },
     BAIDU {
+        //百度
         public String getChannelCode() {//枚举对象实现抽象方法
             return "3003";
         }
     },
     TMAIL {
+        //天猫
         public String getChannelCode() {//枚举对象实现抽象方法
             return "3002";
         }
     },
     MISOUND {
+        //小米
         public String getChannelCode() {//枚举对象实现抽象方法
             return "2016";
         }

app/src/main/java/com/edufound/reader/bean/UserEventEnum.java

@@ -3,6 +3,7 @@ package com.edufound.reader.bean;
 public enum UserEventEnum {
     EVENT_RECOMMEND("RECOMMEND", "推荐"),
     EVENT_MY("MY", "我的"),
+    EVENT_EVENT("EVENT", "活动"),
     EVENT_RESOURCES("RESOURCES", "资源"),
     EVENT_SUBSCRIBE("SUBSCRIBE", "关注"),
     EVENT_RECREAD("REC_READ", "推荐-我要配音"),

app/src/main/java/com/edufound/reader/popwindow/PopWindowUtil.java

@@ -477,7 +477,16 @@ public class PopWindowUtil {
 
             @Override
             public void closeWindow() {
-                
+
+            }
+        });
+        dialog_view.setOnKeyListener(new View.OnKeyListener() {
+            @Override
+            public boolean onKey(View v, int keyCode, KeyEvent event) {
+                if (keyCode == KeyEvent.KEYCODE_BACK) {
+                    return true;
+                }
+                return false;
             }
         });
         newPopupWindow(parent, true);

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

@@ -127,7 +127,7 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
                     mEventFragment = new EventFragment();
                 }
                 changeFragmentLayout(mEventFragment);
-//                mUserApi.postUserEvent(mView.getActivity(), UserEventEnum.EVENT_MY.getEvent());
+                mUserApi.postUserEvent(mView.getActivity(), UserEventEnum.EVENT_EVENT.getEvent());
                 break;
             case R.id.main_left_tab_layout_recommend:
                 //推荐
@@ -273,10 +273,8 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
                         //没有用户数据
                         if (TextUtils.isEmpty(MMKVUtil.getInstance().decodeString(MMKVEncodeKey.USER_GRADE))) {
                             //没有选择过年纪，选择年纪
-                            Logger.e("TextUtils.isEmpty(MMKVUtil.getInstance().decodeString(MMKVEncodeKey.USER_GRADE)");
                             showSelectGradeWindow();
                         } else {
-                            Logger.e("TextUtils.isEmpty(MMKVUtil.getInstance().decodeString(MMKVEncodeKey.USER_GRADE)--else");
                             //选择过年纪。无处理
                         }
 //                    registerMobile("18655365222");
@@ -349,7 +347,6 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
             mEventApi.getEventByType(ActivityEventServerImpl.EVENT_TYPE_LOGIN, new Callback() {
                 @Override
                 public void onSuccess(HttpInfo info) throws IOException {
-                    Logger.e("获取活动成功：" + info.getRetDetail());
                     HttpResultBean<ActivityEventBean> activityBean = info.getRetDetail(new TypeToken<HttpResultBean<ActivityEventBean>>() {
                     }.getType());
                     if (Boolean.valueOf(activityBean.getSuccess())) {

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

@@ -433,7 +433,8 @@ public class MyTabFragmentPresenter extends BasePresenter<MyTabFragmentContract.
             }
         } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())
                 || Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())
-                || Consts.getUmengChannel().equals(ChannelCodeEnum.MISOUND.getChannelCode())) {
+                || Consts.getUmengChannel().equals(ChannelCodeEnum.MISOUND.getChannelCode())
+        ) {
             getAuth();
         }
     }

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

@@ -245,7 +245,8 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
             if (Consts.getmConstsBaiDuUserBean() != null) {
                 mView.getisViewUI().setVisibility(View.INVISIBLE);
             }
-        } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode()) || Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
+        } else  {
+            //除了百度都走这里
             mView.getisViewUI().setEnabled(false);
             mView.getisViewUI().postDelayed(new Runnable() {
                 @Override
@@ -450,7 +451,6 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
         } else {
             mView.showAllUi();
         }
-        Logger.e("视频type:" + mAdapter.getItemTag(mCurrentPosition));
 
         //获取当前显示的View 的数据
         int childCount = rv.getChildCount();

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

@@ -62,7 +62,9 @@ public class SmallFullVideoPresenter extends BasePresenter<SmallFullVideoContrac
     @Override
     public void activityDestory() {
 
-        mFragmentManager.beginTransaction().remove(mRecommendFragment);
+        if (mFragmentManager != null) {
+            mFragmentManager.beginTransaction().remove(mRecommendFragment);
+        }
         mRecommendFragment = null;
     }
 

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

@@ -68,15 +68,12 @@ public class SplashPresenter extends BasePresenter implements SplashContract.Pre
                     getIntentUri = Uri.parse(intent.getStringExtra("url"));
                 }
                 //efunbox://com.edufound.reader/splash?resid=11132
-            } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())
-                    || Consts.getUmengChannel().equals(ChannelCodeEnum.MISOUND.getChannelCode())
-                    || Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())) {
-                //天猫渠道
+            } else {
+                //除了百度都走这里
                 getIntentUri = intent.getData();
 
             }
         }
-        Logger.e("getIntentUri:" + getIntentUri);
         //efunbox://com.edufound.reader/splash?exampleId=103126003&backModel=home&type=typeA (直接去朗读页面参数)
         //efunbox://com.edufound.reader/splash?userReadId=1610706272358766&backModel=home&type=typeB (根据id把视频提前)
         //efunbox://com.edufound.reader/splash?userReadId=1610706272358766&backModel=home&type=typeC (根据id把视频提前)
@@ -120,6 +117,9 @@ public class SplashPresenter extends BasePresenter implements SplashContract.Pre
                     ThroughUtil.mThroughTypeBean.setEventPosition(getIntentUri.getQueryParameter("eventPosition"));
                     ((BaseActivity) mView.getActivity()).toNextActivity(MainActivity.class);
                 }
+            } else {
+                Logger.e("跳转首页");
+                ((BaseActivity) mView.getActivity()).toNextActivity(MainActivity.class);
             }
 
         } else {
@@ -135,10 +135,12 @@ public class SplashPresenter extends BasePresenter implements SplashContract.Pre
             @Override
             public void onSuccess(HttpInfo info) throws IOException {
                 try {
-                    Logger.e("info:" + info.getRetDetail());
                     JSONObject object = new JSONObject(info.getRetDetail());
                     if (object.getString("code").equals("300") || object.getInt("code") == 300) {
-                        getScheme(intent);
+                        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())
+                        ) {
+                            getScheme(intent);
+                        }
                     } else {
                         HttpResultBean<UserBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserBean>>() {
                         }.getType());
@@ -172,11 +174,13 @@ public class SplashPresenter extends BasePresenter implements SplashContract.Pre
         EfunboxUtil.getYFVip(mView.getActivity(), new EfunboxInterfaces.getYFVipInterfaces() {
             @Override
             public void success() {
+                Logger.e("获取是否是义方VIP success");
                 getScheme(intent);
             }
 
             @Override
             public void error() {
+                Logger.e("获取是否是义方VIP error");
                 getScheme(intent);
             }
         });

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

@@ -168,7 +168,11 @@ public class WebPresenter extends BasePresenter<WebContract.View> implements Web
         if (!TextUtils.isEmpty(intent.getStringExtra("paramsJson"))) {
             WebParams params = gson.fromJson(intent.getStringExtra("paramsJson"), WebParams.class);
             if (!TextUtils.isEmpty(params.channelCode)) {
-                buffer.append("&channelCode=" + params.channelCode);
+                if (url.contains("?")) {
+                    buffer.append("&channelCode=" + params.channelCode);
+                } else {
+                    buffer.append("?channelCode=" + params.channelCode);
+                }
             } else {
                 buffer.append("&a=a");
             }

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

@@ -163,14 +163,10 @@ public class EfunboxUtil {
                 return false;
             }
             return (Consts.getmConstsBaiDuUserBean().getUserInfo().getIsVip() == 1);
-        } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())) {
-            return Consts.isIsYFVip();
-        } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
-            return Consts.isIsYFVip();
-        } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.MISOUND.getChannelCode())) {
+        } else {
+            //除了百度都走这里
             return Consts.isIsYFVip();
         }
-        return false;
     }
 
     public static void userLogin(Context context, View parent) {
@@ -179,7 +175,7 @@ public class EfunboxUtil {
             //百度渠道调用百度的授权
             BotRegisterListener.getBaiDuVipInfo();
         } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())) {
-            //义方调用普通版登录
+            //义方/京东调用普通版登录
             Intent tologin = new Intent(context, LoginAlertActivity.class);
             context.startActivity(tologin);
         } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {