فهرست منبع

1.朗读配音注册送7天弹窗+逻辑
2.朗读配音小红花活动弹窗+逻辑
3.朗读配音小红花活动视频根据type隐藏UI显示按钮逻辑
4.朗读配音小红花活动支付界面

FailedToRead 2 سال پیش
والد
کامیت
7a95743392
31فایلهای تغییر یافته به همراه553 افزوده شده و 122 حذف شده
  1. 12 1
      .idea/misc.xml
  2. 57 0
      app/src/exception/layout/activity_event_pay.xml
  3. 22 0
      app/src/exception/layout/popupwindow_webs_events.xml
  4. 17 12
      app/src/fragmentRecommend/layout/popupwindow_myorder.xml
  5. 26 21
      app/src/fragmentUser/layout/popupwindow_bind_wechat.xml
  6. 62 0
      app/src/main/java/com/edufound/reader/activity/EventPayActivity.java
  7. 19 1
      app/src/main/java/com/edufound/reader/activity/MainActivity.java
  8. 1 1
      app/src/main/java/com/edufound/reader/adapter/PopupMyOrderAdapter.java
  9. 46 12
      app/src/main/java/com/edufound/reader/adapter/SlideVideoAdapter.java
  10. 0 2
      app/src/main/java/com/edufound/reader/application/EApplication.java
  11. 2 0
      app/src/main/java/com/edufound/reader/base/BaseActivity.java
  12. 14 0
      app/src/main/java/com/edufound/reader/contract/EventPayContract.java
  13. 4 0
      app/src/main/java/com/edufound/reader/contract/RecommendFragmentContract.java
  14. 54 34
      app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java
  15. 6 0
      app/src/main/java/com/edufound/reader/model/EventPayModel.java
  16. 52 0
      app/src/main/java/com/edufound/reader/popwindow/PopWindowUtil.java
  17. 7 0
      app/src/main/java/com/edufound/reader/presenter/EventPayPresenter.java
  18. 2 0
      app/src/main/java/com/edufound/reader/presenter/LoginAlertPresenter.java
  19. 23 3
      app/src/main/java/com/edufound/reader/presenter/MainPresenter.java
  20. 10 1
      app/src/main/java/com/edufound/reader/presenter/RecommendFragmentPresenter.java
  21. 3 1
      app/src/main/java/com/edufound/reader/presenter/RecordPresenter.java
  22. 4 1
      app/src/main/java/com/edufound/reader/tmailsdk/TMailSDKUtil.java
  23. 28 1
      app/src/main/java/com/edufound/reader/util/EfunboxUtil.java
  24. BIN
      app/src/main/res/drawable/event_pay_bg.png
  25. BIN
      app/src/main/res/drawable/event_pay_item_month.png
  26. BIN
      app/src/main/res/drawable/event_pay_item_topay.png
  27. BIN
      app/src/main/res/drawable/event_pay_item_year.png
  28. 20 0
      app/src/main/res/layout/activity_event_pay_item.xml
  29. 1 1
      app/src/main/res/layout/adapter_item_popupwindow_myorder.xml
  30. 40 30
      app/src/main/res/layout/adapter_item_slidevideo.xml
  31. 21 0
      app/src/main/res/layout/popupwindow_registration_events.xml

+ 12 - 1
.idea/misc.xml

@@ -112,16 +112,23 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/window_deviceinfo.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.4931640625" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.4699248120300752" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/exception/layout/activity_event_pay.xml" value="0.25" />
+        <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/slidevideo_switch_track_selector.xml" value="0.2005" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/fragment_main_recommend.xml" value="0.5" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/popupwindow_myorder.xml" value="0.2871046228710462" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentRecommend/layout/popupwindow_record_remove.xml" value="0.2913625304136253" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/activity_smallfull_video.xml" value="0.21897810218978103" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_bind_wechat.xml" value="0.2913625304136253" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_cancellation_account.xml" value="0.2913625304136253" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_exit_login.xml" value="0.2384428223844282" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_select_grade.xml" value="0.1922141119221411" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/drawable/activity_comment_item_divier.xml" value="0.2005" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_comment.xml" value="0.1873479318734793" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_event_pay_item.xml" value="0.67" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_main.xml" value="0.2" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_otherrecord.xml" value="0.30900243309002434" />
-        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.33" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.22" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_item.xml" value="0.21897810218978103" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail.xml" value="0.33" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_pay_tmail_item.xml" value="0.67" />
@@ -129,11 +136,15 @@
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer.xml" value="0.26034063260340634" />
         <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.26763990267639903" />
+        <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_slidevideo.xml" value="0.33" />
         <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" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/popupwindow_exit_app.xml" value="0.2402676399026764" />
         <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/popupwindow_record_status.xml" value="0.2451338199513382" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/popupwindow_registration_events.xml" value="0.25" />
+        <entry key="..\:/Work_Space/Android_Space/efunboxReader/efunboxReader-android-master/app/src/main/res/layout/window_deviceinfo.xml" value="0.22262773722627738" />
       </map>
     </option>
   </component>

+ 57 - 0
app/src/exception/layout/activity_event_pay.xml

