1.增加绑定微信弹窗

2.增加联系我们界面
3.增加注销用户弹窗
4.增加小红花任务界面

.idea/misc.xml

@@ -4,6 +4,7 @@
     <option name="filePathToZoomLevelMap">
       <map>
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/activity_loginalert_check_selector.xml" value="0.3328125" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/activityLoginAlert/drawable/popup_window_bind_wechat_qrcode_bg.xml" value="0.5048828125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_bg.xml" value="0.4326171875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_one_two.xml" value="0.4326171875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentRecommend/drawable/activity_comment_quick_item_three_bg.xml" value="0.34609375" />
@@ -18,12 +19,16 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/activity_mycollection.xml" value="0.18" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/activity_myfollow.xml" value="0.14" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/activity_smallfull_video.xml" value="0.1" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/adapter_item_record_authority.xml" value="0.3798449612403101" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/adapter_item_record_authority.xml" value="1.0" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/fragment_user_rv_bottom.xml" value="0.2771317829457364" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popup_window_bind_wechat.xml" value="0.25" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_cancellation_account.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_exit_login.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_select_grade.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/fragmentUser/layout/popupwindow_select_grade_griditem_divder.xml" value="0.3309002433090024" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/activity_saffloer_sigin_layout_divier.xml" value="0.4296875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable-v24/popupwindow_select_grade_selector.xml" value="0.4443359375" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/activity_saffloer_sigin_layout_divier.xml" value="0.4296875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/cusjzplayer_controller_seekbar.xml" value="0.2713541666666667" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/main_left_tab_character_selector.xml" value="0.32421875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/main_left_tab_divider.xml" value="0.4" />
@@ -33,14 +38,17 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/main_left_tab_myinfo_selector.xml" value="0.1875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/main_left_tab_recommend_selector.xml" value="0.32421875" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/player_seekbar_list.xml" value="0.2713541666666667" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/drawable/popupwindow_select_grade_griditem_divder.xml" value="0.5048828125" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_alert_login.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_comment.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_crash_dialog.xml" value="0.12" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_customerservice.xml" value="0.16" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_customerservice.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_main.xml" value="0.15" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_message.xml" value="0.18" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_otherrecord.xml" value="0.4627039627039627" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.2" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_pay.xml" value="0.1" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer.xml" value="0.22" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_saffloer_sign_layout_item.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_userinfo_setting.xml" value="0.33" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_video.xml" value="0.18824087245139876" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/activity_web.xml" value="0.2731143552311436" />
@@ -48,7 +56,8 @@
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_myfollow.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_myollow.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_record.xml" value="0.4539641943734015" />
-        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_record_user.xml" value="0.25387596899224807" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_record_user.xml" value="0.67" />
+        <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_safflower.xml" value="0.5" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/adapter_item_slidevideo.xml" value="0.25" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/anim_getfollow.xml" value="0.75" />
         <entry key="..\:/WorkSpace/Git_WorkSpace/efunboxReader-android/efunboxReader-android-master/app/src/main/res/layout/curjzplayer_controller.xml" value="0.16" />

app/build.gradle

