1.修改穿透参数问题。

.idea/misc.xml

@@ -143,7 +143,7 @@
         <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.5" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_web.xml" value="0.2" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_myorder.xml" value="0.2913625304136253" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_popupwindow_myorder.xml" value="0.75" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/adapter_item_slidevideo.xml" value="0.2975260416666667" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/fragment_main_character.xml" value="0.2615571776155718" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/fragment_main_user.xml" value="0.67" />

app/build.gradle

@@ -14,8 +14,8 @@ android {
         applicationId "com.edufound.reader"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 3
-        versionName "1.3"
+        versionCode 5
+        versionName "1.5"
         flavorDimensions "versionCode"
         manifestPlaceholders = [UMENG_CHANNEL_VALUE: "2006"]//添加一个默认渠道号
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

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

@@ -90,7 +90,7 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
 
 
         Uri getIntentUri = null;
-        if (getIntent() != null && getIntent().getStringExtra("url") != null && !getIntent().getStringExtra("url").equals("")) {
+        if (getIntent() != null) {
             //有intent或者scheme
             if (Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
                 //判断是百度渠道
@@ -98,7 +98,9 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
                     String infoData = getIntent().getStringExtra(MemberSdkConstants.BOTAPP_OPEN_PARAMS_ACTIVE_INFO);
                     MemberSdkManager.getInstance().setShowParameter(infoData);
                 }
-                getIntentUri = Uri.parse(getIntent().getStringExtra("url"));
+                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())) {
                 //天猫渠道
@@ -106,9 +108,13 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
 
             }
         }
-//        getIntentUri = Uri.parse("efunbox://com.edufound.reader/main?pkg=com.edufound.reader&spm_url=a1z3lt.93871__5.113990__1__113993__3.1&src_page_id=32EBE680BE5914F6240E4CD941CA77B01650506084917&src_click_id=32EBE680BE5914F6240E4CD941CA77B01650506089830&exampleId=103126003&backModel=home&type=typeB");
+        //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) {
+            Logger.e("getIntentUri:" + getIntentUri);
             String type = getIntentUri.getQueryParameter("type");
             if (type.equals(ThroughType.TYPEA.getTypeCode())) {
                 //typeA类型，直接进入朗读界面
@@ -122,7 +128,7 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
                 //把收到的ID视频提到第一个
                 ThroughUtil.mThroughTypeB = new ThroughTypeB();
                 ThroughUtil.mThroughType = ThroughType.TYPEB;
-                ThroughUtil.mThroughTypeB.setExampleId(getIntentUri.getQueryParameter("exampleId"));
+                ThroughUtil.mThroughTypeB.setUserReadId(getIntentUri.getQueryParameter("userReadId"));
             }
 
         }

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

@@ -1,6 +1,7 @@
 package com.edufound.reader.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,6 +12,7 @@ import com.edufound.reader.R;
 import com.edufound.reader.bean.MyOrderListBean;
 import com.edufound.reader.util.TimeUtil;
 
+import java.text.DecimalFormat;
 import java.util.List;
 
 import androidx.annotation.NonNull;