@@ -0,0 +1,57 @@
+<?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="match_parent"
+    android:layout_height="match_parent">
+
+
+    <FrameLayout
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#70C1FF"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"></FrameLayout>
+
+
+    <FrameLayout
+        android:layout_width="1280dp"
+        android:layout_height="720dp"
+        android:gravity="center"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintDimensionRatio="h,16:9"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/activity_pay_back"
+            android:layout_width="77dp"
+            android:layout_height="77dp"
+            android:layout_marginLeft="32dp"
+            android:layout_marginTop="20dp"
+            android:src="@drawable/main_back"></ImageView>
+
+        <ImageView
+            android:id="@+id/activity_pay_tomyorder"
+            android:layout_width="130dp"
+            android:layout_height="130dp"
+            android:layout_gravity="right"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="32dp"
+            android:src="@drawable/activity_pay_myorder"></ImageView>
+
+        <FrameLayout
+            android:layout_width="1102dp"
+            android:layout_height="571dp"
+            android:layout_gravity="center"
+            android:background="@drawable/event_pay_bg"></FrameLayout>
+
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 22 - 0
app/src/exception/layout/popupwindow_webs_events.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?><!-- 注册送7天活动弹窗 -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/translucent_background">
+
+    <ImageView
+        android:id="@+id/popupwindow_webs_events_img"
+        android:layout_width="370dp"
+        android:layout_height="458dp"
+        android:layout_gravity="center"
+        android:background="@color/red"></ImageView>
+
+
+    <ImageView
+        android:id="@+id/popupwindow_webs_events_close"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center|bottom"
+        android:layout_marginBottom="67dp"
+        android:src="@drawable/close_icon"></ImageView>
+</FrameLayout>

+ 17 - 12
app/src/fragmentRecommend/layout/popupwindow_myorder.xml

@@ -1,12 +1,17 @@
 <?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"
+<FrameLayout 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="match_parent"
+    android:layout_height="match_parent">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
 
-    <FrameLayout
+        <FrameLayout
             android:id="@+id/background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -17,7 +22,7 @@
             app:layout_constraintTop_toTopOf="parent"></FrameLayout>
 
 
-    <FrameLayout
+        <FrameLayout
             android:layout_width="1280dp"
             android:layout_height="720dp"
             android:gravity="center"
@@ -29,15 +34,15 @@
             app:layout_constraintTop_toTopOf="parent">
 
 
-        <androidx.recyclerview.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/popupwindow_myorder_recyclerview"
                 android:layout_width="952dp"
                 android:layout_height="match_parent"
                 android:layout_gravity="center">
 
-        </androidx.recyclerview.widget.RecyclerView>
+            </androidx.recyclerview.widget.RecyclerView>
 
-        <ImageView
+            <ImageView
                 android:id="@+id/popupwindow_myorder_noitem"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -45,13 +50,13 @@
                 android:src="@drawable/popupwinow_myorder_noitem"
                 android:visibility="gone"></ImageView>
 
-        <ImageView
+            <ImageView
                 android:id="@+id/popupwindow_myorder_back"
                 android:layout_width="77dp"
                 android:layout_height="77dp"
                 android:layout_marginLeft="32dp"
                 android:layout_marginTop="20dp"
                 android:src="@drawable/main_back"></ImageView>
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+        </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

+ 26 - 21
app/src/fragmentUser/layout/popupwindow_bind_wechat.xml

@@ -1,12 +1,16 @@
 <?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"
+<FrameLayout 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="match_parent"
+    android:layout_height="match_parent">
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-
-    <FrameLayout
+        <FrameLayout
             android:id="@+id/background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -17,7 +21,7 @@
             app:layout_constraintTop_toTopOf="parent"></FrameLayout>
 
 
-    <LinearLayout
+        <LinearLayout
             android:layout_width="1280dp"
             android:layout_height="720dp"
             android:gravity="center"
@@ -28,12 +32,12 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-        <FrameLayout
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="1">
 
-            <ImageView
+                <ImageView
                     android:id="@+id/popupwindow_bindwechat_back"
                     android:layout_width="77dp"
                     android:layout_height="77dp"
@@ -42,21 +46,21 @@
                     android:src="@drawable/main_back"></ImageView>
 
 
-        </FrameLayout>
+            </FrameLayout>
 
-        <FrameLayout
+            <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
                 android:layout_weight="6">
 
-            <FrameLayout
+                <FrameLayout
                     android:layout_width="1015dp"
                     android:layout_height="545dp"
                     android:layout_gravity="center"
                     android:background="@drawable/popup_window_bind_wechat_bg">
 
 
-                <TextView
+                    <TextView
                         android:id="@+id/popupwindow_bind_wechat_name"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -67,7 +71,7 @@
                         android:visibility="invisible"></TextView>
 
 
-                <TextView
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="44dp"
                         android:layout_gravity="top"
@@ -77,9 +81,9 @@
                         android:textColor="@color/white"
                         android:textSize="30dp"></TextView>
 
-            </FrameLayout>
+                </FrameLayout>
 
-            <FrameLayout
+                <FrameLayout
                     android:layout_width="225dp"
                     android:layout_height="225dp"
                     android:layout_gravity="center"