@@ -41,7 +41,7 @@ android {
                 variant.outputs.each { output ->
                     def outputFile = output.outputFileName
                     if (outputFile != null && output.outputFileName.endsWith('.apk')) {
-                        def fileName = "efunbox_tv_v${defaultConfig.versionCode}_${releaseTime()}_${variant.productFlavors[0].manifestPlaceholders.UMENG_CHANNEL_VALUE}_r.apk"
+                        def fileName = "efunbox_reader_v${defaultConfig.versionCode}_${releaseTime()}_${variant.productFlavors[0].manifestPlaceholders.UMENG_CHANNEL_VALUE}_r.apk"
                         def channel = variant.productFlavors[0].manifestPlaceholders.UMENG_CHANNEL_VALUE;
                         def newoutputFile = "";
                         if (channel == ("2006")) {

app/src/activityLoginAlert/drawable/popup_window_bind_wechat_qrcode_bg.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" />
+    <corners
+            android:bottomLeftRadius="20dp"
+            android:bottomRightRadius="20dp"
+            android:topLeftRadius="20dp"
+            android:topRightRadius="20dp" />
+    <stroke
+            android:width="5dp"
+            android:color="#FFA940" />
+</shape>

app/src/fragmentUser/layout/popup_window_bind_wechat.xml

@@ -0,0 +1,100 @@
+<?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>
+
+
+    <LinearLayout
+            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">
+
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="1">
+
+            <ImageView
+                    android:id="@+id/popupwindow_bindwechat_back"
+                    android:layout_width="77dp"
+                    android:layout_height="77dp"
+                    android:layout_marginLeft="32dp"
+                    android:layout_marginTop="20dp"
+                    android:src="@drawable/main_back"></ImageView>
+
+
+        </FrameLayout>
+
+        <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="6">
+
+            <FrameLayout
+                    android:layout_width="1015dp"
+                    android:layout_height="545dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/popup_window_bind_wechat_bg">
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="44dp"
+                        android:layout_gravity="top"
+                        android:layout_marginLeft="458dp"
+                        android:layout_marginTop="11dp"
+                        android:text="绑定微信"
+                        android:textColor="@color/white"
+                        android:textSize="36dp"
+                        android:textStyle="bold"></TextView>
+            </FrameLayout>
+
+            <FrameLayout
+                    android:layout_width="225dp"
+                    android:layout_height="225dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginBottom="30dp"
+                    android:background="@drawable/popup_window_bind_wechat_qrcode_bg">
+
+                <ImageView
+                        android:layout_width="203dp"
+                        android:layout_height="203dp"
+                        android:layout_gravity="center"
+                        android:src="@color/red"></ImageView>
+            </FrameLayout>
+
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="44dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginTop="130dp"
+                    android:text="扫码绑定微信"
+                    android:textColor="#333333"
+                    android:textSize="36dp"
+                    android:textStyle="bold"></TextView>
+
+        </FrameLayout>
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/fragmentUser/layout/popupwindow_cancellation_account.xml

@@ -0,0 +1,151 @@
+<?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:background="@color/translucent_background">
+
+
+    <com.edufound.reader.cusview.RoundFrameLayout
+            android:layout_width="718dp"
+            android:layout_height="500dp"
+            android:layout_gravity="center"
+            android:background="#EF9B47">
+
+        <com.edufound.reader.cusview.RoundFrameLayout
+                android:layout_width="718dp"
+                android:layout_height="490dp"
+                android:layout_gravity="center|top"
+                android:background="#FFCE82">
+
+            <com.edufound.reader.cusview.RoundFrameLayout
+                    android:layout_width="685dp"
+                    android:layout_height="378dp"
+                    android:layout_gravity="center|top"
+                    android:layout_marginTop="18dp"
+                    android:background="#FFD78B">
+
+                <com.edufound.reader.cusview.RoundFrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="368dp"
+                        android:layout_gravity="center|top"
+                        android:background="@color/white">
+
+                    <LinearLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:divider="@drawable/main_left_tab_divider"
+                            android:orientation="vertical"
+                            android:paddingTop="22dp"
+                            android:showDividers="middle">
+
+                        <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="48dp"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:orientation="horizontal">
+
+                            <ImageView
+                                    android:layout_width="57dp"
+                                    android:layout_height="48dp"
+                                    android:src="@drawable/popupwindow_cancellation_account_icon"></ImageView>
+
+                            <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="match_parent"
+                                    android:gravity="left"
+                                    android:text="账号注销的风险"
+                                    android:textColor="#FF333333"
+                                    android:textSize="36dp" />
+                        </LinearLayout>
+
+                        <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="56dp"
+                                android:layout_gravity="center"
+                                android:gravity="center|left"
+                                android:text="1. 无法继续登录，只能重新注册"
+                                android:textColor="#FF333333"
+                                android:textSize="34dp" />
+
+                        <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_gravity="center"
+                                android:gravity="center|left"
+                                android:text="2. 账号下的全部权益将被清除 \n（订购和支付记录、使用权限）"
+                                android:textColor="#FF333333"
+                                android:textSize="34dp" />
+
+                        <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="56dp"
+                                android:layout_gravity="center"
+                                android:gravity="center|left"
+                                android:text="3. 个人信息和朗读作品全部删除"
+                                android:textColor="#FF333333"
+                                android:textSize="34dp" />
+                    </LinearLayout>
+
+                </com.edufound.reader.cusview.RoundFrameLayout>
+            </com.edufound.reader.cusview.RoundFrameLayout>
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="70dp"
+                    android:layout_gravity="bottom"
+                    android:layout_marginBottom="20dp"
+                    android:orientation="horizontal">
+
+                <FrameLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                    <FrameLayout
+                            android:id="@+id/popupwindow_cancellation_account_ok"
+                            android:layout_width="184dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:background="@drawable/main_ok_btn_bg">
+
+                        <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:text="确认"
+                                android:textColor="@color/white"
+                                android:textSize="30dp"
+                                android:textStyle="bold"></TextView>
+                    </FrameLayout>
+                </FrameLayout>
+
+                <FrameLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                    <FrameLayout
+                            android:id="@+id/popupwindow_cancellation_account_cancel"
+                            android:layout_width="184dp"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:background="@drawable/main_cancel_btn_bg">
+
+                        <TextView
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:layout_gravity="center"
+                                android:gravity="center"
+                                android:text="取消"
+                                android:textColor="@color/white"
+                                android:textSize="30dp"
+                                android:textStyle="bold"></TextView>
+                    </FrameLayout>
+                </FrameLayout>
+            </LinearLayout>
+        </com.edufound.reader.cusview.RoundFrameLayout>
+    </com.edufound.reader.cusview.RoundFrameLayout>
+
+</FrameLayout>

app/src/main/AndroidManifest.xml

@@ -195,6 +195,16 @@
                 android:screenOrientation="landscape"
                 android:theme="@style/efunboxTransparentLoginAlert"
                 android:windowSoftInputMode="adjustNothing|stateHidden"></activity>
+        <activity
+                android:name="com.edufound.reader.activity.SafflowerActivity"
+                android:configChanges="screenLayout|screenSize|keyboardHidden|keyboard|orientation"
+                android:label=""
+                android:launchMode="singleTask"
+                android:maxAspectRatio="2.1"
+                android:resizeableActivity="true"
+                android:screenOrientation="landscape"
+                android:theme="@style/efunboxTransparentLoginAlert"
+                android:windowSoftInputMode="adjustNothing|stateHidden"></activity>
         <!--友盟start-->
         <meta-data
                 android:name="UMENG_APPKEY"

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

@@ -0,0 +1,84 @@
+package com.edufound.reader.activity;
+
+import android.app.Activity;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import com.edufound.reader.R;
+import com.edufound.reader.annotation.BindView;
+import com.edufound.reader.base.BaseMvpActivity;
+import com.edufound.reader.contract.SafflowerContract;
+import com.edufound.reader.presenter.SafflowerPresenter;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+public class SafflowerActivity extends BaseMvpActivity<SafflowerPresenter> implements SafflowerContract.View {
+
+    Activity mActivity;
+    @BindView(id = R.id.activity_saffloer_sign_layout)
+    LinearLayout mSignLayout;
+    @BindView(id = R.id.activity_saffloer_recyclerview)
+    RecyclerView mRecyclerView;
+
+    @BindView(id = R.id.activity_saffloer_back)
+    ImageView mBack;
+    @BindView(id = R.id.activity_saffloer_sign)
+    FrameLayout mSign;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.activity_saffloer;
+    }
+
+    @Override
+    public void initView() {
+        mActivity = this;
+        mPresenter = new SafflowerPresenter();
+        mPresenter.attachView(this);
+        mPresenter.initSignLayout(mSignLayout);
+        mPresenter.initRecyclearView(mRecyclerView);
+        addUiClickListener(mBack, o -> {
+            mActivity.finish();
+        });
+        addUiClickListener(mSign, o -> {
+            Toast.makeText(mActivity, "点击签到", Toast.LENGTH_SHORT).show();
+        });
+    }
+
+    @Override
+    public void onDisconnect() {
+
+    }
+
+    @Override
+    public void onMobileConnect() {
+
+    }
+
+    @Override
+    public void onWifiConnect() {
+
+    }
+
+    @Override
+    public void showLoading() {
+
+    }
+
+    @Override
+    public void hideLoading() {
+
+    }
+
+    @Override
+    public void onError(String errMessage) {
+
+    }
+
+    @Override
+    public Activity getActivity() {
+        return mActivity;
+    }
+}

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

@@ -4,11 +4,13 @@ import android.app.Activity;
 import android.content.Intent;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Toast;
 
 import com.edufound.reader.R;
 import com.edufound.reader.annotation.BindView;
 import com.edufound.reader.base.BaseMvpActivity;
 import com.edufound.reader.contract.UserInfoSettingContract;
+import com.edufound.reader.listener.PopUtilClickListener;
 import com.edufound.reader.popwindow.PopWindowUtil;
 import com.edufound.reader.presenter.UserInfoSettingPresenter;
 import com.edufound.reader.util.Consts;
@@ -27,6 +29,12 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
     LinearLayout mPrivServices;
     @BindView(id = R.id.activity_userinfo_setting_services_layout)
     LinearLayout mAgreementServices;
+    @BindView(id = R.id.activity_userinfo_setting_cancellation_layout)
+    LinearLayout mCancellationLayout;
+    @BindView(id = R.id.activity_userinfo_setting_bindwechat_layout)
+    LinearLayout mBindWeChat;
+    @BindView(id = R.id.activity_userinfo_setting_switchuser_layout)
+    LinearLayout mSwitchLayout;
 
     @Override
     public int getLayoutId() {
@@ -42,7 +50,17 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
             mActivity.finish();
         });
         addUiClickListener(mLoginOut, o -> {
-            PopWindowUtil.showExitLoginWindow(mActivity, getRootView());
+            PopWindowUtil.showExitLoginWindow(mActivity, getRootView(), new PopUtilClickListener() {
+                @Override
+                public void clickCancel() {
+
+                }
+
+                @Override
+                public void clickSubmit(Object obj) {
+                    Toast.makeText(mActivity, "退出账号", Toast.LENGTH_SHORT).show();
+                }
+            });
         });
         addUiClickListener(mPrivServices, o -> {
             Intent intent = new Intent(getActivity(), WebActivity.class);
@@ -54,6 +72,38 @@ public class UserInfoSettingActivity extends BaseMvpActivity<UserInfoSettingPres
             intent.putExtra("loadUrl", Consts.getAgreementServicesUrl());
             getActivity().startActivity(intent);
         });
+
+        addUiClickListener(mCancellationLayout, o -> {
+            PopWindowUtil.showCancellationAccountWindow(mActivity, getRootView(), new PopUtilClickListener() {
+                @Override
+                public void clickCancel() {
+
+                }
+
+                @Override
+                public void clickSubmit(Object obj) {
+                    Toast.makeText(mActivity, "注销账号", Toast.LENGTH_SHORT).show();
+                }
+            });
+        });
+
+        addUiClickListener(mBindWeChat, o -> {
+            PopWindowUtil.showBindWeChatWindow(mActivity, getRootView(), new PopUtilClickListener() {
+                @Override
+                public void clickCancel() {
+
+                }
+
+                @Override
+                public void clickSubmit(Object object) {
+
+                }
+            });
+        });
+        addUiClickListener(mSwitchLayout, o -> {
+            Intent tologin = new Intent(getActivity(), LoginAlertActivity.class);
+            getActivity().startActivity(tologin);
+        });
     }
 
     @Override

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

@@ -0,0 +1,61 @@
+package com.edufound.reader.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.edufound.reader.R;
+
+import java.util.List;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class SafflowerItemAdapter extends RecyclerView.Adapter<SafflowerItemHolder> {
+
+
+    private LayoutInflater mLayoutInflater;
+    private Context mContext;
+    private List<Object> mListData;
+
+    public SafflowerItemAdapter(Context context, List<Object> listData) {
+        mContext = context;
+        mLayoutInflater = LayoutInflater.from(context);
+        mListData = listData;
+
+
+    }
+
+    @NonNull
+    @Override
+    public SafflowerItemHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        return new SafflowerItemHolder(mLayoutInflater.inflate(R.layout.adapter_item_safflower , parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull SafflowerItemHolder holder, int position) {
+        holder.mTitle.setText(mListData.get(position).toString());
+    }
+
+    @Override
+    public int getItemCount() {
+        return mListData.size();
+    }
+
+    @Override
+    public int getItemViewType(int position) {
+        return position;
+    }
+}
+
+class SafflowerItemHolder extends RecyclerView.ViewHolder {
+
+    TextView mTitle;
+
+    public SafflowerItemHolder(@NonNull View itemView) {
+        super(itemView);
+        mTitle = itemView.findViewById(R.id.adapter_item_safflower_title);
+    }
+}

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

@@ -0,0 +1,21 @@
+package com.edufound.reader.contract;
+
+import android.widget.LinearLayout;
+
+import com.edufound.reader.base.BaseView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+public interface SafflowerContract {
+    interface Model {
+    }
+
+    interface View extends BaseView {
+    }
+
+    interface Presenter {
+        void initSignLayout(LinearLayout layout);
+
+        void initRecyclearView(RecyclerView recyclerView);
+    }
+}

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

@@ -20,6 +20,7 @@ import com.edufound.reader.activity.MyCollectionActivity;
 import com.edufound.reader.activity.MyFollowActivity;
 import com.edufound.reader.activity.PayActivity;
 import com.edufound.reader.activity.RecordActivity;
+import com.edufound.reader.activity.SafflowerActivity;
 import com.edufound.reader.activity.UserInfoSettingActivity;
 import com.edufound.reader.base.BaseMvpFragment;
 import com.edufound.reader.bean.UserInfoBean;
@@ -117,6 +118,7 @@ public class MyTabFragment extends BaseMvpFragment<MyTabFragmentPresenter> imple
         });
         addUiClick(mHeadUserRedFlower, o -> {
             Toast.makeText(getActivity(), "click 小红花", Toast.LENGTH_SHORT).show();
+            toNextActivity(SafflowerActivity.class);
         });
         addUiClick(mHeadUserMyAttention, o -> {
             Toast.makeText(getActivity(), "click 我的关注", Toast.LENGTH_SHORT).show();

app/src/main/java/com/edufound/reader/listener/PopUtilClickListener.java

@@ -0,0 +1,7 @@
+package com.edufound.reader.listener;
+
+public interface PopUtilClickListener {
+    void clickCancel();
+
+    void clickSubmit(Object object);
+}

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

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

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

@@ -11,6 +11,7 @@ import android.widget.PopupWindow;
 import com.edufound.reader.R;
 import com.edufound.reader.application.EApplication;
 import com.edufound.reader.cusview.GridRadioGroup;
+import com.edufound.reader.listener.PopUtilClickListener;
 import com.orhanobut.logger.Logger;
 
 public class PopWindowUtil {
@@ -40,7 +41,7 @@ public class PopWindowUtil {
         mPopupWindow.showAtLocation(parent, Gravity.CENTER, 0, 0);
     }
 
-    public static void showSelectGradeWindow(Context context, View parent, int checked) {
+    public static void showSelectGradeWindow(Context context, View parent, int checked, PopUtilClickListener listener) {
         View dialog_view = LayoutInflater.from(context).inflate(R.layout.popupwindow_select_grade, null);
         dialog_view.setFocusable(true);
         FrameLayout btn_ok = dialog_view.findViewById(R.id.popupwindow_select_ok);
@@ -64,17 +65,20 @@ public class PopWindowUtil {
                 break;
         }
         gridRadioGroup.check(id);
+        final String[] checkText = {String.valueOf(id)};
         gridRadioGroup.setOnCheckedChangeListener(new GridRadioGroup.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(GridRadioGroup group, int checkedId) {
                 Logger.e("checkedId：" + checkedId);
                 group.check(checkedId);
+                checkText[0] = String.valueOf(checkedId);
             }
         });
         btn_ok.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 mPopupWindow.dismiss();
+                listener.clickSubmit(checkText[0]);
             }
         });
         mPopupWindow = new PopupWindow(dialog_view, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
@@ -83,7 +87,7 @@ public class PopWindowUtil {
     }
 
 
-    public static void showExitLoginWindow(Context context, View parent) {
+    public static void showExitLoginWindow(Context context, View parent, PopUtilClickListener listener) {
         View dialog_view = LayoutInflater.from(context).inflate(R.layout.popupwindow_exit_login, null);
         dialog_view.setFocusable(true);
         ImageView image = dialog_view.findViewById(R.id.popupwindow_exit_login_image);
@@ -92,12 +96,14 @@ public class PopWindowUtil {
         exit.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
+                listener.clickSubmit(null);
             }
         });
         cancel.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 mPopupWindow.dismiss();
+                listener.clickCancel();
             }
         });
         mPopupWindow = new PopupWindow(dialog_view, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
@@ -106,4 +112,47 @@ public class PopWindowUtil {
         mPopupWindow.showAtLocation(parent, Gravity.CENTER, 0, 0);
     }
 
+    public static void showCancellationAccountWindow(Context context, View parent, PopUtilClickListener listener) {
+        View dialog_view = LayoutInflater.from(context).inflate(R.layout.popupwindow_cancellation_account, null);
+        dialog_view.setFocusable(true);
+        FrameLayout exit = dialog_view.findViewById(R.id.popupwindow_cancellation_account_ok);
+        FrameLayout cancel = dialog_view.findViewById(R.id.popupwindow_cancellation_account_cancel);
+        exit.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                listener.clickSubmit(null);
+            }
+        });
+        cancel.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mPopupWindow.dismiss();
+                listener.clickCancel();
+            }
+        });
+        mPopupWindow = new PopupWindow(dialog_view, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
+        mPopupWindow.setFocusable(true);
+        mPopupWindow.showAtLocation(parent, Gravity.CENTER, 0, 0);
+        mPopupWindow.showAtLocation(parent, Gravity.CENTER, 0, 0);
+    }
+
+
+    public static void showBindWeChatWindow(Context context, View parent, PopUtilClickListener listener) {
+        View dialog_view = LayoutInflater.from(context).inflate(R.layout.popup_window_bind_wechat, null);
+        dialog_view.setFocusable(true);
+        ImageView back = dialog_view.findViewById(R.id.popupwindow_bindwechat_back);
+        back.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mPopupWindow.dismiss();
+                listener.clickCancel();
+            }
+        });
+        mPopupWindow = new PopupWindow(dialog_view, FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT);
+        mPopupWindow.setFocusable(true);
+        mPopupWindow.showAtLocation(parent, Gravity.CENTER, 0, 0);
+        mPopupWindow.showAtLocation(parent, Gravity.CENTER, 0, 0);
+    }
 }
