代码优化

book/app/build.gradle

@@ -194,6 +194,7 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.11.0'
     implementation 'com.google.android.ads:mediation-test-suite:2.0.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    implementation('jp.wasabeef:glide-transformations:4.3.0')
     // 65536
     implementation 'androidx.multidex:multidex:2.0.1'
     // 附件下载更新
@@ -252,6 +253,10 @@ dependencies {
 
     // 穿山甲聚合 接入【穿山甲、快手】
     implementation "com.pangle.cn:mediation-sdk:6.1.2.5"
+    // 穿山甲Applog 上报组件（必须）
+    implementation 'com.bytedance.applog:RangersAppLog-Lite-cn:6.16.3'
+    // 穿山甲商业化转化组件（必须）
+    implementation 'com.bytedance.ads:AppConvert:1.3.0.5'
 
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'

book/app/proguard-rules.pro

@@ -522,3 +522,8 @@ public static final int *;
     public static ** valueOf(java.lang.String);
 }
 # ======================= umeng END ================
+
+
+    # ======================= 穿山甲商业化转化组件 END ================
+    -keep class com.bytedance.ads.convert.broadcast.common.EncryptionTools {*;}
+    # ======================= 穿山甲商业化转化组件 END ================
\ No newline at end of file

book/app/src/main/AndroidManifest.xml

@@ -19,18 +19,6 @@
     <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-
-    <!-- 悬浮窗权限 -->
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-
     <application
         android:name=".MintsApplication"
         android:allowBackup="false"

book/app/src/main/java/com/mints/enjoyboxjia/MintsApplication.java

@@ -12,6 +12,7 @@ import com.downloader.PRDownloader;
 import com.downloader.PRDownloaderConfig;
 import com.mints.enjoyboxjia.ad.TTAdManagerHolder;
 import com.mints.enjoyboxjia.common.Constant;
+import com.mints.enjoyboxjia.manager.CsjAppLogManager;
 import com.mints.enjoyboxjia.manager.ShareSdkManager;
 import com.mints.enjoyboxjia.manager.TalkingDataManager;
 import com.mints.enjoyboxjia.manager.UmengManager;