@@ -87,16 +91,16 @@
                     android:layout_marginBottom="30dp"
                     android:background="@drawable/popup_window_bind_wechat_qrcode_bg">
 
-                <ImageView
+                    <ImageView
                         android:id="@+id/popupwindow_bind_wechat_image"
                         android:layout_width="203dp"
                         android:layout_height="203dp"
                         android:layout_gravity="center"
                         android:src="@color/translucent_background"></ImageView>
-            </FrameLayout>
+                </FrameLayout>
 
 
-            <TextView
+                <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="37dp"
                     android:layout_gravity="center"
@@ -106,7 +110,8 @@
                     android:textColor="#333333"
                     android:textSize="30dp"></TextView>
 
-        </FrameLayout>
-    </LinearLayout>
+            </FrameLayout>
+        </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>

+ 62 - 0
app/src/main/java/com/edufound/reader/activity/EventPayActivity.java

@@ -0,0 +1,62 @@
+package com.edufound.reader.activity;
+
+import android.app.Activity;
+
+import com.edufound.reader.R;
+import com.edufound.reader.base.BaseMvpActivity;
+import com.edufound.reader.contract.EventPayContract;
+import com.edufound.reader.contract.MainContract;
+import com.edufound.reader.presenter.EventPayPresenter;
+import com.edufound.reader.presenter.MainPresenter;
+
+/**
+ * 活动支付页面
+ */
+public class EventPayActivity extends BaseMvpActivity<EventPayPresenter> implements EventPayContract.View {
+
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_event_pay;
+    }
+
+    @Override
+    public void initView() {
+
+    }
+
+    @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 null;
+    }
+}

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

@@ -29,10 +29,12 @@ import com.edufound.reader.base.BaseMvpActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.bean.UserEventEnum;
 import com.edufound.reader.contract.MainContract;
+import com.edufound.reader.listener.PopUtilClickListener;
 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.EfunboxUtil;
 import com.orhanobut.logger.Logger;
 
 import java.util.HashMap;
@@ -113,12 +115,28 @@ public class MainActivity extends BaseMvpActivity<MainPresenter> implements Main
             }
         } else if (Consts.getUmengChannel().equals(ChannelCodeEnum.TMAIL.getChannelCode())) {
             //走天猫的逻辑
-            //efunbox://com.edufound.reader/main?
+            Uri uri = getIntent().getData();
+//            uri = 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=103126001&backModel=home");
+            if (uri != null) {
+                Logger.e("从天猫获取的:" + uri);
+                String exampleId = uri.getQueryParameter("exampleId");
+                String backModel = uri.getQueryParameter("backModel");
+                if (exampleId == null || exampleId.equals("")) {
+
+                } else {
+                    Bundle bundle = new Bundle();
+                    bundle.putString("exampleId", exampleId);
+                    bundle.putString("backModel", backModel);
+                    toNextActivity(RecordActivity.class, bundle);
+
+                }
+            }
 
 
         }
 
 
+
     }
 
     @Override

+ 1 - 1
app/src/main/java/com/edufound/reader/adapter/PopupMyOrderAdapter.java

@@ -47,7 +47,7 @@ public class PopupMyOrderAdapter extends RecyclerView.Adapter<MyOtderItemHolder>
         }
 
         holder.mOrderName.setText(mListData.get(position).getTitle());
-        holder.mOrderPayMoney.setText("实际支付金额:¥" + (mListData.get(position).getPrice() / 100f));
+        holder.mOrderPayMoney.setText("实付金额:¥" + (mListData.get(position).getPrice() / 100f));
     }
 
     @Override

+ 46 - 12
app/src/main/java/com/edufound/reader/adapter/SlideVideoAdapter.java

@@ -1,14 +1,17 @@
 package com.edufound.reader.adapter;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.graphics.Rect;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CompoundButton;
+import android.widget.ImageView;
 import android.widget.Switch;
 
 import com.edufound.reader.R;
+import com.edufound.reader.activity.WebActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.bean.CommentListBean;
 import com.edufound.reader.bean.HttpResultBean;
@@ -42,6 +45,7 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
     private Activity mContext;
     private List<UserRecordBean> mListData;
 
+
     public SlideVideoAdapter(Activity context, @NonNull List<UserRecordBean> data) {
         mContext = context;
         mLayoutInflater = LayoutInflater.from(context);
@@ -54,6 +58,10 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
     }
 
 
+    public String getItemType(int position) {
+        return mListData.get(position).getUserRead().getType();
+    }
+
     @NonNull
     @Override
     public VideoHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -67,21 +75,44 @@ public class SlideVideoAdapter extends RecyclerView.Adapter<VideoHolder> {
         if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
             GlideUtils.loadImageSizeKipMemoryCache(mContext, mListData.get(position).getUserRead().getCoverImg(), holder.mVideo.posterImageView);
         }
-        holder.initDanMu(mListData.get(position).getUserRead().getId());
+
         holder.mVideo.startPreloading();
