1.重构穿透逻辑

2.增加穿透的类型
3.作品播放页面穿透事件逻辑编写
4.增加过度页

.idea/misc.xml

@@ -129,7 +129,7 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/exception/layout/popupwindow_webs_events.xml" value="0.2572992700729927" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_one_bg.xml" value="0.2165" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/drawable/slidevideo_switch_track_selector.xml" value="0.2005" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/adapter_item_cusview_model_view_f.xml" value="1.0" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/adapter_item_cusview_model_view_f.xml" value="1.1" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/cusview_model_view_f.xml" value="0.24939172749391728" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/cusview_model_view_g.xml" value="0.28284671532846717" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="0.5" />
@@ -160,6 +160,7 @@
         <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_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_splash.xml" value="0.26094890510948904" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_test.xml" value="0.24452554744525548" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_userinfo_setting.xml" value="0.2" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_web.xml" value="0.18" />

app/src/exception/layout/adapter_item_cusview_model_view_d.xml

@@ -35,10 +35,10 @@
         android:id="@+id/adapter_item_cusview_model_view_d_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="8dp"
         android:text="春夏秋冬"
         android:textColor="#314051"
-        android:textSize="18dp"
+        android:textSize="22dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="@+id/adapter_item_cusview_model_view_d_icon_layout"

app/src/fragmentRecommend/layout/adapter_item_cusview_model_view_f.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="381dp"
     android:layout_height="120dp"
     android:layout_gravity="center"
@@ -35,24 +36,25 @@
         android:id="@+id/cusview_model_view_f_layout_item_enter_num"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
         android:text="248587"
         android:textColor="#77CE6A"
         android:textSize="18dp"
         app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_icon"
-        app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_icon"
-        app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_icon"
-        app:layout_constraintVertical_bias="0.47000003"></TextView>
+        app:layout_constraintEnd_toStartOf="@+id/textView6"
+        app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_name"
+        app:layout_constraintVertical_bias="0.0"></TextView>
 
     <TextView
+        android:id="@+id/textView6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
         android:text="参与"
         android:textColor="#999999"
         android:textSize="18dp"
         app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_enter_num"
-        app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_enter_num"
-        app:layout_constraintTop_toBottomOf="@+id/cusview_model_view_f_layout_item_name"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_enter_num"
         app:layout_constraintVertical_bias="0.87"></TextView>
 
 
@@ -60,16 +62,17 @@
         android:id="@+id/cusview_model_view_f_layout_item_ranklist"
         android:layout_width="96dp"
         android:layout_height="25dp"
+        android:layout_marginStart="15dp"
         android:background="@drawable/btn_blue_bg"
         app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_icon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="@+id/cusview_model_view_f_layout_item_enter_num"
-        app:layout_constraintTop_toBottomOf="@+id/cusview_model_view_f_layout_item_enter_num"
+        app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_icon"
+        app:layout_constraintTop_toBottomOf="@+id/cusview_model_view_f_layout_item_name"
         app:layout_constraintVertical_bias="1.0">
 
         <TextView
-            android:layout_width="match_parent"
+            android:layout_width="91dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:gravity="center"
@@ -84,12 +87,13 @@
         android:id="@+id/cusview_model_view_f_layout_item_enter_btn"
         android:layout_width="96dp"
         android:layout_height="25dp"
+        android:layout_marginEnd="20dp"
         android:background="@drawable/btn_green_bg"
-        app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_icon"
+        app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_f_layout_item_ranklist"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.45"
+        app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toEndOf="@+id/cusview_model_view_f_layout_item_ranklist"
-        app:layout_constraintTop_toBottomOf="@+id/cusview_model_view_f_layout_item_enter_num"
+        app:layout_constraintTop_toTopOf="@+id/cusview_model_view_f_layout_item_ranklist"
         app:layout_constraintVertical_bias="1.0">
 
         <TextView

app/src/main/AndroidManifest.xml

@@ -28,7 +28,6 @@
         android:label="@string/app_name"
         android:roundIcon="${icon}"
         android:supportsRtl="true"
-        android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"
         android:usesCleartextTraffic="true">
         <meta-data
             android:name="android.notch_support"
@@ -39,8 +38,10 @@
         <meta-data
             android:name="notch.config"
             android:value="portrait|landscape" /> <!-- 主页 -->
+
+
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".activity.SplashActivity"
             android:configChanges="screenLayout|screenSize|keyboardHidden|keyboard|orientation"
             android:launchMode="singleTop"
             android:maxAspectRatio="2.1"
@@ -55,7 +56,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="com.edufound.reader.MAIN"></action>
@@ -67,10 +67,24 @@
                 <!-- 天猫精灵要加一句这个-->
                 <data
                     android:host="com.edufound.reader"
-                    android:path="/main"
+                    android:path="/splash"
                     android:scheme="efunbox" />
             </intent-filter>
 
+
+        </activity>
+
+        <activity
+            android:name=".activity.MainActivity"
+            android:configChanges="screenLayout|screenSize|keyboardHidden|keyboard|orientation"
+            android:launchMode="singleTop"
+            android:maxAspectRatio="2.1"
+            android:resizeableActivity="false"
+            android:screenOrientation="landscape"
+            android:theme="@style/FullScreen"
+            android:windowSoftInputMode="adjustNothing|stateHidden">
+
+
         </activity>
         <!-- 录音界面 -->
         <activity
@@ -80,7 +94,7 @@
             android:maxAspectRatio="2.1"
             android:resizeableActivity="false"
             android:screenOrientation="landscape"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar.FullScreen"
+            android:theme="@style/FullScreen"
             android:windowSoftInputMode="adjustNothing|stateHidden" />
         <!-- 登录界面 -->
         <activity
@@ -90,7 +104,7 @@
             android:maxAspectRatio="2.1"
             android:resizeableActivity="false"
             android:screenOrientation="landscape"
-            android:theme="@style/AppStartTheme"
+            android:theme="@style/FullScreen"
             android:windowSoftInputMode="adjustNothing|stateHidden">
 
         </activity>

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