@@ -98,6 +99,8 @@ public class MintsApplication extends MultiDexApplication {
 
         TalkingDataManager.INSTANCE.init(this);
 
+        CsjAppLogManager.INSTANCE.init(this);
+
         // bugly
         CrashReport.initCrashReport(this, "cbba7599c2", BuildConfig.DEBUG);
 

book/app/src/main/java/com/mints/enjoyboxjia/common/AppConfig.java

@@ -18,4 +18,6 @@ public class AppConfig {
     public static int fragmentClickFlag = 0;
     // 启动页时间戳
     public static long splashTime = 0;
+
+    public static boolean enterAlipay = false;
 }

book/app/src/main/java/com/mints/enjoyboxjia/common/Constant.kt

@@ -13,6 +13,8 @@ object Constant {
     const val FRAGMENT_CLICK_THREE = 2
     const val FRAGMENT_CLICK_FOUR = 3
 
+    const val PAGE_SIZE = 10
+
     // 协议地址
     var REGISTER_URL = "http://mints-web.mints-id.com/agreements/roomprophet/yhxy.html"//注册协议
     var PRIVACY_URL = "http://mints-web.mints-id.com/agreements/roomprophet/syzc.html"//隐私协议

book/app/src/main/java/com/mints/enjoyboxjia/manager/CsjAppLogManager.kt

+package com.mints.enjoyboxjia.manager
+
+import android.app.Application
+import android.text.TextUtils
+import com.bytedance.ads.convert.BDConvert
+import com.bytedance.applog.AppLog
+import com.bytedance.applog.IDataObserver
+import com.bytedance.applog.InitConfig
+import com.bytedance.applog.util.UriConstants
+import com.bytedance.hume.readapk.HumeSDK
+import com.mints.enjoyboxjia.BuildConfig
+import com.mints.enjoyboxjia.MintsApplication
+import com.mints.enjoyboxjia.utils.LogUtil
+import com.mints.enjoyboxjia.utils.MateUtils.getAppMetaData
+import org.json.JSONObject
+
+
+/**
+ * CsjAppLogManager
+ */
+object CsjAppLogManager {
+
+    // 获取方式，穿山甲平台-Adspark-免费广告监测-应用管理创建
+    const val APP_LOG_ID = "622129"
+
+    fun init(application: Application) {
+        // 第一个参数APPID: 参考2.1节获取
+        // 第二个参数CHANNEL: 填写渠道信息，请注意不能为空
+        val config = InitConfig(APP_LOG_ID, createChannel())
+        // 设置数据上送地址
+        config.setUriConfig(UriConstants.DEFAULT)
+        config.isImeiEnable = false //建议关停获取IMEI（出于合规考虑）
+        config.isAutoTrackEnabled = false // 全埋点开关，true开启，false关闭
+        config.isLogEnable = BuildConfig.LOG_DEBUG // true:开启日志，参考4.3节设置logger，false:关闭日志
+        AppLog.setEncryptAndCompress(true) // 加密开关，true开启，false关闭
+        config.setEnablePlay(true) // 配置心跳事件（时长统计）
+        /**
+         * 用于获取用户唯一性bd_did
+         * @description
+         */
+        AppLog.addDataObserver(object : IDataObserver {
+            /**
+             * 本地的id数据加载结果通知
+             * @param did device id
+             * @param iid install id
+             * @param ssid ssid
+             */
+            override fun onIdLoaded(s: String, s1: String, s2: String) {}
+
+            /**
+             * 通知注册结果，以及id变化情况
+             * 仅主进程会被调用
+             * @param changed 是否和本地缓存有所不同
+             * @param oldDid 原device id
+             * @param newDid server返回新的device id
+             * @param oldIid 原install id
+             * @param newIid server返回新install id
+             * @param oldSsid 原ssid
+             * @param newSsid server返回新ssid
+             */
+            override fun onRemoteIdGet(
+                b: Boolean,
+                s: String?,
+                s1: String,
+                s2: String,
+                s3: String,
+                s4: String,
+                s5: String
+            ) {
+                val bd_did = AppLog.getDid()
+                LogUtil.d("mcg --> 用户唯一性bd_did=" + bd_did)
+            }
+
+            /**
+             * Config拉取数据，和本地数据对比有变化的通知
+             * 仅主进程会被调用
+             * @param changed 是否和本地缓存有所不同
+             * @param config server返回新config内容
+             */
+            override fun onRemoteConfigGet(b: Boolean, jsonObject: JSONObject?) {}
+
+            /**
+             * server拉取AbConfig数据，和本地数据对比有变化的通知
+             * 仅主进程会被调用
+             * @param changed 是否和本地缓存有所不同
+             * @param abConfig server返回新abConfig内容
+             */
+            override fun onRemoteAbConfigGet(b: Boolean, jsonObject: JSONObject) {
+                LogUtil.d("mcg -->---测试---返回全部进组信息", "" + jsonObject.toString())
+            }
+
+            /**
+             * Vid变化通知
+             */
+            override fun onAbVidsChange(s: String, s1: String) {}
+        })
+        //SDK会采集OAID、ANDROID_ID和其他的设备特征字段，请遵循相关合规要求在隐私弹窗后采集
+        //传入需要init的AppLog实例，若没有多个AppLog实例，则传入AppLog.getInstance()即可
+        BDConvert.getInstance().init(application, AppLog.getInstance())
+        // 如果在 onCreate 阶段初始化拿不到 XXXActivity 则不需要传递第三个参数
+        AppLog.init(application, config)
+        // 请在用户授权后调用如下方法，start 开始实际采集用户信息+上报：
+        AppLog.start()
+        // 在初始化后必须设置AppLog.setHeaderInfo("csj_attribution",1)，否则会直接影响归因结果。
+        AppLog.setHeaderInfo("csj_attribution", 1)
+    }
+
+
+    /**
+     * 创建渠道
+     *
+     * @return
+     */
+    private fun createChannel(): String {
+        var channel = getAppMetaData(MintsApplication.getContext(), "CHANNEL_NAME")
+        try {
+            // 穿山甲分包渠道
+            val ttChannel = HumeSDK.getChannel(MintsApplication.getContext())
+            if (!TextUtils.isEmpty(ttChannel)) {
+                // 此处方式不能修改，已和后端约定
+                channel = channel + "_" + ttChannel
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        return channel
+    }
+
+
+    object GrownEventType {
+        //注册
+        const val REGISTER = "grown_attribution_event_register"
+
+        //付费
+        const val PURCHASE = "grown_attribution_event_purchase"
+
+        //关键行为
+        const val KEY_BEHAVIOR = "grown_attribution_event_key_behavior"
+
+        //下单
+        const val ORDER = "grown_attribution_event_order"
+
+        //下载
+        const val DOWNLOAD = "grown_attribution_event_download"
+
+        //应用内拉起
+        const val DEEPLINK = "grown_attribution_event_deelink"
+
+        //授权
+        const val AUTHORIZATION = "grown_attribution_event_authorization"
+
+        //广告变现
+        const val AD_PURCHASE = "grown_attribution_event_ad_purchase"
+
+        //次留
+        const val RETENTION_2D = "grown_attribution_event_retention_2d"
+
+        //添加购物车
+        const val ADD_TO_CART = "grown_attribution_event_add_to_cart"
+
+        //表单提交
+        const val FORM_SUBMIT = "grown_attribution_event_form_submit"
+
+        //拉活
+        const val APP_RE_ACTIVE_WAKE_UP = "grown_attribution_event_app_re_active_wake_up"
+
+        //自定义激活
+        const val CUSTOM_ACTIVITION = "grown_attribution_event_custom_activition"
+
+        //自定义注册
+        const val CUSTOM_REGISTER = "grown_attribution_event_custom_register"
+    }
+
+    fun event(v: String) {
+        //方式一,穿山甲
+        AppLog.onEventV3(v)
+
+//        //方式二,自定义
+//        val paramsObj = JSONObject()
+//        try {
+//            paramsObj.put("key_string", "value_string")
+//            paramsObj.put("key_int", 10)
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//        }
+//        AppLog.onEventV3(GrownEventType.PURCHASE, paramsObj)
+    }
+}
\ No newline at end of file

book/app/src/main/java/com/mints/enjoyboxjia/manager/UserManager.java

@@ -11,7 +11,7 @@ import net.grandcentrix.tray.AppPreferences;
 /**
  * 描述：管理用户信息
  * 作者：孟崔广
- * 时间：2022/12/22 13:54
+ * 时间：2024/9/20 13:54
  */
 public class UserManager {
 
@@ -56,6 +56,8 @@ public class UserManager {
     private static final String VIP_FOREVER = "VIP_FOREVER";
     private static final String VIP_DATE = "VIP_DATE";
     private static final String CODE_ID = "codeId";
+    // 匹配用户 = true
+    private static final String NEW_FLAG = "new_flag";
 
     public static UserManager getInstance() {
         if (_inst != null) {
@@ -113,6 +115,7 @@ public class UserManager {
             ps.put(VIP_DATE, user.getExpireTime());
             ps.put(WX_OPENID, openid);
             ps.put(CODE_ID, user.getIdcode());
+            ps.put(NEW_FLAG, user.getActiviteFlag() == 1);
         }
 
     }
@@ -168,6 +171,13 @@ public class UserManager {
         return ps.getBoolean(VIP_FLAG, false);
     }
 
+    public boolean getNewFlag() {
+        if (ps == null) {
+            return false;
+        }
+        return ps.getBoolean(NEW_FLAG, false);
+    }
+
     /**
      * 获取用户登陆状态
      */
@@ -227,6 +237,7 @@ public class UserManager {
             ps.remove(WX_OPENID);
             ps.remove(CODE_ID);
             ps.remove(VIP_DATE);
+            ps.remove(NEW_FLAG);
         }
 
         _inst = null;

book/app/src/main/java/com/mints/enjoyboxjia/mvp/model/BannerList.java

+package com.mints.enjoyboxjia.mvp.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class BannerList implements Serializable {
+    private List<VedioBean> list;
+
+    public List<VedioBean> getList() {
+        return list;
+    }
+
+    public void setList(List<VedioBean> list) {
+        this.list = list;
+    }
+}

book/app/src/main/java/com/mints/enjoyboxjia/mvp/model/UserBean.java

@@ -15,6 +15,7 @@ public class UserBean implements Serializable {
     private String mobile;
     private String idcode;
     private String head;
+    private int activiteFlag=0;// 1-匹配用户
     private String openid;
     private boolean isForever;//true-永久会员
     private long expireTime;// vip到期时间  0-非vip
@@ -92,4 +93,8 @@ public class UserBean implements Serializable {
     public void setCreateTime(long createTime) {
         this.createTime = createTime;
     }
+
+    public int getActiviteFlag() {
+        return activiteFlag;
+    }
 }

book/app/src/main/java/com/mints/enjoyboxjia/mvp/model/VedioBean.java

+package com.mints.enjoyboxjia.mvp.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+public class VedioBean implements Serializable {
+
+    private String thirdId;//穿山甲id
+    private int createType;//类型，1，自有剧，2 穿山甲，3 推荐短剧，4 九宫格
+    private String title;
+    private String type;
+
+    private String tabImage;
+    private String topTabsReamrk;
+    private ArrayList<String> orderTags;//标签
+    private int vedioTotal;//同穿山甲 total
+    private int unlockIndex;//解锁剧集
+    private int seeIndex;//看到哪一集了
+    private int freeIndex;//免费剧
+    private int collect;//0未收藏，1收藏
+    private String vedioDesc;
+    private String coverImage;
+    private int completeStatus;//完结状态 同穿山接status 0-完结
+    private String scriptName;
+    private String scriptAuthor;
+    private int vedioId;// 视频id，服务器标识
+    private String hot;// 收藏量
+    private String showNum;// 播放量
+    private int adGiveVedioNum;// 广告解锁数量
+    private String recommendUrl;// 推荐视频地址
+    private int recommendIndex;// 推荐视频第几集
+    private long seeUpdateTime;// 时间戳
+    private boolean checked;// 选中
+    private boolean isRecommendVedio;// 是否推荐剧
+    private int tipMaxIndex;// 倒计时弹框
+
+    public String getShowNum() {
+        return showNum;
+    }
+
+    public void setShowNum(String showNum) {
+        this.showNum = showNum;
+    }
+
+    public int getTipMaxIndex() {
+        return tipMaxIndex;
+    }
+
+    public void setTipMaxIndex(int tipMaxIndex) {
+        this.tipMaxIndex = tipMaxIndex;
+    }
+
+    public boolean isChecked() {
+        return checked;
+    }
+
+    public void setChecked(boolean checked) {
+        this.checked = checked;
+    }
+
+    public long getSeeUpdateTime() {
+        return seeUpdateTime;
+    }
+
+    public void setSeeUpdateTime(long seeUpdateTime) {
+        this.seeUpdateTime = seeUpdateTime;
+    }
+
+    public String getRecommendUrl() {
+        return recommendUrl;
+    }
+
+    public void setRecommendUrl(String recommendUrl) {
+        this.recommendUrl = recommendUrl;
+    }
+
+    public int getRecommendIndex() {
+        return recommendIndex;
+    }
+
+    public void setRecommendIndex(int recommendIndex) {
+        this.recommendIndex = recommendIndex;
+    }
+
+    public int getAdGiveVedioNum() {
+        return adGiveVedioNum;
+    }
+
+    public void setAdGiveVedioNum(int adGiveVedioNum) {
+        this.adGiveVedioNum = adGiveVedioNum;
+    }
+
+    public void setHot(String hot) {
+        this.hot = hot;
+    }
+
+    public String getThirdId() {
+        return thirdId;
+    }
+
+    public void setThirdId(String thirdId) {
+        this.thirdId = thirdId;
+    }
+
+    public int getCreateType() {
+        return createType;
+    }
+
+    public void setCreateType(int createType) {
+        this.createType = createType;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getTopTabsReamrk() {
+        return topTabsReamrk;
+    }
+
+    public void setTopTabsReamrk(String topTabsReamrk) {
+        this.topTabsReamrk = topTabsReamrk;
+    }
+
+    public ArrayList<String> getOrderTags() {
+        return orderTags;
+    }
+
+    public void setOrderTags(ArrayList<String> orderTags) {
+        this.orderTags = orderTags;
+    }
+
+    public int getVedioTotal() {
+        return vedioTotal;
+    }
+
+    public void setVedioTotal(int vedioTotal) {
+        this.vedioTotal = vedioTotal;
+    }
+
+    public String getVedioDesc() {
+        return vedioDesc;
+    }
+
+    public void setVedioDesc(String vedioDesc) {
+        this.vedioDesc = vedioDesc;
+    }
+
+    public String getCoverImage() {
+        return coverImage;
+    }
+
+    public void setCoverImage(String coverImage) {
+        this.coverImage = coverImage;
+    }
+
+    public int getCompleteStatus() {
+        return completeStatus;
+    }
+
+    public void setCompleteStatus(int completeStatus) {
+        this.completeStatus = completeStatus;
+    }
+
+    public String getScriptName() {
+        return scriptName;
+    }
+
+    public void setScriptName(String scriptName) {
+        this.scriptName = scriptName;
+    }
+
+    public String getScriptAuthor() {
+        return scriptAuthor;
+    }
+
+    public void setScriptAuthor(String scriptAuthor) {
+        this.scriptAuthor = scriptAuthor;
+    }
+
+    public int getVedioId() {
+        return vedioId;
+    }
+
+    public void setVedioId(int vedioId) {
+        this.vedioId = vedioId;
+    }
+
+    public int getUnlockIndex() {
+        return unlockIndex;
+    }
+
+    public void setUnlockIndex(int unlockIndex) {
+        this.unlockIndex = unlockIndex;
+    }
+
+    public int getSeeIndex() {
+        return seeIndex;
+    }
+
+    public void setSeeIndex(int seeIndex) {
+        this.seeIndex = seeIndex;
+    }
+
+    public int getCollect() {
+        return collect;
+    }
+
+    public void setCollect(int collect) {
+        this.collect = collect;
+    }
+
+    public String getHot() {
+        return hot;
+    }
+
+    public void String(String hot) {
+        this.hot = hot;
+    }
+
+    public String getTypeImg() {
+        return tabImage;
+    }
+
+    public void setTypeImg(String tabImage) {
+        this.tabImage = tabImage;
+    }
+
+    public String getTabImage() {
+        return tabImage;
+    }
+
+    public void setTabImage(String tabImage) {
+        this.tabImage = tabImage;
+    }
+
+    public int getFreeIndex() {
+        return freeIndex;
+    }
+
+    public void setFreeIndex(int freeIndex) {
+        this.freeIndex = freeIndex;
+    }
+
+    public boolean isRecommendVedio() {
+        return isRecommendVedio;
+    }
+
+    public void setRecommendVedio(boolean recommendVedio) {
+        isRecommendVedio = recommendVedio;
+    }
+}

book/app/src/main/java/com/mints/enjoyboxjia/mvp/presenters/CountPresenter.kt

+package com.mints.enjoyboxjia.mvp.presenters
+
+import com.mints.enjoyboxjia.common.DeviceInfo
+import com.mints.enjoyboxjia.manager.AppHttpManager
+import com.mints.enjoyboxjia.manager.UserManager
+import com.mints.enjoyboxjia.mvp.model.BaseResponse
+import com.mints.enjoyboxjia.mvp.model.UserBean
+import com.mints.enjoyboxjia.mvp.views.CountView
+import com.mints.enjoyboxjia.utils.DeviceUuidFactory
+import com.mints.library.net.neterror.BaseSubscriber
+import com.mints.library.net.neterror.Throwable
+
+class CountPresenter : BasePresenter<CountView>() {
+
+    /**
+     * 游客登录
+     */
+    fun userLogin() {
+        val vo = HashMap<String, Any>()
+        vo["device"] = DeviceUuidFactory().deviceUuid.toString()
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.visitorlogin(vo),
+                object : BaseSubscriber<BaseResponse<UserBean>>() {
+                    override fun onCompleted() {
+                        if (isLinkView) return
+                    }
+
+                    override fun onError(e: Throwable) {
+                        if (isLinkView) return
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<UserBean>) {
+                        if (isLinkView) return
+                        view.hideLoading()
+                        val code = baseResponse.getStatus()
+                        val message = baseResponse.getMessage()
+                        val data: UserBean? = baseResponse.getData()
+                        when (code) {
+                            200 -> if (data != null) {
+                                UserManager.getInstance().saveUserInfo(data)
+                                saveTerminalInfo()
+                            }
+                            else -> view.showToast(message)
+                        }
+                    }
+                })
+    }
+
+    /**
+     * 提交设备信息
+     *
+     * @param context
+     */
+    fun saveTerminalInfo() {
+        val vo = HashMap<String, Any>()
+        val deviceInfo: DeviceInfo = DeviceInfo.instance
+        val macAddress: String = deviceInfo.getMacAddress()
+        val mac = macAddress.replace(":", "")
+        vo["mac"] = mac
+        vo["mac1"] = macAddress
+        vo["androidid"] = deviceInfo.getAndroidId(null)
+        vo["imei"] = deviceInfo.iMEI
+        vo["os"] = if (deviceInfo.isHarmonyOS()) "android-HarmonyOS" else "android"
+        vo["model"] = deviceInfo.newModel
+        vo["uuid"] = DeviceUuidFactory().deviceUuid
+        vo["osversion"] = deviceInfo.oSVersion
+        vo["appversion"] = deviceInfo.versionName
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.saveTerminalInfo(vo),
+                object : BaseSubscriber<BaseResponse<Any>>() {
+                    override fun onCompleted() {
+                        if (isLinkView) return
+                    }
+
+                    override fun onError(e: Throwable) {
+                        if (isLinkView) return
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<Any>) {
+                        if (isLinkView) return
+                        val code = baseResponse.status
+                        when (code) {
+                            200 -> getMyInfo()
+                        }
+                    }
+                })
+    }
+
+    fun getMyInfo() {
+        val vo = HashMap<String, Any>()
+        vo["os"] = "android"
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.getMyInfo(vo),
+                object : BaseSubscriber<BaseResponse<UserBean>>() {
+
+                    override fun onCompleted() {
+                        if (isLinkView)
+                            return
+
+                        view.hideLoading()
+                    }
+
+                    override fun onError(e: Throwable?) {
+                        if (isLinkView) return
+
+                        view.hideLoading()
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<UserBean>) {
+                        if (isLinkView) return
+
+                        val code: Int = baseResponse.status
+                        val message: String = baseResponse.message
+                        when (code) {
+                            200 -> {
+                                UserManager.getInstance().saveUserInfo(baseResponse.data)
+//                                view.getUserSuc(baseResponse.data)
+                            }
+                            else -> {
+                                view.showToast(message)
+                            }
+                        }
+                    }
+                })
+    }
+}
\ No newline at end of file

book/app/src/main/java/com/mints/enjoyboxjia/mvp/presenters/VipPresenter.kt

 package com.mints.enjoyboxjia.mvp.presenters
 
+import com.mints.enjoyboxjia.MintsApplication
+import com.mints.enjoyboxjia.manager.AppHttpManager
+import com.mints.enjoyboxjia.mvp.views.VipView
 import com.mints.library.net.neterror.BaseSubscriber
 import com.mints.library.net.neterror.Throwable
-import com.mints.enjoyboxjia.MintsApplication
 import com.mints.enjoyboxjia.common.DeviceInfo
-import com.mints.enjoyboxjia.manager.AppHttpManager
 import com.mints.enjoyboxjia.manager.UserManager
-import com.mints.enjoyboxjia.mvp.model.BaseResponse
-import com.mints.enjoyboxjia.mvp.model.UserBean
-import com.mints.enjoyboxjia.mvp.model.VipBean
-import com.mints.enjoyboxjia.mvp.model.WxPayParamBean
-import com.mints.enjoyboxjia.mvp.views.VipView
-import com.mints.enjoyboxjia.net.V6Service
+import com.mints.enjoyboxjia.mvp.model.*
 import com.mints.enjoyboxjia.utils.DeviceUuidFactory
 import java.util.*
 
 class VipPresenter : BasePresenter<VipView>() {
 
+    fun getMyInfo() {
+        val vo = HashMap<String, Any>()
+        vo["os"] = "android"
+        AppHttpManager.getInstance(loanApplication)
+                .call(loanService.getMyInfo(vo),
+                        object : BaseSubscriber<BaseResponse<UserBean>>() {
+
+                            override fun onCompleted() {
+                                if (isLinkView)
+                                    return
+
+                            }
+
+                            override fun onError(e: Throwable?) {
+                                if (isLinkView) return
+
+                            }
+
+                            override fun onNext(baseResponse: BaseResponse<UserBean>) {
+                                if (isLinkView) return
+
+                                val code: Int = baseResponse.status
+                                val message: String = baseResponse.message
+                                when (code) {
+                                    200 -> {
+                                        UserManager.getInstance().saveUserInfo(baseResponse.data)
+                                        view.getUserSuc(baseResponse.data)
+
+                                    }
+                                    else -> {
+                                        view.showToast(message)
+                                    }
+                                }
+                            }
+                        })
+    }
+
     /**
      * 游客登录
      */
@@ -42,7 +75,6 @@ class VipPresenter : BasePresenter<VipView>() {
                         val data: UserBean? = baseResponse.getData()
                         when (code) {
                             200 -> if (data != null) {
-
                                 UserManager.getInstance().saveUserInfo(data)
                                 saveTerminalInfo(isInstallAlipay)
                             }
@@ -211,4 +243,34 @@ class VipPresenter : BasePresenter<VipView>() {
                     }
                 })
     }
+
+    fun orders() {
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.orders(),
+                object : BaseSubscriber<BaseResponse<BannerList>>() {
+                    override fun onCompleted() {
+                        if (isLinkView) return
+                    }
+
+                    override fun onError(e: Throwable) {
+                        if (isLinkView) return
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<BannerList>) {
+                        if (isLinkView) return
+
+                        val code = baseResponse.status
+                        val message = baseResponse.message
+
+                        when (code) {
+                            200 -> {
+                                view.ordersSuc(baseResponse.data)
+                            }
+                            else -> {
+                                view.showToast(message)
+                            }
+                        }
+                    }
+                })
+    }
 }
\ No newline at end of file

book/app/src/main/java/com/mints/enjoyboxjia/mvp/views/CountView.kt

+package com.mints.enjoyboxjia.mvp.views
+
+import com.mints.enjoyboxjia.mvp.model.UserBean
+
+interface CountView : BaseView {
+//    fun getUserSuc(data:UserBean)
+}

book/app/src/main/java/com/mints/enjoyboxjia/mvp/views/VipView.kt

 package com.mints.enjoyboxjia.mvp.views
 
+import com.mints.enjoyboxjia.mvp.model.BannerList
+import com.mints.enjoyboxjia.mvp.model.UserBean
 import com.mints.enjoyboxjia.mvp.model.VipBean
 import com.mints.enjoyboxjia.mvp.model.WxPayParamBean
 
@@ -7,4 +9,7 @@ interface VipView : BaseView {
     fun getVipProductSuc(data: VipBean)
     fun getVipPayParamsSuc(payChannel:String,data: WxPayParamBean)
     fun queryVipOrderSuc(isPay:Boolean)
+    fun getUserSuc(data: UserBean)
+
+    fun ordersSuc(data: BannerList?)
 }
\ No newline at end of file

book/app/src/main/java/com/mints/enjoyboxjia/net/LoanService.java

@@ -4,6 +4,7 @@ import android.text.TextUtils;
 
 import com.google.gson.JsonObject;
 import com.mints.enjoyboxjia.BuildConfig;
+import com.mints.enjoyboxjia.mvp.model.BannerList;
 import com.mints.enjoyboxjia.mvp.model.BaseResponse;
 import com.mints.enjoyboxjia.mvp.model.HotStyleListBean;
 import com.mints.enjoyboxjia.mvp.model.OrderRecordBean;
@@ -82,7 +83,7 @@ public interface LoanService {
     /**
      * 查询vip产品
      */
-    @POST("api/vip/getVipProducts/fai")
+    @POST("api/vip/getVipProducts/appv2")
     Observable<BaseResponse<VipBean>> getVipProducts(@Body Map<String, Object> vo);
 
     /**
@@ -133,6 +134,14 @@ public interface LoanService {
     @POST("api/vip/payError")
     Observable<BaseResponse<Object>> payError(@Body Map<String, Object> vo);
 
+    /**
+     * 排行榜
+     *
+     * @return
+     */
+    @POST("api/vedio/orders")
+    Observable<BaseResponse<BannerList>> orders();
+
 
     /**
      * 默认http工厂

book/app/src/main/java/com/mints/enjoyboxjia/ui/activitys/GuideActivity.kt

@@ -66,7 +66,7 @@ class GuideActivity : BaseActivity(), GuideView {
                     readyGoThenKill(MainActivity::class.java)
                 } else {
                     val bundle = Bundle()
-                    bundle.putBoolean(VipActivity.IS_GUIDE, true)
+//                    bundle.putBoolean(VipActivity.IS_GUIDE, true)
                     readyGoThenKill(VipActivity::class.java, bundle)
                 }
                 //带点渐变动画

book/app/src/main/java/com/mints/enjoyboxjia/ui/activitys/SettingsActivity.kt

@@ -56,11 +56,11 @@ class SettingsActivity : BaseActivity(), View.OnClickListener {
             item_phone.findViewById<TextView>(R.id.tv_right).text = "未授权"
         }
 
-        if (!TextUtils.isEmpty(userManager.wxOpenid)) {
-            item_wechat.findViewById<TextView>(R.id.tv_right).text = userManager.name
-        } else {
-            item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
-        }
+//        if (!TextUtils.isEmpty(userManager.wxOpenid)) {
+//            item_wechat.findViewById<TextView>(R.id.tv_right).text = userManager.name
+//        } else {
+//            item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
+//        }
     }
 
     @SuppressLint("CutPasteId")

book/app/src/main/java/com/mints/enjoyboxjia/ui/activitys/SplashAdActivity.kt

@@ -97,9 +97,7 @@ class SplashAdActivity : BaseActivity() {
         if (UserManager.getInstance().vipFlag) {
             readyGoThenKill(MainActivity::class.java)
         } else {
-            val bundle = Bundle()
-            bundle.putBoolean(VipActivity.IS_GUIDE, true)
-            readyGoThenKill(VipActivity::class.java, bundle)
+            readyGoThenKill(VipActivity::class.java)
         }
     }
 

book/app/src/main/java/com/mints/enjoyboxjia/ui/activitys/VipActivity.kt

 package com.mints.enjoyboxjia.ui.activitys
 
+import android.animation.ValueAnimator
 import android.app.Dialog
 import android.content.Intent
 import android.net.Uri
@@ -10,34 +11,35 @@ import android.text.TextUtils
 import android.view.KeyEvent
 import android.view.View
 import android.widget.CompoundButton
-import android.widget.LinearLayout
 import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import com.daimajia.androidanimations.library.Techniques
+import com.daimajia.androidanimations.library.YoYo
+import com.mints.library.utils.GlideUtils
 import com.mints.library.utils.nodoubleclick.AntiShake
 import com.mints.enjoyboxjia.BuildConfig
 import com.mints.enjoyboxjia.R
+import com.mints.enjoyboxjia.common.AppConfig
 import com.mints.enjoyboxjia.common.Constant
+import com.mints.enjoyboxjia.manager.ActivityPageManager
 import com.mints.enjoyboxjia.manager.UserManager
-import com.mints.enjoyboxjia.mvp.model.VipBean
-import com.mints.enjoyboxjia.mvp.model.WxPayParamBean
+import com.mints.enjoyboxjia.mvp.model.*
 import com.mints.enjoyboxjia.mvp.presenters.VipPresenter
 import com.mints.enjoyboxjia.mvp.views.VipView
 import com.mints.enjoyboxjia.ui.activitys.base.BaseActivity
-import com.mints.enjoyboxjia.ui.adapter.BannerIntImageAdapter
+import com.mints.enjoyboxjia.ui.adapter.VipAdapter
+import com.mints.enjoyboxjia.ui.adapter.VipBannerAdapter
 import com.mints.enjoyboxjia.ui.widgets.*
-import com.mints.enjoyboxjia.utils.AppPreferencesManager
-import com.daimajia.androidanimations.library.Techniques
-import com.daimajia.androidanimations.library.YoYo
+import com.mints.enjoyboxjia.ui.widgets.countdowntimer.CountDownTimerSupport
+import com.mints.enjoyboxjia.ui.widgets.countdowntimer.OnCountDownTimerListener
 import com.jobo.alipay.AliPay
 import com.jobo.alipay.AlipayInfoImpl
 import com.jobo.rxpay.RxPay
 import com.jobo.rxpay.callback.IPayCallback
 import com.jobo.wxpay.WXPay
 import com.jobo.wxpay.WXPayInfoImpl
-import com.mints.enjoyboxjia.ui.adapter.VipAdapter
-import com.youth.banner.Banner
 import com.youth.banner.listener.OnPageChangeListener
-import kotlinx.android.synthetic.main.activity_vip.*
-import kotlinx.android.synthetic.main.header_layout.*
+import kotlinx.android.synthetic.main.activity_new_vip.*
 
 
 /**
@@ -47,65 +49,95 @@ import kotlinx.android.synthetic.main.header_layout.*
  */
 class VipActivity : BaseActivity(), VipView, View.OnClickListener,
     VipAdapter.OnItemClickListener,
-        CompoundButton.OnCheckedChangeListener {
+    CompoundButton.OnCheckedChangeListener {
 
     companion object {
-        const val IS_GUIDE = "IS_GUIDE"//是否从引导页进入
+        const val IS_DETAIL = "IS_DETAIL"//是否从剧集详情页进入
+        const val IS_MAIN = "IS_MAIN"//是否从首页进入
+        const val IS_RECOMMEND = "IS_RECOMMEND"//是否从推荐页进入
         const val wxAppId = BuildConfig.WEIXIN_APP_PAY_ID
         const val WEIXIN_PAY = "WEIXIN_PAY"
         const val ALIPAY = "ALIPAY"
+        const val THIRD_ID = "THIRD_ID"
+        const val VEDIO_ID = "VEDIO_ID"
     }
 
-    private val imageUrls = listOf(
-            R.mipmap.ic_vip_banner_1,
-            R.mipmap.ic_vip_banner_2,
-            R.mipmap.ic_vip_banner_3,
-    )
+    var timer: CountDownTimerSupport? = null
 
     private var breathAnim: YoYo.YoYoString? = null
-    private var breathBotAnim: YoYo.YoYoString? = null
     private var payAgreementDialog: PayAgreementDialog? = null
     private var payYesDialog: PayYesDialog? = null
     private var ruleAgreementDialog: RuleAgreementDialog? = null
+
     private val vipPresenter by lazy { VipPresenter() }
+    private lateinit var vipAdapter: VipAdapter
     private var vipList: MutableList<VipBean.ListBean>? = null
     private var isCheckAgreeFlag: Boolean = true
-    private var isGuide: Boolean = false// 从启动页进入vip界面，返回时要回到首页
-    private var payType = ALIPAY// 支付类型
-    private lateinit var vipAdapter: VipAdapter
+    private var isDetail: Boolean = false
+    private var isMain: Boolean = false
+    private var isRecommend: Boolean = false
+    private var payType = WEIXIN_PAY// 支付类型
+    private var vedioId = ""
+    private var thirdId = ""
 
-    override fun getContentViewLayoutID() = R.layout.activity_vip
+    private val mainHandler = Handler(Looper.getMainLooper())
+
+    override fun getContentViewLayoutID() = R.layout.activity_new_vip
+
+    override fun toggleOverridePendingTransition() = true
+
+    override fun getOverridePendingTransitionMode() = TransitionMode.BOTTOM
 
     override fun isApplyKitKatTranslucency() = false
 
     override fun getBundleExtras(extras: Bundle?) {
         super.getBundleExtras(extras)
         extras?.let {
-            isGuide = it.getBoolean(IS_GUIDE, false)
+            isDetail = it.getBoolean(IS_DETAIL, false)
+            isMain = it.getBoolean(IS_MAIN, false)
+            isRecommend = it.getBoolean(IS_RECOMMEND, false)
+            thirdId = it.getString(THIRD_ID, "")
+            vedioId = it.getString(VEDIO_ID, "")
         }
     }
 
     override fun initViewsAndEvents() {
         vipPresenter.attachView(this)
-        tv_title.text = "支付中心"
-        iv_left_icon.visibility = View.VISIBLE
-        iv_left_icon.setImageResource(R.mipmap.ic_arrow_back)
-
         if (!TextUtils.isEmpty(UserManager.getInstance().userID)) {
             vipPresenter.getVipProducts(isAliPayInstalled())
         } else {
             vipPresenter.userLogin(isAliPayInstalled())
         }
 
-        initBanner()
+        vipPresenter.orders()
+
         initListener()
     }
 
+    override fun finish() {
+        super.finish()
+        //关闭窗体动画显示
+        overridePendingTransition(0, R.anim.push_bottom_out)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (AppConfig.enterAlipay) {
+            AppConfig.enterAlipay = false
+            showLoading("查询支付结果...")
+            startTimer()
+        }
+    }
 
     override fun onDestroy() {
         super.onDestroy()
         breathAnim?.stop()
-        breathBotAnim?.stop()
+
+        if (timer != null) { //防止计时器重复
+            timer!!.stop()
+            timer = null
+        }
+
         vipPresenter.detachView()
     }
 
@@ -190,6 +222,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
 
         if (isPay) {
             showToast("支付成功")
+
+//            if (isRecommend) {
+//                finish()
+//            } else {
+//                if (!UserManager.getInstance().userIsLogin()) {
+//                    val b = Bundle()
+//                    b.putString(MobileLoginActivity.TYPE, "vip")
+//                    readyGoThenKill(MobileLoginActivity::class.java, b)
+//                } else {
+//                    readyGoThenKill(MainActivity::class.java)
+//                }
+//            }
             if (!UserManager.getInstance().userIsLogin()) {
                 val b = Bundle()
                 b.putString(MobileLoginActivity.TYPE, "vip")
@@ -200,10 +244,30 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         }
     }
 
+    override fun getUserSuc(data: UserBean) {
+        if (data.expireTime > 0) {
+            readyGo(MainActivity::class.java)
+            val activity =
+                ActivityPageManager.getInstance().getActivity(MainActivity::class.java)
+            if (activity != null && activity is MainActivity) {
+                activity.clickTab4Layout()
+            }
+        }
+    }
+
+    override fun ordersSuc(data: BannerList?) {
+        data?.let {
+            setBanner(it.list)
+        }
+    }
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent?): Boolean {
         when (keyCode) {
             KeyEvent.KEYCODE_BACK -> {
-                if (vipList != null && vipList!!.size > 0) {
+                if (UserManager.getInstance().newFlag
+                    && vipList != null && vipList!!.size > 0
+                ) {
+
                     vipAdapter.setPosition(0)
                     vipAdapter.notifyDataSetChanged()
                     val vipBean = vipList!![0]
@@ -218,11 +282,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                     return true
                 }
 
-                if (isGuide) {
-                    readyGoThenKill(MainActivity::class.java)
-                } else {
-                    finish()
-                }
+                finish()
             }
         }
         return true
@@ -232,8 +292,10 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         if (AntiShake.check(v?.id)) return
 
         when (v?.id) {
-            R.id.iv_left_icon -> {
-                if (vipList != null && vipList!!.size > 0) {
+            R.id.ic_vip_quit -> {
+                if (UserManager.getInstance().newFlag &&
+                    vipList != null && vipList!!.size > 0
+                ) {
                     vipAdapter.setPosition(0)
                     vipAdapter.notifyDataSetChanged()
                     val vipBean = vipList!![0]
@@ -254,7 +316,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                     val vipBean = vipList!![vipAdapter.getPosition()]
 
                     if (!isCheckAgreeFlag) {
-                        vipAgreementDialog(vipBean,false)
+                        vipAgreementDialog(vipBean)
                         return
                     }
 
@@ -290,57 +352,19 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
             }
             R.id.ll_vip_wx -> {
                 payType = WEIXIN_PAY
-                iv_vip_wx.setImageResource(R.mipmap.ic_vip_enable)
+                iv_vip_wx.setImageResource(R.mipmap.ic_vip_enable_blue)
                 iv_vip_alipay.setImageResource(R.mipmap.ic_vip_none)
             }
         }
     }
 
-    override fun onItemClick(position: Int) {
-        vipAdapter.setPosition(position)
-        vipAdapter.notifyDataSetChanged()
-
-        //设置content样式
+    private fun initRvView() {
         if (vipList != null && vipList!!.size > 0) {
-            setVipContent(vipList!![position])
-        }
-    }
-
-    private fun initBanner() {
-        val bannerLayout = (banner as Banner<Int, BannerIntImageAdapter>)
-
-        /**
-         * Tab标签初始化
-         */
-        val tabTitle = arrayOf("随时随地查房价", "提供多年数据", "多纬度数据可视化")
-        tabLayout.addTab(tabLayout.newTab().setText(tabTitle[0]))
-        tabLayout.addTab(tabLayout.newTab().setText(tabTitle[1]))
-        tabLayout.addTab(tabLayout.newTab().setText(tabTitle[2]))
-        // 禁止tablayout 点击
-        val tabStrip: LinearLayout = tabLayout.getChildAt(0) as LinearLayout
-        for (i in 0 until tabStrip.childCount) {
-            val tabView: View = tabStrip.getChildAt(i)
-            tabView.isClickable = false
-        }
-
-        bannerLayout.apply {
-            addBannerLifecycleObserver(this@VipActivity)
-            setAdapter(BannerIntImageAdapter(imageUrls))
-            addBannerLifecycleObserver(this@VipActivity)
-            addOnPageChangeListener(object : OnPageChangeListener {
-                override fun onPageScrolled(
-                        position: Int,
-                        positionOffset: Float,
-                        positionOffsetPixels: Int
-                ) {
-                }
-
-                override fun onPageSelected(position: Int) {
-                    tabLayout.getTabAt(position)!!.select()
-                }
-
-                override fun onPageScrollStateChanged(state: Int) {}
-            })
+            val gridLayoutManager = LinearLayoutManager(this)
+            rvVip.layoutManager = gridLayoutManager
+            vipAdapter = VipAdapter(vipList!!)
+            rvVip.adapter = vipAdapter
+            vipAdapter.setOnItemClickListener(this)
         }
     }
 
@@ -348,15 +372,26 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         shimmer_text?.postDelayed({
             shimmer_text?.startShimmerAnimation()
             breathAnim =
-                    YoYo.with(Techniques.Pulse).duration(700).repeat(-1).playOn(shimmer_text)
+                YoYo.with(Techniques.Pulse).duration(700).repeat(-1).playOn(shimmer_text)
         }, 200)
 
-        iv_left_icon.setOnClickListener(this)
+        ic_vip_quit.setOnClickListener(this)
         tvVipPay.setOnClickListener(this)
         tvVipAgreement.setOnClickListener(this)
         ll_vip_alipay.setOnClickListener(this)
         ll_vip_wx.setOnClickListener(this)
         cbVipAgreement.setOnCheckedChangeListener(this)
+
+    }
+
+    override fun onItemClick(position: Int) {
+        vipAdapter.setPosition(position)
+        vipAdapter.notifyDataSetChanged()
+
+        //设置content样式
+        if (vipList != null && vipList!!.size > 0) {
+            setVipContent(vipList!![position])
+        }
     }
 
     fun wxPay(wxParanBean: WxPayParamBean) {
@@ -376,16 +411,16 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         RxPay.pay(wxPay, this, wxPayInfoImpl, object : IPayCallback {
             override fun success() {
                 UserManager.getInstance().vipFlag = true
-                vipPresenter?.queryVipOrder(wxParanBean.tid.toString(), true)
+                vipPresenter.queryVipOrder(wxParanBean.tid.toString(), true)
             }
 
             override fun failed(code: Int, message: String?) {
-                vipPresenter?.queryVipOrder(wxParanBean.tid.toString(), false)
+                vipPresenter.queryVipOrder(wxParanBean.tid.toString(), false)
 
             }
 
             override fun cancel() {
-                vipPresenter?.queryVipOrder(wxParanBean.tid.toString(), false)
+                vipPresenter.queryVipOrder(wxParanBean.tid.toString(), false)
 
             }
         })
@@ -395,6 +430,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         try {
             // 自动签约付费
             if (wxParanBean.params.isSign) {
+                AppConfig.enterAlipay = true
                 openAutoAlipay(wxParanBean.params.params)
                 return
             }
@@ -402,6 +438,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
             e.printStackTrace()
         }
 
+
         //实例化支付宝支付策略
         val aliPay = AliPay()
         //构造支付宝订单实体。一般都是由服务端直接返回。
@@ -411,18 +448,18 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         RxPay.pay(aliPay, this, alipayInfoImpl, object : IPayCallback {
             override fun success() {
                 UserManager.getInstance().vipFlag = true
-                vipPresenter?.queryVipOrder(wxParanBean.tid.toString(), true)
+                vipPresenter.queryVipOrder(wxParanBean.tid.toString(), true)
             }
 
             override fun failed(code: Int, message: String?) {
-                vipPresenter?.payError(code)
+                vipPresenter.payError(code)
                 if (!TextUtils.isEmpty(message)) {
                     showToast(message)
                 }
             }
 
             override fun cancel() {
-                vipPresenter?.queryVipOrder(wxParanBean.tid.toString(), false)
+                vipPresenter.queryVipOrder(wxParanBean.tid.toString(), false)
             }
         })
     }
@@ -462,47 +499,28 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
     private fun backPayYesDialog(vipBean: VipBean.ListBean) {
         payYesDialog = PayYesDialog(context, vipBean, object : DialogListener() {
             override fun onClick(v: View) {
+                if (!isFinishing() && payYesDialog != null && payYesDialog!!.isShowing()) {
+                    payYesDialog!!.dismiss()
+                }
                 when (v.id) {
-                    R.id.tvVipAgreement -> {
-                        val bundle = Bundle()
-                        bundle.putString(WebActivity.WEB_TITLE, getString(R.string.members_name))
-                        bundle.putString(WebActivity.WEB_URL, Constant.MEMBERS_URL)
-                        readyGo(WebActivity::class.java, bundle)
+                    R.id.iv_dialog_vip_quit -> {
+                        finish()
+//                        payYesDialog!!.dismiss()
                     }
-                    R.id.tv_pay_yes_cancle, R.id.tv_origin -> {
-                        if (!isFinishing && payYesDialog != null && payYesDialog!!.isShowing) {
-                            payYesDialog!!.dismiss()
-                        }
-                        if (isGuide) {
-                            readyGoThenKill(MainActivity::class.java)
-                        } else {
-                            finish()
-                        }
-                    }
-                    R.id.tv_pay_yes_next -> {
-                        if (!payYesDialog!!.getCheckboxStatus()) {
-                            if (vipList != null && vipList!!.size > 0) {
-                                vipAgreementDialog(vipList!![0], true)
-                            }
-                            return
-                        }
-
-                        if (!isFinishing && payYesDialog != null && payYesDialog!!.isShowing) {
-                            payYesDialog!!.dismiss()
-                        }
-
+                    R.id.tv_dialog_vip_next -> {
                         cbVipAgreement.isChecked = true
+
                         if (vipList != null && vipList!!.size > 0) {
-                            val vipBean = vipList!![0]
-                            if (vipBean.trial != 0 && vipBean.isAlipay) {
+                            val vipBean = vipList!![vipAdapter.getPosition()]
+                            if (TextUtils.equals(payType, WEIXIN_PAY)) {
                                 vipPresenter.getVipPayParams(
-                                        "ALIPAY",
-                                        vipBean.pid, isAliPayInstalled()
+                                    "WEIXIN",
+                                    vipBean.pid, isAliPayInstalled()
                                 )
-                            } else {
+                            } else if (TextUtils.equals(payType, ALIPAY)) {
                                 vipPresenter.getVipPayParams(
-                                        "WEIXIN",
-                                        vipBean.pid, isAliPayInstalled()
+                                    "ALIPAY",
+                                    vipBean.pid, isAliPayInstalled()
                                 )
                             }
                         } else {
@@ -539,7 +557,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
      */
     private fun ruleAgreementPayDialog() {
         if (vipList != null && vipList!!.size > 0) {
-            val vipBean = vipList!![0]
+            val vipBean = vipList!![vipAdapter.getPosition()]
             ruleAgreementDialog = RuleAgreementDialog(context, object : DialogListener() {
                 override fun onClick(v: View) {
                     if (!isFinishing() && ruleAgreementDialog != null && ruleAgreementDialog!!.isShowing()) {
@@ -547,19 +565,27 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                     }
                     when (v.id) {
                         R.id.tv_agreement_next -> {
-                            vipPresenter.getVipPayParams(
+                            if (TextUtils.equals(payType, WEIXIN_PAY)) {
+                                vipPresenter.getVipPayParams(
+                                    "WEIXIN",
+                                    vipBean.pid, isAliPayInstalled()
+                                )
+                            } else if (TextUtils.equals(payType, ALIPAY)) {
+                                vipPresenter.getVipPayParams(
                                     "ALIPAY",
                                     vipBean.pid, isAliPayInstalled()
-                            )
+                                )
+                            }
+
                         }
                     }
                 }
             })
             ruleAgreementDialog!!.setText(
-                    vipBean.remarks,
-                    vipBean.trialFirstDay,
-                    vipBean.price,
-                    vipBean.title
+                vipBean.remarks,
+                vipBean.trialFirstDay,
+                vipBean.price,
+                vipBean.title
             )
             ruleAgreementDialog!!.show()
         } else {
@@ -570,7 +596,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
     /**
      * 未勾选协议弹窗
      */
-    private fun vipAgreementDialog(bean: VipBean.ListBean, isDialog: Boolean) {
+    private fun vipAgreementDialog(bean: VipBean.ListBean) {
         var agreeStr = "会员付费协议"
         if (bean.isShowCycTips) {
             agreeStr = "自动续费协议"
@@ -580,55 +606,29 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
                 dialog?.dismiss()
                 when (v?.id) {
                     R.id.dialog_btn_right -> {
-                        if (isDialog) {
-
-                            payYesDialog?.setCheckboxTrue()
-                            if (vipList != null && vipList!!.size > 0) {
-                                val vipBean = vipList!![0]
-                                if (vipBean.isShowCycTips) {
-                                    agreementPayDialog()
-                                } else {
-                                    if (vipBean.trial != 0 && vipBean.isAlipay) {
-                                        vipPresenter.getVipPayParams(
-                                                "ALIPAY",
-                                                vipBean.pid, isAliPayInstalled()
-                                        )
-                                    } else {
-                                        vipPresenter.getVipPayParams(
-                                                "WEIXIN",
-                                                vipBean.pid, isAliPayInstalled()
-                                        )
-                                    }
-                                }
+                        cbVipAgreement.isChecked = true
+
+
+                        if (vipList != null && vipList!!.size > 0) {
+                            val vipBean = vipList!![vipAdapter.getPosition()]
+                            if (vipBean.isShowCycTips) {
+                                agreementPayDialog()
                             } else {
-                                showToast("产品未配置")
-                            }
-                            payYesDialog?.dismiss()
-                        } else {
-                            cbVipAgreement.isChecked = true
-                            if (vipList != null && vipList!!.size > 0) {
-                                val vipBean = vipList!![0]
-                                if (vipBean.isShowCycTips) {
-                                    agreementPayDialog()
-                                } else {
-                                    if (vipBean.trial != 0 && vipBean.isAlipay) {
-                                        vipPresenter.getVipPayParams(
-                                                "ALIPAY",
-                                                vipBean.pid, isAliPayInstalled()
-                                        )
-                                    } else {
-                                        vipPresenter.getVipPayParams(
-                                                "WEIXIN",
-                                                vipBean.pid, isAliPayInstalled()
-                                        )
-                                    }
+                                if (TextUtils.equals(payType, WEIXIN_PAY)) {
+                                    vipPresenter.getVipPayParams(
+                                        "WEIXIN",
+                                        vipBean.pid, isAliPayInstalled()
+                                    )
+                                } else if (TextUtils.equals(payType, ALIPAY)) {
+                                    vipPresenter.getVipPayParams(
+                                        "ALIPAY",
+                                        vipBean.pid, isAliPayInstalled()
+                                    )
                                 }
-                            } else {
-                                showToast("产品未配置")
                             }
+                        } else {
+                            showToast("产品未配置")
                         }
-
-
                     }
                 }
             }
@@ -642,13 +642,74 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
         cdaa.show()
     }
 
-    private fun initRvView() {
-        if (vipList != null && vipList!!.size > 0) {
-            val gridLayoutManager = GridLayoutManager(this, 3)
-            rvVip.layoutManager = gridLayoutManager
-            vipAdapter = VipAdapter(vipList!!)
-            rvVip.adapter = vipAdapter
-            vipAdapter.setOnItemClickListener(this)
+    private fun setBanner(data: List<VedioBean>) {
+        mainHandler.postDelayed({
+            val scrollToBottomAnimator =
+                ValueAnimator.ofInt(0, nsv.getChildAt(0).height - nsv.height)
+            scrollToBottomAnimator.addUpdateListener { animator ->
+                val value = animator.animatedValue as Int
+                nsv.scrollTo(0, value)
+            }
+            scrollToBottomAnimator.duration = 2000
+            scrollToBottomAnimator.start()
+        }, 500)
+
+        mainHandler.postDelayed({
+            val scrollToTopAnimator = ValueAnimator.ofInt(nsv.scrollY, 0)
+            scrollToTopAnimator.addUpdateListener { animator ->
+                val value = animator.animatedValue as Int
+                nsv.scrollTo(0, value)
+            }
+            scrollToTopAnimator.duration = 1500
+            scrollToTopAnimator.start()
+        }, 3000)
+
+        val adapter = VipBannerAdapter(data)
+        // 绑定生命周期
+        vip_banner.addBannerLifecycleObserver(this)
+            .setBannerGalleryEffect(80, 15, 0.8f)
+            .setAdapter(adapter)
+            .addOnPageChangeListener(object : OnPageChangeListener {
+                override fun onPageScrolled(
+                    position: Int,
+                    positionOffset: Float,
+                    positionOffsetPixels: Int
+                ) {
+                }
+
+                override fun onPageSelected(position: Int) {
+                    GlideUtils.loadBlurImageView(mContext, data[position].coverImage, iv_blur)
+                    tv_banner_title.text = String.format("《%1s》", data[position].title)
+                }
+
+                override fun onPageScrollStateChanged(state: Int) {}
+            })
+        GlideUtils.loadBlurImageView(mContext, data[0].coverImage, iv_blur)
+        tv_banner_title.text = String.format("《%1s》", data[0].title)
+    }
+
+    fun startTimer() {
+        if (timer != null) { //防止计时器重复
+            timer!!.stop()
+            timer = null
         }
+        timer = CountDownTimerSupport(9000, 1000)
+        timer!!.setOnCountDownTimerListener(object : OnCountDownTimerListener {
+            override fun onTick(millisUntilFinished: Long) {
+                if (!isFinishing) {
+                    if (millisUntilFinished == 4000L) {
+                        vipPresenter.getMyInfo()
+                    }
+                }
+            }
+
+            override fun onFinish() {
+                if (!isFinishing) {
+                    hideLoading()
+                    vipPresenter.getMyInfo()
+                }
+            }
+        })
+        timer!!.start()
     }
 }
\ No newline at end of file

book/app/src/main/java/com/mints/enjoyboxjia/ui/adapter/ImageTitleHolder.java

+package com.mints.enjoyboxjia.ui.adapter;
+
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.mints.enjoyboxjia.R;
+
+public class ImageTitleHolder extends RecyclerView.ViewHolder {
+    public ImageView imageView;
+    public TextView title;
+
+    public ImageTitleHolder(@NonNull View view) {
+        super(view);
+        imageView = view.findViewById(R.id.image);
+        title = view.findViewById(R.id.bannerTitle);
+    }
+}

book/app/src/main/java/com/mints/enjoyboxjia/ui/adapter/VipAdapter.kt

 package com.mints.enjoyboxjia.ui.adapter
 
 import android.content.Context
-import android.graphics.Color
 import android.graphics.Paint
 import android.text.TextUtils
+import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
+import android.widget.FrameLayout
 import android.widget.LinearLayout
-import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.mints.enjoyboxjia.R
 import com.mints.enjoyboxjia.mvp.model.VipBean
+import com.mints.enjoyboxjia.utils.BubbleUtils
+import com.mints.enjoyboxjia.utils.SpanUtils
+import com.mints.enjoyboxjia.utils.UIUtils
+import kotlinx.android.synthetic.main.fragment_main_my.*
 
 class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
     RecyclerView.Adapter<VipAdapter.ViewHolder>() {
@@ -36,7 +39,7 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
     }
 
     inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
-        val rlVipItemRoot: LinearLayout = view.findViewById(R.id.rlVipItemRoot)
+        val rlVipItemRoot: FrameLayout = view.findViewById(R.id.rlVipItemRoot)
         val tvVipItemCurMoney: TextView = view.findViewById(R.id.tvVipItemCurMoney)
         val tvVipItemMoney: TextView = view.findViewById(R.id.tvVipItemMoney)
         val tvVipItemTitle: TextView = view.findViewById(R.id.tvVipItemTitle)
@@ -52,23 +55,82 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val vipBean = vipList[position]
-        holder.tvVipItemTitle.text = vipBean.title
-        if (TextUtils.isEmpty(vipBean.topTitle)) {
-            holder.tvVipItemLable.visibility = View.INVISIBLE
-        } else {
-            holder.tvVipItemLable.text = vipBean.topTitle
-            holder.tvVipItemLable.visibility = View.VISIBLE
-        }
-        holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
-        if (vipBean.oldPrice > 0) {
-            holder.tvVipItemMoney.visibility = View.VISIBLE
-            holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线（删除线）
-            holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+
+        if (vipBean.trial != 0) {
+            holder.tvVipItemLable.setPadding(0, 0, 0, 0)
+            holder.tvVipItemLable.text = "限时特惠"
+            holder.tvVipItemLable.gravity = Gravity.CENTER
+            holder.tvVipItemLable.setBackgroundResource(R.mipmap.ic_vip_lable)
         } else {
-            holder.tvVipItemMoney.visibility = View.INVISIBLE
+            holder.tvVipItemLable.setPadding(0, 0, 0, 0)
+            holder.tvVipItemLable.text = "热门"
+            holder.tvVipItemLable.gravity = Gravity.CENTER
+            holder.tvVipItemLable.setBackgroundResource(R.mipmap.ic_vip_lable)
         }
 
 
+//        try {
+//            if(!TextUtils.isEmpty(vipBean.topTitle)){
+//
+//               val topArray= vipBean.topTitle.split(",")
+//                holder.tvVipItemCurMoney.text = SpanUtils()
+//                        .append(topArray[0])
+//                        .append(topArray[1])
+//                        .setFontSize(BubbleUtils.sp2px(28))
+//                        .append(topArray[2])
+//                        .create()
+//                holder.tvVipItemMoney.text = topArray[3]
+//                holder.tvVipItemTitle.text = topArray[4]
+//            }else{
+//                holder.tvVipItemTitle.text = vipBean.title
+//                if (vipBean.price < 1) {
+//                    holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+//                } else {
+//                    holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+////            holder.tvVipItemCurMoney.text = "￥${String.format("%.0f", vipBean.price)}"
+//                }
+//                if (vipBean.oldPrice > 0) {
+//                    holder.tvVipItemMoney.visibility = View.VISIBLE
+//                    holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线（删除线）
+//                    if (vipBean.oldPrice < 1) {
+//                        holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+//                    } else {
+//                        holder.tvVipItemMoney.text = "原价：${String.format("%.0f", vipBean.oldPrice)}"
+//                    }
+//                } else {
+//                    holder.tvVipItemMoney.visibility = View.INVISIBLE
+//                }
+//
+//            }
+//        }catch (e:Exception){
+//            e.printStackTrace()
+            holder.tvVipItemTitle.text = vipBean.title
+//            if (vipBean.price < 1) {
+//                holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+//            } else {
+//                holder.tvVipItemCurMoney.text = "￥${vipBean.price}"
+////            holder.tvVipItemCurMoney.text = "￥${String.format("%.0f", vipBean.price)}"
+//            }
+                        holder.tvVipItemCurMoney.text = SpanUtils()
+                        .append(vipBean.price.toString())
+                        .setFontSize(BubbleUtils.sp2px(34))
+                        .append("元")
+                        .create()
+//            if (vipBean.oldPrice > 0) {
+//                holder.tvVipItemMoney.visibility = View.VISIBLE
+//                holder.tvVipItemMoney.getPaint().setFlags(Paint.STRIKE_THRU_TEXT_FLAG) //中间横线（删除线）
+//                if (vipBean.oldPrice < 1) {
+//                    holder.tvVipItemMoney.text = "原价：${vipBean.oldPrice}"
+//                } else {
+//                    holder.tvVipItemMoney.text = "原价：${String.format("%.0f", vipBean.oldPrice)}"
+//                }
+//            } else {
+//                holder.tvVipItemMoney.visibility = View.INVISIBLE
+//            }
+//        }
+        holder.tvVipItemMoney.text = vipBean.topTitle
+
+
         holder.rlVipItemRoot.setOnClickListener {
             mOnItemClickListener.onItemClick(position)
             notifyDataSetChanged()
@@ -77,32 +139,20 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
         if (getPosition() == position) {
             //当前选中
             holder.rlVipItemRoot.setBackgroundResource(R.drawable.shape_vip_adapter)
-            holder.tvVipItemTitle.setTextColor(
-                ContextCompat.getColor(
-                    context,
-                    R.color.white
-                )
-            )
-            holder.tvVipItemCurMoney.setTextColor(
-                ContextCompat.getColor(
-                    context,
-                    R.color.white
-                )
-            )
+//            holder.tvVipItemCurMoney.setTextColor(
+//                ContextCompat.getColor(
+//                    context,
+//                    R.color.color_FD7E0E
+//                )
+//            )
         } else {
             holder.rlVipItemRoot.setBackgroundResource(R.drawable.shape_vip_adapter_none)
-            holder.tvVipItemTitle.setTextColor(
-                ContextCompat.getColor(
-                    context,
-                    R.color.color_939AA3
-                )
-            )
-            holder.tvVipItemCurMoney.setTextColor(
-                ContextCompat.getColor(
-                    context,
-                    R.color.color_939AA3
-                )
-            )
+//            holder.tvVipItemCurMoney.setTextColor(
+//                ContextCompat.getColor(
+//                    context,
+//                    R.color.white
+//                )
+//            )
         }
 
         holder.itemView.setTag(position)

book/app/src/main/java/com/mints/enjoyboxjia/ui/adapter/VipBannerAdapter.java

+package com.mints.enjoyboxjia.ui.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.mints.enjoyboxjia.R;
+import com.mints.enjoyboxjia.mvp.model.VedioBean;
+import com.mints.library.utils.GlideUtils;
+import com.youth.banner.adapter.BannerAdapter;
+
+import java.util.List;
+
+public class VipBannerAdapter extends BannerAdapter<VedioBean, ImageTitleHolder> {
+
+    private Context context;
+
+    public VipBannerAdapter(List<VedioBean> data) {
+        super(data);
+    }
+
+    @Override
+    public ImageTitleHolder onCreateHolder(ViewGroup parent, int viewType) {
+        context = parent.getContext();
+        return new ImageTitleHolder(LayoutInflater.from(context).inflate(R.layout.item_banner_vip, parent, false));
+    }
+
+    @Override
+    public void onBindView(ImageTitleHolder holder, VedioBean data, int position, int size) {
+        if (data.getCoverImage() != null) {
+            GlideUtils.INSTANCE.loadImageViewGifForCenterCrop(context, data.getCoverImage(), holder.imageView, 15);
+        }
+        holder.title.setText(data.getTitle());
+    }
+
+}

book/app/src/main/java/com/mints/enjoyboxjia/ui/fragment/CountFragment.kt

 package com.mints.enjoyboxjia.ui.fragment
 
+import android.os.Bundle
+import android.text.TextUtils
+import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
 import com.mints.enjoyboxjia.R
 import com.mints.enjoyboxjia.common.AppConfig
 import com.mints.enjoyboxjia.common.Constant
+import com.mints.enjoyboxjia.manager.UserManager
+import com.mints.enjoyboxjia.mvp.presenters.CountPresenter
+import com.mints.enjoyboxjia.mvp.views.CountView
 import com.mints.enjoyboxjia.ui.fragment.base.LazyLoadBaseFragment
+import com.scwang.smartrefresh.layout.api.RefreshLayout
+import com.scwang.smartrefresh.layout.listener.OnLoadMoreListener
+import com.scwang.smartrefresh.layout.listener.OnRefreshListener
+import kotlinx.android.synthetic.main.fragment_main_count.*
+import java.util.ArrayList
 
 /**
- * 统计
+ * 书库
  */
-class CountFragment : LazyLoadBaseFragment() {
+class CountFragment : LazyLoadBaseFragment(), CountView, OnRefreshListener,
+    OnLoadMoreListener {
+
+    private val countPresenter by lazy { CountPresenter() }
+    private val userManager by lazy { UserManager.getInstance() }
+
+    private var hotPage = 1 // 分页
+//    private val videoData: ArrayList<VideoStyleBean> = arrayListOf()
+    private val videoData: ArrayList<Any> = arrayListOf()
+//    private lateinit var videoListAdapter: VideoListAdapter
 
     override fun getContentViewLayoutID() = R.layout.fragment_main_count
 
     override fun initViewsAndEvents() {
+        countPresenter.attachView(this)
+        initView()
+        initListener()
     }
 
     override fun onFragmentFirstVisible() {
         super.onFragmentFirstVisible()
+
+        srlMainPage.autoRefresh()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        countPresenter.detachView()
     }
 
     override fun onFragmentResume() {
         super.onFragmentResume()
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_THREE) {
+//            if (AntiShake.check(ll_my_cancel?.id)) return
 
+            if (!TextUtils.isEmpty(userManager?.userID)) {
+//                countPresenter.getMyInfo()
+            } else {
+                countPresenter.userLogin()
+            }
+        }
+    }
+    override fun onRefresh(refreshLayout: RefreshLayout) {
+        hotPage = 1
+        videoData.clear()
+        srlMainPage.resetNoMoreData()
+        if (!TextUtils.isEmpty(userManager?.userID)) {
+//            videoListPresenter.getVedioPageList(hotPage, Constant.PAGE_SIZE, mType)
         }
     }
+
+    override fun onLoadMore(refreshLayout: RefreshLayout) {
+        hotPage = ++hotPage
+//        videoListPresenter.getVedioPageList(hotPage, Constant.PAGE_SIZE, mType)
+    }
+
+//    override fun getVedioPageListSuc(data: VideoStyleListBean) {
+//        if (activity == null || requireActivity().isFinishing
+//        ) {
+//            return
+//        }
+//
+//        if (::videoListAdapter.isInitialized) {
+//            videoData.addAll(data.list)
+//            if (hotPage == 1) {
+//                srlMainPage.finishRefresh(true)
+//                videoListAdapter.notifyDataSetChanged()
+//            } else {
+//                if (data.list.size < Constant.PAGE_SIZE) {
+//                    srlMainPage.finishLoadMoreWithNoMoreData()
+//                } else {
+//                    srlMainPage.finishLoadMore()
+//                }
+//                videoListAdapter.notifyItemChanged(data.list.size)
+//            }
+//        }
+//    }
+
+//    override fun getVedioPageListFail() {
+//        srlMainPage.finishRefresh(false)
+//        srlMainPage.finishLoadMore(false)
+//        hotPage = if (hotPage == 1) 1 else hotPage - 1
+//    }
+
+    private fun initView() {
+        val gridLayoutManager = GridLayoutManager(requireContext(), 2)
+//        rv_video_list.layoutManager = gridLayoutManager
+//        videoListAdapter = VideoListAdapter(requireContext(), videoData)
+//        rv_video_list.adapter = videoListAdapter
+//        videoListAdapter.setOnItemClickListener(object : OnItemClickListener {
+//            override fun onItemClick(view: View?, position: Int) {
+//                if (videoData.size > 0) {
+//                }
+//            }
+//        })
+    }
+
+    private fun initListener() {
+        srlMainPage.setOnRefreshListener(this)
+        srlMainPage.setOnLoadMoreListener(this)
+    }
 }
\ No newline at end of file

book/app/src/main/java/com/mints/enjoyboxjia/ui/fragment/MyFragment.kt

@@ -2,14 +2,16 @@ package com.mints.enjoyboxjia.ui.fragment
 
 import android.content.Intent
 import android.net.Uri
+import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
-import com.mints.library.utils.nodoubleclick.AntiShake
 import com.mints.enjoyboxjia.R
 import com.mints.enjoyboxjia.common.AppConfig
 import com.mints.enjoyboxjia.common.Constant
-import com.mints.enjoyboxjia.manager.ActivityPageManager
+import com.mints.enjoyboxjia.manager.AppHttpManager
 import com.mints.enjoyboxjia.manager.UserManager
+import com.mints.enjoyboxjia.mvp.model.BaseResponse
+import com.mints.enjoyboxjia.mvp.model.OrderRecordBean
 import com.mints.enjoyboxjia.mvp.model.UserBean
 import com.mints.enjoyboxjia.mvp.presenters.MyPresenter
 import com.mints.enjoyboxjia.mvp.views.MyView
@@ -17,35 +19,29 @@ import com.mints.enjoyboxjia.ui.activitys.*
 import com.mints.enjoyboxjia.ui.fragment.base.LazyLoadBaseFragment
 import com.mints.enjoyboxjia.ui.widgets.DialogListener
 import com.mints.enjoyboxjia.ui.widgets.PhoneDialog
-import com.mints.enjoyboxjia.utils.SpanUtils
 import com.mints.enjoyboxjia.utils.TimeRender
+import com.mints.library.net.neterror.BaseSubscriber
+import com.mints.library.net.neterror.Throwable
+import com.mints.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.fragment_main_my.*
 
 /**
  * 描述：我
  * 作者：孟崔广
- * 时间：2023/7/7 11:30
+ * 时间：2024/9/20 11:30
  */
 class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
 
     private val myPresenter by lazy { MyPresenter() }
     private val userManager by lazy { UserManager.getInstance() }
     private var phoneDialog: PhoneDialog? = null
+    private var mAgreementDTO: OrderRecordBean.AgreementDTO? = null
 
     override fun getContentViewLayoutID() = R.layout.fragment_main_my
 
     override fun initViewsAndEvents() {
         myPresenter.attachView(this)
 
-        tv_contact.text = SpanUtils()
-            .append("如有问题，请直接联系")
-            .append("在线客服\n")
-            .setForegroundColor(resources.getColor(R.color.main_mints))
-            .append("处理速度更快，")
-            .append("无需联系支付宝")
-            .setForegroundColor(resources.getColor(R.color.main_mints))
-            .create()
-
         initListener()
     }
 
@@ -63,7 +59,7 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         super.onFragmentResume()
 
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_FOUR) {
-            if (AntiShake.check(ll_my_read?.id)) return
+            if (AntiShake.check(ll_my_cancel?.id)) return
 
             if (!TextUtils.isEmpty(userManager?.userID)) {
                 myPresenter.getMyInfo()
@@ -87,57 +83,68 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
                     readyGo(VipActivity::class.java)
                 }
             }
-            R.id.ll_my_read -> {
-                val activity = ActivityPageManager.getInstance().getActivity(MainActivity::class.java)
-                if (activity != null && activity is MainActivity) {
-                    activity.clickTab3Layout()
+            R.id.ll_my_history -> {
+                readyGo(HistoryActivity::class.java)
+            }
+            R.id.ll_my_change -> {
+//                readyGo(HistoryActivity::class.java)
+            }
+            R.id.ll_my_cancel -> {
+                if (mAgreementDTO == null) {
+                    showToast("暂未开通自动续费")
+                } else {
+                    val bundle = Bundle()
+                    bundle.putSerializable(ManageOrderActivity.AGREEMENT_DATA, mAgreementDTO)
+                    readyGo(ManageOrderActivity::class.java, bundle)
                 }
             }
-            R.id.ll_my_payrecord -> {
+            R.id.ll_my_order -> {
                 readyGo(OrderRecordActivity::class.java)
             }
-            R.id.ll_my_history -> {
-                readyGo(HistoryActivity::class.java)
+            R.id.ll_my_phone -> {
+                backPhoneDialog()
             }
-            R.id.ll_my_setting -> {
+            R.id.ll_my_set -> {
                 readyGo(SettingsActivity::class.java)
-//                readyGo(BillActivity::class.java)
-            }
-            R.id.ll_contactus,R.id.iv_contactus -> {
-                backPhoneDialog()
             }
+
         }
     }
 
     override fun getUserSuc(data: UserBean) {
+        getData()
         loginStatus(data)
     }
 
     private fun loginStatus(consumer: UserBean) {
-        // 2-是否有手机号
+        // 是否有手机号
         if (!TextUtils.isEmpty(userManager.mobile)) {
-            tv_my_account.text = "手机号:" + consumer.mobile.substring(0,3)+"****"+consumer.mobile.substring(consumer.mobile.length-4)
+            tv_my_account.text =
+                "手机号:" + consumer.mobile.substring(0, 3) + "****" + consumer.mobile.substring(
+                    consumer.mobile.length - 4
+                )
             iv_my_bind.visibility = View.GONE
         } else {
             tv_my_account.text = "绑定手机号"
             iv_my_bind.visibility = View.VISIBLE
         }
-        tv_my_id.text = "用户ID:"+consumer.idcode
+        tv_my_id.text = "书友" + consumer.idcode
 
-        // 3-vip
+        // vip状态
         if (consumer.expireTime > 0) {
+            iv_my_bind.setImageResource(R.mipmap.ic_my_v)
             tv_my_vip.text = "VIP会员"
-            tv_my_btn.visibility = View.GONE
             if (consumer.isForever) {
                 tv_my_status.text = "有效期: 永久有效"
             } else {
                 tv_my_status.text =
                     "到期时间 ${TimeRender.formatDate(consumer.expireTime, TimeRender.DEFAULT_FORMAT)}"
             }
+            tv_my_btn.text = "已开通"
         } else {
-            tv_my_vip.text = "开通数据会员服务"
-            tv_my_status.text = "随时随地查询房地产行情"
-            tv_my_btn.visibility = View.VISIBLE
+            iv_my_bind.setImageResource(R.mipmap.ic_my_pt)
+            tv_my_vip.text = "开通VIP会员"
+            tv_my_status.text = "万本小说免费看"
             tv_my_btn.text = "立即开通"
         }
     }
@@ -146,12 +153,12 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         ll_my_login.setOnClickListener(this)
         tv_my_btn.setOnClickListener(this)
         tv_my_account.setOnClickListener(this)
-        ll_my_read.setOnClickListener(this)
         ll_my_history.setOnClickListener(this)
-        ll_my_payrecord.setOnClickListener(this)
-        ll_my_setting.setOnClickListener(this)
-        ll_contactus.setOnClickListener(this)
-        iv_contactus.setOnClickListener(this)
+        ll_my_change.setOnClickListener(this)
+        ll_my_cancel.setOnClickListener(this)
+        ll_my_order.setOnClickListener(this)
+        ll_my_phone.setOnClickListener(this)
+        ll_my_set.setOnClickListener(this)
     }
 
     fun backPhoneDialog() {
@@ -171,4 +178,19 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         })
         phoneDialog!!.show()
     }
+
+    private fun getData() {
+        AppHttpManager.getInstance(baseApplication)
+            .call(baseApplication.loanService.cashOutRecords,
+                object : BaseSubscriber<BaseResponse<OrderRecordBean>>() {
+                    override fun onError(e: Throwable) {
+                    }
+
+                    override fun onNext(t: BaseResponse<OrderRecordBean>) {
+                        if (t.status == 200) {
+                            mAgreementDTO = t.data.agreement
+                        }
+                    }
+                })
+    }
 }
\ No newline at end of file

book/app/src/main/java/com/mints/enjoyboxjia/ui/widgets/PayYesDialog.kt

@@ -6,37 +6,28 @@ import android.view.Gravity
 import android.view.KeyEvent
 import android.view.View
 import android.view.WindowManager
-import android.widget.CheckBox
+import android.widget.FrameLayout
 import android.widget.ImageView
+import android.widget.RelativeLayout
 import android.widget.TextView
 import com.mints.enjoyboxjia.R
 import com.mints.enjoyboxjia.common.AppConfig
 import com.mints.enjoyboxjia.mvp.model.VipBean
+import com.mints.enjoyboxjia.utils.SpanUtils
 
 class PayYesDialog(
-        context: Context,
-        vipBean: VipBean.ListBean,
-        private val listener: DialogListener
+    private val context: Context,
+    vipBean: VipBean.ListBean,
+    private val listener: DialogListener
 ) : Dialog(
-        context, R.style.dialog
+    context, R.style.dialog
 ) {
     private val lp: WindowManager.LayoutParams
-    private var milliCountDownTimer: MilliDownTimer? = null
-    private val tv_pay_yes_cancle: ImageView
-    private val tv_pay_yes_next: TextView
-    private val tv_pay_yes_title: TextView
-    private val tv_pay_yes_money: TextView
-    private val tv_pay_yes_preferential: TextView
-    private val tv_pay_yes_money_text: TextView
-    private val tv_origin: TextView
-
-    private val tv_time_min: TextView
-    private val tv_time_sec: TextView
-    private val tv_time_mil: TextView
-    private val tv_pay_text: TextView
-
-    private val cbVipAgreement: CheckBox
-    private val tvVipAgreement: TextView
+    private val tv_dialog_vip_next: TextView
+    private val tv_dialog_vip_count: TextView
+    private val iv_dialog_vip_quit: ImageView
+    private val iv_dialog_vip_top: ImageView
+    private val rl_dialog_vip_bg: RelativeLayout
 
     init {
         setContentView(R.layout.dialog_payyes)
@@ -56,86 +47,31 @@ class PayYesDialog(
 
 
         // 查找View
-        tv_origin = findViewById<View>(R.id.tv_origin) as TextView
-        tv_time_min = findViewById<View>(R.id.tv_time_min) as TextView
-        tv_time_sec = findViewById<View>(R.id.tv_time_sec) as TextView
-        tv_time_mil = findViewById<View>(R.id.tv_time_mil) as TextView
-        tv_pay_text = findViewById<View>(R.id.tv_pay_text) as TextView
-
-        cbVipAgreement = findViewById<View>(R.id.cbVipAgreement) as CheckBox
-        tvVipAgreement = findViewById<View>(R.id.tvVipAgreement) as TextView
-
-        tv_pay_yes_cancle = findViewById<View>(R.id.tv_pay_yes_cancle) as ImageView
-        tv_pay_yes_next = findViewById<View>(R.id.tv_pay_yes_next) as TextView
-        tv_pay_yes_title = findViewById<View>(R.id.tv_pay_yes_title) as TextView
-        tv_pay_yes_money = findViewById<View>(R.id.tv_pay_yes_money) as TextView
-        tv_pay_yes_preferential = findViewById<View>(R.id.tv_pay_yes_preferential) as TextView
-        tv_pay_yes_money_text = findViewById<View>(R.id.tv_pay_yes_money_text) as TextView
-        tvVipAgreement.setOnClickListener(listener)
-        tv_pay_yes_cancle.setOnClickListener(listener)
-        tv_origin.setOnClickListener(listener)
-        tv_pay_yes_next.setOnClickListener(listener)
-
-        tv_pay_yes_money.text = "¥${vipBean.price}"
-        tv_pay_yes_money_text.text = vipBean.topTitle
-        tv_pay_yes_preferential.text = (vipBean.price).toString()
-
-        tv_pay_text.text = vipBean.remarks
-        tv_origin.text = "以后原价￥${vipBean.oldPrice}元买"
-
-        milliCountDownTimer = MilliDownTimer(getShowTime())
-        milliCountDownTimer?.start()
-        milliCountDownTimer?.setOnTickListener { min, sec, mil ->
-            tv_time_min.text = min
-            tv_time_sec.text = sec
-            tv_time_mil.text = mil
-        }
-        milliCountDownTimer?.setOnFinishListener {
-            tv_time_min.text = "00"
-            tv_time_sec.text = "00"
-            tv_time_mil.text = "00"
-        }
-    }
-
-    override fun dismiss() {
-        super.dismiss()
-        milliCountDownTimer?.cancel()
-        milliCountDownTimer = null
-    }
-
-    /**
-     * 获取倒计时时间
-     */
-    fun getShowTime(): Long {
-        var showTime = 0L
-        val currentTime = System.currentTimeMillis()
-        val diff = (currentTime - AppConfig.splashTime) / 1000 / 60 //获取两个时间相差的分钟
-//        if (diff < 60) {
-//            showTime = 60 - diff
-//        } else {
-//            showTime = 59
-//            AppConfig.splashTime = currentTime
-//        }
-        if (diff < 10) {
-            showTime = 10 - diff
+        iv_dialog_vip_quit = findViewById<View>(R.id.iv_dialog_vip_quit) as ImageView
+        iv_dialog_vip_top = findViewById<View>(R.id.iv_dialog_vip_top) as ImageView
+        tv_dialog_vip_next = findViewById<View>(R.id.tv_dialog_vip_next) as TextView
+        tv_dialog_vip_count = findViewById<View>(R.id.tv_dialog_vip_count) as TextView
+        rl_dialog_vip_bg = findViewById<View>(R.id.rl_dialog_vip_bg) as RelativeLayout
+        iv_dialog_vip_quit.setOnClickListener(listener)
+        tv_dialog_vip_next.setOnClickListener(listener)
+
+        if (vipBean.trial == 0) {
+            //0-没签约 无0.01
+            tv_dialog_vip_count.text = SpanUtils()
+                .append("" + vipBean.price)
+                .setFontSize(30, true)
+                .append(" 元")
+                .setFontSize(16, true)
+                .create()
+            iv_dialog_vip_top.setImageResource(R.mipmap.ic_vip_pay_top2)
         } else {
-            showTime = 9
-            AppConfig.splashTime = currentTime
+            tv_dialog_vip_count.text = SpanUtils()
+                .append(""+vipBean.price)
+                .setFontSize(30, true)
+                .append(" 元")
+                .setFontSize(16, true)
+                .create()
+            iv_dialog_vip_top.setImageResource(R.mipmap.ic_vip_pay_top2)
         }
-        return showTime * 60 * 1000
-    }
-
-    /**
-     * 设置同意协议
-     */
-    fun getCheckboxStatus(): Boolean {
-        return cbVipAgreement.isChecked
-    }
-
-    /**
-     * 设置同意协议
-     */
-    fun setCheckboxTrue() {
-        cbVipAgreement.isChecked = true
     }
 }
\ No newline at end of file

book/app/src/main/java/com/mints/library/utils/GlideUtils.kt

@@ -15,6 +15,7 @@ import com.bumptech.glide.request.transition.Transition
 import com.bumptech.glide.signature.ObjectKey
 import com.mints.enjoyboxjia.utils.BubbleUtils
 import com.scwang.smartrefresh.layout.util.DensityUtil.px2dp
+import jp.wasabeef.glide.transformations.BlurTransformation
 
 /**
  * 描述：GlideUtils
@@ -40,6 +41,45 @@ object GlideUtils {
         Glide.with(mContext!!).load(path).into(mImageView!!)
     }
 
+
+    //加载毛玻璃图片
+    fun loadBlurImageView(mContext: Context, url: String, imageView: ImageView) {
+        Glide.with(mContext).load(url)
+            .apply(RequestOptions.bitmapTransform(BlurTransformation(25, 4)))
+            .into(imageView)
+    }
+
+    fun loadImageViewGifForCenterCrop(mContext: Context, drawable: String, imageView: ImageView) {
+        val options = RequestOptions()
+            .transform(
+                CenterCrop(),
+                RoundedCorners(BubbleUtils.dp2px(5))
+            )
+            .diskCacheStrategy(DiskCacheStrategy.DATA)
+        Glide.with(mContext)
+            .load(drawable)
+            .apply(options)
+            .into(imageView)
+    }
+
+    fun loadImageViewGifForCenterCrop(
+        mContext: Context,
+        drawable: String,
+        imageView: ImageView,
+        dp: Int
+    ) {
+        val options = RequestOptions()
+            .transform(
+                CenterCrop(),
+                RoundedCorners(BubbleUtils.dp2px(dp))
+            )
+            .diskCacheStrategy(DiskCacheStrategy.DATA)
+        Glide.with(mContext)
+            .load(drawable)
+            .apply(options)
+            .into(imageView)
+    }
+
     fun loadImageViewFake(mContext: Context?, path: Any?, mImageView: ImageView?) {
         Glide.with(mContext!!)
             .load(path)

book/app/src/main/res/drawable/bg_shape_twoban.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <solid android:color="#50000000" />
+    <corners android:bottomLeftRadius="5dp"
+        android:bottomRightRadius="5dp"/>
+
+</shape>
\ No newline at end of file

book/app/src/main/res/drawable/shape_mine.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="#fef3f3"
+        android:endColor="#F8F8F8"
+        android:angle="270"/>
+</shape>
\ No newline at end of file

book/app/src/main/res/drawable/shape_my.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <solid android:color="#5B1500" />
+    <solid android:color="#FAD198" />
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
     <corners android:radius="30dip" />

book/app/src/main/res/drawable/shape_vip_adapter.xml

@@ -2,10 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <stroke android:width="1dp" android:color="#FA57D7" />
-    <solid android:color="#282537" />
+    <stroke android:width="2dp" android:color="#EFBC6A" />
+    <solid android:color="@color/black" />
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
-    <corners android:radius="15dip" />
+    <corners android:radius="5dip" />
 
 </shape>
\ No newline at end of file

book/app/src/main/res/drawable/shape_vip_adapter_none.xml

@@ -2,9 +2,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <solid android:color="#282537" />
+
+    <solid android:color="@color/black" />
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
-    <corners android:radius="15dip" />
+    <corners android:radius="5dip" />
 
 </shape>
\ No newline at end of file

book/app/src/main/res/drawable/shape_vip_blur.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <gradient
+        android:centerColor="@color/half_transparent"
+        android:centerX="0.5"
+        android:centerY="0.5"
+        android:endColor="@color/black"
+        android:gradientRadius="200dp"
+        android:startColor="@color/full_transparent"
+        android:type="radial" />
+
+</shape>
\ No newline at end of file

book/app/src/main/res/drawable/shape_vip_btn.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <gradient
+        android:angle="180"
+        android:endColor="#f2d6a4"
+        android:startColor="#efbc6a" />
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:radius="30dp"
+        />
+
+</shape>
\ No newline at end of file

book/app/src/main/res/drawable/shape_vip_lable.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <gradient
+        android:angle="180"
+        android:endColor="#f2d6a4"
+        android:startColor="#efbc6a" />
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:bottomLeftRadius="5dp"
+        android:bottomRightRadius="5dp"
+        android:topLeftRadius="0dp"
+        android:topRightRadius="0dp"
+        />
+
+</shape>
\ No newline at end of file

book/app/src/main/res/layout/activity_new_vip.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1">
+
+        <androidx.core.widget.NestedScrollView
+            android:id="@+id/nsv"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+
+                    <ImageView
+                        android:id="@+id/iv_blur"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="fitXY" />
+
+                    <ImageView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:background="@drawable/shape_vip_blur" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="50dp"
+                            android:layout_marginTop="30dp">
+
+                            <ImageView
+                                android:id="@+id/ic_vip_quit"
+                                android:layout_width="50dp"
+                                android:layout_height="50dp"
+                                android:padding="15dp"
+                                android:src="@mipmap/ic_left_arrow" />
+
+                            <ImageView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_centerInParent="true"
+                                android:layout_gravity="center"
+                                android:src="@mipmap/ic_vip_label" />
+
+                        </RelativeLayout>
+
+                        <FrameLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent">
+
+                            <LinearLayout
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:orientation="vertical">
+
+                                <com.youth.banner.Banner
+                                    android:id="@+id/vip_banner"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="220dp" />
+
+                                <TextView
+                                    android:id="@+id/tv_banner_title"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_gravity="center"
+                                    android:layout_marginTop="10dp"
+                                    android:layout_marginBottom="10dp"
+                                    android:textColor="@color/white"
+                                    android:textSize="18sp" />
+
+                            </LinearLayout>
+
+                        </FrameLayout>
+
+                    </LinearLayout>
+
+                </FrameLayout>
+
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:src="@mipmap/bg_vip_1" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+
+                    android:src="@mipmap/bg_vip_2" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+
+                    android:src="@mipmap/bg_vip_3" />
+
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:scaleType="fitXY"
+            android:src="@mipmap/ic_vip_arc" />
+    </FrameLayout>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginBottom="30dp"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rvVip"
+            android:layout_width="match_parent"
+            android:layout_height="130dp"
+            android:layout_gravity="center_horizontal"
+            android:background="@null"
+            android:overScrollMode="never" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
+
+            <LinearLayout
+                android:id="@+id/ll_vip_wx"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingLeft="20dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@mipmap/ic_call_wx"
+                    android:drawablePadding="6dp"
+                    android:gravity="center_vertical"
+                    android:text="微信支付"
+                    android:textColor="@color/white"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+
+                <ImageView
+                    android:id="@+id/iv_vip_wx"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="center"
+                    android:src="@mipmap/ic_vip_enable_blue" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/ll_vip_alipay"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_weight="1"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:paddingRight="20dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:drawableLeft="@mipmap/ic_alipay"
+                    android:drawablePadding="6dp"
+                    android:gravity="center_vertical"
+                    android:text="支付宝支付"
+                    android:textColor="@color/white"
+                    android:textSize="14sp"
+                    android:textStyle="bold" />
+
+                <ImageView
+                    android:id="@+id/iv_vip_alipay"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:scaleType="center"
+                    android:src="@mipmap/ic_vip_none" />
+            </LinearLayout>
+
+
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/tv_vip_hint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:text="试用到期后将按终身xx元自动续费，可随时关闭"
+            android:textColor="#97ffffff"
+            android:textSize="10sp" />
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="6dp"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/cbVipAgreement"
+                style="@style/CustomCheckboxTheme"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checked="true" />
+
+            <TextView
+                android:id="@+id/tvVipAgreement"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:text="点击购买即表示您同意《会员付费协议》"
+                android:textColor="@color/white"
+                android:textSize="10sp" />
+        </LinearLayout>
+
+        <io.supercharge.shimmerlayout.ShimmerLayout
+            android:id="@+id/shimmer_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginLeft="40dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginBottom="10dp"
+            app:shimmer_animation_duration="1200"
+            app:shimmer_color="#50ffffff">
+
+            <TextView
+                android:id="@+id/tvVipPay"
+                android:layout_width="match_parent"
+                android:layout_height="46dp"
+                android:background="@drawable/shape_vip_btn"
+                android:gravity="center"
+                android:text="立即开通"
+                android:textColor="#2F155E"
+                android:textSize="20sp" />
+        </io.supercharge.shimmerlayout.ShimmerLayout>
+
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file

book/app/src/main/res/layout/banner_image_title.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY" />
+
+    <TextView
+        android:id="@+id/bannerTitle"
+        android:layout_width="match_parent"
+        android:layout_height="32dp"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:background="@drawable/bg_shape_twoban"
+        android:focusableInTouchMode="true"
+        android:gravity="center_vertical"
+        android:singleLine="true"
+        android:textSize="14sp"
+        android:textColor="#ffffff"
+        android:paddingLeft="10dp"
+        android:layout_alignParentBottom="true"/>
+</RelativeLayout>
\ No newline at end of file

book/app/src/main/res/layout/dialog_payyes.xml

@@ -3,239 +3,50 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <LinearLayout
+    <RelativeLayout
+        android:id="@+id/rl_dialog_vip_bg"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:layout_height="420dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginStart="36dp"
+        android:layout_marginTop="-20dp"
+        android:layout_marginEnd="36dp"
+        android:background="@mipmap/bg_pay_yes"
         android:orientation="vertical">
 
         <ImageView
-            android:id="@+id/tv_pay_yes_cancle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="end"
-            android:layout_marginEnd="20dp"
-            android:layout_marginBottom="10dp"
-            android:src="@mipmap/ic_close" />
-
-        <LinearLayout
-            android:id="@+id/ll_content"
+            android:id="@+id/iv_dialog_vip_top"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/shape_banner_write"
-            android:orientation="vertical">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="12dp"
-                android:background="@drawable/shape_bg_payyes"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/tv_pay_yes_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="12dp"
-                    android:gravity="center_horizontal"
-                    android:text="超级VIP体验卡"
-                    android:textColor="@color/main_mints"
-                    android:textSize="20sp" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginBottom="20dp"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/tv_pay_yes_money_text"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:gravity="center_horizontal"
-                        android:textColor="#692120"
-                        android:textSize="18sp" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="10dp"
-                        android:text="￥"
-                        android:textColor="@color/color_8B560F"
-                        android:textSize="18sp" />
-
-                    <TextView
-                        android:id="@+id/tv_pay_yes_preferential"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="6dp"
-                        android:text="300"
-                        android:textColor="@color/color_8B560F"
-                        android:textSize="36sp"
-                        android:textStyle="bold" />
-                </LinearLayout>
-
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="12dp"
-                android:src="@mipmap/bg_pay_yes_center" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:gravity="center_horizontal"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="倒计时："
-                    android:textColor="@color/black"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tv_time_min"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:background="@drawable/shape_bg_gray2"
-                    android:gravity="center"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="分"
-                    android:textColor="@color/black"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/tv_time_sec"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:background="@drawable/shape_bg_gray2"
-                    android:gravity="center"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="秒"
-                    android:textColor="@color/black"
-                    android:textSize="16sp" />
+            android:layout_marginTop="10dp"
+            android:src="@mipmap/ic_vip_pay_top1" />
 
-                <TextView
-                    android:id="@+id/tv_time_mil"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginStart="8dp"
-                    android:background="@drawable/shape_bg_gray2"
-                    android:gravity="center"
-                    android:textColor="@color/black"
-                    android:textSize="20sp"
-                    android:textStyle="bold" />
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginTop="20dp"
-                android:orientation="horizontal">
-
-                <CheckBox
-                    android:id="@+id/cbVipAgreement"
-                    style="@style/CustomCheckboxTheme"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:checked="false" />
-
-                <TextView
-                    android:id="@+id/tvVipAgreement"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginStart="6dp"
-                    android:text="点击购买即表示您同意《会员付费协议》"
-                    android:textColor="#929297"
-                    android:textSize="12sp" />
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/tv_pay_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="10dp"
-                android:layout_marginEnd="12dp"
-                android:textColor="#929297"
-                android:textSize="12sp" />
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="12dp">
-
-                <TextView
-                    android:id="@+id/tv_pay_yes_next"
-                    android:layout_width="match_parent"
-                    android:layout_height="52dp"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginTop="12dp"
-                    android:background="@drawable/shape_share_right"
-                    android:gravity="center"
-                    android:text="开始使用"
-                    android:textColor="@color/white"
-                    android:textSize="18sp" />
-
-                <TextView
-                    android:id="@+id/tv_pay_yes_money"
-                    android:layout_width="wrap_content"
-                    android:layout_height="28dp"
-                    android:layout_alignParentEnd="true"
-                    android:background="@drawable/shape_tv_tips"
-                    android:gravity="center"
-                    android:paddingStart="10dp"
-                    android:paddingEnd="10dp"
-                    android:textColor="@color/white" />
-
-            </RelativeLayout>
-
-            <TextView
-                android:id="@+id/tv_origin"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_marginBottom="10dp"
-                android:text="以后原价￥xx元买"
-                android:textColor="@color/main_mints"
-                android:textSize="16sp" />
-        </LinearLayout>
-
-    </LinearLayout>
+        <ImageView
+            android:id="@+id/iv_dialog_vip_quit"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="124dp"
+            android:layout_marginEnd="15dp"
+            android:layout_marginRight="20dp"
+            android:src="@mipmap/ic_vip_back" />
+
+        <TextView
+            android:id="@+id/tv_dialog_vip_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="136dp"
+            android:textColor="#FFF0D4" />
 
+        <TextView
+            android:id="@+id/tv_dialog_vip_next"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="30dp"
+            android:background="@mipmap/ic_vip_pay_btn" />
+    </RelativeLayout>
 </FrameLayout>

book/app/src/main/res/layout/fragment_main_count.xml

@@ -2,8 +2,32 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@drawable/shape_mine"
     android:orientation="vertical">
 
+    <com.scwang.smartrefresh.layout.SmartRefreshLayout
+        android:id="@+id/srlMainPage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:srlAccentColor="@color/black"
+        app:srlPrimaryColor="@color/color_FDFDFD">
+
+        <com.scwang.smartrefresh.layout.header.ClassicsHeader
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/rv_count_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:minHeight="600dp"
+            android:overScrollMode="never" />
+
+        <com.scwang.smartrefresh.layout.footer.ClassicsFooter
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:srlAccentColor="@color/black"
+            app:srlPrimaryColor="@color/color_FDFDFD" />
+    </com.scwang.smartrefresh.layout.SmartRefreshLayout>
 
 </LinearLayout>
\ No newline at end of file

book/app/src/main/res/layout/fragment_main_my.xml

@@ -2,305 +2,372 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@drawable/shape_mine">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <FrameLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <ImageView
-                android:id="@+id/iv_contactus"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
-                android:layout_gravity="right"
-                android:layout_marginTop="20dp"
-                android:layout_marginRight="10dp"
-                android:src="@mipmap/ic_launcher_main"></ImageView>
-
             <LinearLayout
+                android:id="@+id/ll_my_login"
                 android:layout_width="match_parent"
-                android:layout_height="220dp"
-                android:background="@mipmap/bg_my"
-                android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:layout_marginTop="56dp"
+                android:orientation="horizontal">
+
+                <com.mints.enjoyboxjia.ui.widgets.CircleImageView
+                    android:id="@+id/civ_my"
+                    android:layout_width="60dp"
+                    android:layout_height="60dp"
+                    android:layout_marginStart="20dp"
+                    android:src="@mipmap/ic_launcher_main" />
 
                 <LinearLayout
-                    android:id="@+id/ll_my_login"
-                    android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="56dp"
-                    android:orientation="horizontal">
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginLeft="10dp"
+                    android:orientation="vertical">
 
-                    <com.mints.enjoyboxjia.ui.widgets.CircleImageView
-                        android:id="@+id/civ_my"
-                        android:layout_width="70dp"
-                        android:layout_height="70dp"
-                        android:layout_marginStart="20dp"
-                        android:src="@mipmap/ic_my_avat" />
+                    <TextView
+                        android:id="@+id/tv_my_id"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginStart="10dp"
+                        android:text="书友"
+                        android:textColor="@color/black_text"
+                        android:textSize="16sp" />
 
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:orientation="vertical">
+                        android:layout_marginTop="6dp"
+                        android:orientation="horizontal">
 
                         <TextView
-                            android:id="@+id/tv_my_id"
+                            android:id="@+id/tv_my_account"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_vertical"
                             android:layout_marginStart="10dp"
-                            android:text="用户ID:"
-                            android:textColor="@color/black_text"
-                            android:textSize="16sp" />
+                            android:text="绑定手机号"
+                            android:textColor="#000000"
+                            android:textSize="18sp"
+                            android:textStyle="bold" />
 
-                        <LinearLayout
+                        <ImageView
+                            android:id="@+id/iv_my_bind"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="6dp"
-                            android:orientation="horizontal">
-
-                            <TextView
-                                android:id="@+id/tv_my_account"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginStart="10dp"
-                                android:text="绑定手机号"
-                                android:textColor="#000000"
-                                android:textSize="18sp"
-                                android:textStyle="bold" />
-
-                            <ImageView
-                                android:id="@+id/iv_my_bind"
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:layout_marginLeft="10dp"
-                                android:src="@mipmap/ic_my_bind"></ImageView>
-                        </LinearLayout>
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginLeft="10dp"
+                            android:src="@mipmap/ic_my_pt"></ImageView>
                     </LinearLayout>
-
                 </LinearLayout>
 
             </LinearLayout>
 
-            <LinearLayout
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <FrameLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="140dp"
-                android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="15dp"
+                android:layout_marginTop="30dp"
+                android:layout_marginRight="15dp"
+                android:layout_marginBottom="30dp">
+
 
                 <LinearLayout
                     android:id="@+id/ll_my_vip"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="10dp"
-                    android:layout_marginRight="10dp"
                     android:background="@mipmap/bg_my_vip"
+                    android:gravity="center_vertical"
                     android:orientation="vertical"
-                    android:paddingLeft="24dp">
+                    android:paddingLeft="104dp">
 
                     <TextView
                         android:id="@+id/tv_my_vip"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="20dp"
-                        android:text="开通数据会员服务"
-                        android:textColor="#5B1500"
-                        android:textSize="22sp"
+                        android:text="开通VIP会员"
+                        android:textColor="#FFE5BA"
+                        android:textSize="24sp"
                         android:textStyle="bold" />
 
                     <TextView
                         android:id="@+id/tv_my_status"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="10dp"
-                        android:text="随时随地查询房地产行情"
-                        android:textColor="#5B1500" />
-
-                    <Button
-                        android:id="@+id/tv_my_btn"
-                        android:layout_width="120dp"
-                        android:layout_height="40dp"
-                        android:layout_marginTop="20dp"
-                        android:background="@drawable/shape_my"
-                        android:text="立即开通"
-                        android:textColor="#FFEED3"
+                        android:layout_marginTop="4dp"
                         android:textSize="16sp"
-                        android:textStyle="bold" />
+                        android:text="万本小说免费看"
+                        android:textColor="#ADABAA" />
+
 
                 </LinearLayout>
 
+                <Button
+                    android:id="@+id/tv_my_btn"
+                    android:layout_width="100dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="center_vertical|right"
+                    android:layout_marginRight="10dp"
+                    android:background="@drawable/shape_my"
+                    android:text="立即开通"
+                    android:textColor="#4F301D"
+                    android:textSize="16sp"
+                    android:textStyle="bold" />
+            </FrameLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="14dp"
+                android:layout_marginEnd="14dp"
+                android:background="@drawable/shape_bg_mobile"
+                android:orientation="vertical">
+
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="14dp"
-                    android:layout_marginTop="10dp"
-                    android:layout_marginEnd="14dp"
-                    android:layout_marginBottom="10dp"
-                    android:background="@drawable/shape_bg_mobile"
-                    android:orientation="vertical">
+                    android:layout_marginTop="30dp"
+                    android:layout_marginBottom="30dp"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:id="@+id/ll_my_payrecord"
-                        android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:id="@+id/ll_my_history"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="15dp">
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@mipmap/ic_my_history" />
 
                         <TextView
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="我的订单"
-                            android:textColor="@color/black"
-                            android:textSize="16sp" />
-
-                        <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:padding="6dp"
-                            android:src="@mipmap/ic_arrow_more" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="阅读记录"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
 
                     </LinearLayout>
 
-                    <View
-                        android:id="@+id/line_my_payrecord"
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/my_color_gray" />
-
-
                     <LinearLayout
-                        android:id="@+id/ll_my_read"
-                        android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:id="@+id/ll_my_change"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="15dp">
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@mipmap/ic_my_change" />
 
                         <TextView
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="房价资讯"
-                            android:textColor="@color/black"
-                            android:textSize="16sp" />
-
-                        <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:padding="6dp"
-                            android:src="@mipmap/ic_arrow_more" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="兑换会员"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
 
                     </LinearLayout>
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/my_color_gray" />
-
-
                     <LinearLayout
-                        android:id="@+id/ll_my_history"
-                        android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:id="@+id/ll_my_cancel"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="15dp">
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@mipmap/ic_my_cancel" />
 
                         <TextView
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="历史记录"
-                            android:textColor="@color/black"
-                            android:textSize="16sp" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="取消订阅"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_my_order"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:orientation="vertical">
 
                         <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:padding="6dp"
-                            android:src="@mipmap/ic_arrow_more" />
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@mipmap/ic_my_order" />
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="我的订单"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
 
                     </LinearLayout>
+                </LinearLayout>
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/my_color_gray" />
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="30dp"
+                    android:orientation="horizontal">
 
                     <LinearLayout
-                        android:id="@+id/ll_my_setting"
-                        android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:id="@+id/ll_my_phone"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="15dp">
+                        android:orientation="vertical">
+
+                        <ImageView
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@mipmap/ic_my_phone" />
 
                         <TextView
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="功能设置"
-                            android:textColor="@color/black"
-                            android:textSize="16sp" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="联系客服"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:id="@+id/ll_my_set"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:orientation="vertical">
 
                         <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:padding="6dp"
-                            android:src="@mipmap/ic_arrow_more" />
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@mipmap/ic_my_set" />
 
-                    </LinearLayout>
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="设置"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
 
-                    <View
-                        android:id="@+id/line_my_contactus"
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:background="@color/my_color_gray" />
+                    </LinearLayout>
 
                     <LinearLayout
-                        android:id="@+id/ll_contactus"
-                        android:layout_width="match_parent"
-                        android:layout_height="50dp"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
                         android:gravity="center_vertical"
-                        android:orientation="horizontal"
-                        android:paddingStart="20dp"
-                        android:paddingEnd="15dp">
+                        android:orientation="vertical"
+                        android:visibility="invisible">
+
+                        <ImageView
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@mipmap/ic_arrow_more" />
 
                         <TextView
-                            android:id="@+id/tv_contact"
-                            android:layout_width="0dp"
+                            android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_weight="1"
-                            android:text="如有问题，请直接联系在线客服\n"
-                            android:textColor="@color/black" />
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="阅读记录"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
+
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center_vertical"
+                        android:orientation="vertical"
+                        android:visibility="invisible">
 
                         <ImageView
-                            android:layout_width="30dp"
-                            android:layout_height="30dp"
-                            android:padding="6dp"
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_gravity="center_horizontal"
                             android:src="@mipmap/ic_arrow_more" />
 
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_horizontal"
+                            android:layout_marginTop="8dp"
+                            android:text="阅读记录"
+                            android:textColor="#3D3D3D"
+                            android:textSize="18sp" />
+
                     </LinearLayout>
+                </LinearLayout>
+
+
+                <View
+                    android:id="@+id/line_my_payrecord"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@color/my_color_gray" />
 
 
-                </LinearLayout>
             </LinearLayout>
+        </LinearLayout>
 
-        </FrameLayout>
     </LinearLayout>
 </ScrollView>
 

book/app/src/main/res/layout/item_banner_vip.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="fitXY" />
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@mipmap/ic_vip_selected"
+        android:scaleType="fitXY" />
+
+    <TextView
+        android:visibility="gone"
+        android:id="@+id/bannerTitle"
+        android:layout_width="match_parent"
+        android:layout_height="24dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_marginStart="60dp"
+        android:background="@mipmap/ic_vip_lable"
+        android:ellipsize="marquee"
+        android:focusable="true"
+        android:focusableInTouchMode="true"
+        android:gravity="center"
+        android:singleLine="true"
+        android:textColor="@color/color_815136"
+        android:textSize="12sp" />
+</RelativeLayout>
\ No newline at end of file

book/app/src/main/res/layout/item_rv_vip.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/rlVipItemRoot"
-    android:layout_width="110dp"
-    android:layout_height="150dp"
-    android:layout_margin="10dp"
-    android:background="@drawable/shape_vip_adapter_none"
+    android:layout_width="match_parent"
+    android:layout_marginLeft="20dp"
+    android:layout_marginRight="20dp"
+    android:layout_marginTop="10dp"
+    android:layout_marginBottom="10dp"
+    android:layout_height="wrap_content"
     android:orientation="vertical">
 
+    <FrameLayout
+        android:id="@+id/rlVipItemRoot"
+        android:layout_width="match_parent"
+        android:layout_height="110dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/shape_vip_adapter_none"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_marginTop="-8dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical">
+
+            <TextView
+                android:id="@+id/tvVipItemTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginLeft="18dp"
+                android:textColor="#efbc6a"
+                android:textSize="20sp"
+                android:layout_centerVertical="true"
+                android:textStyle="bold"
+                tools:text="包年会员" />
+
+            <TextView
+                android:id="@+id/tvVipItemCurMoney"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_alignParentRight="true"
+                android:layout_marginRight="18dp"
+                android:gravity="center"
+                android:textColor="#efbc6a"
+                android:textSize="16sp"
+                tools:text="$78" />
+
+
+        </RelativeLayout>
+
+        <TextView
+            android:id="@+id/tvVipItemMoney"
+            android:layout_width="match_parent"
+            android:layout_height="28dp"
+            android:layout_gravity="bottom"
+            android:background="@drawable/shape_vip_lable"
+            android:gravity="center"
+            android:textColor="#A24240"
+            android:textSize="12sp"
+            tools:text="原价：123" />
+
+
+    </FrameLayout>
+
     <TextView
         android:id="@+id/tvVipItemLable"
         android:layout_width="wrap_content"
@@ -19,41 +75,7 @@
         android:paddingTop="2dp"
         android:paddingRight="6dp"
         android:paddingBottom="2dp"
-        android:textColor="@color/black"
-        android:textSize="12sp"
-        tools:text="包年会员" />
-
-    <TextView
-        android:id="@+id/tvVipItemTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="16dp"
-        android:textColor="@color/white"
-        android:textSize="18sp"
-        tools:text="包年会员" />
-
-    <TextView
-        android:id="@+id/tvVipItemCurMoney"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        android:gravity="center"
-        android:textColor="@color/white"
-        android:textSize="24sp"
-        android:textStyle="bold"
-        tools:text="$78" />
-
-    <TextView
-        android:id="@+id/tvVipItemMoney"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="16dp"
-        android:textColor="@color/color_939AA3"
+        android:textColor="@color/color_815136"
         android:textSize="14sp"
-        tools:text="原价：123" />
-
-</LinearLayout>
\ No newline at end of file
+        tools:text="包年会员" />
+</FrameLayout>
\ No newline at end of file

book/app/src/main/res/values/colors.xml

@@ -23,7 +23,7 @@
     <color name="color_FDFDFD">#FDFDFD</color>
     <color name="color_8B560F">#8B560F</color>
     <color name="red_e73a3d">#e73a3d</color>
-
+    <color name="half_transparent">#80000000</color>
     <color name="id_photo_gray">#E0E4E7</color>
-
+    <color name="color_815136">#815136</color>
 </resources>
\ No newline at end of file