-        holder.mSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-                if (b) {
-                    holder.mMarqueen.setVisibility(View.VISIBLE);
-                    holder.mMarqueen.start();
-                } else {
-                    holder.mMarqueen.setVisibility(View.INVISIBLE);
-                    holder.mMarqueen.stop();
+
+        /**
+         * type=READ(用户朗读的)
+         * type=EXAMPLE(官方的)
+         * */
+        holder.mItemView.setTag(mListData.get(position).getUserRead().getType());
+        holder.itemView.setTag(mListData.get(position).getUserRead().getType());
+        if (mListData.get(position).getUserRead().getType().equals("READ") || mListData.get(position).getUserRead().getType().equals("AAA")) {
+            holder.initDanMu(mListData.get(position).getUserRead().getId());
+            holder.mSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+                @Override
+                public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
+                    if (b) {
+                        holder.mMarqueen.setVisibility(View.VISIBLE);
+                        holder.mMarqueen.start();
+                    } else {
+                        holder.mMarqueen.setVisibility(View.INVISIBLE);
+                        holder.mMarqueen.stop();
+                    }
                 }
-            }
-        });
+            });
+        } else if (mListData.get(position).getUserRead().getType().equals("EXAMPLE")) {
+            //这里修改成新的type。就可以使用了
+            holder.mSwitch.setVisibility(View.INVISIBLE);
+            holder.mEventBtn.setVisibility(View.VISIBLE);
+            holder.mEventBtn.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    Intent intent = new Intent(mContext, WebActivity.class);
+                    intent.putExtra("loadUrl", "");
+                    mContext.startActivity(intent);
+                }
+            });
+        } else {
 
+        }
 
 //        holder.mVideo.posterImageView.setImageURI(Uri.parse(mListData.get(position).videoUrl));
 