+
+

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

@@ -4,6 +4,7 @@ import android.content.Intent;
 import android.view.KeyEvent;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.Toast;
 
 import com.edufound.reader.R;
 import com.edufound.reader.activity.LoginAlertActivity;
@@ -13,6 +14,7 @@ import com.edufound.reader.fragment.CharacterFragment;
 import com.edufound.reader.fragment.RecommendFragment;
 import com.edufound.reader.fragment.MyTabFragment;
 import com.edufound.reader.model.MainModel;
+import com.edufound.reader.listener.PopUtilClickListener;
 import com.edufound.reader.popwindow.PopWindowUtil;
 import com.edufound.reader.util.Consts;
 import com.orhanobut.logger.Logger;
@@ -66,7 +68,17 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
                     radioGroup.postDelayed(new Runnable() {
                         @Override
                         public void run() {
-                            PopWindowUtil.showSelectGradeWindow(mView.getActivity(), mView.getRootView(), 0);
+                            PopWindowUtil.showSelectGradeWindow(mView.getActivity(), mView.getRootView(), 0, new PopUtilClickListener() {
+                                @Override
+                                public void clickCancel() {
+
+                                }
+
+                                @Override
+                                public void clickSubmit(Object object) {
+                                    Toast.makeText(mView.getActivity(), "选择了：" + object.toString(), Toast.LENGTH_SHORT).show();
+                                }
+                            });
                             showSelectGrade = false;
                         }
                     }, 500);