@@ -39,12 +41,18 @@ public class PopupMyOrderAdapter extends RecyclerView.Adapter<MyOtderItemHolder>
 
     @Override
     public void onBindViewHolder(@NonNull MyOtderItemHolder holder, int position) {
+        DecimalFormat df = new DecimalFormat("########0.00");
         holder.mOrderTime.setText(String.valueOf(TimeUtil.timeStamp2Date(Long.valueOf(mListData.get(position).getGmtCreated()), null)));
         if (mListData.get(position).getPayStatus().equals("SUCCESS")) {
             holder.mOrderStatus.setText("支付成功");
         } else {
             holder.mOrderStatus.setText(mListData.get(position).getPayStatus());
         }
+        //voucherAmount
+        if (!TextUtils.isEmpty(mListData.get(position).getVoucherAmount())) {
+            holder.mVoucherAmount.setText("抵用券减¥" + df.format(Double.parseDouble(mListData.get(position).getVoucherAmount()) / 100));
+            holder.mVoucherAmount.setVisibility(View.VISIBLE);
+        }
 
         holder.mOrderName.setText(mListData.get(position).getTitle());
         holder.mOrderPayMoney.setText("实付金额：￥" + (mListData.get(position).getPrice() / 100f));
@@ -68,6 +76,7 @@ class MyOtderItemHolder extends RecyclerView.ViewHolder {
     TextView mOrderName;
     TextView mOrderStatus;
     TextView mOrderPayMoney;
+    TextView mVoucherAmount;
 
 
     public MyOtderItemHolder(@NonNull View itemView) {
@@ -76,5 +85,7 @@ class MyOtderItemHolder extends RecyclerView.ViewHolder {
         mOrderStatus = itemView.findViewById(R.id.popupwindow_myorder_status);
         mOrderName = itemView.findViewById(R.id.popupwindow_myorder_name);
         mOrderPayMoney = itemView.findViewById(R.id.popupwindow_myorder_paymoney);
+        mVoucherAmount = itemView.findViewById(R.id.popupwindow_myorder_voucherAmount);
+        mVoucherAmount.setVisibility(View.GONE);
     }
 }

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

@@ -101,9 +101,12 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
         boolean needTag = false;
         int tagType = -1;
         String tagText = "";
-        if (mListData.get(position).getUserRead().getTag().equals("READ") || mListData.get(position).getUserRead().getTag().equals("EXAMPLE")) {
-            //是用户朗读的和官方作品
+        if (!mListData.get(position).getUserRead().getTag().equals("ACTIVITY")) {
             needDanMu = true;
+
+        }
+        if (mListData.get(position).getUserRead().getTag().equals("READ")) {
+            //是用户朗读的和官方作品
             needTag = false;
             tagText = "";
 
@@ -119,30 +122,30 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
                     EfunboxUtil.toWebFlowerActivity(mContext);
                 }
             });
-            needDanMu = false;
             needTag = true;
             tagText = "活动";
             tagType = 1;
 
         } else if (mListData.get(position).getUserRead().getTag().equals("HOT")) {
             //热播作品
-            needDanMu = true;
-            needTag = false;
+            needTag = true;
             tagText = "热播";
             tagType = 2;
 
         } else if (mListData.get(position).getUserRead().getTag().equals("NEW")) {
             //新作品
-            needDanMu = true;
-            needTag = false;
+            needTag = true;
             tagText = "新作品";
             tagType = 3;
         } else if (mListData.get(position).getUserRead().getTag().equals("EXCELLENT")) {
             //优秀作品
-            needDanMu = true;
             needTag = true;
             tagText = "优秀作品";
             tagType = 4;
+        } else if (mListData.get(position).getUserRead().getTag().equals("EXAMPLE")) {
+            needTag = true;
+            tagText = "官方作品";
+            tagType = 5;
         }
 
         if (needDanMu) {
@@ -160,37 +163,31 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
                 }
             });
         }