@@ -110,6 +141,7 @@ class VideoHolder extends RecyclerView.ViewHolder {
     public RvListJzvdStd mVideo;
     public AutoPollRecyclerView mMarqueen;
     public Switch mSwitch;
+    public ImageView mEventBtn;
     public Activity mContext;
 
     public VideoHolder(Activity context, @NonNull View itemView) {
@@ -118,6 +150,8 @@ class VideoHolder extends RecyclerView.ViewHolder {
         mItemView = itemView;
         mVideo = itemView.findViewById((R.id.slidevideo_video));
         mSwitch = itemView.findViewById(R.id.slidevideo_video_switch);
+        mEventBtn = itemView.findViewById(R.id.adapter_item_slidevideo_event_btn);
+        mEventBtn.setVisibility(View.GONE);
         mSwitch.setVisibility(View.INVISIBLE);
 //        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
         mMarqueen = itemView.findViewById(R.id.slidevideo_video_marqueen);

+ 0 - 2
app/src/main/java/com/edufound/reader/application/EApplication.java

@@ -150,7 +150,6 @@ public class EApplication extends Application {
                 //app回到前台
                 isForeground = true;
 //                ToastUtil.showToast("app回到前台了");
-                Logger.e("app回到前台了");
 
                 APP_START_TIME = System.currentTimeMillis();
             }
@@ -171,7 +170,6 @@ public class EApplication extends Application {
             if (activityAount == 0) {
                 isForeground = false;
 //                ToastUtil.showToast("app后台了");
-                Logger.e("app后台了");
                 if (Consts.getUmengChannel().equals(ChannelCodeEnum.YIFANG.getChannelCode())) {
                     killAppProcess(Consts.getmApplicAtion());
                 }

+ 2 - 0
app/src/main/java/com/edufound/reader/base/BaseActivity.java

@@ -719,6 +719,8 @@ public abstract class BaseActivity extends AppCompatActivity {
 
                                             }
                                         });
+                                        //检查活动
+                                        EfunboxUtil.checkEvents(topActivity, getRootView());
                                     }
 
                                     @Override

+ 14 - 0
app/src/main/java/com/edufound/reader/contract/EventPayContract.java

@@ -0,0 +1,14 @@
+package com.edufound.reader.contract;
+
+import com.edufound.reader.base.BaseView;
+
+public interface EventPayContract {
+    interface Model {
+    }
+
+    interface View extends BaseView {
+    }
+
+    interface Presenter {
+    }
+}

+ 4 - 0
app/src/main/java/com/edufound/reader/contract/RecommendFragmentContract.java

@@ -50,6 +50,10 @@ public interface RecommendFragmentContract {
 
         void clearRecyclerView();
 
+        void eventHideUi();
+
+        void showAllUi();
+
 
 
     }

+ 54 - 34
app/src/main/java/com/edufound/reader/fragment/RecommendFragment.java

@@ -107,40 +107,44 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         isFollow = view.findViewById(R.id.fragment_main_recommend_isfollow);
         isUserVip = view.findViewById(R.id.fragment_recommend_app_user_isvip);
 
-//        int scaleTime = 0;
-//        int rotateTime = 0;
-//        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
-//            //录音按钮背景旋转
-//            scaleTime = 5000;
-//            rotateTime = 3000;
-//        } else {
-//            scaleTime = 1000;
-//            rotateTime = 1500;
-//        }
-//        mToRecordRotationbg = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_bg);
-//        mRotationImgAnim = ObjectAnimator.ofFloat(mToRecordRotationbg, "rotation", 0.0F, 359.0F);
-//        mRotationImgAnim.setRepeatCount(-1);
-//        mRotationImgAnim.setDuration(1500);
-//        LinearInterpolator interpolator = new LinearInterpolator();
-//        mRotationImgAnim.setInterpolator(interpolator); //设置匀速旋转,不卡顿 icon_anim.start();
-//        mRotationImgAnim.start();
-
-        //录音按钮缩小放大
-//        mToRecordScaleIcon = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_icon);
-//        mToRecordScaleXAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleX", 1F, 1.2F);//设置Y轴的立体旋转动画
-//        mToRecordScaleXAnim.setRepeatCount(-1);
-//        mToRecordScaleXAnim.setRepeatMode(ObjectAnimator.REVERSE);
-//        mToRecordScaleXAnim.setDuration(scaleTime);
-//        LinearInterpolator interpolator2 = new LinearInterpolator();
-//        mToRecordScaleXAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
-//        mToRecordScaleYAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleY", 1F, 1.2F);//设置Y轴的立体旋转动画
-//        mToRecordScaleYAnim.setRepeatCount(-1);
-//        mToRecordScaleYAnim.setRepeatMode(ObjectAnimator.REVERSE);
-//        mToRecordScaleYAnim.setDuration(scaleTime);
-//        mToRecordScaleYAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
-//        AnimatorSet animatorSet = new AnimatorSet();
-//        animatorSet.play(mToRecordScaleXAnim).with(mToRecordScaleYAnim);
-//        animatorSet.start();
+
+        if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+            //不是百度渠道得增加动画
+            int scaleTime = 0;
+            int rotateTime = 0;
+            if (!Consts.getUmengChannel().equals(ChannelCodeEnum.BAIDU.getChannelCode())) {
+                //录音按钮背景旋转
+                scaleTime = 5000;
+                rotateTime = 3000;
+            } else {
+                scaleTime = 1000;
+                rotateTime = 1500;
+            }
+            mToRecordRotationbg = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_bg);
+            mRotationImgAnim = ObjectAnimator.ofFloat(mToRecordRotationbg, "rotation", 0.0F, 359.0F);
+            mRotationImgAnim.setRepeatCount(-1);
+            mRotationImgAnim.setDuration(1500);
+            LinearInterpolator interpolator = new LinearInterpolator();
+            mRotationImgAnim.setInterpolator(interpolator); //设置匀速旋转,不卡顿 icon_anim.start();
+            mRotationImgAnim.start();
+
+//        录音按钮缩小放大
+            mToRecordScaleIcon = mToRecordLayout.findViewById(R.id.fragment_recommend_to_record_icon);
+            mToRecordScaleXAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleX", 1F, 1.2F);//设置Y轴的立体旋转动画
+            mToRecordScaleXAnim.setRepeatCount(-1);
+            mToRecordScaleXAnim.setRepeatMode(ObjectAnimator.REVERSE);
+            mToRecordScaleXAnim.setDuration(scaleTime);
+            LinearInterpolator interpolator2 = new LinearInterpolator();
+            mToRecordScaleXAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
+            mToRecordScaleYAnim = ObjectAnimator.ofFloat(mToRecordScaleIcon, "scaleY", 1F, 1.2F);//设置Y轴的立体旋转动画
+            mToRecordScaleYAnim.setRepeatCount(-1);
+            mToRecordScaleYAnim.setRepeatMode(ObjectAnimator.REVERSE);
+            mToRecordScaleYAnim.setDuration(scaleTime);
+            mToRecordScaleYAnim.setInterpolator(interpolator2); //设置匀速旋转,不卡顿 icon_anim.start();
+            AnimatorSet animatorSet = new AnimatorSet();
+            animatorSet.play(mToRecordScaleXAnim).with(mToRecordScaleYAnim);
+            animatorSet.start();
+        }
 
 
     }
@@ -372,6 +376,22 @@ public class RecommendFragment extends BaseMvpFragment<RecommendFragmentPresente
         mRecyclerView = null;
     }
 