@@ -101,7 +113,6 @@ public class MainPresenter extends BasePresenter<MainContract.View> implements M
         transaction.commit();
     }
 
-
     boolean checkLogin() {
         if (Consts.getmConstsUserBean() != null) {
             //已登录

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

@@ -0,0 +1,60 @@
+package com.edufound.reader.presenter;
+
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.LinearLayout;
+
+import com.edufound.reader.R;
+import com.edufound.reader.adapter.MessageItemAdapter;
+import com.edufound.reader.adapter.SafflowerItemAdapter;
+import com.edufound.reader.base.BasePresenter;
+import com.edufound.reader.contract.SafflowerContract;
+import com.edufound.reader.model.SafflowerModel;
+import com.edufound.reader.util.SizeUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class SafflowerPresenter extends BasePresenter<SafflowerContract.View> implements SafflowerContract.Presenter {
+    SafflowerModel mModel;
+    List<Object> mDataList;
+
+    public SafflowerPresenter() {
+        mModel = new SafflowerModel();
+        mDataList = new ArrayList<>();
+        for (int i = 0; i < 7; i++) {
+            mDataList.add(i);
+        }
+    }
+
+    @Override
+    public void initSignLayout(LinearLayout layout) {
+        if (mDataList != null && mDataList.size() > 0) {
+            for (int i = 0; i < mDataList.size(); i++) {
+                View view = LayoutInflater.from(mView.getActivity()).inflate(R.layout.activity_saffloer_sign_layout_item, null);
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT, 1);
+                params.gravity = Gravity.CENTER;
+                view.setLayoutParams(params);
+                layout.addView(view);
+            }
+        }
+    }
+
+    @Override
+    public void initRecyclearView(RecyclerView rv) {
+        SafflowerItemAdapter mMessageItemAdapter = new SafflowerItemAdapter(mView.getActivity(), mDataList);
+        GridLayoutManager gridLayoutManager = new GridLayoutManager(mView.getActivity(), 2);
+        gridLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
+        rv.addItemDecoration(new MyCollectionItemDecoration(
+                SizeUtils.dp2px(mView.getActivity(), 20f),
+                SizeUtils.dp2px(mView.getActivity(), 20)));
+        rv.setLayoutManager(gridLayoutManager);
+        rv.setAdapter(mMessageItemAdapter);
+    }
+}

app/src/main/res/drawable/activity_saffloer_sigin_layout_divier.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+        android:shape="rectangle">
+    <size
+            android:width="49dp"
+            android:height="10dp" />
+    <solid android:color="#F55743" />
+</shape>

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

@@ -10,7 +10,7 @@
             android:id="@+id/background"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/main_background"
+            android:background="#70C1FF"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,11 +44,58 @@
 
         </FrameLayout>
 
-        <ImageView
+        <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="6"
-                android:src="@color/springgreen"></ImageView>
+                android:layout_weight="6">
+
+            <FrameLayout
+                    android:layout_width="1015dp"
+                    android:layout_height="545dp"
+                    android:layout_gravity="center"
+                    android:background="@drawable/popup_window_bind_wechat_bg">
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="44dp"
+                        android:layout_gravity="top"
+                        android:layout_marginLeft="378dp"
+                        android:layout_marginTop="11dp"
+                        android:text="感谢使用 联系我们"
+                        android:textColor="@color/white"
+                        android:textSize="36dp"
+                        android:textStyle="bold"></TextView>
+            </FrameLayout>
+
+            <FrameLayout
+                    android:layout_width="225dp"
+                    android:layout_height="225dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginBottom="40dp"
+                    android:background="@drawable/popup_window_bind_wechat_qrcode_bg">
+
+                <ImageView
+                        android:layout_width="203dp"
+                        android:layout_height="203dp"
+                        android:layout_gravity="center"
+                        android:src="@color/red"></ImageView>
+            </FrameLayout>
+
+
+            <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="35dp"
+                    android:layout_marginTop="130dp"
+                    android:gravity="center"
+                    android:text="客服沟通 | 问题反馈 | 产品吐槽\n有任何问题均可在线咨询哦"
+                    android:textColor="#333333"
+                    android:textSize="32dp"
+                    android:textStyle="bold"></TextView>
+
+        </FrameLayout>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -17,7 +17,7 @@
             app:layout_constraintTop_toTopOf="parent"></FrameLayout>
 
 
-    <LinearLayout
+    <FrameLayout
             android:layout_width="1280dp"
             android:layout_height="720dp"
             android:gravity="center"
@@ -28,36 +28,284 @@
             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="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1">
-
-            <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="77dp"
-                    android:layout_height="77dp"
-                    android:layout_gravity="right"
-                    android:layout_marginTop="20dp"
-                    android:layout_marginRight="32dp"
-                    android:src="@drawable/activity_pay_myorder"></ImageView>
+                android:layout_width="1196dp"
+                android:layout_height="613dp"
+                android:layout_gravity="center|bottom"
+                android:layout_marginBottom="27dp"
+                android:background="@drawable/activity_pay_bg">
+
+            <LinearLayout
+                    android:layout_width="1062dp"
+                    android:layout_height="474dp"
+                    android:layout_gravity="center"
+                    android:layout_marginTop="10dp"
+
+                    android:orientation="horizontal">
+
+                <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="15dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:orientation="vertical">
+
+
+                    <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_weight="1">
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="522dp"
+                                android:layout_height="190dp"
+                                android:layout_gravity="center"
+                                android:background="@drawable/activity_pay_year_bg">
+
+                            <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="50dp"
+                                    android:layout_marginLeft="25dp"
+                                    android:layout_marginTop="32dp"
+                                    android:text="12个月"
+                                    android:textColor="@color/white"
+                                    android:textSize="36dp"
+                                    android:textStyle="bold"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="0.0"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.0"></TextView>
+
+
+                            <LinearLayout
+                                    android:id="@+id/linearLayout"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="50dp"
+                                    android:layout_marginEnd="43dp"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="1.0"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.23000002">
+
+                                <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="30dp"
+                                        android:layout_gravity="bottom"
+                                        android:gravity="bottom"
+                                        android:text="实际支付￥"
+                                        android:textColor="@color/white"
+                                        android:textSize="24dp"
+                                        android:textStyle="bold"></TextView>
+
+                                <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="50dp"
+                                        android:layout_gravity="bottom"
+                                        android:gravity="bottom"
+                                        android:text="60"
+                                        android:textColor="@color/white"
+                                        android:textSize="36dp"
+                                        android:textStyle="bold"></TextView>
+
+                                <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="30dp"
+                                        android:layout_gravity="bottom"
+                                        android:gravity="bottom"
+                                        android:text="元"
+                                        android:textColor="@color/white"
+                                        android:textSize="24dp"
+                                        android:textStyle="bold"></TextView>
+                            </LinearLayout>
+
+                            <TextView
+                                    android:id="@+id/textView2"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="25dp"
+                                    android:layout_marginLeft="25dp"
+                                    android:layout_marginBottom="32dp"
+                                    android:text="1222222222月"
+                                    android:textColor="@color/white"
+                                    android:textSize="18dp"
+                                    android:textStyle="bold"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="0.0"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.85"></TextView>
 
 
+                            <ImageView
+                                    android:layout_width="73dp"
+                                    android:layout_height="58dp"
+                                    android:layout_marginEnd="12dp"
+                                    android:layout_marginBottom="5dp"
+                                    android:src="@drawable/activity_pay_itemcheck"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="1.0"
+                                    app:layout_constraintStart_toEndOf="@+id/textView2"
+                                    app:layout_constraintTop_toBottomOf="@+id/linearLayout"
+                                    app:layout_constraintVertical_bias="0.81"></ImageView>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </FrameLayout>
+
+                    <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="0dp"
+                            android:layout_gravity="center"
+                            android:layout_weight="1">
+
+                        <androidx.constraintlayout.widget.ConstraintLayout
+                                android:layout_width="522dp"
+                                android:layout_height="190dp"
+                                android:layout_gravity="center"
+                                android:background="@drawable/activity_pay_month_bg">
+
+                            <TextView
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="50dp"
+                                    android:layout_marginLeft="25dp"
+                                    android:layout_marginTop="32dp"
+                                    android:text="12个月"
+                                    android:textColor="@color/white"
+                                    android:textSize="36dp"
+                                    android:textStyle="bold"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="0.0"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.0"></TextView>
+
+
+                            <LinearLayout
+                                    android:id="@+id/linearLayout2"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="50dp"
+                                    android:layout_marginEnd="43dp"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="1.0"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.23000002">
+
+                                <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="30dp"
+                                        android:layout_gravity="bottom"
+                                        android:gravity="bottom"
+                                        android:text="实际支付￥"
+                                        android:textColor="@color/white"
+                                        android:textSize="24dp"
+                                        android:textStyle="bold"></TextView>
+
+                                <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="50dp"
+                                        android:layout_gravity="bottom"
+                                        android:gravity="bottom"
+                                        android:text="60"
+                                        android:textColor="@color/white"
+                                        android:textSize="36dp"
+                                        android:textStyle="bold"></TextView>
+
+                                <TextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="30dp"
+                                        android:layout_gravity="bottom"
+                                        android:gravity="bottom"
+                                        android:text="元"
+                                        android:textColor="@color/white"
+                                        android:textSize="24dp"
+                                        android:textStyle="bold"></TextView>
+                            </LinearLayout>
+
+                            <TextView
+                                    android:id="@+id/textView3"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="25dp"
+                                    android:layout_marginLeft="25dp"
+                                    android:layout_marginBottom="32dp"
+                                    android:text="1222222222月"
+                                    android:textColor="@color/white"
+                                    android:textSize="18dp"
+                                    android:textStyle="bold"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="0.0"
+                                    app:layout_constraintStart_toStartOf="parent"
+                                    app:layout_constraintTop_toTopOf="parent"
+                                    app:layout_constraintVertical_bias="0.85"></TextView>
+
+
+                            <ImageView
+                                    android:layout_width="73dp"
+                                    android:layout_height="58dp"
+                                    android:layout_marginEnd="12dp"
+                                    android:layout_marginBottom="5dp"
+                                    android:src="@drawable/activity_pay_itemcheck"
+                                    app:layout_constraintBottom_toBottomOf="parent"
+                                    app:layout_constraintEnd_toEndOf="parent"
+                                    app:layout_constraintHorizontal_bias="1.0"
+                                    app:layout_constraintStart_toEndOf="@+id/textView3"
+                                    app:layout_constraintTop_toBottomOf="@+id/linearLayout2"
+                                    app:layout_constraintVertical_bias="0.76"></ImageView>
+                        </androidx.constraintlayout.widget.ConstraintLayout>
+
+                    </FrameLayout>
+                </LinearLayout>
+
+                <FrameLayout
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1">
+
+                    <FrameLayout
+                            android:layout_width="383dp"
+                            android:layout_height="383dp"
+                            android:layout_gravity="center"
+                            android:background="@drawable/activity_pay_qrcode_bg">
+
+                        <ImageView
+                                android:layout_width="216dp"
+                                android:layout_height="216dp"
+                                android:layout_gravity="center"
+                                android:layout_marginBottom="20dp"
+                                android:src="@color/red"></ImageView>
+                    </FrameLayout>
+                </FrameLayout>
+            </LinearLayout>
         </FrameLayout>
 
-        <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="6"
-                android:background="@color/springgreen"></FrameLayout>
-    </LinearLayout>
+    </FrameLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,152 @@
+<?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="#55B77C"
+            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: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">
+
+        <LinearLayout
+                android:layout_width="1184dp"
+                android:layout_height="630dp"
+                android:layout_gravity="center"
+                android:background="@drawable/activity_safflower_bg"
+                android:orientation="vertical">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1.6">
+
+                <TextView
+                        android:id="@+id/textView4"
+                        android:layout_width="256dp"
+                        android:layout_height="46dp"
+                        android:layout_marginTop="44dp"
+                        android:layout_marginBottom="297dp"
+                        android:gravity="center"
+                        android:text="签到打卡得小红花"
+                        android:textColor="@color/white"
+                        android:textSize="32dp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"></TextView>
+
+                <TextView
+                        android:id="@+id/textView5"
+                        android:layout_width="200dp"
+                        android:layout_height="46dp"
+                        android:layout_marginTop="44dp"
+                        android:layout_marginBottom="297dp"
+                        android:gravity="center"
+                        android:text="已签到113天"
+                        android:textColor="@color/black"
+                        android:textSize="32dp"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintHorizontal_bias="0.78"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"></TextView>
+
+                <LinearLayout
+                        android:id="@+id/activity_saffloer_sign_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="140dp"
+                        android:layout_marginLeft="100dp"
+                        android:layout_marginTop="20dp"
+                        android:layout_marginRight="100dp"
+                        android:divider="@drawable/activity_saffloer_sigin_layout_divier"
+                        android:dividerPadding="67dp"
+                        android:orientation="horizontal"
+                        android:showDividers="middle"
+                        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.44">
+
+                </LinearLayout>
+
+
+                <FrameLayout
+                        android:id="@+id/activity_saffloer_sign"
+                        android:layout_width="283dp"
+                        android:layout_height="76dp"
+                        android:background="@drawable/activity_safflower_sigin_bg"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@+id/activity_saffloer_sign_layout">
+
+                    <TextView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:gravity="center"
+                            android:text="点击签到"
+                            android:textColor="@color/white"
+                            android:textSize="31dp"
+                            android:textStyle="bold"></TextView>
+                </FrameLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical">
+
+                <TextView
+                        android:layout_width="352dp"
+                        android:layout_height="39dp"
+                        android:layout_gravity="center"
+                        android:layout_marginTop="22dp"
+                        android:gravity="center"
+                        android:text="小小任务条，朗读好习惯"
+                        android:textColor="@color/black"
+                        android:textSize="32dp"
+                        android:textStyle="bold"></TextView>
+
+                <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/activity_saffloer_recyclerview"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:paddingTop="20dp"></androidx.recyclerview.widget.RecyclerView>
+            </LinearLayout>
+        </LinearLayout>
+
+        <ImageView
+                android:id="@+id/activity_saffloer_back"
+                android:layout_width="77dp"
+                android:layout_height="77dp"
+                android:layout_gravity="left|top"
+                android:layout_marginLeft="32dp"
+                android:layout_marginTop="20dp"
+                android:src="@drawable/main_back"></ImageView>
+
+    </FrameLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:paddingTop="30dp">
+
+    <FrameLayout
+            android:layout_width="90dp"
+            android:layout_height="71dp"
+            android:layout_gravity="center">
+
+        <ImageView
+                android:id="@+id/activity_saffloer_sign_layout_item_status"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@drawable/activity_saffloer_sign_layout_item_true"></ImageView>
+
+        <ImageView
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="right"
+                android:src="@drawable/activity_saffloer_sign_layout_item_true_check"></ImageView>
+    </FrameLayout>
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="28dp"
+            android:layout_marginTop="10dp"
+            android:alpha="0.6"
+            android:text="11.23"
+            android:textColor="@color/black"
+            android:textSize="23dp"></TextView>
+</LinearLayout>

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

@@ -165,7 +165,7 @@
                                         <FrameLayout
                                                 android:layout_width="191dp"
                                                 android:layout_height="60dp"
-                                                android:background="@drawable/activity_userinfo_setting_item_sex_bg">
+                                                android:background="@drawable/activity_userinfo_setting_item_sex_true_bg">
 
                                             <TextView
                                                     android:layout_width="match_parent"
@@ -176,13 +176,6 @@
                                                     android:textColor="@color/white"
                                                     android:textSize="36dp"></TextView>
 
-                                            <ImageView
-                                                    android:layout_width="42dp"
-                                                    android:layout_height="46dp"
-                                                    android:layout_gravity="right|center"
-                                                    android:layout_marginTop="1dp"
-                                                    android:layout_marginRight="22dp"
-                                                    android:src="@drawable/activity_loginalert_chech_true"></ImageView>
                                         </FrameLayout>
 
                                         <FrameLayout
@@ -199,13 +192,6 @@
                                                     android:textColor="@color/white"
                                                     android:textSize="36dp"></TextView>
 
-                                            <ImageView
-                                                    android:layout_width="42dp"
-                                                    android:layout_height="46dp"
-                                                    android:layout_gravity="right|center"
-                                                    android:layout_marginTop="1dp"
-                                                    android:layout_marginRight="22dp"
-                                                    android:src="@drawable/activity_loginalert_chech_true"></ImageView>
                                         </FrameLayout>
                                     </LinearLayout>
                                 </LinearLayout>

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

@@ -0,0 +1,75 @@
+<?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="550dp"
+        android:layout_height="52dp"
+        android:layout_gravity="center"
+        android:background="@color/white"
+        roundframelayout:radio="26">
+
+    <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal">
+
+            <TextView
+                    android:id="@+id/adapter_item_safflower_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="22dp"
+                    android:gravity="center|left"
+                    android:text="别人对我的作品评论，回复1次"
+                    android:textColor="@color/black"
+                    android:textSize="26dp"
+                    android:textStyle="bold"></TextView>
+
+            <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="6dp"
+                    android:orientation="horizontal">
+
+                <ImageView
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+                        android:src="@drawable/anim_red_follow"></ImageView>
+
+                <TextView
+                        android:id="@+id/adapter_item_safflower_redfcount"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:layout_marginLeft="7dp"
+                        android:gravity="center"
+                        android:text="1"
+                        android:textColor="#F65641"
+                        android:textSize="26dp"
+                        android:textStyle="bold"></TextView>
+            </LinearLayout>
+        </LinearLayout>
+
+        <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center|right"
+                android:layout_marginRight="22dp"
+                android:orientation="horizontal">
+
+            <TextView
+                    android:id="@+id/adapter_item_safflower_overcount"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="0/5"
+                    android:textColor="#F65641"
+                    android:textSize="26dp"
+                    android:textStyle="bold"></TextView>
+        </LinearLayout>
+    </FrameLayout>
+</com.edufound.reader.cusview.RoundFrameLayout>