-
         if (needTag) {
-//            // 判断是否是优秀视频type，然后增加tag标签
-//            TextView textView = new TextView(mContext);
-//            textView.setLayoutParams(new LinearLayout.LayoutParams(SizeUtils.dp2px(mContext, 200), LinearLayout.LayoutParams.MATCH_PARENT));
-//            textView.setText(tagText);
-//            //左上圆角
-//
-//            ShapeCreator.create()
-//                    .setCornerRadiusLT(50)
-//                    .setCornerRadiusRB(50)
-//                    .setSolidColor(mContext.getResources().getColor(R.color.grassgreen))
-//                    .into(textView);
             holder.mTagLayout.removeAllViews();
             ImageView tagImg = new ImageView(mContext);
-            tagImg.setLayoutParams(new FrameLayout.LayoutParams(new LinearLayout.LayoutParams(SizeUtils.dp2px(mContext, 200), SizeUtils.dp2px(mContext, 70))));
+            tagImg.setLayoutParams(new FrameLayout.LayoutParams(new LinearLayout.LayoutParams(SizeUtils.dp2px(mContext, 142), SizeUtils.dp2px(mContext, 36))));
             Logger.e("tagType:" + tagType);
             switch (tagType) {
                 case 1:
                     //活动
-                    GlideUtils.loadImage(mContext, R.drawable.event_activity, tagImg);
+                    GlideUtils.loadImage(mContext, R.drawable.tag_activity, tagImg);
                     break;
                 case 2:
                     //热播
+                    GlideUtils.loadImage(mContext, R.drawable.tag_hot, tagImg);
                     break;
                 case 3:
                     //新作品
+                    GlideUtils.loadImage(mContext, R.drawable.tag_new, tagImg);
                     break;
                 case 4:
                     //优秀作品
-                    GlideUtils.loadImage(mContext, R.drawable.event_excellent, tagImg);
+                    GlideUtils.loadImage(mContext, R.drawable.tag_excellent, tagImg);
+                    break;
+                case 5:
+                    //官方作品
+                    GlideUtils.loadImage(mContext, R.drawable.tag_example, tagImg);
                     break;
             }
             holder.mTagLayout.addView(tagImg);

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

@@ -13,6 +13,7 @@ public class MyOrderListBean {
     private String thirdPartOrderId;
     private String title;
     private String uid;
+    private String voucherAmount;
 
 
     public int getAddDays() {
@@ -110,4 +111,12 @@ public class MyOrderListBean {
     public void setUid(String uid) {
         this.uid = uid;
     }
+
+    public String getVoucherAmount() {
+        return voucherAmount;
+    }
+
+    public void setVoucherAmount(String voucherAmount) {
+        this.voucherAmount = voucherAmount;
+    }
 }

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

@@ -6,13 +6,13 @@ package com.edufound.reader.bean;
  * */
 public class ThroughTypeB {
 
-    private String exampleId;
+    private String userReadId;
 
-    public String getExampleId() {
-        return exampleId;
+    public String getUserReadId() {
+        return userReadId;
     }
 
-    public void setExampleId(String exampleId) {
-        this.exampleId = exampleId;
+    public void setUserReadId(String userReadId) {
+        this.userReadId = userReadId;
     }
 }

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

@@ -53,7 +53,11 @@ public class CharacterFragment extends BaseMvpFragment<CharacterFragmentPresente
         mScreenRect = new Rect(0, 0, Consts.getScreenSize()[0], Consts.getScreenSize()[1]);
         //初始化左侧广告UI
         ImageView mCharacterImage = view.findViewById(R.id.fragment_main_character_img);
-        GlideUtils.loadImageSizeKipMemoryCache(getContext(), "http://reader-apk.ai160.com/reader-apk/res/character_image_1.png", mCharacterImage);
+        if (Consts.isIsHaveFlowerEvent()) {
+            GlideUtils.loadImageSizeKipMemoryCache(getContext(), "http://reader-apk.ai160.com/reader-apk/res/character_image.png", mCharacterImage);
+        } else {
+            GlideUtils.loadImageSizeKipMemoryCache(getContext(), "http://reader-apk.ai160.com/reader-apk/res/character_image_1.png", mCharacterImage);
+        }
         mScrollView = view.findViewById(R.id.fragment_main_character_scrollview);
         mGridLayout = view.findViewById(R.id.fragment_my_recyclerview);
         mBottomView = view.findViewById(R.id.fragment_main_character_bottomview);

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

@@ -279,8 +279,10 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
                 if (ThroughUtil.mThroughType != null && ThroughUtil.mThroughType.equals(ThroughType.TYPEB)) {
                     //要根据ID获取视频并且放到第一个
                     for (int i = 0; i < bean.getData().getList().size(); i++) {
-                        if (bean.getData().getList().get(i).getUserRead().getId().equals(ThroughUtil.mThroughTypeB.getExampleId())) {
+                        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())) {
                             //找到了。要放到第一个
+                            Logger.e("找到了推荐视频。要放到第一个");
                             UserRecordBean upbbean = bean.getData().getList().get(i);
                             bean.getData().getList().remove(i);
                             bean.getData().getList().add(0, upbbean);
@@ -448,7 +450,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
         } else {
             mView.showAllUi();
         }
-        Logger.e("mAdapter.getItemTag(mCurrentPosition):" + mAdapter.getItemTag(mCurrentPosition));
+        Logger.e("视频type:" + mAdapter.getItemTag(mCurrentPosition));
 
         //获取当前显示的View 的数据
         int childCount = rv.getChildCount();

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

@@ -1,82 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.edufound.reader.cusview.RoundFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:roundframelayout="http://schemas.android.com/apk/res-auto"
-        android:layout_width="952dp"
-        android:layout_height="180dp"
-        android:layout_gravity="center"
-        android:background="@color/white"
-        roundframelayout:radio="20">
+    xmlns:roundframelayout="http://schemas.android.com/apk/res-auto"
+    android:layout_width="952dp"
+    android:layout_height="180dp"
+    android:layout_gravity="center"
+    android:background="@color/white"
+    roundframelayout:radio="20">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <TextView
-                android:id="@+id/popupwindow_myorder_time"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginTop="20dp"
-                android:text="2021-08-06 23:00:21"
-                android:textColor="#666666"
-                android:textSize="36dp"
-                roundframelayout:layout_constraintBottom_toBottomOf="parent"
-                roundframelayout:layout_constraintEnd_toEndOf="parent"
-                roundframelayout:layout_constraintHorizontal_bias="0.0"
-                roundframelayout:layout_constraintStart_toStartOf="parent"
-                roundframelayout:layout_constraintTop_toTopOf="parent"
-                roundframelayout:layout_constraintVertical_bias="0.0"></TextView>
+            android:id="@+id/popupwindow_myorder_time"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="20dp"
+            android:text="2021-08-06 23:00:21"
+            android:textColor="#666666"
+            android:textSize="36dp"
+            roundframelayout:layout_constraintBottom_toBottomOf="parent"
+            roundframelayout:layout_constraintEnd_toEndOf="parent"
+            roundframelayout:layout_constraintHorizontal_bias="0.0"
+            roundframelayout:layout_constraintStart_toStartOf="parent"
+            roundframelayout:layout_constraintTop_toTopOf="parent"
+            roundframelayout:layout_constraintVertical_bias="0.0"></TextView>
 
 
         <TextView
-                android:id="@+id/popupwindow_myorder_status"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginEnd="52dp"
-                android:text="支付成功"
-                android:textColor="#1BB24E"
-                android:textSize="36dp"
-                roundframelayout:layout_constraintBottom_toBottomOf="parent"
-                roundframelayout:layout_constraintEnd_toEndOf="parent"
-                roundframelayout:layout_constraintHorizontal_bias="1.0"
-                roundframelayout:layout_constraintStart_toStartOf="parent"
-                roundframelayout:layout_constraintTop_toTopOf="parent"
-                roundframelayout:layout_constraintVertical_bias="0.0"></TextView>
+            android:id="@+id/popupwindow_myorder_status"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginEnd="52dp"
+            android:text="支付成功"
+            android:textColor="#1BB24E"
+            android:textSize="36dp"
+            roundframelayout:layout_constraintBottom_toBottomOf="parent"
+            roundframelayout:layout_constraintEnd_toEndOf="parent"
+            roundframelayout:layout_constraintHorizontal_bias="1.0"
+            roundframelayout:layout_constraintStart_toStartOf="parent"
+            roundframelayout:layout_constraintTop_toTopOf="parent"
+            roundframelayout:layout_constraintVertical_bias="0.0"></TextView>
 
 
         <TextView
-                android:id="@+id/popupwindow_myorder_name"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_marginStart="30dp"
-                android:layout_marginBottom="20dp"
-                android:text="朗读配音1个月VIP"
-                android:textColor="#000000"
-                android:textSize="36dp"
-                roundframelayout:layout_constraintBottom_toBottomOf="parent"
-                roundframelayout:layout_constraintEnd_toEndOf="parent"
-                roundframelayout:layout_constraintHorizontal_bias="0.0"
-                roundframelayout:layout_constraintStart_toStartOf="parent"
-                roundframelayout:layout_constraintTop_toTopOf="parent"
-                roundframelayout:layout_constraintVertical_bias="1.0"></TextView>
+            android:id="@+id/popupwindow_myorder_name"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginBottom="20dp"
+            android:text="朗读配音1个月VIP"
+            android:textColor="#000000"
+            android:textSize="36dp"
+            roundframelayout:layout_constraintBottom_toBottomOf="parent"
+            roundframelayout:layout_constraintEnd_toEndOf="parent"
+            roundframelayout:layout_constraintHorizontal_bias="0.0"
+            roundframelayout:layout_constraintStart_toStartOf="parent"
+            roundframelayout:layout_constraintTop_toTopOf="parent"
+            roundframelayout:layout_constraintVertical_bias="1.0"></TextView>
+
+        <TextView
+            android:id="@+id/popupwindow_myorder_voucherAmount"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginBottom="20dp"
+            android:text="抵用券减¥10"
+            android:textColor="#FF3D3E"
+            android:textSize="36dp"
+            roundframelayout:layout_constraintBottom_toBottomOf="parent"
+            roundframelayout:layout_constraintEnd_toEndOf="parent"
+            roundframelayout:layout_constraintHorizontal_bias="0.47"
+            roundframelayout:layout_constraintStart_toStartOf="parent"
+            roundframelayout:layout_constraintTop_toTopOf="parent"
+            roundframelayout:layout_constraintVertical_bias="1.0"></TextView>
 
 
         <TextView
-                android:id="@+id/popupwindow_myorder_paymoney"
-                android:layout_width="wrap_content"
-                android:layout_height="50dp"
-                android:layout_marginEnd="52dp"
-                android:layout_marginBottom="20dp"
-                android:text="实付金额：￥10"
-                android:textColor="#000000"
-                android:textSize="36dp"
-                roundframelayout:layout_constraintBottom_toBottomOf="parent"
-                roundframelayout:layout_constraintEnd_toEndOf="parent"
-                roundframelayout:layout_constraintHorizontal_bias="1.0"
-                roundframelayout:layout_constraintStart_toStartOf="parent"
-                roundframelayout:layout_constraintTop_toTopOf="parent"
-                roundframelayout:layout_constraintVertical_bias="1.0"></TextView>
+            android:id="@+id/popupwindow_myorder_paymoney"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:layout_marginEnd="52dp"
+            android:layout_marginBottom="20dp"
+            android:text="实付金额：￥10"
+            android:textColor="#000000"
+            android:textSize="36dp"
+            roundframelayout:layout_constraintBottom_toBottomOf="parent"
+            roundframelayout:layout_constraintEnd_toEndOf="parent"
+            roundframelayout:layout_constraintHorizontal_bias="1.0"
+            roundframelayout:layout_constraintStart_toStartOf="parent"
+            roundframelayout:layout_constraintTop_toTopOf="parent"
+            roundframelayout:layout_constraintVertical_bias="1.0"></TextView>
 
 
     </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -58,8 +58,6 @@
         android:id="@+id/adapter_item_slidevideo_tagLayout"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginTop="5dp"
         android:orientation="horizontal">
 
     </FrameLayout>