+    @Override
+    public void eventHideUi() {
+        mCommentLayout.setVisibility(View.INVISIBLE);
+        mCollectionLayout.setVisibility(View.INVISIBLE);
+        mThumbsLayout.setVisibility(View.INVISIBLE);
+        mToRecordLayout.setVisibility(View.INVISIBLE);
+    }
+
+    @Override
+    public void showAllUi() {
+        mCommentLayout.setVisibility(View.VISIBLE);
+        mCollectionLayout.setVisibility(View.VISIBLE);
+        mThumbsLayout.setVisibility(View.VISIBLE);
+        mToRecordLayout.setVisibility(View.VISIBLE);
+    }
+
 
     @Override
     public void onDestroy() {

+ 6 - 0
app/src/main/java/com/edufound/reader/model/EventPayModel.java

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

+ 52 - 0
app/src/main/java/com/edufound/reader/popwindow/PopWindowUtil.java

@@ -313,6 +313,58 @@ public class PopWindowUtil {
     }
 
 
+    /**
+     * 注冊送7天活动的popupwindow
+     */
+    public static void RegistrationEventsWindow(Context context, View parent, PopUtilClickListener listener) {
+        initPresenter();
+        if (checkWindowShoing()) {
+            return;
+        }
+        dialog_view = (FrameLayout) LayoutInflater.from(context).inflate(R.layout.popupwindow_registration_events, null);
+        dialog_view.setFocusable(true);
+        ImageView img = dialog_view.findViewById(R.id.popupwindow_registration_events_img);
+        ImageView close = dialog_view.findViewById(R.id.popupwindow_registration_events_close);
+        setClickListener(img, o -> {
+            mPopupWindow.dismiss();
+            listener.clickSubmit(null);
+        });
+
+        setClickListener(close, o -> {
+            mPopupWindow.dismiss();
+            listener.clickCancel();
+        });
+        newPopupWindow(parent, true);
+    }
+
+
+    /**
+     * 跳转webview的活动
+     */
+    public static void webviewEventsWindow(Context context, View parent, PopUtilClickListener listener) {
+        initPresenter();
+        if (checkWindowShoing()) {
+            return;
+        }
+        dialog_view = (FrameLayout) LayoutInflater.from(context).inflate(R.layout.popupwindow_webs_events, null);
+        dialog_view.setFocusable(true);
+        ImageView img = dialog_view.findViewById(R.id.popupwindow_webs_events_img);
+        ImageView close = dialog_view.findViewById(R.id.popupwindow_webs_events_close);
+        setClickListener(img, o -> {
+            mPopupWindow.dismiss();
+            listener.clickSubmit(null);
+        });
+
+        setClickListener(close, o -> {
+            mPopupWindow.dismiss();
+            listener.clickCancel();
+        });
+        newPopupWindow(parent, true);
+    }
+
+
+
+
     private static void showDeviceInfo(Activity context) {
         StringBuffer buffer = new StringBuffer();
         buffer.append("\tchannel:\t" + "\t" + Consts.getUmengChannel() + "\n");

+ 7 - 0
app/src/main/java/com/edufound/reader/presenter/EventPayPresenter.java

@@ -0,0 +1,7 @@
+package com.edufound.reader.presenter;
+
+import com.edufound.reader.base.BasePresenter;
+import com.edufound.reader.contract.EventPayContract;
+
+public class EventPayPresenter extends BasePresenter<EventPayContract.View> implements EventPayContract.Presenter {
+}

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

@@ -168,6 +168,8 @@ public class LoginAlertPresenter extends BasePresenter<LoginAlertContract.View>
                         //用户是否登录,登录了,创建Consts的userbean
                         Consts.setmConstsUserBean(bean.getData());
                         getYFVip();
+                        //检查活动
+                        EfunboxUtil.checkEvents(mView.getActivity(), mView.getRootView());
 
                     }
 

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

@@ -1,5 +1,6 @@
 package com.edufound.reader.presenter;
 
+import android.content.Intent;
 import android.graphics.Color;
 import android.text.TextUtils;
 import android.view.KeyEvent;
@@ -12,6 +13,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.edufound.reader.R;
+import com.edufound.reader.activity.WebActivity;
 import com.edufound.reader.apiserver.OrderApiServerImpl;
 import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.base.BaseActivity;
@@ -206,10 +208,7 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
         mUserApi.isLogin(mView.getActivity(), DeviceUuidFactory.getUuid(), new Callback() {
             @Override
             public void onSuccess(HttpInfo info) throws IOException {
-                Logger.e("info.get:" + info.getRetDetail());
                 Gson gson = new Gson();
-                String jsonssss = gson.toJson(info.getHeads());
-                Logger.e("info.getHead:" + jsonssss);
                 try {
                     JSONObject object = new JSONObject(info.getRetDetail());
                     if (object.getString("code").equals("300") || object.getInt("code") == 300) {
@@ -259,8 +258,29 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
                     }
                 } catch (JSONException e) {
                     e.printStackTrace();
+                } finally {
+                    //检查有没有用户信息
+                    if (Consts.getmConstsUserBean() == null && Consts.getmConstsBaiDuUserBean() == null) {
+                        //百度跟自己的都没有用户信息,请求有没有注册活动,有活动显示活动,没活动不显示
+                        PopWindowUtil.RegistrationEventsWindow(mView.getActivity(), mView.getRootView(), new PopUtilClickListener() {
+                            @Override
+                            public void clickCancel() {
+
+                            }
+
+                            @Override
+                            public void clickSubmit(Object object) {
+                                //点击进行登录逻辑
+                                Logger.e("登录");
+                                EfunboxUtil.checkLogin(mView.getActivity());
+                            }
+                        });
+                    } else {
+                        EfunboxUtil.checkEvents(mView.getActivity(), mView.getRootView());
+                    }
                 }
 
+
             }
 
             @Override

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

@@ -10,6 +10,7 @@ import android.widget.Switch;
 import android.widget.Toast;
 
 import com.edufound.reader.R;
+import com.edufound.reader.activity.WebActivity;
 import com.edufound.reader.adapter.SlideVideoAdapter;
 import com.edufound.reader.apiserver.UserApiServerImpl;
 import com.edufound.reader.base.BaseActivity;
@@ -171,6 +172,14 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
                 } else if (mCurrentPosition == (mTotalSize - 1)) {
                     Toast.makeText(mContext, "到底了", Toast.LENGTH_SHORT).show();
                 }
+
+                if (mAdapter.getItemType(mCurrentPosition).equals("READ")) {
+                    mView.showAllUi();
+                } else if (mAdapter.getItemType(mCurrentPosition).equals("EXAMPLE")) {
+                    mView.eventHideUi();
+                } else {
+
+                }
 //                Logger.e("mCurrentPosition:" + mCurrentPosition);
 //                Logger.e("mDataList:" + mDataList.size());
                 scrollToNextFunction(rv, false);
@@ -453,7 +462,7 @@ public class RecommendFragmentPresenter extends BasePresenter<RecommendFragmentC
                         System.gc();
                         if (mCurrentPosition >= mTotalSize - 1) {
                             //Toast.makeText(mView.getActivity(), "全部播放完成", Toast.LENGTH_SHORT).show();
-                            CusToast.getInstance(mView.getActivity()).show("注册失败", 2000);
+                            CusToast.getInstance(mView.getActivity()).show("全部播放完成", 2000);
 //                            mView.getActivity().finish();
                             return;
                         }

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

@@ -87,6 +87,7 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
 
     @Override
     public void getReadInfo(Intent intent) {
+        Logger.e("getReadInfo---------------");
         Bundle params = intent.getBundleExtra("params_bundle");
         mReadId = params.getString("exampleId");
         backModel = params.getString("backModel");
@@ -100,6 +101,7 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
                 }.getType());
                 mRecordUserRead = bean.getData().getUserRead();
                 exampleUrl = mRecordUserRead.getVideoPath();
+                Logger.e("exampleUrl:" + exampleUrl);
                 recordUrl = mRecordUserRead.getOriginVideo();
                 GlideUtils.loadImageSizeKipMemoryCache(mView.getActivity(), mRecordUserRead.getCoverImg(), mView.getJZVideoView().posterImageView);
                 mView.getJZVideoView().setUp(new JZDataSource(exampleUrl), JzvdStd.SCREEN_FULLSCREEN, JZMediaIjk.class, mRecordUserRead.getId());
@@ -107,7 +109,7 @@ public class RecordPresenter extends BasePresenter<RecordContract.View> implemen
 
             @Override
             public void onFailure(HttpInfo info) throws IOException {
-
+                Logger.e("获取录音的音频视频失败:" + info.getRetDetail());
             }
         });
     }