@@ -23,6 +23,7 @@ import java.util.HashMap;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresApi;
+
 import io.reactivex.rxjava3.annotations.Nullable;
 
 public class CrashDialogActivity extends BaseMvpActivity<CrashDialogPresenter> implements CrashDialogContract.View {
@@ -61,12 +62,7 @@ public class CrashDialogActivity extends BaseMvpActivity<CrashDialogPresenter> i
 //        builder.create().show();
 
         addUiClickListener(mRestart, o -> {
-            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);
+            EApplication.reloadApp(1);
         });
         addUiClickListener(mExitApp, o -> {
             EApplication.killAppProcess(getActivity());

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

@@ -7,7 +7,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -24,18 +23,16 @@ import com.baidu.duer.membersdk.MemberSdkManager;
 import com.baidu.duer.membersdk.constant.MemberSdkConstants;
 import com.edufound.reader.R;
 import com.edufound.reader.annotation.BindView;
-import com.edufound.reader.application.EApplication;
 import com.edufound.reader.base.BaseActivity;
 import com.edufound.reader.base.BaseMvpActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.bean.ThroughType;
-import com.edufound.reader.bean.ThroughTypeA;
+import com.edufound.reader.bean.ThroughTypeBean;
 import com.edufound.reader.contract.MainContract;
 import com.edufound.reader.popwindow.PopWindowUtil;
 import com.edufound.reader.presenter.MainPresenter;
 import com.edufound.reader.receiver.BackPageReceiver;
 import com.edufound.reader.util.Consts;
-import com.edufound.reader.util.DeviceUuidFactory;
 import com.edufound.reader.util.SizeUtils;
 import com.edufound.reader.util.ThroughUtil;
 import com.orhanobut.logger.Logger;
@@ -68,8 +65,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
     @BindView(id = R.id.activity_main_exitapp_icon)
     ImageView mExitApp;
 
-    @BindView(id = R.id.testbg)
-    ImageView testBg;
 
     @BindView(id = R.id.main_left_tab_linearlayout)
     LinearLayout mTabLayout;
@@ -86,7 +81,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
         mPresenter.attachView(this);
         mActivity = this;
 //        mRadioGroupTab = null;
-        testBg.setVisibility(View.GONE);
         mRadioGroupTab.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(RadioGroup radioGroup, int id) {
@@ -104,55 +98,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
 //        PermissionsUtil.readPhoneStatePermissions(mActivity);
 
 
-        Uri getIntentUri = null;
-        if (getIntent() != null) {
-            //有intent或者scheme
-            if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
-                //判断是百度渠道
-                if (getIntent() != null && getIntent().hasExtra(MemberSdkConstants.BOTAPP_OPEN_PARAMS_ACTIVE_INFO)) {
-                    String infoData = getIntent().getStringExtra(MemberSdkConstants.BOTAPP_OPEN_PARAMS_ACTIVE_INFO);
-                    MemberSdkManager.getInstance().setShowParameter(infoData);
-                }
-                if (getIntent().getStringExtra("url") != null && !getIntent().getStringExtra("url").equals("")) {
-                    getIntentUri = Uri.parse(getIntent().getStringExtra("url"));
-                }
-                //efunbox://com.edufound.reader/main?resid=11132
-            } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
-                //天猫渠道
-                getIntentUri = getIntent().getData();
-
-            }
-        }
-        //efunbox://com.edufound.reader/main?exampleId=103126003&backModel=home&type=typeA (直接去朗读页面参数)
-        //efunbox://com.edufound.reader/main?userReadId=1610706272358766&type=typeB (根据id把视频提前)
-//        getIntentUri = Uri.parse("efunbox://com.edufound.reader/main?userReadId=1610706272358766&backModel=home&type=typeB");
-
-        //判断获取的uri是不是空的
-        if (getIntentUri != null) {
-            String type = getIntentUri.getQueryParameter("type");
-            if (getIntentUri.getQueryParameter("type") != null) {
-                if (type.equals(ThroughType.TYPEA.getTypeCode())) {
-                    //typeA类型，直接进入朗读界面
-                    Logger.e("进入了TypeA类型");
-                    ThroughUtil.mThroughTypeA = new ThroughTypeA();
-                    ThroughUtil.mThroughType = ThroughType.TYPEA;
-                    ThroughUtil.mThroughTypeA.setExampleId(getIntentUri.getQueryParameter("exampleId"));
-                    //backModel只有app和home两个值，app是直接退出应用，home是返回首页
-                    ThroughUtil.mThroughTypeA.setBackModel(getIntentUri.getQueryParameter("backModel"));
-                    toNextActivity(RecordActivity.class);
-                } else if (type.equals(ThroughType.TYPEB.getTypeCode())) {
-                    Logger.e("进入了TypeB类型");
-                    //把收到的ID视频提到第一个
-//                    ThroughUtil.mThroughTypeB = new ThroughTypeB();
-//                    ThroughUtil.mThroughType = ThroughType.TYPEB;
-//                    ThroughUtil.mThroughTypeB.setUserReadId(getIntentUri.getQueryParameter("userReadId"));
-                }
-            }
-
-
-        }
-
-
     }
 
 
@@ -295,7 +240,7 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
             public void run() {
                 ((RadioButton) mRadioGroupTab.getChildAt(defaultIndex)).setChecked(true);
             }
-        }, 200);
+        }, 50);
 
 //        ((RadioButton) mRadioGroupTab.getChildAt(defaultIndex)).performClick();
         mTabLayout.setVisibility(View.VISIBLE);
@@ -356,10 +301,6 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
 
     @Override
     protected void onAppScreenOff() {
-        if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())) {
-            //义方渠道在手机
-            testBg.setVisibility(View.VISIBLE);
-        }
         super.onAppScreenOff();
     }
 

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

@@ -26,6 +26,7 @@ import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.application.EApplication;
 import com.edufound.reader.base.BaseMvpActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
+import com.edufound.reader.bean.ThroughType;
 import com.edufound.reader.botsdk.BotRegisterListener;
 import com.edufound.reader.contract.RecordContract;
 import com.edufound.reader.cusview.CusToast;
@@ -35,6 +36,7 @@ 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.edufound.reader.util.ThroughUtil;
 import com.orhanobut.logger.Logger;
 
 import java.util.HashMap;