+ 4 - 1
app/src/main/java/com/edufound/reader/tmailsdk/TMailSDKUtil.java

@@ -17,11 +17,13 @@ import com.alibaba.genie.waft.gcs.rpc.GenieServiceLoader;
 import com.edufound.reader.activity.LoginAlertActivity;
 import com.edufound.reader.apiserver.OrderApiServerImpl;
 import com.edufound.reader.apiserver.UserApiServerImpl;
+import com.edufound.reader.base.BaseActivity;
 import com.edufound.reader.bean.HttpResultBean;
 import com.edufound.reader.bean.UserBean;
 import com.edufound.reader.util.Consts;
 import com.edufound.reader.util.DeviceUuidFactory;
 import com.edufound.reader.util.EfunboxCallBack;
+import com.edufound.reader.util.EfunboxUtil;
 import com.edufound.reader.util.MMKVEncodeKey;
 import com.edufound.reader.util.MMKVUtil;
 import com.google.gson.Gson;
@@ -87,7 +89,6 @@ public class TMailSDKUtil {
                             mUserApi.getTMailPhone(gson.toJson(map), new Callback() {
                                 @Override
                                 public void onSuccess(HttpInfo info) throws IOException {
-                                    Logger.e("info.params:" + info.getParamJson());
                                     Logger.e("获取天猫手机号成功哦--info:" + info.getRetDetail());
                                     HttpResultBean<UserBean> bean = info.getRetDetail(new TypeToken<HttpResultBean<UserBean>>() {
                                     }.getType());
@@ -112,6 +113,8 @@ public class TMailSDKUtil {
 
                                         }
                                     });
+                                    //检查活动
+                                    EfunboxUtil.checkEvents(context, ((BaseActivity) context).getRootView());
                                 }
 
                                 @Override

+ 28 - 1
app/src/main/java/com/edufound/reader/util/EfunboxUtil.java

@@ -5,12 +5,16 @@ import android.content.Context;
 import android.content.Intent;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
+import android.view.View;
 
 import com.edufound.reader.activity.LoginAlertActivity;
 import com.edufound.reader.activity.PayActivity;
 import com.edufound.reader.activity.TmailPayActivity;
+import com.edufound.reader.activity.WebActivity;
 import com.edufound.reader.bean.ChannelCodeEnum;
 import com.edufound.reader.botsdk.BotRegisterListener;
+import com.edufound.reader.listener.PopUtilClickListener;
+import com.edufound.reader.popwindow.PopWindowUtil;
 import com.edufound.reader.tmailsdk.TMailSDKUtil;
 import com.orhanobut.logger.Logger;
 
@@ -22,7 +26,6 @@ public class EfunboxUtil {
      * 得到宽高缩放比
      */
     public static void initDesignSize(Context context) {
-        Logger.e("修改DIP适配问题");
         final DisplayMetrics appDisplayMetrics = context.getResources().getDisplayMetrics();
         int designWidth = 1280;
         int designHeight = 720;
@@ -209,4 +212,28 @@ public class EfunboxUtil {
         String emails = email.replaceAll("(\\w?)(\\w+)(\\w)(@\\w+\\.[a-z]+(\\.[a-z]+)?)", "$1****$3$4");
         return emails;
     }
+
+
+    /**
+     * 检查是否有活动
+     */
+    public static void checkEvents(Context context, View parent) {
+        //检查有没有活动
+
+        //如果这两个其中一个有用户信息,则请求有没有其他活动.如果有,就显示
+        PopWindowUtil.webviewEventsWindow(context, parent, new PopUtilClickListener() {
+            @Override
+            public void clickCancel() {
+
+            }
+
+            @Override
+            public void clickSubmit(Object object) {
+                //去webview界面,加载活动地址
+                Intent intent = new Intent(context, WebActivity.class);
+                intent.putExtra("loadUrl", "");
+                context.startActivity(intent);
+            }
+        });
+    }
 }

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


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


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


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


+ 20 - 0
app/src/main/res/layout/activity_event_pay_item.xml

@@ -0,0 +1,20 @@
+<?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"
+    android:layout_width="365dp"
+    android:layout_height="346dp"
+    android:layout_gravity="center"
+    android:background="@drawable/event_pay_item_month">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="12个月"
+        android:textColor="#FF8A5215"
+        android:textSize="38dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.100000024" />
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 1
app/src/main/res/layout/adapter_item_popupwindow_myorder.xml

@@ -68,7 +68,7 @@
                 android:layout_height="50dp"
                 android:layout_marginEnd="52dp"
                 android:layout_marginBottom="20dp"
-                android:text="实际支付金额:¥10"
+                android:text="实付金额:¥10"
                 android:textColor="#000000"
                 android:textSize="36dp"
                 roundframelayout:layout_constraintBottom_toBottomOf="parent"

+ 40 - 30
app/src/main/res/layout/adapter_item_slidevideo.xml

@@ -1,45 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
 
 
     <com.edufound.reader.cusview.RvListJzvdStd
-            android:id="@+id/slidevideo_video"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"></com.edufound.reader.cusview.RvListJzvdStd>
+        android:id="@+id/slidevideo_video"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"></com.edufound.reader.cusview.RvListJzvdStd>
 
     <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:layout_marginLeft="40dp"
-            android:layout_marginTop="34dp"
-            android:layout_marginRight="40dp">
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:layout_marginLeft="40dp"
+        android:layout_marginTop="34dp"
+        android:layout_marginRight="40dp">
 
         <com.edufound.reader.cusview.AutoPollRecyclerView
-                android:id="@+id/slidevideo_video_marqueen"
-                android:layout_width="9dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="10"
-                android:orientation="horizontal">
+            android:id="@+id/slidevideo_video_marqueen"
+            android:layout_width="9dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="10"
+            android:orientation="horizontal">
 
         </com.edufound.reader.cusview.AutoPollRecyclerView>
 
         <Switch
-                android:id="@+id/slidevideo_video_switch"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:layout_weight="2"
-                android:checked="true"
-                android:gravity="center"
-                android:switchMinWidth="40dp"
-                android:switchPadding="15dp"
-                android:text="弹幕"
-                android:textColor="@color/black"
-                android:textSize="25dp"
-                android:thumb="@drawable/switch_thumb"
-                android:track="@drawable/slidevideo_switch_track_selector" />
+            android:id="@+id/slidevideo_video_switch"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:layout_weight="2"
+            android:checked="true"
+            android:gravity="center"
+            android:switchMinWidth="40dp"
+            android:switchPadding="15dp"
+            android:text="弹幕"
+            android:textColor="@color/black"
+            android:textSize="25dp"
+            android:thumb="@drawable/switch_thumb"
+            android:track="@drawable/slidevideo_switch_track_selector" />
     </LinearLayout>
+
+
+    <ImageView
+        android:id="@+id/adapter_item_slidevideo_event_btn"
+        android:layout_width="200dp"
+        android:layout_height="100dp"
+        android:layout_gravity="center|bottom"
+        android:layout_marginRight="150dp"
+        android:layout_marginBottom="150dp"
+        android:background="@color/yellow"></ImageView>
 </FrameLayout>

+ 21 - 0
app/src/main/res/layout/popupwindow_registration_events.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!-- 注册送7天活动弹窗 -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/translucent_background">
+
+    <ImageView
+        android:id="@+id/popupwindow_registration_events_img"
+        android:layout_width="463dp"
+        android:layout_height="376dp"
+        android:layout_gravity="center"
+        android:background="@color/green"></ImageView>
+
+    <ImageView
+        android:id="@+id/popupwindow_registration_events_close"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center|bottom"
+        android:layout_marginBottom="67dp"
+        android:src="@drawable/close_icon"></ImageView>
+</FrameLayout>