@@ -87,16 +89,14 @@ public class RecordActivity extends BaseMvpActivity<RecordPresenter> implements
         mJzVideoViwe.setCanPause(false);
         mJzVideoViwe.setHideAllUI(true);
         addUiClickListener(mBack, o -> {
-            if (mPresenter.getBackModel() == null || mPresenter.getBackModel().equals("") || mPresenter.getBackModel().equals("home")) {
-                mActivity.finish();
-            } else if (mPresenter.getBackModel().equals("app")) {
-
-                for (int i = 0; i < EApplication.mActivityList.size(); i++) {
-                    EApplication.mActivityList.get(i).finish();
+            if (ThroughUtil.mThroughTypeBean != null && ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPEA.getTypeCode())) {
+                if (mPresenter.getBackModel() == null || mPresenter.getBackModel().equals("") || mPresenter.getBackModel().equals("home")) {
+                    EApplication.reloadApp(-1);
+                } else if (mPresenter.getBackModel().equals("app")) {
+                    EApplication.killAppProcess(Consts.getmApplicAtion());
                 }
-                EApplication.killAppProcess(mActivity);
-                android.os.Process.killProcess(android.os.Process.myPid());
-
+            } else {
+                mActivity.finish();
             }
         });
         addUiClickListener(mMikeIcon, o -> {
@@ -116,7 +116,7 @@ public class RecordActivity extends BaseMvpActivity<RecordPresenter> implements
                 }
                 return;
             } else {
-                if (EfunboxUtil.checkLogin(mActivity,getRootView())) {
+                if (EfunboxUtil.checkLogin(mActivity, getRootView())) {
                     if (EfunboxUtil.checkIsVip()) {
                         if (isRecordNow) {
                             refRecordStatus();

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

@@ -10,12 +10,15 @@ import com.edufound.reader.R;
 import com.edufound.reader.annotation.BindView;
 import com.edufound.reader.application.EApplication;
 import com.edufound.reader.base.BaseMvpActivity;
+import com.edufound.reader.bean.ThroughType;
 import com.edufound.reader.contract.SmallFullVideoContract;
 import com.edufound.reader.model.MyCollectionModel;
 import com.edufound.reader.model.MyFollowModel;
 import com.edufound.reader.presenter.SmallFullVideoPresenter;
 import com.edufound.reader.receiver.BackPageReceiver;
+import com.edufound.reader.util.Consts;
 import com.edufound.reader.util.MMKVUtil;
+import com.edufound.reader.util.ThroughUtil;
 import com.orhanobut.logger.Logger;
 
 public class SmallFullVideoActivity extends BaseMvpActivity<SmallFullVideoPresenter> implements SmallFullVideoContract.View {
@@ -39,23 +42,41 @@ public class SmallFullVideoActivity extends BaseMvpActivity<SmallFullVideoPresen
         mPresenter = new SmallFullVideoPresenter(getSupportFragmentManager());
         mPresenter.attachView(this);
         addUiClickListener(mBack, o -> {
+            if (ThroughUtil.mThroughTypeBean != null && ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPEC.getTypeCode())) {
+                String backModel = ThroughUtil.mThroughTypeBean.getBackModel();
+                if (backModel.equals("home")) {
+                    EApplication.reloadApp(-1);
+                } else if (backModel.equals("app")) {
+                    EApplication.killAppProcess(Consts.getmApplicAtion());
+                }
+                return;
+            }
             if (into_Page.equals("MyCollection")) {
                 Intent i = new Intent();
                 setResult(MyCollectionModel.ACTIVITY_BACK_RESULT, i);
             }
             mActivity.finish();
         });
-        Bundle params = getIntent().getBundleExtra("params_bundle");
-        int index = Integer.valueOf(params.getString("index"));
-        into_Page = params.getString("intoPage");
-        String dataJson = params.getString("dataJson");
-        if (dataJson.equals("getmmkv")) {
-            dataJson = MMKVUtil.getInstance().decodeString("video_data");
+
+        if (ThroughUtil.mThroughTypeBean != null) {
+            if (ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPEC.getTypeCode())) {
+                //直接通过外部穿透进来的。要请求数据,测试id  1654047320268005
+                mPresenter.getReadInfo(ThroughUtil.mThroughTypeBean.getUserReadId());
+                into_Page = "default";
+            }
+        } else {
+            Bundle params = getIntent().getBundleExtra("params_bundle");
+            into_Page = params.getString("intoPage");
+            String dataJson = params.getString("dataJson");
+            if (dataJson.equals("getmmkv")) {
+                dataJson = MMKVUtil.getInstance().decodeString("video_data");
+            }
+            initPage(params.getString("index"), dataJson);
         }
-        mPresenter.setInfoPage(into_Page);
+
         BackPageReceiver.registerReceiver(this, BackPageReceiver.BACK_HOME_REF_VIDEO_ITEM);
         BackPageReceiver.registerBackPageReceiverListener(backListener);
-        mPresenter.initFragment(index, dataJson);
+
     }
 
     @Override
@@ -101,8 +122,12 @@ public class SmallFullVideoActivity extends BaseMvpActivity<SmallFullVideoPresen
 
     @Override
     protected void onDestroy() {
+        Logger.e("播放页面被关了");
         MMKVUtil.getInstance().removeKey("video_data");
         BackPageReceiver.unRegisterReceiver(this);
+        if (ThroughUtil.mThroughTypeBean != null && ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPEC.getTypeCode())) {
+            ThroughUtil.mThroughTypeBean = null;
+        }
         mPresenter.activityDestory();
         super.onDestroy();
     }
@@ -127,11 +152,12 @@ public class SmallFullVideoActivity extends BaseMvpActivity<SmallFullVideoPresen
     @Override
     protected void onScreenUserPresent() {
         super.onScreenUserPresent();
-        for (int i = 0; i < EApplication.mActivityList.size(); i++) {
-            EApplication.mActivityList.get(i).finish();
-        }
-        Intent intent = new Intent(getActivity(), MainActivity.class);
-        intent.putExtra("defaultIndex", 2);
-        startActivity(intent);
+        EApplication.reloadApp(2);
+    }
+
+    @Override
+    public void initPage(String index, String dataJson) {
+        mPresenter.setInfoPage(into_Page);
+        mPresenter.initFragment(Integer.valueOf(index), dataJson);
     }
 }

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

@@ -0,0 +1,69 @@
+package com.edufound.reader.activity;
+
+import android.app.Activity;
+import android.graphics.drawable.BitmapDrawable;
+
+import com.edufound.reader.R;
+import com.edufound.reader.base.BaseMvpActivity;
+import com.edufound.reader.contract.SplashContract;
+import com.edufound.reader.presenter.SplashPresenter;
+import com.orhanobut.logger.Logger;
+
+public class SplashActivity extends BaseMvpActivity<SplashPresenter> implements SplashContract.View {
+    Activity mActivity;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_splash;
+    }
+
+    @Override
+    public void initView() {
+        mActivity = this;
+        mPresenter = new SplashPresenter();
+        mPresenter.attachView(this);
+        mPresenter.getUserInfo(getIntent());
+    }
+
+    @Override
+    public void onGetDisconnect() {
+
+    }
+
+    @Override
+    public void onGetMobileConnect() {
+
+    }
+
+    @Override
+    public void onGetWifiConnect() {
+
+    }
+
+    @Override
+    public void showLoading() {
+
+    }
+
+    @Override
+    public void hideLoading() {
+
+    }
+
+    @Override
+    public void onError(String errMessage) {
+
+    }
+
+    @Override
+    public Activity getActivity() {
+        return mActivity;
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        Logger.e("splash被关闭了");
+        mPresenter.detachView();
+    }
+}

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

@@ -370,11 +370,7 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
 
     @Override
     public void loginOutSuccess() {
-        for (int i = 0; i < EApplication.mActivityList.size(); i++) {
-            EApplication.mActivityList.get(i).finish();
-        }
-        Intent intent = new Intent(getActivity(), MainActivity.class);
-        startActivity(intent);
+        EApplication.reloadApp(-1);
     }
 
     @Override

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

@@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import com.edufound.reader.R;
 import com.edufound.reader.bean.UserRecordBean;
 import com.edufound.reader.util.Consts;
+import com.orhanobut.logger.Logger;
 
 import java.util.List;
 
@@ -23,6 +24,7 @@ public class RankListItemAdapter extends RecyclerView.Adapter<RankListViewHoler>
     LayoutInflater mLayoutInflater;
     List<UserRecordBean> mListData;
     CallbackUserNum mCallBack;
+    boolean getMyRank = false;
 
     public RankListItemAdapter(Context context, List<UserRecordBean> listData) {
         mContext = context;
@@ -72,10 +74,12 @@ public class RankListItemAdapter extends RecyclerView.Adapter<RankListViewHoler>
         holder.mThumb.setText(mListData.get(position).getUserRead().getLikeAmount());
         holder.mCollection.setText(mListData.get(position).getUserRead().getFavoritesAmount());
         holder.mScore.setText(mListData.get(position).getUserRead().getScore());
-        if (mListData.get(position).getUser().getUid().equals(Consts.getUID())) {
+        if (getMyRank == false && mListData.get(position).getUser().getUid().equals(Consts.getUID())) {
             //获取到自己的uid了。看看在第几名
             if (mCallBack != null) {
-                mCallBack.CallBack(position);
+                getMyRank = true;
+                Logger.e("position:" + position);
+                mCallBack.CallBack(mListData.get(position).getUserRead(), position);
             }
         }
     }
@@ -91,7 +95,7 @@ public class RankListItemAdapter extends RecyclerView.Adapter<RankListViewHoler>
     }
 
     public interface CallbackUserNum {
-        void CallBack(int number);
+        void CallBack(UserRecordBean.UserRead bean, int position);
     }
 }
 

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

@@ -18,6 +18,7 @@ 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.activity.MainActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.botsdk.BotConstants;
 import com.edufound.reader.botsdk.BotMessageListener;
@@ -125,6 +126,9 @@ public class EApplication extends Application {
 
 
     public static void killAppProcess(Context context) {
+        for (int i = 0; i < EApplication.mActivityList.size(); i++) {
+            EApplication.mActivityList.get(i).finish();
+        }
         //注意：不能先杀掉主进程，否则逻辑代码无法继续执行，需先杀掉相关进程最后杀掉主进程
         MobclickAgent.onKillProcess(context.getApplicationContext());
         ActivityManager mActivityManager = (ActivityManager) context.getSystemService(Context.ACTIVITY_SERVICE);
@@ -283,4 +287,15 @@ public class EApplication extends Application {
         }
         return appkey;
     }
+
+    public static void reloadApp(int defaultIndex) {
+        for (int i = 0; i < EApplication.mActivityList.size(); i++) {
+            EApplication.mActivityList.get(i).finish();
+        }
+        Intent intent = new Intent(Consts.getmApplicAtion(), MainActivity.class);
+        if (defaultIndex != -1) {
+            intent.putExtra("defaultIndex", defaultIndex);
+        }
+        Consts.getmApplicAtion().startActivity(intent);
+    }
 }

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

@@ -2,16 +2,25 @@ package com.edufound.reader.bean;
 
 public enum ThroughType {
     TYPEA {
+        /**
+         * 直接进入朗读界面
+         * */
         public String getTypeCode() {//枚举对象实现抽象方法
             return "typeA";
         }
     },
     TYPEB {
+        /**
+         * 把传输的id视频提到第一位
+         * */
         public String getTypeCode() {//枚举对象实现抽象方法
             return "typeB";
         }
     },
     TYPEC {
+        /**
+         * 直接进入小窗口播放界面
+         * */
         public String getTypeCode() {//枚举对象实现抽象方法
             return "typeC";
         }

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

@@ -1,27 +0,0 @@
-package com.edufound.reader.bean;
-
-/**
- * 通过scheme或者intent打开应用透传参数进行相应操作（Type=A）
- * 直接进入朗读页面
- * */
-public class ThroughTypeA {
-
-    private String exampleId;
-    private String backModel;
-
-    public String getExampleId() {
-        return exampleId;
-    }
-
-    public void setExampleId(String exampleId) {
-        this.exampleId = exampleId;
-    }
-
-    public String getBackModel() {
-        return backModel;
-    }
-
-    public void setBackModel(String backModel) {
-        this.backModel = backModel;
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.edufound.reader.bean;
-
-/**
- * 通过scheme或者intent打开应用透传参数进行相应操作（Type=B）
- * 进入首页，把收到的id在list里面循环找到提到第一位
- * */
-public class ThroughTypeB {
-
-    private String userReadId;
-
-    public String getUserReadId() {
-        return userReadId;
-    }
-
-    public void setUserReadId(String userReadId) {
-        this.userReadId = userReadId;
-    }
-}

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

@@ -0,0 +1,54 @@
+package com.edufound.reader.bean;
+
+/**
+ * 通过scheme或者intent打开应用透传参数进行相应操作（Type=A）
+ * 直接进入朗读页面
+ */
+public class ThroughTypeBean {
+
+    private String exampleId;
+    private String backModel;
+    private String backDefaultIndex;
+    private String userReadId;
+    private String mThroughType;
+
+    public String getUserReadId() {
+        return userReadId;
+    }
+
+    public void setUserReadId(String userReadId) {
+        this.userReadId = userReadId;
+    }
+
+    public String getExampleId() {
+        return exampleId;
+    }
+
+    public void setExampleId(String exampleId) {
+        this.exampleId = exampleId;
+    }
+
+    public String getBackModel() {
+        return backModel;
+    }
+
+    public void setBackModel(String backModel) {
+        this.backModel = backModel;
+    }
+
+    public String getBackDefaultIndex() {
+        return backDefaultIndex;
+    }
+
+    public void setBackDefaultIndex(String backDefaultIndex) {
+        this.backDefaultIndex = backDefaultIndex;
+    }
+
+    public String getmThroughType() {
+        return mThroughType;
+    }
+
+    public void setmThroughType(String mThroughType) {
+        this.mThroughType = mThroughType;
+    }
+}

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

@@ -1,12 +1,18 @@
 package com.edufound.reader.contract;
 
+import android.app.Activity;
+
 import com.edufound.reader.base.BaseView;
+import com.okhttplib.callback.Callback;
 
 public interface SmallFullVideoContract {
     interface Model {
+        void getReadInfo(Activity activity, String recordId, Callback callback);
     }
 
     interface View extends BaseView {
+
+        void initPage(String index,String dataJson);
     }
 
     interface Presenter {
@@ -17,5 +23,7 @@ public interface SmallFullVideoContract {
         void setInfoPage(String page);
 
         void refRecordById(String id);
+
+        void getReadInfo(String id);
     }
 }

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

@@ -0,0 +1,17 @@
+package com.edufound.reader.contract;
+
+import android.content.Intent;
+
+import com.edufound.reader.base.BaseView;
+
+public interface SplashContract {
+    interface Model {
+    }
+
+    interface View extends BaseView {
+    }
+
+    interface Presenter {
+        void getUserInfo(Intent intent);
+    }
+}

app/src/main/java/com/edufound/reader/cusview/ModelViewA.java

@@ -10,6 +10,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -41,6 +42,7 @@ public class ModelViewA extends FrameLayout {
     }
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(SizeUtils.dp2px(mContext, 428)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);

app/src/main/java/com/edufound/reader/cusview/ModelViewB.java

@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.edufound.reader.R;
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -53,6 +54,7 @@ public class ModelViewB extends FrameLayout {
 
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         LayoutParams layoutParams = new LayoutParams(SizeUtils.dp2px(mContext, 644)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);

app/src/main/java/com/edufound/reader/cusview/ModelViewC.java

@@ -76,6 +76,7 @@ public class ModelViewC extends FrameLayout {
     }
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         LayoutParams layoutParams = new LayoutParams(SizeUtils.dp2px(mContext, 428)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);
@@ -141,6 +142,7 @@ public class ModelViewC extends FrameLayout {
         @NonNull
         @Override
         public ModelViewCViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            EfunboxUtil.initDesignSize(mContext);
             return new ModelViewCViewHolder(mLayoutInflater.inflate(R.layout.adapter_item_cusview_model_view_c, parent, false));
         }
 

app/src/main/java/com/edufound/reader/cusview/ModelViewD.java

@@ -16,6 +16,7 @@ import androidx.annotation.Nullable;
 
 import com.edufound.reader.R;
 import com.edufound.reader.bean.ModelBean;
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -50,6 +51,7 @@ public class ModelViewD extends FrameLayout {
     }
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         LayoutParams layoutParams = new LayoutParams(SizeUtils.dp2px(mContext, 644)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);

app/src/main/java/com/edufound/reader/cusview/ModelViewE.java

@@ -22,6 +22,7 @@ import com.edufound.reader.R;
 import com.edufound.reader.bean.ExampleBean;
 import com.edufound.reader.bean.ModelBean;
 import com.edufound.reader.bean.UserRecordBean;
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -69,6 +70,7 @@ public class ModelViewE extends FrameLayout {
 
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         LayoutParams layoutParams = new LayoutParams(SizeUtils.dp2px(mContext, 428)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);
@@ -140,6 +142,7 @@ public class ModelViewE extends FrameLayout {
         @NonNull
         @Override
         public ModelViewEViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+            EfunboxUtil.initDesignSize(mContext);
             return new ModelViewEViewHolder(mLayoutInflater.inflate(R.layout.adapter_item_cusview_model_view_c, parent, false));
         }
 

app/src/main/java/com/edufound/reader/cusview/ModelViewF.java

@@ -18,6 +18,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.edufound.reader.R;
 import com.edufound.reader.bean.ModelBean;
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -52,6 +53,7 @@ public class ModelViewF extends FrameLayout {
     }
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(SizeUtils.dp2px(mContext, 428)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);

app/src/main/java/com/edufound/reader/cusview/ModelViewG.java

@@ -18,6 +18,7 @@ import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.edufound.reader.R;
 import com.edufound.reader.bean.ModelBean;
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -47,6 +48,7 @@ public class ModelViewG extends FrameLayout {
     }
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         FrameLayout.LayoutParams layoutParams = new FrameLayout.LayoutParams(SizeUtils.dp2px(mContext, 428)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);

app/src/main/java/com/edufound/reader/cusview/ModelViewWidthA.java

@@ -9,6 +9,7 @@ import android.widget.ImageView;
 
 import androidx.annotation.Nullable;
 
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.GlideUtils;
 import com.edufound.reader.util.SizeUtils;
 import com.jakewharton.rxbinding4.view.RxView;
@@ -40,6 +41,7 @@ public class ModelViewWidthA extends ModelViewA {
     }
 
     public void initView() {
+        EfunboxUtil.initDesignSize(mContext);
         LayoutParams layoutParams = new LayoutParams(SizeUtils.dp2px(mContext, 642)
                 , SizeUtils.dp2px(mContext, 598));
         this.setLayoutParams(layoutParams);

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

@@ -83,6 +83,7 @@ public class CharacterFragment extends BaseMvpFragment<CharacterFragmentPresente
     @RequiresApi(api = Build.VERSION_CODES.M)
     @Override
     protected void initViewListener() {
+
         RxView.scrollChangeEvents(mScrollView).subscribe(viewScrollChangeEvent -> {
             if (mBottomView.getLocalVisibleRect(mScreenRect)) {
                 if (isNeedLoad) {

app/src/main/java/com/edufound/reader/model/SmallFullVideoModel.java

@@ -1,6 +1,18 @@
 package com.edufound.reader.model;
 
+import android.app.Activity;
+
 import com.edufound.reader.contract.SmallFullVideoContract;
+import com.edufound.reader.util.Consts;
+import com.edufound.reader.util.OkHttpClient;
+import com.okhttplib.HttpInfo;
+import com.okhttplib.callback.Callback;
 
 public class SmallFullVideoModel implements SmallFullVideoContract.Model {
+    private final String API = Consts.getFinalApi();
+
+    @Override
+    public void getReadInfo(Activity activity, String recordId, Callback callback) {
+        OkHttpClient.doGetAsync(activity, new HttpInfo.Builder().setUrl(API + "/userRead/readInfo/" + recordId + ""), callback);
+    }
 }

app/src/main/java/com/edufound/reader/model/SplashModel.java

@@ -0,0 +1,6 @@
+package com.edufound.reader.model;
+
+import com.edufound.reader.contract.SplashContract;
+
+public class SplashModel implements SplashContract.Model {
+}

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

@@ -238,12 +238,7 @@ public class PopWindowPresneter {
                                                 public void onClick(View view) {
                                                     PopWindowUtil.hidePopupWindow();
 //                                                    Toast.makeText(context, "去听听（首页->我的tab）", Toast.LENGTH_SHORT).show();
-                                                    for (int i = 0; i < EApplication.mActivityList.size(); i++) {
-                                                        EApplication.mActivityList.get(i).finish();
-                                                    }
-                                                    Intent intent = new Intent(activity, MainActivity.class);
-                                                    intent.putExtra("defaultIndex", 0);
-                                                    activity.startActivity(intent);
+                                                    EApplication.reloadApp(0);
                                                 }
                                             });
                                         }
@@ -431,26 +426,25 @@ public class PopWindowPresneter {
                     recyclerView.setLayoutManager(linearLayoutManager);
                     recyclerView.setAdapter(adapter);
                     FrameLayout myInfoLayout = dialog_view.findViewById(R.id.popupwindow_ranklist_myinfo_layout);
-                    if (bean.getData().getMyRank() == null) {
-                        myInfoLayout.setVisibility(View.GONE);
-                    } else {
-                        TextView myNum = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_num);
-                        TextView myName = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_name);
-                        TextView myThumb = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_thumb);
-                        TextView myCollection = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_collection);
-                        TextView myScore = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_score);
-                        myName.setText("我自己");
-                        myThumb.setText(bean.getData().getMyRank().getLikeAmount());
-                        myCollection.setText(bean.getData().getMyRank().getFavoritesAmount());
-                        myScore.setText(bean.getData().getMyRank().getScore());
-                        adapter.setCallBack(new RankListItemAdapter.CallbackUserNum() {
-                            @Override
-                            public void CallBack(int number) {
-                                Logger.e("找到自己了：" + number);
-                                myNum.setText((number + 1) + "");
-                            }
-                        });
-                    }
+                    TextView myNum = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_num);
+                    TextView myName = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_name);
+                    TextView myThumb = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_thumb);
+                    TextView myCollection = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_collection);
+                    TextView myScore = dialog_view.findViewById(R.id.popupwindow_show_ranklist_my_score);
+                    myInfoLayout.setVisibility(View.GONE);
+
+                    adapter.setCallBack(new RankListItemAdapter.CallbackUserNum() {
+                        @Override
+                        public void CallBack(UserRecordBean.UserRead bean, int position) {
+                            myInfoLayout.setVisibility(View.VISIBLE);
+                            myName.setText("我自己");
+                            myNum.setText((position + 1) + "");
+                            myThumb.setText(bean.getLikeAmount());
+                            myCollection.setText(bean.getFavoritesAmount());
+                            myScore.setText(bean.getScore());
+                        }
+
+                    });
                 } else {
                     LinearLayout recyParent = dialog_view.findViewById(R.id.popupwindow_ranklist_recyclerview_layout);
                     recyParent.setVisibility(View.GONE);

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

@@ -276,11 +276,11 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
             public void onSuccess(HttpInfo info) throws IOException {
                 HttpResultBean<HttpResultDataListBean<UserRecordBean>> bean = info.getRetDetail(new TypeToken<HttpResultBean<HttpResultDataListBean<UserRecordBean>>>() {
                 }.getType());
-                if (ThroughUtil.mThroughType != null && ThroughUtil.mThroughType.equals(ThroughType.TYPEB)) {
+                if (ThroughUtil.mThroughTypeBean != null && ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPEB.getTypeCode())) {
                     //要根据ID获取视频并且放到第一个
                     for (int i = 0; i < bean.getData().getList().size(); i++) {
                         Logger.e("bean.getData().getList().get(i).getUserRead().getId():" + bean.getData().getList().get(i).getUserRead().getId());
-                        if (bean.getData().getList().get(i).getUserRead().getId().equals(ThroughUtil.mThroughTypeB.getUserReadId())) {
+                        if (bean.getData().getList().get(i).getUserRead().getId().equals(ThroughUtil.mThroughTypeBean.getUserReadId())) {
                             //找到了。要放到第一个
                             Logger.e("找到了推荐视频。要放到第一个");
                             UserRecordBean upbbean = bean.getData().getList().get(i);

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

@@ -89,9 +89,9 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
 
     @Override
     public void getReadInfo(Intent intent) {
-        if (ThroughUtil.mThroughType != null && ThroughUtil.mThroughType.equals(ThroughType.TYPEA)) {
-            mReadId = ThroughUtil.mThroughTypeA.getExampleId();
-            backModel = ThroughUtil.mThroughTypeA.getBackModel();
+        if (ThroughUtil.mThroughTypeBean != null && ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPEA.getTypeCode())) {
+            mReadId = ThroughUtil.mThroughTypeBean.getExampleId();
+            backModel = ThroughUtil.mThroughTypeBean.getBackModel();
         } else {
             Bundle bundle = intent.getBundleExtra("params_bundle");
             if (bundle != null) {
@@ -236,10 +236,8 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
 
     @Override
     public void activityDestroy() {
-        if (ThroughUtil.mThroughType != null) {
-            ThroughUtil.mThroughType = null;
-            ThroughUtil.mThroughTypeA = null;
-            ThroughUtil.mThroughTypeB = null;
+        if (ThroughUtil.mThroughTypeBean != null && ThroughUtil.mThroughTypeBean.getmThroughType().equals(ThroughType.TYPEA.getTypeCode())) {
+            ThroughUtil.mThroughTypeBean = null;
         }
         mView.getJZVideoView().pauseVideo();
         mRecordServices.stopRecord();

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

@@ -4,14 +4,26 @@ import android.view.KeyEvent;
 
 import com.edufound.reader.R;
 import com.edufound.reader.base.BasePresenter;
+import com.edufound.reader.bean.HttpResultBean;
+import com.edufound.reader.bean.HttpResultDataListBean;
+import com.edufound.reader.bean.RecordResultBean;
+import com.edufound.reader.bean.UserRecordBean;
 import com.edufound.reader.contract.SmallFullVideoContract;
 import com.edufound.reader.fragment.RecommendFragment;
 import com.edufound.reader.model.SmallFullVideoModel;
 import com.edufound.reader.receiver.BackPageReceiver;
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import com.okhttplib.HttpInfo;
+import com.okhttplib.callback.Callback;
 
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 public class SmallFullVideoPresenter extends BasePresenter<SmallFullVideoContract.View> implements SmallFullVideoContract.Presenter {
 
     SmallFullVideoModel mModel;
@@ -59,6 +71,27 @@ public class SmallFullVideoPresenter extends BasePresenter<SmallFullVideoContrac
         mRecommendFragment.getPresenter().getRecordInfoById(id);
     }
 
+    @Override
+    public void getReadInfo(String id) {
+        mModel.getReadInfo(mView.getActivity(), id, new Callback() {
+            @Override
+            public void onSuccess(HttpInfo info) throws IOException {
+                HttpResultBean<UserRecordBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserRecordBean>>() {
+                }.getType());
+                if (bean.getSuccess() && bean.getCode().equals("200")) {
+                    List<UserRecordBean> listbean = new ArrayList<>();
+                    listbean.add(bean.getData());
+                    mView.initPage("0", new Gson().toJson(listbean));
+                }
+            }
+
+            @Override
+            public void onFailure(HttpInfo info) throws IOException {
+
+            }
+        });
+    }
+
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         switch (keyCode) {
             case KeyEvent.KEYCODE_BACK:

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

@@ -0,0 +1,227 @@
+package com.edufound.reader.presenter;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.baidu.duer.membersdk.MemberSdkManager;
+import com.baidu.duer.membersdk.constant.MemberSdkConstants;
+import com.edufound.reader.activity.MainActivity;
+import com.edufound.reader.activity.RecordActivity;
+import com.edufound.reader.activity.SmallFullVideoActivity;
+import com.edufound.reader.apiserver.ActivityEventServerImpl;
+import com.edufound.reader.apiserver.OrderApiServerImpl;
+import com.edufound.reader.apiserver.UserApiServerImpl;
+import com.edufound.reader.base.BaseActivity;
+import com.edufound.reader.base.BasePresenter;
+import com.edufound.reader.bean.ActivityEventBean;
+import com.edufound.reader.bean.ChannelCodeEnum;
+import com.edufound.reader.bean.HttpResultBean;
+import com.edufound.reader.bean.SignBean;
+import com.edufound.reader.bean.ThroughType;
+import com.edufound.reader.bean.ThroughTypeBean;
+import com.edufound.reader.bean.UserBean;
+import com.edufound.reader.contract.SplashContract;
+import com.edufound.reader.cusview.CusToast;
+import com.edufound.reader.listener.PopUtilClickListener;
+import com.edufound.reader.popwindow.PopWindowUtil;
+import com.edufound.reader.util.Consts;
+import com.edufound.reader.util.DeviceUuidFactory;
+import com.edufound.reader.util.EfunboxUtil;
+import com.edufound.reader.util.MMKVEncodeKey;
+import com.edufound.reader.util.MMKVUtil;
+import com.edufound.reader.util.ThroughUtil;
+import com.google.gson.reflect.TypeToken;
+import com.okhttplib.HttpInfo;
+import com.okhttplib.callback.Callback;
+import com.orhanobut.logger.Logger;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.IOException;
+
+public class SplashPresenter extends BasePresenter implements SplashContract.Presenter {
+
+    UserApiServerImpl mUserApi;
+    OrderApiServerImpl mOrderApi;
+    ActivityEventServerImpl mEventApi;
+
+    public SplashPresenter() {
+        mUserApi = new UserApiServerImpl();
+        mOrderApi = new OrderApiServerImpl();
+        mEventApi = new ActivityEventServerImpl();
+    }
+
+    private void getScheme(Intent intent) {
+        Uri getIntentUri = null;
+        if (intent != null) {
+            //有intent或者scheme
+            if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+                //判断是百度渠道
+                if (intent != null && intent.hasExtra(MemberSdkConstants.BOTAPP_OPEN_PARAMS_ACTIVE_INFO)) {
+                    String infoData = intent.getStringExtra(MemberSdkConstants.BOTAPP_OPEN_PARAMS_ACTIVE_INFO);
+                    MemberSdkManager.getInstance().setShowParameter(infoData);
+                }
+                if (intent.getStringExtra("url") != null && !intent.getStringExtra("url").equals("")) {
+                    getIntentUri = Uri.parse(intent.getStringExtra("url"));
+                }
+                //efunbox://com.edufound.reader/splash?resid=11132
+            } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
+                //天猫渠道
+                getIntentUri = intent.getData();
+
+            }
+        }
+        //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把视频提前)
+//        getIntentUri = Uri.parse("efunbox://com.edufound.reader/splash?exampleId=103126003&backModel=home&type=typeA");
+
+        //判断获取的uri是不是空的
+        if (getIntentUri != null) {
+            String type = getIntentUri.getQueryParameter("type");
+            if (getIntentUri.getQueryParameter("type") != null) {
+                ThroughUtil.mThroughTypeBean = new ThroughTypeBean();
+                if (type.equals(ThroughType.TYPEA.getTypeCode())) {
+                    //typeA类型，直接进入朗读界面
+                    Logger.e("进入了TypeA类型");
+                    ThroughUtil.mThroughTypeBean.setmThroughType(ThroughType.TYPEA.getTypeCode());
+                    ThroughUtil.mThroughTypeBean.setExampleId(getIntentUri.getQueryParameter("exampleId"));
+                    //backModel只有app和home两个值，app是直接退出应用，home是返回首页
+                    ThroughUtil.mThroughTypeBean.setBackModel(getIntentUri.getQueryParameter("backModel"));
+                    Logger.e("getIntentUri.getQueryParameter(\"exampleId\"):" + getIntentUri.getQueryParameter("exampleId"));
+                    Logger.e("getIntentUri.getQueryParameter(\"backModel\"):" + getIntentUri.getQueryParameter("backModel"));
+                    //暂时还没处理defaultIndex
+//                    String defaultIndex = getIntentUri.getQueryParameter("backDefaultIndex");
+//                    if (!TextUtils.isEmpty(defaultIndex)) {
+//                        ThroughUtil.mThroughTypeBean.setBackDefaultIndex(getIntentUri.getQueryParameter("backDefaultIndex"));
+//                    } else {
+//                        ThroughUtil.mThroughTypeBean.setBackDefaultIndex("0");
+//                    }
+                    ((BaseActivity) mView.getActivity()).toNextActivity(RecordActivity.class);
+
+                } else if (type.equals(ThroughType.TYPEB.getTypeCode())) {
+                    Logger.e("进入了TypeB类型");
+                    //把收到的ID视频提到第一个
+                    ThroughUtil.mThroughTypeBean.setmThroughType(ThroughType.TYPEB.getTypeCode());
+                    ThroughUtil.mThroughTypeBean.setUserReadId(getIntentUri.getQueryParameter("userReadId"));
+                } else if (type.equals(ThroughType.TYPEC.getTypeCode())) {
+                    ThroughUtil.mThroughTypeBean.setmThroughType(ThroughType.TYPEC.getTypeCode());
+                    ThroughUtil.mThroughTypeBean.setUserReadId(getIntentUri.getQueryParameter("userReadId"));
+                    ThroughUtil.mThroughTypeBean.setBackModel(getIntentUri.getQueryParameter("backModel"));
+                    ((BaseActivity) mView.getActivity()).toNextActivity(SmallFullVideoActivity.class);
+                }
+            }
+
+
+        } else {
+            //如果什么都没有得到，就默认跳转首页
+            ((BaseActivity) mView.getActivity()).toNextActivity(MainActivity.class);
+        }
+        mView.getActivity().finish();
+    }
+
+
+    public void getUserInfo(Intent intent) {
+        mUserApi.isLogin(mView.getActivity(), DeviceUuidFactory.getUuid(), new Callback() {
+            @Override
+            public void onSuccess(HttpInfo info) throws IOException {
+                try {
+                    JSONObject object = new JSONObject(info.getRetDetail());
+                    if (object.getString("code").equals("300") || object.getInt("code") == 300) {
+                        //没有用户数据
+                        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");
+                        getYFVip();
+                    } else {
+                        HttpResultBean<UserBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserBean>>() {
+                        }.getType());
+                        Consts.setUID(bean.getData().getUid());
+                        //用户是否登录,登录了，创建Consts的userbean
+                        Consts.setmConstsUserBean(bean.getData());
+                        mUserApi.loginSign(mView.getActivity(), new Callback() {
+                            @Override
+                            public void onSuccess(HttpInfo info) throws IOException {
+                                try {
+                                    HttpResultBean<SignBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<SignBean>>() {
+                                    }.getType());
+                                    if (bean.getData() != null) {
+                                        if (bean.getData().getIsSign()) {
+                                            CusToast.getInstance(mView.getActivity()).show("恭喜签到成功\n奖励" + bean.getData().getCount() + "朵小红花", 2000);
+                                        }
+                                    } else {
+                                        Logger.e("签到参数 isSign是空的");
+                                    }
+
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                } finally {
+                                    getYFVip();
+                                }
+
+                            }
+
+                            @Override
+                            public void onFailure(HttpInfo info) throws IOException {
+                                Logger.e("info:" + info.getRetDetail());
+                            }
+                        });
+                    }
+                } catch (JSONException e) {
+                    e.printStackTrace();
+                } finally {
+
+                    //无论如何最后走判断
+                    getScheme(intent);
+
+                }
+
+
+            }
+
+            @Override
+            public void onFailure(HttpInfo info) throws IOException {
+                if (TextUtils.isEmpty(MMKVUtil.getInstance().decodeString(MMKVEncodeKey.USER_GRADE))) {
+                    //没有选择过年纪，选择年纪
+//                    showSelectGradeWindow();
+                } else {
+                    //选择过年纪。无处理
+                }
+            }
+        });
+    }
+
+
+    private void getYFVip() {
+
+        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+            //不是百度渠道，检查是否是义方VIP
+            if (Consts.getmConstsUserBean() != null) {
+                mOrderApi.getAuth(mView.getActivity(), new Callback() {
+                    @Override
+                    public void onSuccess(HttpInfo info) throws IOException {
+                        HttpResultBean<String> bean = info.getRetDetail(new TypeToken<HttpResultBean<String>>() {
+                        }.getType());
+                        if (!TextUtils.isEmpty(bean.getData())) {
+                            Consts.setIsYFVip(true);
+                        }
+                    }
+
+                    @Override
+                    public void onFailure(HttpInfo info) throws IOException {
+
+                    }
+                });
+            }
+        }
+    }
+
+}

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

@@ -28,7 +28,7 @@ public class HorizontalItemDecoration extends RecyclerView.ItemDecoration {
             outRect.right = space / 2;
         } else if (position == totalCount - 1) {//最后一个
             outRect.left = space / 2;
-            outRect.right = space;
+            outRect.right = space * 3;
         } else {//中间其它的
             outRect.left = space / 2;
             outRect.right = space / 2;

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

@@ -1,12 +1,9 @@
 package com.edufound.reader.util;
 
 import com.edufound.reader.bean.ThroughType;
-import com.edufound.reader.bean.ThroughTypeA;
-import com.edufound.reader.bean.ThroughTypeB;
+import com.edufound.reader.bean.ThroughTypeBean;
 
 public class ThroughUtil {
 
-    public static ThroughType mThroughType;
-    public static ThroughTypeA mThroughTypeA;
-    public static ThroughTypeB mThroughTypeB;
+    public static ThroughTypeBean mThroughTypeBean;
 }

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

@@ -119,9 +119,4 @@
 
     </FrameLayout>
 
-    <ImageView
-        android:id="@+id/testbg"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/splash_bg"></ImageView>
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/splash_bg">
 
-</LinearLayout>
+</FrameLayout>

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

@@ -29,7 +29,7 @@
         android:layout_marginStart="15dp"
         android:text="春夏秋冬"
         android:textColor="#314051"
-        android:textSize="18dp"
+        android:textSize="22dp"
         app:layout_constraintBottom_toBottomOf="@+id/cusview_model_view_g_layout_item_icon"
         app:layout_constraintStart_toEndOf="@+id/cusview_model_view_g_layout_item_icon"
         app:layout_constraintTop_toTopOf="@+id/cusview_model_view_g_layout_item_icon"

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

@@ -49,7 +49,8 @@
             android:layout_height="wrap_content"
             android:maxLength="13"
             android:text="春夏秋冬"
-            android:textSize="26dp"
+            android:textColor="#333333"
+            android:textSize="22dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.05"

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

@@ -48,7 +48,8 @@
             android:layout_height="wrap_content"
             android:maxLength="6"
             android:text="春夏秋冬"
-            android:textSize="26dp"
+            android:textColor="#333333"
+            android:textSize="22dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.05"

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

@@ -133,7 +133,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="0dp"
                             android:layout_weight="1.5"
-                            android:background="@drawable/ranklist_my_bg">
+                            android:background="@drawable/ranklist_my_bg"
+                            android:visibility="invisible">
 
                             <LinearLayout
                                 android:layout_width="match_parent"
@@ -156,7 +157,7 @@
                                         android:layout_height="36dp"
                                         android:layout_gravity="center"
                                         android:text="1"
-                                        android:textColor="#333333"
+                                        android:textColor="#8D4C05"
                                         android:textSize="22dp"></TextView>
                                 </FrameLayout>
 
@@ -173,7 +174,7 @@
                                     android:layout_weight="3"
                                     android:gravity="center|left"
                                     android:text="昵称"
-                                    android:textColor="#333333"
+                                    android:textColor="#8D4C05"
                                     android:textSize="22dp"></TextView>
 
 
@@ -184,7 +185,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:text="点赞"
-                                    android:textColor="#333333"
+                                    android:textColor="#8D4C05"
                                     android:textSize="22dp"></TextView>
 
                                 <TextView
@@ -194,7 +195,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:text="收藏"
-                                    android:textColor="#333333"
+                                    android:textColor="#8D4C05"
                                     android:textSize="22dp"></TextView>
 
                                 <TextView
@@ -204,7 +205,7 @@
                                     android:layout_weight="1"
                                     android:gravity="center"
                                     android:text="成绩"
-                                    android:textColor="#333333"
+                                    android:textColor="#8D4C05"
                                     android:textSize="22dp"></TextView>
 
                                 <Space

app/src/main/res/values/themes.xml

@@ -8,7 +8,7 @@
         <!-- Customize your theme here. -->
     </style>
 
-    <style name="Theme.AppCompat.Light.NoActionBar.FullScreen" parent="@style/Theme.AppCompat.Light">
+    <style name="FullScreen" parent="@style/Theme.AppCompat.Light">
         <item name="windowNoTitle">true</item>
         <item name="android:windowFullscreen">true</item>
 
@@ -17,7 +17,8 @@
     <style name="AppStartTheme" parent="@style/Theme.AppCompat.Light">
         <item name="windowNoTitle">true</item>
         <item name="android:windowFullscreen">true</item>
-        <item name="android:windowBackground">@drawable/splash_bg</item>
+        <item name="android:windowIsTranslucent">false</item>
+        <item name="android:background">@drawable/splash_bg</item>
     </style>
 
 
@@ -31,7 +32,7 @@
         <item name="android:backgroundDimEnabled">true</item>
     </style>
 
-    <style name="efunboxTransparentLoginAlert" parent="@style/Theme.AppCompat.Light.NoActionBar.FullScreen">
+    <style name="efunboxTransparentLoginAlert" parent="@style/FullScreen">
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowBackground">@color/transparent</item>