测试

app/agconnect-services.json

@@ -33,7 +33,7 @@
 		"project_id":"388421841221488221",
 		"app_id":"108318391",
 		"api_key":"DAEDACb//MwJd8VoONZ8qwwwfyYb5+/Oeh0YImMODrMKXBRAkqUXPO+jp44QOcybtAsiOgIaYZ2Wgor4WLQTbhJYtLxHmmFE9Dy/xw==",
-		"package_name":"com.fengliyan.tianlesue"
+		"package_name":"com.xuebiping.bolizhuzi"
 	},
 	"oauth_client":{
 		"client_id":"108318391",
@@ -41,7 +41,7 @@
 	},
 	"app_info":{
 		"app_id":"108318391",
-		"package_name":"com.fengliyan.tianlesue"
+		"package_name":"com.xuebiping.bolizhuzi"
 	},
 	"service":{
 		"analytics":{
@@ -79,12 +79,12 @@
 	"configuration_version":"3.0",
 	"appInfos":[
 		{
-			"package_name":"com.fengliyan.tianlesue",
+			"package_name":"com.xuebiping.bolizhuzi",
 			"client":{
 				"app_id":"108318391"
 			},
 			"app_info":{
-				"package_name":"com.fengliyan.tianlesue",
+				"package_name":"com.xuebiping.bolizhuzi",
 				"app_id":"108318391"
 			},
 			"oauth_client":{

app/build.gradle

@@ -35,11 +35,11 @@ android {
     }
     useLibrary 'org.apache.http.legacy'
     defaultConfig {
-        applicationId "com.fengliyan.tianlesue"
+        applicationId "com.xuebiping.bolizhuzi"
         minSdkVersion 24
         targetSdkVersion 30
-        versionCode 38
+        versionCode 1
-        versionName "2.5.1"
+        versionName "1.0.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         flavorDimensions "versionCode"
         buildConfigField "String", "AUTH_SECRET", '"tX1pY3+d9GOsDdek6c8EkqlBagajAzzq4Yl8xWzKxE66qzaa51BRukuNO66MPcv92lK5tTifKP6md8Jn/vIcgQCLpJWhr4vKvcGeOmBFIPmdo/++elnHTJdJ10RSRN8fDaQVUhX7Ap3KoPQ4n/oSUNSpa/HKZihCLQK31vyNCL/GZ4bGijb2e63JDN4GbUOP1d7yw4vbaNEA883Da+CQ+CyYW4aXWuLca/1ngoszOw3wRFhe/ZMVDhDRRMc7Bpp/+judD4ehwydRzLprBpVSQufZV6XAUpec3V7eJRH3FHGXE4fwtZK4BA=="'
@@ -76,10 +76,10 @@ android {
             keyAlias properties.get("keyAlias") ?: System.getenv("FLOW_ALIAS_NAME")
             keyPassword properties.get("keyPassword") ?: System.getenv("FLOW_ALIAS_PASS")*/
 
-            storeFile file("xiayue.jks")
+            storeFile file("bolizhuzi.jks")
-            storePassword 'Chenqihong3'
+            storePassword 'bolizhuzi'
-            keyAlias 'chenqihong3'
+            keyAlias 'bolizhuzi'
-            keyPassword 'Chenqihong3'
+            keyPassword 'bolizhuzi'
             v1SigningEnabled true
             v2SigningEnabled true
         }
@@ -154,169 +154,169 @@ android {
 
     productFlavors {
 //        dev {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "true"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "oss",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
         oss {
-            applicationId "com.fengliyan.tianlesue"
+            applicationId "com.xuebiping.bolizhuzi"
-            buildConfigField "boolean", "IS_DEV", "false"
+            buildConfigField "boolean", "IS_DEV", "true"
             buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
             buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
             buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
                                     MARKET_VALUE  : "oss",
-                                    APP_NAME      : "私语"
+                                    APP_NAME      : "芊颜"
             ]
         }
 
 //        vivo {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "vivo",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        oppo {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "oppo",
-//                                    APP_NAME      : "私语",
+//                                    APP_NAME      : "芊颜",
 //            ]
 //        }
 //        xiaomi {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "xiaomi",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        yingyongbao {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "yingyongbao",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        huawei {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuSocialPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuSocialAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuSocialVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "huawei",
-//                                    APP_NAME      : "私语交友"
+//                                    APP_NAME      : "芊颜交友"
 //            ]
 //        }
 //        honor {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "honor",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        meizu {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "meizu",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        baiduss {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "baiduss",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        baiduxxl {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "baiduxxl",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        threesixzero {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "\"360\"",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        ali {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "ali",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        kuaishou {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "kuaishou",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
 //        douyin {
-//            applicationId "com.fengliyan.tianlesue"
+//            applicationId "com.xuebiping.bolizhuzi"
 //            buildConfigField "boolean", "IS_DEV", "false"
 //            buildConfigField "String", "PRIVACY", '"/index/about/siyuPrivacy.html"'
 //            buildConfigField "String", "AGREEMENT", '"/index/about/siyuAgreement.html"'
 //            buildConfigField "String", "VIP_AGREEMENT", '"/index/about/siyuVipAgreement.html"'
-//            manifestPlaceholders = [APPLICATION_ID: "com.fengliyan.tianlesue",
+//            manifestPlaceholders = [APPLICATION_ID: "com.xuebiping.bolizhuzi",
 //                                    MARKET_VALUE  : "douyin",
-//                                    APP_NAME      : "私语"
+//                                    APP_NAME      : "芊颜"
 //            ]
 //        }
     }
@@ -348,6 +348,7 @@ android {
         implementation project(path: ':storage')
         implementation project(path: ':yunxinkit')
         implementation project(':faceunity')
+        implementation project(':magicindicator')
         //EventBus
         implementation 'de.greenrobot:eventbus:2.4.0'
         implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0'
@@ -378,7 +379,7 @@ android {
         implementation 'com.flyco.roundview:FlycoRoundView_Lib:1.1.4@aar'
         implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'
         implementation 'com.github.eralpyucel:CircleProgressView:v1.1'
-        //implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.0'
+//        implementation 'com.github.CarGuo.GSYVideoPlayer:GSYVideoPlayer:v8.1.0'
         implementation 'com.shuyu:GSYVideoPlayer:8.1.0'
 
         implementation 'com.googlecode.mp4parser:isoparser:1.1.21'
@@ -398,6 +399,11 @@ android {
         implementation 'com.devzld:expandlayout:1.0.0'
         implementation 'io.github.lucksiege:pictureselector:v3.11.2'
         implementation 'com.github.Dimezis:BlurView:version-3.1.0'
+
+        implementation "com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-x"
+//        implementation "com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6" //3.0.2更换了很多API
+
+//        implementation 'io.github.carguo:gsyvideoplayer:12.1.0'
     }
 }
 
@@ -405,4 +411,6 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }

app/mcs-services.json

@@ -1,6 +1,6 @@
 {
 	"developer_id":"109999896480",
 	"app_id":"104457750",
-	"package_name":"com.fengliyan.tianlesue",
+	"package_name":"com.xuebiping.bolizhuzi",
 	"version":"1.0"
 }

app/oss/release/output-metadata.json

@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.xuebiping.bolizhuzi",
+  "variantName": "ossRelease",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1,
+      "versionName": "1.0.0",
+      "outputFile": "siyu_v1.0.0_oss_release.apk"
+    }
+  ]
+}

app/src/androidTest/java/com/fengliyan/tianlesue/ExampleInstrumentedTest.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue;
+package com.xuebiping.bolizhuzi;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("com.fengliyan.tianlesue", appContext.getPackageName());
+        assertEquals("com.xuebiping.bolizhuzi", appContext.getPackageName());
     }
 }

app/src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.fengliyan.tianlesue">
+    package="com.xuebiping.bolizhuzi">
     <!-- 主要用于高德定位用途 -->
     <!-- 用于进行网络定位 -->
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- 用于访问GPS定位 -->
@@ -58,33 +58,33 @@
     </queries> <!-- SDK 权限申明, 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
     <!-- 和下面的 uses-permission 一起加入到你的 AndroidManifest 文件中。 -->
     <permission
-        android:name="com.fengliyan.tianlesue.permission.RECEIVE_MSG"
+        android:name="com.xuebiping.bolizhuzi.permission.RECEIVE_MSG"
         android:protectionLevel="signature" /> <!-- 接收 SDK 消息广播权限， 第三方 APP 接入时，请将 com.netease.nim.demo 替换为自己的包名 -->
-    <uses-permission android:name="com.fengliyan.tianlesue.permission.RECEIVE_MSG" /> <!-- 小米推送 -->
+    <uses-permission android:name="com.xuebiping.bolizhuzi.permission.RECEIVE_MSG" /> <!-- 小米推送 -->
     <!-- start -->
     <!-- 配置权限，已经配置过的条目则无须添加 -->
     <uses-permission android:name="android.permission.GET_TASKS" /> <!-- 以下两处 {你的包名} 改开发者App的包名 -->
     <permission
-        android:name="com.fengliyan.tianlesue.permission.MIPUSH_RECEIVE"
+        android:name="com.xuebiping.bolizhuzi.permission.MIPUSH_RECEIVE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="com.fengliyan.tianlesue.permission.MIPUSH_RECEIVE" /> <!-- end -->
+    <uses-permission android:name="com.xuebiping.bolizhuzi.permission.MIPUSH_RECEIVE" /> <!-- end -->
     <!-- 魅族推送start -->
     <!-- 兼容flyme5.0以下版本，魅族内部集成pushSDK必填，不然无法收到消息，将{你的包名} 改开发者App的包名 -->
     <uses-permission android:name="com.meizu.flyme.push.permission.RECEIVE" />
 
     <permission
-        android:name="com.fengliyan.tianlesue.push.permission.MESSAGE"
+        android:name="com.xuebiping.bolizhuzi.push.permission.MESSAGE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="com.fengliyan.tianlesue.push.permission.MESSAGE" /> <!-- 兼容flyme3.0配置权限 -->
+    <uses-permission android:name="com.xuebiping.bolizhuzi.push.permission.MESSAGE" /> <!-- 兼容flyme3.0配置权限 -->
     <uses-permission android:name="com.meizu.c2dm.permission.RECEIVE" />
 
     <permission
-        android:name="com.fengliyan.tianlesue.permission.C2D_MESSAGE"
+        android:name="com.xuebiping.bolizhuzi.permission.C2D_MESSAGE"
         android:protectionLevel="signature" />
 
-    <uses-permission android:name="com.fengliyan.tianlesue.permission.C2D_MESSAGE" /> <!-- 魅族推送end -->
+    <uses-permission android:name="com.xuebiping.bolizhuzi.permission.C2D_MESSAGE" /> <!-- 魅族推送end -->
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
@@ -115,7 +115,7 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:label,android:allowBackup"
         tools:targetApi="r">
-        <activity android:name=".view.main.VideoFriendActivity"></activity>
+
 
         <meta-data
             android:name="ScopedStorage"
@@ -174,9 +174,24 @@
         <activity
             android:name=".view.base.BaseActivity"
             android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".view.settings.PersonalJobActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".view.settings.PersonalSchoolActivity"
+            android:screenOrientation="portrait" />
+
+        <activity
+            android:name=".view.settings.PhotoListTwoActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.register.RegisterActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.dynamics.activity.DynamicDetailTwoActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.settings.WithdrawActivity"
             android:screenOrientation="portrait" />
@@ -229,9 +244,22 @@
         <activity
             android:name=".view.settings.InvitationDataActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.settings.WxCodeActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.settings.SocialActivity"
             android:screenOrientation="portrait" />
+        <activity android:name=".view.settings.VideoRenzhengActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".view.settings.RealNameTwoActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".view.settings.UploadPhotoCoverActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".view.settings.PhotoListActivity"
+            android:screenOrientation="portrait" />
+        <activity android:name=".view.settings.UpPrivilegeActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.settings.MyItemsActivity"
             android:screenOrientation="portrait" />
@@ -244,15 +272,24 @@
         <activity
             android:name=".view.main.GiftReceivedActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.main.GiftReceived2Activity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.dynamics.activity.ImageDisplayActivity"
             android:screenOrientation="portrait" />
         <activity
             android:name=".view.dynamics.activity.DynamicPostActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.dynamics.activity.DynamicPublishActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.main.MainPageActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.main.MainPageCommentActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.main.AllChannelActivity"
             android:screenOrientation="portrait" />
@@ -307,6 +344,12 @@
         <activity
             android:name=".view.main.ComplaintActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.dynamics.activity.TopicDynamicListActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.main.VideoFriendActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".view.settings.CaibeiRechargeActivity"
             android:exported="true"
@@ -338,12 +381,16 @@
         <activity
             android:name=".view.main.GenderUserAndMibiRankActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.news.activity.CateRecordActivity"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".wxapi.WXEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="true"
             android:launchMode="singleTask"
-            android:taskAffinity="com.fengliyan.tianlesue"
+            android:taskAffinity="com.xuebiping.bolizhuzi"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
         <activity
             android:name=".view.main.SearchActivity"
@@ -387,6 +434,10 @@
         <activity
             android:name=".view.main.VideoFinishActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.main.VideoFinish2Activity"
+            android:screenOrientation="portrait"
+            android:theme="@style/activity_dialog"/>
         <activity android:name=".view.news.activity.FakeActivity" />
         <activity
             android:name=".view.news.activity.Fake2Activity"
@@ -451,6 +502,18 @@
         <activity
             android:name=".view.settings.PersonalSignatureActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.settings.ContactListActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.settings.VisitorActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.settings.GenderActiveActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.settings.IntimacyListActivity"
+            android:screenOrientation="portrait" />
 
         <receiver android:name=".view.main.receiver.NotificationClickReceiver" /> <!-- 微信支付 -->
         <activity
@@ -500,16 +563,16 @@
         <service android:name="com.netease.nimlib.service.ResponseService" /> <!-- 云信内部使用的进程间通信provider -->
         <provider
             android:name="com.netease.nimlib.ipc.cp.provider.PreferenceContentProvider"
-            android:authorities="com.fengliyan.tianlesue.ipc.provider.preference"
+            android:authorities="com.xuebiping.bolizhuzi.ipc.provider.preference"
             android:exported="false" />
         <provider
             android:name="com.netease.nimlib.ipc.NIMContentProvider"
-            android:authorities="com.fengliyan.tianlesue.ipc.provider"
+            android:authorities="com.xuebiping.bolizhuzi.ipc.provider"
             android:exported="false"
             android:process=":core" />
         <provider
             android:name="androidx.core.content.FileProvider"
-            android:authorities="com.fengliyan.tianlesue.fileprovider"
+            android:authorities="com.xuebiping.bolizhuzi.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
 
@@ -521,7 +584,7 @@
 
         <meta-data
             android:name="com.netease.nim.appKey"
-            android:value="5416101821422e21b3305dc0c3117832" />
+            android:value="7c66fa0f782771bc2b2829158b6c6aac" />
         <meta-data
             android:name="TD_APP_ID"
             android:value="29B64B08724440F8B620A472CE95A249" />
@@ -590,7 +653,7 @@
         <!-- 替换为自己的包名 -->
         <!-- <provider -->
         <!-- android:name="com.huawei.hms.update.provider.UpdateProvider" -->
-        <!-- android:authorities="com.fengliyan.tianlesue.hms.update.provider" -->
+        <!-- android:authorities="com.xuebiping.bolizhuzi.hms.update.provider" -->
         <!-- android:exported="false" -->
         <!-- android:grantUriPermissions="true" /> -->
         <!-- 云信华为推送消息广播 -->
@@ -643,7 +706,7 @@
                 <action android:name="com.meizu.c2dm.intent.REGISTRATION" />
                 <action android:name="com.meizu.c2dm.intent.RECEIVE" />
 
-                <category android:name="com.fengliyan.tianlesue" />
+                <category android:name="com.xuebiping.bolizhuzi" />
             </intent-filter>
         </receiver> <!-- 魅族推送配置end -->
         <!-- oppo推送配置 -->
@@ -688,7 +751,7 @@
             android:name="app_id"
             android:value="105654483" /> <!-- 云信uikit库里面的 -->
         <meta-data
-            android:name="com.fengliyan.tianlesue.im.uikit.support.glide.NIMGlideModule"
+            android:name="com.xuebiping.bolizhuzi.im.uikit.support.glide.NIMGlideModule"
             android:value="GlideModule" /> <!-- 会话窗口 -->
         <!--
  UI组件中包含了语音选文字功能，该界面是全屏显示，为了视觉上的美观，该界面主题ActionBar使用Overlay模式。
@@ -870,6 +933,9 @@
         <activity
             android:name=".view.dynamics.activity.PageVideoPlayActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name=".view.dynamics.activity.PageVideoPlay2Activity"
+            android:screenOrientation="portrait" />
         <activity android:name=".view.settings.GoddessPrivilegeActivity" />
         <activity android:name=".view.settings.CancellationActivity" />
         <activity android:name=".view.settings.BindBankActivity" />

app/src/main/aidl/com/xuebiping/bolizhuzi/aidl/IMyAidlInterface.aidl

@@ -1,5 +1,5 @@
 // IMyAidlInterface.aidl
-package com.fengliyan.tianlesue.aidl;
+package com.xuebiping.bolizhuzi.aidl;
 
 // Declare any non-default types here with import statements
 

app/src/main/java/com/fengliyan/tianlesue/controller/settings/adapter/GeneralOptionsRecyclerAdapter.java

@@ -1,228 +0,0 @@
-package com.fengliyan.tianlesue.controller.settings.adapter;
-
-import android.content.Context;
-import android.text.TextUtils;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import androidx.constraintlayout.widget.ConstraintLayout;
-import androidx.recyclerview.widget.RecyclerView;
-
-import com.fengliyan.tianlesue.R;
-import com.fengliyan.tianlesue.controller.main.adapter.ViewHolder;
-import com.fengliyan.tianlesue.controller.settings.manager.SettingManager;
-import com.fengliyan.tianlesue.model.settings.MemberPrivilegesInfo;
-import com.fengliyan.tianlesue.model.settings.RechargeListBean;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.view.MemberRechargeDialog;
-import com.fengliyan.tianlesue.view.base.utils.view.MemberTipsDialog;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Created by halifa on 2019/5/15.
- */
-
-public class GeneralOptionsRecyclerAdapter extends RecyclerView.Adapter {
-
-    private List<MemberPrivilegesInfo> mOptions = new ArrayList<>();
-    private Context mContext;
-    private int vipType;
-    private String vip_day_free_send = "100";
-
-    public GeneralOptionsRecyclerAdapter(Context context, int vipType) {
-        mContext = context;
-        this.vipType = vipType;
-    }
-
-    public void setOptions(List<MemberPrivilegesInfo> list) {
-        mOptions = list;
-        notifyDataSetChanged();
-        Log.i("TAG", "setOptions: mOptions---->" + mOptions.size());
-    }
-
-    public List<MemberPrivilegesInfo> getmOptions() {
-        return mOptions;
-    }
-
-    public void setVip_day_free_send(String vip_day_free_send) {
-        this.vip_day_free_send = vip_day_free_send;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View view = LayoutInflater.from(mContext).inflate(R.layout.item_general_option, null);
-        return new Holder(mContext, view);
-    }
-
-    @Override
-    public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        MemberPrivilegesInfo options = mOptions.get(position);
-        Holder dataHolder = (Holder) holder;
-        if (vipType == 0) {
-//            dataHolder.cl_privilege.setBackgroundResource(R.drawable.member_privilege_bg);
-            dataHolder.iv_privilege_tip.setImageResource(R.drawable.ic_privilege_tip);
-//            dataHolder.tv_member_privilege_name.setTextColor(Color.parseColor("#61380C"));
-//            dataHolder.tv_privilege_dec.setTextColor(Color.parseColor("#A6793E"));
-        } else {
-//            dataHolder.cl_privilege.setBackgroundResource(R.drawable.super_member_privilege_bg);
-            dataHolder.iv_privilege_tip.setImageResource(R.drawable.ic_privilege_tip1);
-//            dataHolder.tv_member_privilege_name.setTextColor(Color.parseColor("#DDD6FF"));
-//           dataHolder.tv_privilege_dec.setTextColor(Color.parseColor("#AAA0F0"));
-        }
-        switch (options.getId()) {
-            case 0:
-                if (vipType == 0) {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_privilege1);
-                    dataHolder.tv_member_privilege_name.setText("私信畅聊特权");
-                    dataHolder.tv_privilege_dec.setText(options.getDesc());
-                    dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-                } else {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_super_privilege1);
-                    dataHolder.tv_member_privilege_name.setText("加送金币");
-                    dataHolder.tv_privilege_dec.setText("额外赠送金币");
-                    if (TextUtils.equals("VISIBLE", options.getName())) {
-                        dataHolder.iv_privilege_tip.setVisibility(View.VISIBLE);
-                        dataHolder.iv_privilege_tip.setOnClickListener(new View.OnClickListener() {
-                            @Override
-                            public void onClick(View v) {
-                                getGoodsList();
-                            }
-                        });
-                    } else {
-                        dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-                    }
-                }
-                break;
-            case 1:
-                if (vipType == 0) {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_privilege4);
-                } else {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_super_privilege2);
-                }
-                dataHolder.tv_member_privilege_name.setText("视频畅聊卡");
-                dataHolder.tv_privilege_dec.setText(options.getDesc());
-                dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-                dataHolder.iv_privilege_tip.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        MemberTipsDialog tipsDialog = new MemberTipsDialog(mContext, "隐身功能，开启后您的上线、榜单、充值、登录、访问都会隐身，并且群发和速配免打扰。");
-                        tipsDialog.show();
-                    }
-                });
-                break;
-            case 2:
-                if (vipType == 0) {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_privilege3);
-                } else {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_super_privilege3);
-                }
-                dataHolder.tv_member_privilege_name.setText("充值加送金币");
-                dataHolder.tv_privilege_dec.setText("额外赠送金币");
-//                if (TextUtils.equals("VISIBLE", options.getName())) {
-//                    dataHolder.iv_privilege_tip.setVisibility(View.VISIBLE);
-//                    dataHolder.iv_privilege_tip.setOnClickListener(new View.OnClickListener() {
-//                        @Override
-//                        public void onClick(View v) {
-//                            MemberTipsDialog tipsDialog = new MemberTipsDialog(mContext, "专属客服微信号: Zdhfa1234");
-//                            tipsDialog.show();
-//                        }
-//                    });
-//                } else {
-                dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-//                }
-                break;
-            case 3:
-                if (vipType == 0) {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_privilege7);
-                } else {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_super_privilege7);
-                }
-                dataHolder.tv_member_privilege_name.setText("消息读取状态");
-                dataHolder.tv_privilege_dec.setText("可查看是否已读");
-                dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-                break;
-            case 4:
-                if (vipType == 0) {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_privilege5);
-                } else {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_super_privilege4);
-                }
-                dataHolder.tv_member_privilege_name.setText("专属会员标识");
-                dataHolder.tv_privilege_dec.setText("头像框、聊天气泡");
-                dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-                break;
-            case 5:
-                if (vipType == 0) {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_privilege2);
-                } else {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_super_privilege5);
-                }
-                dataHolder.tv_member_privilege_name.setText("隐身模式");
-                dataHolder.tv_privilege_dec.setText("全平台隐身畅玩");
-                dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-                break;
-            case 6:
-                if (vipType == 0) {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_privilege6);
-                } else {
-                    dataHolder.iv_privilege_img.setImageResource(R.drawable.ic_super_privilege6);
-                }
-                dataHolder.tv_member_privilege_name.setText("聊天气泡框");
-                dataHolder.tv_privilege_dec.setText("VIP专属聊天框");
-                dataHolder.iv_privilege_tip.setVisibility(View.GONE);
-                break;
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return mOptions.size();
-    }
-
-
-    public class Holder extends ViewHolder {
-        ImageView iv_privilege_img;
-        TextView tv_member_privilege_name;
-        TextView tv_privilege_dec;
-        ImageView iv_privilege_tip;
-        ConstraintLayout cl_privilege;
-
-        public Holder(Context context, View itemView) {
-            super(context, itemView);
-            iv_privilege_img = itemView.findViewById(R.id.iv_privilege_img);
-            tv_member_privilege_name = itemView.findViewById(R.id.tv_member_privilege_name);
-            tv_privilege_dec = itemView.findViewById(R.id.tv_privilege_dec);
-            iv_privilege_tip = itemView.findViewById(R.id.iv_privilege_tip);
-            cl_privilege = itemView.findViewById(R.id.cl_privilege);
-        }
-    }
-
-    private void getGoodsList() {
-        SettingManager.getRechargeInfo((BaseActivity) mContext, 6, new HttpUiCallBack<RechargeListBean>() {
-            @Override
-            public void onSuccess(BaseActivity activity, RechargeListBean result, String message) {
-                if (result != null && result.getList() != null && result.getList().size() > 0) {
-                    MemberRechargeDialog memberRechargeDialog = new MemberRechargeDialog(activity, result.getList());
-                    memberRechargeDialog.show();
-                }
-            }
-
-            @Override
-            public void onFailure(BaseActivity activity, String tip) {
-
-            }
-
-            @Override
-            public void onException(BaseActivity activity, Throwable e) {
-
-            }
-        });
-    }
-}

app/src/main/java/com/fengliyan/tianlesue/view/main/ChannelSelectorActivity.java

@@ -1,6 +0,0 @@
-package com.fengliyan.tianlesue.view.main;
-
-import com.fengliyan.tianlesue.view.base.BaseActivity;
-
-public class ChannelSelectorActivity extends BaseActivity {
-}

app/src/main/java/com/fengliyan/tianlesue/view/settings/WalletActivity.java

@@ -1,115 +0,0 @@
-package com.fengliyan.tianlesue.view.settings;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.fengliyan.tianlesue.R;
-import com.fengliyan.tianlesue.controller.settings.manager.SettingManager;
-import com.fengliyan.tianlesue.model.settings.WalletIndexBean;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
-import com.fengliyan.uikit.title.Title;
-
-public class WalletActivity extends BaseActivity implements View.OnClickListener{
-    public static final int REQUEST_RECHARGE = 110;
-    private TextView mWalletRecharge;
-    private TextView mWalletIncoming;
-    private Button mRechargeButton;
-    private Button mExchangeButton;
-    private Button mWithdrawButton;
-    private TextView mCaiBeiRecharge;
-    private TextView mCaiBeiImcome;
-    private View mCaiBeiRechargeButton;
-    @Override
-    public void onCreate(Bundle onSavedInstance){
-        super.onCreate(onSavedInstance);
-        setContentView(R.layout.activity_wallet);
-        Title title = getCustomTitle();
-        title.setTitleBackgroundResource(R.drawable.shape_backgound);
-        title.dismissBottomLine();
-        title.findViewById(R.id.title_bg).getBackground().setAlpha(255);
-        ImageView left = findViewById(R.id.left_image);
-        left.setImageResource(R.drawable.ic_return_white);
-        title.setTitleWhite("私语钱包", "账单明细", null, new Title.OnFunctionalAreaClickListener() {
-            @Override
-            public void onLeftClick(View v) {
-                    finish();
-            }
-
-            @Override
-            public void onRightClick(View v) {
-                Intent intent = new Intent(WalletActivity.this, BillActivity.class);
-                intent.putExtra("type", 0);
-                startActivity(intent);
-            }
-        });
-
-        initView();
-        getWalletIndex();
-    }
-
-    private void initView(){
-        mWalletRecharge = findViewById(R.id.wallet_charge_amount);
-        mWalletIncoming = findViewById(R.id.wallet_income_amount);
-        mRechargeButton = findViewById(R.id.wallet_recharge_button);
-        mExchangeButton = findViewById(R.id.wallet_exchange_button);
-        mWithdrawButton = findViewById(R.id.wallet_cash_button);
-        mCaiBeiRecharge = findViewById(R.id.wallet_caibei_recharge);
-        mCaiBeiImcome = findViewById(R.id.wallet_caibei_income);
-        mCaiBeiRechargeButton = findViewById(R.id.wallet_caibei_recharge_layout);
-        mRechargeButton.setOnClickListener(this);
-        mExchangeButton.setOnClickListener(this);
-        mWithdrawButton.setOnClickListener(this);
-        mCaiBeiRechargeButton.setOnClickListener(this);
-    }
-
-    private void getWalletIndex(){
-        SettingManager.getWalletIndex(this, new HttpUiCallBack<WalletIndexBean>() {
-            @Override
-            public void onSuccess(BaseActivity activity, WalletIndexBean result, String message) {
-                mWalletRecharge.setText(result.getAccount().getCoin() + "");
-                mWalletIncoming.setText(result.getAccount().getIncome_coin() + "");
-                mCaiBeiRecharge.setText(result.getAccount().getCoin() + "");
-                mCaiBeiImcome.setText(result.getAccount().getIncome_coin() + "");
-            }
-
-            @Override
-            public void onFailure(BaseActivity activity, String tip) {
-
-            }
-
-            @Override
-            public void onException(BaseActivity activity, Throwable e) {
-
-            }
-        });
-    }
-
-    @Override
-    public void onClick(View view) {
-        if(view == mRechargeButton){
-            Intent intent = new Intent(this, CaibeiRechargeActivity.class);
-            startActivityForResult(intent, REQUEST_RECHARGE);
-        }else if(view == mCaiBeiRechargeButton){
-            Intent intent = new Intent(this, CaibeiRechargeActivity.class);
-            startActivityForResult(intent, REQUEST_RECHARGE);
-        }else if(view == mWithdrawButton){
-            Intent intent = new Intent(this, WithdrawActivity.class);
-            startActivityForResult(intent, REQUEST_RECHARGE);
-        }else if(view == mExchangeButton){
-            Intent intent = new Intent(this, ExchangeActivity.class);
-            startActivityForResult(intent, REQUEST_RECHARGE);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data){
-        if(requestCode == REQUEST_RECHARGE){
-            getWalletIndex();
-        }
-    }
-}

app/src/main/java/com/xuebiping/bolizhuzi/agora/EngineConfig.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora;
+package com.xuebiping.bolizhuzi.agora;
 
 public class EngineConfig {
     public int mClientRole;

app/src/main/java/com/xuebiping/bolizhuzi/agora/RtcEngineEventHandler.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora;
+package com.xuebiping.bolizhuzi.agora;
 
 public interface RtcEngineEventHandler {
     void onFirstRemoteVideoDecoded(int uid, int width, int height, int elapsed);

app/src/main/java/com/xuebiping/bolizhuzi/agora/RtcEngineEventHandlerProxy.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora;
+package com.xuebiping.bolizhuzi.agora;
 
 import android.util.Log;
 

app/src/main/java/com/xuebiping/bolizhuzi/agora/framework/PreprocessorFaceUnity.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.framework;
+package com.xuebiping.bolizhuzi.agora.framework;
 
 import android.content.Context;
 import android.opengl.GLES20;
@@ -12,7 +12,7 @@ import com.faceunity.core.model.facebeauty.FaceBeautyBlurTypeEnum;
 import com.faceunity.nama.FUConfig;
 import com.faceunity.nama.FURenderer;
 import com.faceunity.nama.utils.FuDeviceUtils;
-import com.fengliyan.tianlesue.agora.profile.CSVUtils;
+import com.xuebiping.bolizhuzi.agora.profile.CSVUtils;
 
 import io.agora.capture.framework.modules.channels.VideoChannel;
 import io.agora.capture.framework.modules.processors.IPreprocessor;

app/src/main/java/com/xuebiping/bolizhuzi/agora/framework/RtcVideoConsumer.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.framework;
+package com.xuebiping.bolizhuzi.agora.framework;
 
 import android.opengl.GLES20;
 import android.util.Log;

app/src/main/java/com/xuebiping/bolizhuzi/agora/profile/CPUInfoUtil.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.profile;
+package com.xuebiping.bolizhuzi.agora.profile;
 
 import android.content.Context;
 import android.os.Build;

app/src/main/java/com/xuebiping/bolizhuzi/agora/profile/CSVUtils.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.profile;
+package com.xuebiping.bolizhuzi.agora.profile;
 
 import android.app.ActivityManager;
 import android.content.Context;
@@ -7,8 +7,8 @@ import android.os.HandlerThread;
 import android.os.Process;
 import android.util.Log;
 
-import com.fengliyan.tianlesue.agora.RtcEngineEventHandlerProxy;
+import com.xuebiping.bolizhuzi.agora.RtcEngineEventHandlerProxy;
-import com.fengliyan.tianlesue.agora.utils.FPSUtil;
+import com.xuebiping.bolizhuzi.agora.utils.FPSUtil;
 
 import java.io.File;
 import java.io.FileOutputStream;

app/src/main/java/com/xuebiping/bolizhuzi/agora/profile/Constant.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.profile;
+package com.xuebiping.bolizhuzi.agora.profile;
 
 import android.os.Build;
 import android.os.Environment;

app/src/main/java/com/xuebiping/bolizhuzi/agora/profile/MemoryInfoUtil.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.profile;
+package com.xuebiping.bolizhuzi.agora.profile;
 
 import android.os.Build;
 import android.os.Debug;

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/DiscreteSeekBar.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -23,13 +23,13 @@ import androidx.annotation.Nullable;
 import androidx.core.graphics.drawable.DrawableCompat;
 import androidx.core.view.ViewCompat;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.PopupIndicator;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.PopupIndicator;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.compat.AnimatorCompat;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.compat.AnimatorCompat;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.compat.SeekBarCompat;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.compat.SeekBarCompat;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.MarkerDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.MarkerDrawable;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.ThumbDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.ThumbDrawable;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.TrackRectDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.TrackRectDrawable;
 
 import java.util.Formatter;
 import java.util.Locale;

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/Marker.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal;
 
 import android.content.Context;
 import android.content.res.ColorStateList;
@@ -16,9 +16,9 @@ import android.widget.TextView;
 
 import androidx.core.view.ViewCompat;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.compat.SeekBarCompat;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.compat.SeekBarCompat;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.MarkerDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.MarkerDrawable;
 
 
 /**

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/PopupIndicator.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal;
 
 import android.content.Context;
 import android.graphics.PixelFormat;
@@ -15,8 +15,8 @@ import android.widget.FrameLayout;
 
 import androidx.core.view.GravityCompat;
 
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.compat.SeekBarCompat;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.compat.SeekBarCompat;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.MarkerDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.MarkerDrawable;
 
 
 /**

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/compat/AnimatorCompat.java

@@ -1,7 +1,7 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.compat;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.compat;
 
 
-import com.fengliyan.tianlesue.agora.ui.seekbar.DiscreteSeekBar;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.DiscreteSeekBar;
 
 /**
  * Currently, there's no {@link android.animation.ValueAnimator} compatibility version

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/compat/SeekBarCompat.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.compat;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.compat;
 
 import android.content.res.ColorStateList;
 import android.graphics.drawable.Drawable;
@@ -11,8 +11,8 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.core.graphics.drawable.DrawableCompat;
 
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.AlmostRippleDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.AlmostRippleDrawable;
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.MarkerDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.MarkerDrawable;
 
 
 /**

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/compat/SeekBarCompatDontCrash.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.compat;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.compat;
 
 import android.annotation.TargetApi;
 import android.content.res.ColorStateList;
@@ -11,7 +11,7 @@ import android.view.ViewOutlineProvider;
 import android.view.ViewParent;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable.MarkerDrawable;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable.MarkerDrawable;
 
 
 /**

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/drawable/AlmostRippleDrawable.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable;
 
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/drawable/MarkerDrawable.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable;
 
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/drawable/StateDrawable.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable;
 
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/drawable/ThumbDrawable.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable;
 
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;
@@ -8,7 +8,7 @@ import android.graphics.drawable.Animatable;
 import android.os.SystemClock;
 import androidx.annotation.NonNull;
 
-import com.fengliyan.tianlesue.agora.ui.seekbar.internal.Marker;
+import com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.Marker;
 
 
 /**

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/drawable/TrackOvalDrawable.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable;
 
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;

app/src/main/java/com/xuebiping/bolizhuzi/agora/ui/seekbar/internal/drawable/TrackRectDrawable.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.ui.seekbar.internal.drawable;
+package com.xuebiping.bolizhuzi.agora.ui.seekbar.internal.drawable;
 
 import android.content.res.ColorStateList;
 import android.graphics.Canvas;

app/src/main/java/com/xuebiping/bolizhuzi/agora/utils/CameraUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.fengliyan.tianlesue.agora.utils;
+package com.xuebiping.bolizhuzi.agora.utils;
 
 import android.app.Activity;
 import android.hardware.Camera;

app/src/main/java/com/xuebiping/bolizhuzi/agora/utils/FPSUtil.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.utils;
+package com.xuebiping.bolizhuzi.agora.utils;
 
 import android.util.Log;
 

app/src/main/java/com/xuebiping/bolizhuzi/agora/utils/ToastUtil.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.agora.utils;
+package com.xuebiping.bolizhuzi.agora.utils;
 
 import android.content.Context;
 import android.view.Gravity;

app/src/main/java/com/xuebiping/bolizhuzi/controller/base/RecyclerLoadAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.base;
+package com.xuebiping.bolizhuzi.controller.base;
 
 
 import androidx.recyclerview.widget.LinearLayoutManager;

app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConsUser.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.constant;
+package com.xuebiping.bolizhuzi.controller.constant;
 
 /**
  * Created by halifa on 2018/12/4.

app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/ConstUrl.java

@@ -1,10 +1,10 @@
-package com.fengliyan.tianlesue.controller.constant;
+package com.xuebiping.bolizhuzi.controller.constant;
 
 
-import com.fengliyan.tianlesue.BuildConfig;
+import com.xuebiping.bolizhuzi.BuildConfig;
-import com.fengliyan.tianlesue.im.uikit.common.Constans;
+import com.xuebiping.bolizhuzi.im.uikit.common.Constans;
-import com.fengliyan.tianlesue.utils.NoClearSPUtils;
+import com.xuebiping.bolizhuzi.utils.NoClearSPUtils;
-import com.fengliyan.tianlesue.view.base.BaseApplication;
+import com.xuebiping.bolizhuzi.view.base.BaseApplication;
 
 /**
  * Created by abby on 2018/4/6.
@@ -16,15 +16,16 @@ public class ConstUrl {
     public final static boolean DEBUG = BuildConfig.IS_DEV;
     public static boolean DEBUG1 = NoClearSPUtils.getBoolean(BaseApplication.getInstance(), Constans.ENVIRONMENT_TYPE, true);
     public final static boolean LOGDEBUG = BuildConfig.IS_DEV;
-    public final static String BASE_ROOT = DEBUG ? (DEBUG1 ? "https://pre.xq.whnuanbeinikj.cn/" : "https://xq.whnuanbeinikj.cn/") :
+    public final static String BASE_ROOT = DEBUG ? (DEBUG1 ? "http://pre-api.jindashengkj.cn/" : "http://pre-api.jindashengkj.cn/") :
-            "https://xq.whnuanbeinikj.cn/";
+            "http://pre-api.jindashengkj.cn/";
     //public static final String WEBSOCKTURL = "saws://192.168.32.106:11119/acc1";
     public static final String WEBSOCKTURL = "ws://red.nndongqing.cn/acc1";
-    public static final String SOCKET_USERSTATIS_DEBUG = "wss://pre.ws.ncaicai.tech?user_id=";
+    public static final String SOCKET_USERSTATIS_DEBUG = "wss://pre.ws.whnuanbeinikj.cn?user_id=";
     public static final String SOCKET_USERSTATIS = "wss://ws.whnuanbeinikj.cn?user_id=";
     public static final String SOCKET_SPEED_DATE = DEBUG ? (DEBUG1 ? "wss://pre.ws.whnuanbeinikj.cn/speed?token=" : "wss://ws.whnuanbeinikj.cn/speed?token=") :
             "wss://ws.whnuanbeinikj.cn/speed?token=";
-    public final static String IMAGE_URL = "http://xqasset.whnuanbeinikj.cn/";
+    //public final static String IMAGE_URL = "http://qianyan-asset.oss-cn-shanghai.aliyuncs.com/";
+    public final static String IMAGE_URL = "http://oss.jindashengkj.cn/";
     public final static String BASE_URL = BASE_ROOT + "api/";
     public final static String APP_FIELD = "app/";
     public final static String AUTH_FIELD = "passport/";
@@ -65,6 +66,7 @@ public class ConstUrl {
     public final static String THIRD = getUrl(BASE_URL, AUTH_FIELD, "third");
     public final static String SET_USER_INFO = getUrl(BASE_URL, USER_FIELD, "saveinfo");
     public final static String GET_USER_INFO = getUrl(BASE_URL, USER_FIELD, "home");
+    public final static String INTIMACY_LIST = getUrl(BASE_URL, USER_FIELD, "intimacy_list");
     public final static String GET_USER_MY_DYNAMIC = getUrl(BASE_URL, USER_FIELD, "my_dynamic_list");
     public final static String GET_USER_IS_VIP = getUrl(BASE_URL, USER_FIELD, "ifVip");
     public final static String GET_DYNAMIC_LIST = getUrl(BASE_URL, ZONE_FIELD, "lists");
@@ -81,6 +83,7 @@ public class ConstUrl {
     public final static String FREEANCHOR = getUrl(BASE_URL, MAIN_FIELD, "freeAnchor");
     public final static String CHANNEL_DATA = getUrl(BASE_URL, CHANNEL_FIELD, "anchors");
     public final static String MAIN_PAGE_DATA = getUrl(BASE_URL, USER_FIELD, "info");
+    public final static String WECHAT_INTIMACY = getUrl(BASE_URL, USER_FIELD, "getWechatIntimacy");
     public final static String GET_ALL_CHANNELS = getUrl(BASE_URL, CHANNEL_FIELD, "lists");
     public final static String BE_ANCHOR_STATUS = getUrl(BASE_URL, ANCHOR_FIELD, "join");
     public final static String GET_SELFIE_EXAMPLE = getUrl(BASE_URL, ANCHOR_FIELD, "camera_audit");
@@ -114,8 +117,10 @@ public class ConstUrl {
 
     public final static String TRACER_LIST = getUrl(BASE_URL, USER_FIELD, "viewer_list");
     public final static String VISITOR_LIST = getUrl(BASE_URL, USER_FIELD, "visitor_list");
+    public final static String VISITOR_LIST_NEW = getUrl(BASE_URL, USER_FIELD, "visitor_list_new");
     public final static String GETADVERT = getUrl(BASE_URL, USER_FIELD, "getAdvert");  //广告
     public final static String FOCUS_LIST = getUrl(BASE_URL, USER_FIELD, "follow_list");
+    public final static String FRIEND_LIST = getUrl(BASE_URL, USER_FIELD, "friend_list");
     public final static String FANS_LIST = getUrl(BASE_URL, USER_FIELD, "fans_list");
     public final static String RECEIVED_GIFT_LIST = getUrl(BASE_URL, USER_FIELD, "gift_list");
     public final static String GET_CHAT_INFO = getUrl(BASE_URL, CHAT_FIELD, "call");
@@ -135,6 +140,7 @@ public class ConstUrl {
     public final static String BIND_PHONE = getUrl(BASE_URL, USER_FIELD, "bind_mobile");
     public final static String REAL_NAME_ATTEST = getUrl(BASE_URL, "", "attest/realNameAttest");
     public final static String BIND_PLATFORM = getUrl(BASE_URL, USER_FIELD, "bind_platform");
+    public final static String SET_DO_NOT_DISTURB = getUrl(BASE_URL, USER_FIELD, "set_do_not_disturb");
     public final static String CHANGE_VIDEO_STATUS = getUrl(BASE_URL, ANCHOR_FIELD, "set_video_status");
     public final static String SWITCH_SERVICE_NUM = getUrl(BASE_URL, ANCHOR_FIELD, "switchServiceNum");
     public final static String GET_GLOBAL_CONFIG = getUrl(BASE_URL, APP_FIELD, "config");
@@ -154,6 +160,7 @@ public class ConstUrl {
     public final static String DO_COMPLAINT = getUrl(BASE_URL, USER_FIELD, "report");
     public final static String DO_BLACK = getUrl(BASE_URL, USER_FIELD, "black");
     public final static String GET_USER_DYNAMIC_LIST = getUrl(BASE_URL, USER_FIELD, "dynamic_list");
+    public final static String MAIN_COMMENT_LIST = getUrl(BASE_URL, USER_FIELD, "comment_list");
     public final static String GET_WITHDRAW_INFO = getUrl(BASE_URL, WALLET_FIELD, "withdraw");
     public final static String BIND_ACCOUNT = getUrl(BASE_URL, WALLET_FIELD, "bind_alipay");
     public final static String GET_BIND_ACCOUNT = getUrl(BASE_URL, WALLET_FIELD, "alipay");
@@ -172,6 +179,7 @@ public class ConstUrl {
     public final static String RECOMMEND_ANCHORS = getUrl(BASE_URL, INDEX_FIELD, "recommend_anchors");
     public final static String NEW_ANCHORS = getUrl(BASE_URL, INDEX_FIELD, "new_anchors");
     public final static String ACTIVE_ANCHORS = getUrl(BASE_URL, INDEX_FIELD, "active_anchors");
+    public final static String HOME_DATA = getUrl(BASE_URL, "home/", "index");
     public final static String COVER_VIDEO = getUrl(BASE_URL, INDEX_FIELD, "cover_video");
     public final static String CITY_ANCHORS = getUrl(BASE_URL, INDEX_FIELD, "city_anchors");
     public final static String CHAT_TIP = getUrl(BASE_URL, CHAT_FIELD, "chat_tip");
@@ -243,6 +251,10 @@ public class ConstUrl {
     public final static String TURNTABLE_WINNING_RECORD = getUrl(BASE_URL, "", "activity/turntableWinningRecord");
     public final static String YEAR_TREASURE_HUNT = getUrl(BASE_URL, "", "activity/yearTreasureHunt");
 
+    public final static String up_auth_detail = getUrl(BASE_URL, "", "/attest/up_auth_detail");
+    public final static String up_auth_save = getUrl(BASE_URL, "", "/attest/up_auth_save");
+    public final static String up_auth_submit = getUrl(BASE_URL, "", "/attest/up_auth_submit");
+
     public static String getUrl(String base, String field, String method) {
         return base + field + method;
     }

app/src/main/java/com/xuebiping/bolizhuzi/controller/constant/Constant.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.constant;
+package com.xuebiping.bolizhuzi.controller.constant;
 
 /**
  * Created by halifa on 2018/12/12.
@@ -63,7 +63,9 @@ public class Constant {
     //飘屏通知
     public final static String FLUTTER_NOTICE = "flutter_notice";
 
-    public final static String AES_PASSWORD = "KBqTS1K3qj0flRE9";
+    public final static String AES_PASSWORD = "!qianyan20260315";
 
     public static boolean IS_LOGIN_AGREEMENT_CHECK = false;
+
+    public final static String FRIEND_SELECT = "friend_select";
 }

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.dynamics.adapter;
+package com.xuebiping.bolizhuzi.controller.dynamics.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -20,22 +20,22 @@ import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.generic.RoundingParams;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.constant.ConsUser;
+import com.xuebiping.bolizhuzi.controller.constant.ConsUser;
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.im.uikit.api.NimUIKit;
+import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
-import com.fengliyan.tianlesue.model.dynamics.DynamicImage;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicImage;
-import com.fengliyan.tianlesue.model.dynamics.DynamicsItemBean;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicsItemBean;
-import com.fengliyan.tianlesue.utils.SPUtils;
+import com.xuebiping.bolizhuzi.utils.SPUtils;
-import com.fengliyan.tianlesue.view.base.BaseApplication;
+import com.xuebiping.bolizhuzi.view.base.BaseApplication;
-import com.fengliyan.tianlesue.view.diooto.Diooto;
+import com.xuebiping.bolizhuzi.view.diooto.Diooto;
-import com.fengliyan.tianlesue.view.diooto.config.DiootoConfig;
+import com.xuebiping.bolizhuzi.view.diooto.config.DiootoConfig;
-import com.fengliyan.tianlesue.view.diooto.tools.Utils;
+import com.xuebiping.bolizhuzi.view.diooto.tools.Utils;
-import com.fengliyan.tianlesue.view.dynamics.activity.DynamicDetailActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.DynamicDetailActivity;
-import com.fengliyan.tianlesue.view.dynamics.activity.ImageDisplayActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.ImageDisplayActivity;
-import com.fengliyan.tianlesue.view.dynamics.activity.QYPreviewVideoActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.QYPreviewVideoActivity;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
-import com.fengliyan.tianlesue.view.main.utils.UiUtils;
+import com.xuebiping.bolizhuzi.view.main.utils.UiUtils;
 import com.fengliyan.uikit.dialog.BaseMessageDialog;
 import com.fengliyan.uikit.sketch.SketchImageView;
 import com.zld.expandlayout.ExpandLayout;
@@ -147,14 +147,16 @@ public class DynamicsAdapter extends BaseAdapter {
         } else {
             holder.msgBtn.setVisibility(View.VISIBLE);
         }
-        holder.likeCountLabel.setText(bean.getLike_count() + "");
+        //holder.likeCountLabel.setText(bean.getLike_count() + "");
-        holder.commentCountLabel.setText(bean.getComment_count() + "");
+        //holder.commentCountLabel.setText(bean.getComment_count() + "");
         final int index = i;
         holder.name.setText(bean.getNickname());
         holder.head.setImageURI(ConstUrl.IMAGE_URL + bean.getAvatar());
         holder.newPeopleImageView.setVisibility(View.GONE);
         holder.realPeopleImageView.setVisibility(View.GONE);
 
+//        holder.tv_see_count.setText("已有"+bean.getLike_count()+"次浏览");
+
         if (bean.getGender() == 1) {
             holder.realPeopleImageView.setVisibility(View.VISIBLE);
             if (bean.getMark() == 2) {
@@ -194,7 +196,7 @@ public class DynamicsAdapter extends BaseAdapter {
                 NimUIKit.startChat(bean.getUser_id(), mContext);
             }
         });
-        holder.commentImageView.setOnClickListener(new View.OnClickListener() {
+        /*holder.commentImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (dynamicCommentCallback != null) {
@@ -205,7 +207,7 @@ public class DynamicsAdapter extends BaseAdapter {
                     mContext.startActivity(intent);
                 }
             }
-        });
+        });*/
         if (String.valueOf(SPUtils.getInt(mContext, ConsUser.USER_ID)).equals(mDynamicsItemList.get(index).getUser_id())) {
             holder.getMenu.setImageResource(R.mipmap.feed_del);
         } else {
@@ -241,11 +243,11 @@ public class DynamicsAdapter extends BaseAdapter {
         addImageView(holder, bean.getImages());
 
 
-        if (bean.getIs_like() == 1) {
+        /*if (bean.getIs_like() == 1) {
             holder.likeImageView.setImageResource(R.mipmap.feed_heart_);
         } else {
             holder.likeImageView.setImageResource(R.mipmap.feed_heart);
-        }
+        }*/
 
         holder.head.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -255,13 +257,22 @@ public class DynamicsAdapter extends BaseAdapter {
                 mContext.startActivity(intent);
             }
         });
-        holder.likeImageView.setOnClickListener(new View.OnClickListener() {
+       /* holder.likeImageView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if (likeDynamicCallback != null) {
                     likeDynamicCallback.likeDynamic(bean);
                 }
             }
+        });*/
+
+        holder.giftLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mGiftListener != null) {
+                    mGiftListener.onSend(bean,bean.getReward_count());
+                }
+            }
         });
 
         view.setTag(R.id.tag_second, holder);
@@ -439,13 +450,14 @@ public class DynamicsAdapter extends BaseAdapter {
         holder.imageListView2 = v.findViewById(R.id.dynamic_list_image_list_2);
         holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3);
         holder.msgBtn = v.findViewById(R.id.msgBtn);
-        holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
+        //holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
-        holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
+        //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
-        holder.likeImageView = v.findViewById(R.id.likeImageView);
+        //holder.likeImageView = v.findViewById(R.id.likeImageView);
-        holder.commentImageView = v.findViewById(R.id.commentImageView);
+        //holder.commentImageView = v.findViewById(R.id.commentImageView);
         holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView);
         holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView);
         holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item);
+        holder.tv_see_count = v.findViewById(R.id.tv_see_count);
         return holder;
     }
 
@@ -456,19 +468,20 @@ public class DynamicsAdapter extends BaseAdapter {
         TextView years;
         ImageView iv_sex;
         ExpandLayout info;
-        TextView commentCountLabel;
+        //TextView commentCountLabel;
-        TextView likeCountLabel;
+        //TextView likeCountLabel;
         LinearLayout imageListView1;
         LinearLayout imageListView2;
         LinearLayout imageListView3;
         View giftLayout;
         ImageView getMenu;
         ImageView msgBtn;
-        ImageView likeImageView;
+        //ImageView likeImageView;
-        ImageView commentImageView;
+        //ImageView commentImageView;
         ImageView realPeopleImageView;
         ImageView newPeopleImageView;
         RelativeLayout rl_dynamic_item;
+        TextView tv_see_count;
     }
 
     public void delete(int index) {

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsAdapter1.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.dynamics.adapter;
+package com.xuebiping.bolizhuzi.controller.dynamics.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -20,27 +20,27 @@ import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
 import com.facebook.drawee.generic.RoundingParams;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.constant.ConsUser;
+import com.xuebiping.bolizhuzi.controller.constant.ConsUser;
-import com.fengliyan.tianlesue.im.uikit.api.NimUIKit;
+import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
-import com.fengliyan.tianlesue.im.uikit.common.Constans;
+import com.xuebiping.bolizhuzi.im.uikit.common.Constans;
-import com.fengliyan.tianlesue.model.dynamics.DynamicImage;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicImage;
-import com.fengliyan.tianlesue.model.dynamics.DynamicsItemBean;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicsItemBean;
-import com.fengliyan.tianlesue.model.main.BannerBean;
+import com.xuebiping.bolizhuzi.model.main.BannerBean;
-import com.fengliyan.tianlesue.utils.GlideImageLoader1;
+import com.xuebiping.bolizhuzi.utils.GlideImageLoader1;
-import com.fengliyan.tianlesue.utils.NoClearSPUtils;
+import com.xuebiping.bolizhuzi.utils.NoClearSPUtils;
-import com.fengliyan.tianlesue.utils.SPUtils;
+import com.xuebiping.bolizhuzi.utils.SPUtils;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.base.BaseApplication;
+import com.xuebiping.bolizhuzi.view.base.BaseApplication;
-import com.fengliyan.tianlesue.view.diooto.Diooto;
+import com.xuebiping.bolizhuzi.view.diooto.Diooto;
-import com.fengliyan.tianlesue.view.diooto.config.DiootoConfig;
+import com.xuebiping.bolizhuzi.view.diooto.config.DiootoConfig;
-import com.fengliyan.tianlesue.view.diooto.tools.Utils;
+import com.xuebiping.bolizhuzi.view.diooto.tools.Utils;
-import com.fengliyan.tianlesue.view.dynamics.activity.DynamicDetailActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.DynamicDetailActivity;
-import com.fengliyan.tianlesue.view.dynamics.activity.ImageDisplayActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.ImageDisplayActivity;
-import com.fengliyan.tianlesue.view.dynamics.activity.QYPreviewVideoActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.QYPreviewVideoActivity;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
-import com.fengliyan.tianlesue.view.main.utils.JumpUtils;
+import com.xuebiping.bolizhuzi.view.main.utils.JumpUtils;
-import com.fengliyan.tianlesue.view.main.utils.UiUtils;
+import com.xuebiping.bolizhuzi.view.main.utils.UiUtils;
 import com.fengliyan.uikit.dialog.BaseMessageDialog;
 import com.fengliyan.uikit.sketch.SketchImageView;
 import com.youth.banner.Banner;
@@ -193,7 +193,7 @@ public class DynamicsAdapter1 extends BaseAdapter {
         if (bean.getUser_id().equals(String.valueOf(selfID))) {
             holder.msgBtn.setVisibility(View.INVISIBLE);
         } else {
-            holder.msgBtn.setVisibility(View.VISIBLE);
+            holder.msgBtn.setVisibility(View.INVISIBLE);
         }
         holder.likeCountLabel.setText(bean.getLike_count() + "");
         holder.commentCountLabel.setText(bean.getComment_count() + "");
@@ -226,11 +226,14 @@ public class DynamicsAdapter1 extends BaseAdapter {
             holder.years.setCompoundDrawables(drawableLeft, null, null, null);
         }
         holder.years.setText(bean.getAge() + "");
-        holder.location.setText(bean.getCity() + "  |  " + bean.getCreate_time());
+//        holder.location.setText(bean.getCity() + "  |  " + bean.getCreate_time());
+        holder.location.setText(bean.getCreate_time());
 //        holder.info.setText(bean.getContent());
 
         //TODO  显示浏览次数
-        holder.tv_see_count.setText("已有0次浏览");
+        holder.tv_see_count.setText("已有"+bean.getLike_count()+"次浏览");
+
+        holder.tv_dynamic_level.setText("LV." + bean.getLevel());
 
         holder.info.setText(bean.getContent(), bean.getExpand(), new ExpandLayout.OnExpandListener() {
             @Override
@@ -250,26 +253,29 @@ public class DynamicsAdapter1 extends BaseAdapter {
             public void onClick(View v) {
                 if (dynamicCommentCallback != null) {
                     dynamicCommentCallback.commentDynamic(bean);
-                } else {
-                    Intent intent = new Intent(mContext, DynamicDetailActivity.class);
-                    intent.putExtra("dynamic_id", bean.getId());
-                    mContext.startActivity(intent);
                 }
+//                else {
+//                    Intent intent = new Intent(mContext, DynamicDetailActivity.class);
+//                    intent.putExtra("dynamic_id", bean.getId());
+//                    mContext.startActivity(intent);
+//                }
             }
         });
         holder.getMenu.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                if (String.valueOf(SPUtils.getInt(mContext, ConsUser.USER_ID)).equals(mDynamicsItemList.get(index).getUser_id())) {
+//                if (String.valueOf(SPUtils.getInt(mContext, ConsUser.USER_ID)).equals(mDynamicsItemList.get(index).getUser_id())) {
-                    if (null != mOnMunuDeleteClickListener) {
+//                    if (null != mOnMunuDeleteClickListener) {
+//
+//                        mOnMunuDeleteClickListener.onMenuDelete(index, mDynamicsItemList);
+//                    }
+//                } else {
+//                    if (null != mMenuClickListener) {
+//                        mMenuClickListener.onMenuClicked(index);
+//                    }
+//                }
 
-                        mOnMunuDeleteClickListener.onMenuDelete(index, mDynamicsItemList);
+                NimUIKit.startChat("4", mContext);
-                    }
-                } else {
-                    if (null != mMenuClickListener) {
-                        mMenuClickListener.onMenuClicked(index);
-                    }
-                }
             }
         });
 
@@ -543,6 +549,8 @@ public class DynamicsAdapter1 extends BaseAdapter {
         holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView);
         holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView);
         holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item);
+        holder.tv_dynamic_level = v.findViewById(R.id.tv_dynamic_level);
+
         return holder;
     }
 
@@ -572,6 +580,8 @@ public class DynamicsAdapter1 extends BaseAdapter {
         ImageView realPeopleImageView;
         ImageView newPeopleImageView;
         RelativeLayout rl_dynamic_item;
+        TextView tv_dynamic_level;
+
     }
 
     public void delete(int index) {

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/DynamicsTopicAdapter.java

@@ -0,0 +1,618 @@
+package com.xuebiping.bolizhuzi.controller.dynamics.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+import android.util.DisplayMetrics;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.ContextCompat;
+
+import com.facebook.drawee.generic.GenericDraweeHierarchy;
+import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
+import com.facebook.drawee.generic.RoundingParams;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.constant.ConsUser;
+import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
+import com.xuebiping.bolizhuzi.im.uikit.common.Constans;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicImage;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicsItemBean;
+import com.xuebiping.bolizhuzi.model.main.BannerBean;
+import com.xuebiping.bolizhuzi.utils.GlideImageLoader1;
+import com.xuebiping.bolizhuzi.utils.NoClearSPUtils;
+import com.xuebiping.bolizhuzi.utils.SPUtils;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.base.BaseApplication;
+import com.xuebiping.bolizhuzi.view.diooto.Diooto;
+import com.xuebiping.bolizhuzi.view.diooto.config.DiootoConfig;
+import com.xuebiping.bolizhuzi.view.diooto.tools.Utils;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.DynamicDetailActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.ImageDisplayActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.QYPreviewVideoActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.utils.JumpUtils;
+import com.xuebiping.bolizhuzi.view.main.utils.UiUtils;
+import com.fengliyan.uikit.dialog.BaseMessageDialog;
+import com.fengliyan.uikit.sketch.SketchImageView;
+import com.youth.banner.Banner;
+import com.youth.banner.listener.OnBannerListener;
+import com.zld.expandlayout.ExpandLayout;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DynamicsTopicAdapter extends BaseAdapter {
+    private List<DynamicsItemBean> mDynamicsItemList = new ArrayList<>();
+    private Context mContext;
+    private OnThumbupClickedListener mListener;
+    private OnGiftSendListener mGiftListener;
+    private OnMenuClickListener mMenuClickListener;
+    private OnMenuDeleteClickListener mOnMunuDeleteClickListener;
+    public DynamicLikeCallback likeDynamicCallback;
+    public DynamicCommentCallback dynamicCommentCallback;
+    private OnDetailClickListener onDetailClicked;
+    private BaseMessageDialog mDialog;
+    private int deleteCount = 0;
+    private int selfID = SPUtils.getInt(BaseApplication.getInstance(), ConsUser.USER_ID);
+    private List<BannerBean> bannerImages = new ArrayList<>();
+    private boolean showBanner;
+
+    public interface DynamicLikeCallback {
+        void likeDynamic(DynamicsItemBean bean);
+    }
+
+    public interface DynamicCommentCallback {
+        void commentDynamic(DynamicsItemBean bean);
+    }
+
+    public interface OnThumbupClickedListener {
+        void onClick(View v, String uid);
+    }
+
+    public interface OnGiftSendListener {
+        void onSend(DynamicsItemBean bean, int quantity);
+    }
+
+    public interface OnMenuClickListener {
+        void onMenuClicked(int position);
+    }
+
+    public interface OnDetailClickListener {
+        void onDetailClicked(int position, DynamicsItemBean bean);
+    }
+
+    //删除动态接口
+    public interface OnMenuDeleteClickListener {
+        void onMenuDelete(int position, List<DynamicsItemBean> mDynamicsItemList);
+    }
+
+    public void setOnThumbupClickedListener(OnThumbupClickedListener listener) {
+        mListener = listener;
+    }
+
+    public void setOnGiftSendListener(OnGiftSendListener listener) {
+        mGiftListener = listener;
+    }
+
+    public void setOnMenuClickListener(OnMenuClickListener listener) {
+        mMenuClickListener = listener;
+    }
+
+    public void setOnMenuDeleteClickListener(OnMenuDeleteClickListener onMunuDeleteClickListener) {
+        mOnMunuDeleteClickListener = onMunuDeleteClickListener;
+    }
+
+    public void setOnDetailClicked(OnDetailClickListener onDetailClicked) {
+        this.onDetailClicked = onDetailClicked;
+    }
+
+    public DynamicsTopicAdapter(Context context) {
+        mContext = context;
+    }
+
+    public void setList(List<DynamicsItemBean> list) {
+        mDynamicsItemList = list;
+    }
+
+    public List<DynamicsItemBean> getmDynamicsItemList() {
+        return mDynamicsItemList;
+    }
+
+    private int nnumber;
+    private String id = "";
+
+    public void setGiftCount(int number, String id) {
+        this.nnumber = number;
+        this.id = id;
+    }
+
+    public void setBannerImages(List<BannerBean> bannerImages, boolean showBanner) {
+        this.bannerImages = bannerImages;
+        this.showBanner = showBanner;
+        notifyDataSetChanged();
+    }
+
+    @Override
+    public int getCount() {
+        return mDynamicsItemList.size();
+    }
+
+    @Override
+    public Object getItem(int i) {
+        return mDynamicsItemList.get(i);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+    @Override
+    public View getView(int i, View view, ViewGroup viewGroup) {
+        Holder holder = null;
+        if (null == view) {
+            view = View.inflate(mContext, R.layout.item_dynamic_topic, null);
+            holder = initView(view);
+        } else {
+            holder = (Holder) view.getTag(R.id.tag_second);
+        }
+        final DynamicsItemBean bean = mDynamicsItemList.get(i);
+        if (i == 0 && showBanner && bannerImages != null && bannerImages.size() > 0) {
+            if (NoClearSPUtils.getInt(mContext, Constans.MARKET_STATUS) == 0 || SPUtils.getInt(mContext, ConsUser.TYPE) == 2) {
+                holder.image_banner.setVisibility(View.GONE);
+            } else {
+                holder.image_banner.setVisibility(View.VISIBLE);
+                holder.image_banner.setImages(bannerImages)
+                        .setImageLoader(new GlideImageLoader1())
+                        .setOnBannerListener(new OnBannerListener() {
+                            @Override
+                            public void OnBannerClick(int position) {
+                                int size = bannerImages.size();
+                                if (size != 0) {
+                                    int i = position % size;
+                                    JumpUtils.jump(bannerImages.get(i).getLink_type(), bannerImages.get(i).getLink_url(), mContext);
+                                }
+                            }
+                        })
+                        .setDelayTime(3000)
+                        .start();
+            }
+        } else {
+            holder.image_banner.setVisibility(View.GONE);
+        }
+
+        if (bean.getUser_id().equals(String.valueOf(selfID))) {
+            holder.msgBtn.setVisibility(View.INVISIBLE);
+        } else {
+            holder.msgBtn.setVisibility(View.VISIBLE);
+        }
+        //holder.likeCountLabel.setText(bean.getLike_count() + "");
+        //holder.commentCountLabel.setText(bean.getComment_count() + "");
+        final int index = i;
+        holder.name.setText(bean.getNickname());
+        holder.head.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
+        holder.newPeopleImageView.setVisibility(View.GONE);
+        holder.realPeopleImageView.setVisibility(View.GONE);
+
+        if (bean.getGender() == 1) {
+            holder.realPeopleImageView.setVisibility(View.VISIBLE);
+            if (bean.getMark() == 2) {
+                holder.newPeopleImageView.setVisibility(View.VISIBLE);
+            }
+            Drawable drawableLeft = ContextCompat.getDrawable(mContext, R.mipmap.sex_girl);
+            drawableLeft.setBounds(0, 0, drawableLeft.getMinimumWidth(), drawableLeft.getMinimumHeight());
+            holder.iv_sex.setBackgroundResource(R.drawable.shape_dynamic_age_women);
+            holder.iv_sex.setImageResource(R.mipmap.sex_girl);
+            holder.years.setBackgroundResource(R.drawable.shape_dynamic_age_women);
+            holder.years.setCompoundDrawables(drawableLeft, null, null, null);
+        } else {
+            if (bean.getMark() == 2) {
+                holder.newPeopleImageView.setVisibility(View.VISIBLE);
+            }
+            holder.iv_sex.setBackgroundResource(R.drawable.shape_dynamic_age);
+            holder.iv_sex.setImageResource(R.mipmap.sex_men);
+            holder.years.setBackgroundResource(R.drawable.shape_dynamic_age);
+            Drawable drawableLeft = ContextCompat.getDrawable(mContext, R.mipmap.sex_men);
+            drawableLeft.setBounds(0, 0, drawableLeft.getMinimumWidth(), drawableLeft.getMinimumHeight());
+            holder.years.setCompoundDrawables(drawableLeft, null, null, null);
+        }
+        holder.years.setText(bean.getAge() + "");
+        holder.location.setText(bean.getCity() + "  |  " + bean.getCreate_time());
+//        holder.info.setText(bean.getContent());
+
+        //TODO  显示浏览次数
+        holder.tv_see_count.setText("已有0次浏览");
+
+        holder.info.setText(bean.getContent(), bean.getExpand(), new ExpandLayout.OnExpandListener() {
+            @Override
+            public void expandChange() {
+                bean.setExpand(!bean.getExpand());
+                notifyDataSetChanged();
+            }
+        });
+        holder.msgBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                NimUIKit.startChat(bean.getUser_id(), mContext);
+            }
+        });
+       /* holder.commentImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (dynamicCommentCallback != null) {
+                    dynamicCommentCallback.commentDynamic(bean);
+                } else {
+                    Intent intent = new Intent(mContext, DynamicDetailActivity.class);
+                    intent.putExtra("dynamic_id", bean.getId());
+                    mContext.startActivity(intent);
+                }
+            }
+        });*/
+        holder.getMenu.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (String.valueOf(SPUtils.getInt(mContext, ConsUser.USER_ID)).equals(mDynamicsItemList.get(index).getUser_id())) {
+                    if (null != mOnMunuDeleteClickListener) {
+
+                        mOnMunuDeleteClickListener.onMenuDelete(index, mDynamicsItemList);
+                    }
+                } else {
+                    if (null != mMenuClickListener) {
+                        mMenuClickListener.onMenuClicked(index);
+                    }
+                }
+            }
+        });
+
+        holder.rl_dynamic_item.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != onDetailClicked) {
+                    onDetailClicked.onDetailClicked(index, bean);
+                }
+            }
+        });
+        holder.giftLayout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if(null != mGiftListener){
+                    mGiftListener.onSend(bean,bean.getReward_count());
+                }
+            }
+        });
+        addImageView(holder, bean.getImages());
+
+
+        /*if (bean.getIs_like() == 1) {
+            holder.likeImageView.setImageResource(R.mipmap.feed_heart_);
+        } else {
+            holder.likeImageView.setImageResource(R.mipmap.feed_heart);
+        }*/
+
+        holder.head.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(mContext, MainPageActivity.class);
+                intent.putExtra("userId", Integer.parseInt(bean.getUser_id()));
+                mContext.startActivity(intent);
+            }
+        });
+        /*holder.likeImageView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (likeDynamicCallback != null) {
+                    likeDynamicCallback.likeDynamic(bean);
+                }
+
+            }
+        });*/
+
+        view.setTag(R.id.tag_second, holder);
+        return view;
+    }
+
+    private int isLike;
+
+
+    private void addImageView(Holder holder, final List<DynamicImage> dynamicImageList) {
+
+        holder.imageListView1.removeAllViews();
+//        holder.imageListView2.removeAllViews();
+        holder.imageListView2.setVisibility(View.GONE);
+        holder.imageListView3.removeAllViews();
+        final List<String> pathList = new ArrayList<>();
+        if (null == dynamicImageList || dynamicImageList.size() == 0) {
+            return;
+        }
+
+        if (1 == dynamicImageList.size()) {
+            GenericDraweeHierarchy hierarchy = GenericDraweeHierarchyBuilder
+                    .newInstance(mContext.getResources()).setRoundingParams(RoundingParams.fromCornersRadius(Utils.dip2px(mContext, 16)))
+                    .build();
+            DynamicImage image = dynamicImageList.get(0);
+            RelativeLayout container = new RelativeLayout(mContext);
+            final SimpleDraweeView photoView = new SimpleDraweeView(mContext);
+            container.addView(photoView);
+            DisplayMetrics dm = mContext.getResources().getDisplayMetrics();
+            int height = dm.heightPixels;
+            int width = dm.widthPixels;
+            int newWidth = 0;
+            int newHeight = 0;
+            if (image.getWidth() > image.getHeight()) {
+                newWidth = (int) (0.55 * width);
+                newHeight = (int) (newWidth * image.getHeight() / image.getWidth());
+            } else {
+                newHeight = (int) (0.25 * height);
+                newWidth = (int) (newHeight * image.getWidth() / image.getHeight());
+            }
+            ImageView imageview = new ImageView(mContext);
+            if (!TextUtils.isEmpty(image.getVideo_url())) {
+                imageview.setImageResource(R.mipmap.feed_play);
+            }
+            RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(newWidth, newHeight);
+            RelativeLayout.LayoutParams containerPAram = new RelativeLayout.LayoutParams(newWidth, newHeight);
+            RelativeLayout.LayoutParams imageParam = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, RelativeLayout.LayoutParams.WRAP_CONTENT);
+            imageParam.addRule(RelativeLayout.CENTER_IN_PARENT);
+            container.addView(imageview, imageParam);
+            container.setLayoutParams(containerPAram);
+            photoView.setLayoutParams(params);
+            photoView.setHierarchy(hierarchy);
+            photoView.setImageURI(StrU.getResourcePath(image.getUrl(), mContext));
+            ((ViewGroup) holder.imageListView1).addView(container);
+            pathList.add(StrU.getResourcePath(image.getUrl(), mContext));
+            photoView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    if (TextUtils.isEmpty(image.getVideo_url())) {
+                        View[] views = new View[dynamicImageList.size()];
+                        views[0] = photoView;
+                        startDisplayActivity(dynamicImageList, views, 0);
+                    } else {
+                        Intent intent = new Intent(mContext, QYPreviewVideoActivity.class);
+                        intent.putExtra("videoUrl", StrU.getResourcePath(image.getVideo_url(), mContext));
+                        mContext.startActivity(intent);
+                    }
+                }
+            });
+        } else if (2 == dynamicImageList.size()) {
+            holder.imageListView1.setWeightSum(2);
+            final View[] views = new View[dynamicImageList.size()];
+            for (int i = 0; i < dynamicImageList.size(); i++) {
+                RoundingParams roundingParams;
+                if (i == 0) {
+                    roundingParams = RoundingParams.fromCornersRadii(Utils.dip2px(mContext, 16), 0, 0, Utils.dip2px(mContext, 16));
+                } else {
+                    roundingParams = RoundingParams.fromCornersRadii(0, Utils.dip2px(mContext, 16), Utils.dip2px(mContext, 16), 0);
+                }
+                GenericDraweeHierarchy hierarchy = GenericDraweeHierarchyBuilder
+                        .newInstance(mContext.getResources()).setRoundingParams(roundingParams).build();
+                DynamicImage image = dynamicImageList.get(i);
+                SimpleDraweeView photoView = new SimpleDraweeView(mContext);
+                LinearLayout.LayoutParams params = new LinearLayout
+                        .LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                        UiUtils.dp2px(mContext, 170));
+                params.setMargins(5, 0, 5, 0);
+                params.weight = 1;
+                photoView.setLayoutParams(params);
+                photoView.setHierarchy(hierarchy);
+                photoView.setImageURI(StrU.getResourcePath(image.getUrl(), mContext));
+                ((ViewGroup) holder.imageListView1).addView(photoView);
+                views[i] = photoView;
+                final int count = i;
+                pathList.add(StrU.getResourcePath(image.getUrl(), mContext));
+                photoView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        startDisplayActivity(dynamicImageList, views, count);
+                    }
+                });
+            }
+//        } else if (4 == dynamicImageList.size()) {
+//            holder.imageListView1.setWeightSum(2);
+////            holder.imageListView2.setWeightSum(2);
+//            final View[] views = new View[dynamicImageList.size()];
+//            for (int i = 0; i < dynamicImageList.size(); i++) {
+//                GenericDraweeHierarchy hierarchy = GenericDraweeHierarchyBuilder
+//                        .newInstance(mContext.getResources()).setRoundingParams(RoundingParams.fromCornersRadius(Utils.dip2px(mContext, 6)))
+//                        .build();
+//
+//                DynamicImage image = dynamicImageList.get(i);
+//                SimpleDraweeView photoView = new SimpleDraweeView(mContext);
+//                LinearLayout.LayoutParams params = new LinearLayout
+//                        .LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+//                        UiUtils.dp2px(mContext, 170));
+//                params.setMargins(5, 0, 5, 0);
+//                params.weight = 1;
+//                photoView.setLayoutParams(params);
+//                photoView.setHierarchy(hierarchy);
+//                photoView.setImageURI(ConstUrl.IMAGE_URL + image.getUrl());
+//                if (i < 2) {
+//                    ((ViewGroup) holder.imageListView1).addView(photoView);
+//                } else {
+//                    ((ViewGroup) holder.imageListView2).addView(photoView);
+//                }
+//                views[i] = photoView;
+//                final int count = i;
+//                pathList.add(ConstUrl.IMAGE_URL + image.getUrl());
+//                photoView.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View view) {
+//                        startDisplayActivity(dynamicImageList, views, count);
+//                    }
+//                });
+//            }
+        } else {
+            holder.imageListView2.setVisibility(View.VISIBLE);
+            holder.dynamic_image1.setImageURI(StrU.getResourcePath(dynamicImageList.get(0).getUrl(), mContext));
+            holder.dynamic_image2.setImageURI(StrU.getResourcePath(dynamicImageList.get(1).getUrl(), mContext));
+            holder.dynamic_image3.setImageURI(StrU.getResourcePath(dynamicImageList.get(2).getUrl(), mContext));
+            if (dynamicImageList.size() > 3) {
+                holder.dynamic_image_num.setText(dynamicImageList.size() + "");
+                holder.dynamic_image_num.setVisibility(View.VISIBLE);
+            } else {
+                holder.dynamic_image_num.setVisibility(View.GONE);
+            }
+
+            final View[] views = new View[dynamicImageList.size()];
+            for (int i = 0; i < dynamicImageList.size(); i++) {
+                GenericDraweeHierarchy hierarchy = GenericDraweeHierarchyBuilder
+                        .newInstance(mContext.getResources()).setRoundingParams(RoundingParams.fromCornersRadius(Utils.dip2px(mContext, 6)))
+                        .build();
+                DynamicImage image = dynamicImageList.get(i);
+                SimpleDraweeView photoView = new SimpleDraweeView(mContext);
+
+                DisplayMetrics dm = mContext.getResources().getDisplayMetrics();
+                int width = dm.widthPixels;
+                int measure = (((width - UiUtils.dp2px(mContext, 32)) - 20) / 3) - 5;
+                LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(measure, measure);
+                params.setMargins(5, 0, 5, 0);
+                photoView.setLayoutParams(params);
+                photoView.setHierarchy(hierarchy);
+                photoView.setImageURI(StrU.getResourcePath(image.getUrl(), mContext));
+                views[i] = photoView;
+                pathList.add(StrU.getResourcePath(image.getUrl(), mContext));
+            }
+            holder.dynamic_image1.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    startDisplayActivity(dynamicImageList, views, 0);
+                }
+            });
+            holder.dynamic_image2.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    startDisplayActivity(dynamicImageList, views, 1);
+                }
+            });
+            holder.dynamic_image3.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    startDisplayActivity(dynamicImageList, views, 2);
+                }
+            });
+        }
+    }
+
+    private void clickImage(ArrayList<String> pathList, int innerCount) {
+        Intent intent = new Intent(mContext, ImageDisplayActivity.class);
+        intent.putStringArrayListExtra("urlList", pathList);
+        intent.putExtra("pageCount", innerCount);
+        mContext.startActivity(intent);
+    }
+
+    private void startImageDisplaying(ArrayList<String> url, String pageCount) {
+        Intent intent = new Intent(mContext, ImageDisplayActivity.class);
+        intent.putStringArrayListExtra("urlList", url);
+        intent.putExtra("pageCount", pageCount);
+        mContext.startActivity(intent);
+    }
+
+    private Holder initView(View v) {
+        Holder holder = new Holder();
+        holder.image_banner = v.findViewById(R.id.image_banner);
+        holder.head = v.findViewById(R.id.dynamic_list_photo);
+        holder.name = v.findViewById(R.id.dynamic_list_name);
+        holder.location = v.findViewById(R.id.dynamic_list_sub_info);
+        holder.years = v.findViewById(R.id.dynamic_list_age);
+        holder.iv_sex = v.findViewById(R.id.iv_sex);
+        holder.info = v.findViewById(R.id.dynamic_list_message);
+        holder.giftLayout = v.findViewById(R.id.item_dynamic_gift_layout);
+        holder.tv_see_count = v.findViewById(R.id.tv_see_count);
+        holder.getMenu = v.findViewById(R.id.dynamic_list_menu);
+        holder.imageListView1 = v.findViewById(R.id.dynamic_list_image_list_1);
+        holder.imageListView2 = v.findViewById(R.id.dynamic_list_image_list_2);
+        holder.dynamic_image1 = v.findViewById(R.id.dynamic_image1);
+        holder.dynamic_image2 = v.findViewById(R.id.dynamic_image2);
+        holder.dynamic_image3 = v.findViewById(R.id.dynamic_image3);
+        holder.dynamic_image_num = v.findViewById(R.id.dynamic_image_num);
+        holder.imageListView3 = v.findViewById(R.id.dynamic_list_image_list_3);
+        holder.msgBtn = v.findViewById(R.id.msgBtn);
+        //holder.commentCountLabel = v.findViewById(R.id.commentCountLabel);
+        //holder.likeCountLabel = v.findViewById(R.id.likeCountLabel);
+        //holder.likeImageView = v.findViewById(R.id.likeImageView);
+       // holder.commentImageView = v.findViewById(R.id.commentImageView);
+        holder.realPeopleImageView = v.findViewById(R.id.realPeopleImageView);
+        holder.newPeopleImageView = v.findViewById(R.id.newPeopleImageView);
+        holder.rl_dynamic_item = v.findViewById(R.id.rl_dynamic_item);
+        return holder;
+    }
+
+    class Holder {
+        Banner image_banner;
+        SimpleDraweeView head;
+        TextView name;
+        TextView location;
+        TextView years;
+        ImageView iv_sex;
+        ExpandLayout info;
+        //TextView commentCountLabel;
+       // TextView likeCountLabel;
+        LinearLayout imageListView1;
+        ConstraintLayout imageListView2;
+        SimpleDraweeView dynamic_image1;
+        SimpleDraweeView dynamic_image2;
+        SimpleDraweeView dynamic_image3;
+        TextView dynamic_image_num;
+        LinearLayout imageListView3;
+        View giftLayout;
+        TextView tv_see_count;
+        ImageView getMenu;
+        ImageView msgBtn;
+        //ImageView likeImageView;
+       // ImageView commentImageView;
+        ImageView realPeopleImageView;
+        ImageView newPeopleImageView;
+        RelativeLayout rl_dynamic_item;
+    }
+
+    public void delete(int index) {
+        mDynamicsItemList.remove(index);
+        deleteCount++;
+        notifyDataSetChanged();
+    }
+
+    public int getDeleteCount() {
+        return deleteCount;
+    }
+
+    public void setDeleteCount(int deleteCount) {
+        this.deleteCount = deleteCount;
+    }
+
+    private void startDisplayActivity(List<DynamicImage> dynamicImageList, View[] views, int currentPosition) {
+        String[] strings = new String[dynamicImageList.size()];
+        for (int i = 0; i < dynamicImageList.size(); i++) {
+            strings[i] = StrU.getResourcePath(dynamicImageList.get(i).getUrl(), mContext);
+        }
+        Diooto diooto = new Diooto(mContext)
+                .urls(strings)
+                .type(DiootoConfig.PHOTO)
+                .immersive(true)
+                .position(currentPosition, 0)
+                .views(views)
+                .loadPhotoBeforeShowBigImage(new Diooto.OnLoadPhotoBeforeShowBigImageListener() {
+                    @Override
+                    public void loadView(SketchImageView sketchImageView, int position) {
+//                                Glide.with(context).load(normalImageUlr[position]).into(sketchImageView);
+//                                sketchImageView.displayImage(normalImageUlr[position]);
+                        sketchImageView.setOnLongClickListener(new View.OnLongClickListener() {
+                            @Override
+                            public boolean onLongClick(View v) {
+//                                Toast.makeText(mContext, "Long click", Toast.LENGTH_SHORT).show();
+                                return false;
+                            }
+                        });
+                    }
+                })
+                .start();
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/ImageSlidePagerAdapter.java

@@ -1,11 +1,11 @@
-package com.fengliyan.tianlesue.controller.dynamics.adapter;
+package com.xuebiping.bolizhuzi.controller.dynamics.adapter;
 
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 
-import com.fengliyan.tianlesue.view.dynamics.fragment.ImageSlideFragment;
+import com.xuebiping.bolizhuzi.view.dynamics.fragment.ImageSlideFragment;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/MenuPopupItemAdapter.java

@@ -1,11 +1,11 @@
-package com.fengliyan.tianlesue.controller.dynamics.adapter;
+package com.xuebiping.bolizhuzi.controller.dynamics.adapter;
 
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
 import com.ryan.github.menupopupview.MenuPopupAdapter;
 
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/TopicListDialogAdapter.java

@@ -0,0 +1,66 @@
+package com.xuebiping.bolizhuzi.controller.dynamics.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.xuebiping.bolizhuzi.R;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class TopicListDialogAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
+    private List<String> mTopicBean = new ArrayList<>();
+    private Context mContext;
+    private OnButtonClickedListener mListener;
+
+    public TopicListDialogAdapter(Context context) {
+        super(R.layout.item_black_list);
+        mContext = context;
+    }
+
+    public void setOnButtonClickedListener(OnButtonClickedListener listener) {
+        mListener = listener;
+    }
+
+    public void setData(List<String> beans) {
+        mTopicBean = beans;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, String bean) {
+
+        RelativeLayout ll_layout = baseViewHolder.getView(R.id.rl_layout);
+        TextView tv_content = baseViewHolder.getView(R.id.tv_content);
+        TextView tv_see_count = baseViewHolder.getView(R.id.tv_see_count);
+
+        tv_content.setText(bean);
+        tv_see_count.setText("208734浏览量");
+
+        ll_layout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mListener != null) {
+                    mListener.onCliked(baseViewHolder.getLayoutPosition(), bean);
+                }
+            }
+        });
+    }
+
+    public interface OnButtonClickedListener {
+        void onCliked(int position, String userId);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/adapter/TopicZjUseAdapter.java

@@ -0,0 +1,74 @@
+package com.xuebiping.bolizhuzi.controller.dynamics.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.settings.SocialBean;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class TopicZjUseAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
+    private List<String> mTopicBean = new ArrayList<>();
+    private Context mContext;
+    private OnButtonClickedListener mListener;
+
+    public TopicZjUseAdapter(Context context) {
+        super(R.layout.item_topic_zjuse);
+        mContext = context;
+    }
+
+    public void setOnButtonClickedListener(OnButtonClickedListener listener) {
+        mListener = listener;
+    }
+
+    public void setData(List<String> beans) {
+        mTopicBean = beans;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, String bean) {
+
+        LinearLayout ll_layout = baseViewHolder.getView(R.id.ll_layout);
+        TextView tv_content = baseViewHolder.getView(R.id.tv_content);
+
+        tv_content.setText(bean);
+
+        ll_layout.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mListener != null) {
+                    mListener.onCliked(baseViewHolder.getLayoutPosition(), bean);
+                }
+            }
+        });
+    }
+
+    public interface OnButtonClickedListener {
+        void onCliked(int position, String userId);
+    }
+
+    @Override
+    public long getItemId(int i) {
+        return i;
+    }
+
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/dynamics/manager/DynamicsManager.java

@@ -1,24 +1,24 @@
-package com.fengliyan.tianlesue.controller.dynamics.manager;
+package com.xuebiping.bolizhuzi.controller.dynamics.manager;
 
 import android.text.TextUtils;
 
 import com.fengliyan.http.httprequest.HttpMethod;
 import com.fengliyan.http.httprequest.TType;
 import com.fengliyan.http.httprequest.UploadFile;
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.model.dynamics.DynamicPostBean;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicPostBean;
-import com.fengliyan.tianlesue.model.dynamics.DynamicsItemBean;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicsItemBean;
-import com.fengliyan.tianlesue.model.dynamics.DynamicsListBean;
+import com.xuebiping.bolizhuzi.model.dynamics.DynamicsListBean;
-import com.fengliyan.tianlesue.model.dynamics.ImageUploadBean;
+import com.xuebiping.bolizhuzi.model.dynamics.ImageUploadBean;
-import com.fengliyan.tianlesue.model.dynamics.UploadImageBean;
+import com.xuebiping.bolizhuzi.model.dynamics.UploadImageBean;
-import com.fengliyan.tianlesue.model.login.bean.VipBean;
+import com.xuebiping.bolizhuzi.model.login.bean.VipBean;
-import com.fengliyan.tianlesue.model.main.ChannelAnchorBean;
+import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean;
-import com.fengliyan.tianlesue.model.main.FollowResultBean;
+import com.xuebiping.bolizhuzi.model.main.FollowResultBean;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpRequest;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpResult;
-import com.fengliyan.tianlesue.view.base.utils.task.HttpWithUiTask;
+import com.xuebiping.bolizhuzi.view.base.utils.task.HttpWithUiTask;
 
 import java.util.List;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/ActiveUpdateEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2019/1/5.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/BeAnchorEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2018/11/21.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/DynamicEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2018/12/25.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/DynamicLikeEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2018/12/19.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/InviteTypeEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2019/12/19.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/KidEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2019/12/19.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/NotificationEvent.java

@@ -1,6 +1,6 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
-import com.fengliyan.tianlesue.model.main.VideoRequestBean;
+import com.xuebiping.bolizhuzi.model.main.VideoRequestBean;
 
 /**
  * Created by halifa on 2018/12/24.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/PayEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2018/12/19.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/RegisterInfoEvent.java

@@ -1,6 +1,6 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
-import com.fengliyan.tianlesue.model.login.bean.LoginBean;
+import com.xuebiping.bolizhuzi.model.login.bean.LoginBean;
 
 /**
  * Created by halifa on 2018/11/22.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/SocialToSettingEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2018/12/18.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/TurntableEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2019/12/19.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/UnReadCountEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2018/12/15.

app/src/main/java/com/xuebiping/bolizhuzi/controller/eventBus/UpdateChatEvent.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.eventBus;
+package com.xuebiping.bolizhuzi.controller.eventBus;
 
 /**
  * Created by halifa on 2019/2/20.

app/src/main/java/com/xuebiping/bolizhuzi/controller/login/manager/ForgetManager.java

@@ -1,11 +1,11 @@
-package com.fengliyan.tianlesue.controller.login.manager;
+package com.xuebiping.bolizhuzi.controller.login.manager;
 
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpRequest;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpResult;
-import com.fengliyan.tianlesue.view.base.utils.task.HttpWithUiTask;
+import com.xuebiping.bolizhuzi.view.base.utils.task.HttpWithUiTask;
 import com.fengliyan.http.httprequest.HttpMethod;
 import com.fengliyan.http.httprequest.TType;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/login/manager/LoginManager.java

@@ -1,17 +1,17 @@
-package com.fengliyan.tianlesue.controller.login.manager;
+package com.xuebiping.bolizhuzi.controller.login.manager;
 
 import android.text.TextUtils;
 
 import com.fengliyan.http.httprequest.HttpMethod;
 import com.fengliyan.http.httprequest.TType;
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.model.login.bean.CustomerTipBean;
+import com.xuebiping.bolizhuzi.model.login.bean.CustomerTipBean;
-import com.fengliyan.tianlesue.model.login.bean.LoginBean;
+import com.xuebiping.bolizhuzi.model.login.bean.LoginBean;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpRequest;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpResult;
-import com.fengliyan.tianlesue.view.base.utils.task.HttpWithUiTask;
+import com.xuebiping.bolizhuzi.view.base.utils.task.HttpWithUiTask;
 
 /**
  * Created by abby on 2018/4/7.

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/AllChannelRecyclerAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,9 +9,9 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.SkillAnchorBean;
+import com.xuebiping.bolizhuzi.model.main.SkillAnchorBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/AutoPollAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -13,11 +13,11 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.user.manager.UserManager;
+import com.xuebiping.bolizhuzi.controller.user.manager.UserManager;
-import com.fengliyan.tianlesue.im.uikit.common.ui.recyclerview.holder.BaseViewHolder;
+import com.xuebiping.bolizhuzi.im.uikit.common.ui.recyclerview.holder.BaseViewHolder;
-import com.fengliyan.tianlesue.model.main.SpeedInfoBean;
+import com.xuebiping.bolizhuzi.model.main.SpeedInfoBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.List;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/BlackAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,10 +10,10 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.settings.SocialBean;
+import com.xuebiping.bolizhuzi.model.settings.SocialBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 import com.facebook.drawee.view.SimpleDraweeView;
 
 import java.util.ArrayList;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/CardAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -11,9 +11,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
 
 import java.util.List;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/ChannelAnchorRecyclerViewAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,10 +8,10 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 import com.facebook.drawee.view.SimpleDraweeView;
 
 import java.util.ArrayList;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/ComplaintAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -6,8 +6,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.CheckBox;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.ComplaintListBean;
+import com.xuebiping.bolizhuzi.model.main.ComplaintListBean;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/FreeVideoAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -7,9 +7,9 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.FreeVideoBean;
+import com.xuebiping.bolizhuzi.model.main.FreeVideoBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/GenderUserAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -8,10 +8,10 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.settings.UserInfoBean;
+import com.xuebiping.bolizhuzi.model.settings.UserInfoBean;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/GiftReceived2Adapter.java

@@ -0,0 +1,35 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.model.main.GiftReceivedItemBean;
+import com.xuebiping.bolizhuzi.utils.StrU;
+
+import org.jetbrains.annotations.NotNull;
+
+public class GiftReceived2Adapter extends BaseQuickAdapter<GiftReceivedItemBean, BaseViewHolder> {
+
+    private Context mContext;
+
+    public GiftReceived2Adapter(int layoutResId, Context context) {
+        super(layoutResId);
+        this.mContext = context;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, GiftReceivedItemBean bean) {
+
+        SimpleDraweeView gift_received_logo = baseViewHolder.getView(R.id.gift_received_logo);
+        TextView gift_received_name = baseViewHolder.getView(R.id.gift_received_name);
+        TextView gift_received_number = baseViewHolder.getView(R.id.gift_received_number);
+
+        gift_received_logo.setImageURI(StrU.getResourcePath(bean.getImg(), mContext));
+        gift_received_name.setText(bean.getName());
+        gift_received_number.setText("x" + bean.getTotal());
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/GiftReceivedAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -6,10 +6,10 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.GiftReceivedItemBean;
+import com.xuebiping.bolizhuzi.model.main.GiftReceivedItemBean;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/GroupCallAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -8,8 +8,8 @@ import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.GroupCallListBean;
+import com.xuebiping.bolizhuzi.model.main.GroupCallListBean;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/GuardRankAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.view.View;
@@ -8,9 +8,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.GuardRankBean;
+import com.xuebiping.bolizhuzi.model.main.GuardRankBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/LuckListAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,12 +13,12 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.flyco.roundview.RoundTextView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.user.manager.UserManager;
+import com.xuebiping.bolizhuzi.controller.user.manager.UserManager;
-import com.fengliyan.tianlesue.im.uikit.api.NimUIKit;
+import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
-import com.fengliyan.tianlesue.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 
 import org.jetbrains.annotations.NotNull;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,10 +10,10 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelAdapter1.kt

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter
+package com.xuebiping.bolizhuzi.controller.main.adapter
 
 import android.content.Context
 import android.content.Intent
@@ -7,6 +7,7 @@ import android.os.CountDownTimer
 import android.text.TextUtils
 import android.view.View
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import com.chad.library.adapter.base.BaseDelegateMultiAdapter
 import com.chad.library.adapter.base.delegate.BaseMultiTypeDelegate
@@ -17,13 +18,13 @@ import com.google.android.exoplayer2.ExoPlayer
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.SimpleExoPlayer
 import com.google.android.exoplayer2.ui.PlayerView
-import com.fengliyan.tianlesue.R
+import com.xuebiping.bolizhuzi.R
-import com.fengliyan.tianlesue.model.main.AnchorBean
+import com.xuebiping.bolizhuzi.model.main.AnchorBean
-import com.fengliyan.tianlesue.utils.GlideUtils
+import com.xuebiping.bolizhuzi.utils.GlideUtils
-import com.fengliyan.tianlesue.utils.ProgressView
+import com.xuebiping.bolizhuzi.utils.ProgressView
-import com.fengliyan.tianlesue.utils.StrU
+import com.xuebiping.bolizhuzi.utils.StrU
-import com.fengliyan.tianlesue.view.main.MainPageActivity
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity
-import com.fengliyan.tianlesue.view.main.utils.DefaultExoConfig
+import com.xuebiping.bolizhuzi.view.main.utils.DefaultExoConfig
 
 class MainChannelAdapter1(private val mContext: Context, val key: String) :
     BaseDelegateMultiAdapter<AnchorBean, BaseViewHolder>() {
@@ -61,8 +62,8 @@ class MainChannelAdapter1(private val mContext: Context, val key: String) :
                 val mPhoto = holder.getView<SimpleDraweeView>(R.id.channel_anchor_id_photo_1)
                 val mCost = holder.getView<TextView>(R.id.channel_anchor_id_cost_1)
                 val mScore = holder.getView<TextView>(R.id.channel_anchor_id_score_1)
-                val nmpp = holder.getView<TextView>(R.id.iv_anchor_nm_img)
+                val nmpp = holder.getView<ImageView>(R.id.iv_anchor_nm_img)
-                val online = holder.getView<TextView>(R.id.iv_anchor_online)
+                val online = holder.getView<LinearLayout>(R.id.iv_anchor_online)
                 val mLocation = holder.getView<TextView>(R.id.channel_anchor_location_1)
                 val newPeopleImageView = holder.getView<ImageView>(R.id.newPeopleImageView)
                 val iv_anchor_tag = holder.getView<ImageView>(R.id.iv_anchor_tag)

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainChannelDefaultAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -10,11 +10,11 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.im.uikit.api.NimUIKit;
+import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
-import com.fengliyan.tianlesue.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainLookMeAdapter.java

@@ -0,0 +1,171 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.controller.settings.adapter.ContactListAdapter;
+import com.xuebiping.bolizhuzi.im.uikit.api.NimUIKit;
+import com.xuebiping.bolizhuzi.model.main.LookMeBean;
+import com.xuebiping.bolizhuzi.model.settings.SocialBean;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
+
+import org.jetbrains.annotations.NotNull;
+
+public class MainLookMeAdapter extends BaseQuickAdapter<SocialBean, BaseViewHolder> {
+
+    private Context mContext;
+    private int mType;
+
+    public MainLookMeAdapter(int layoutResId, Context context, int type) {
+        super(layoutResId);
+        this.mContext = context;
+        this.mType = type;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, SocialBean bean) {
+
+        SimpleDraweeView photo = baseViewHolder.getView(R.id.list_photo);
+        TextView name = baseViewHolder.getView(R.id.social_list_name);
+        View redPoint = baseViewHolder.getView(R.id.social_red_point);
+        ImageView ivMemberSign = baseViewHolder.getView(R.id.iv_member_sign);
+        TextView tv_sign = baseViewHolder.getView(R.id.tv_sign);
+        RelativeLayout rl_online_bg = baseViewHolder.getView(R.id.rl_online_bg);
+        TextView tv_online = baseViewHolder.getView(R.id.tv_online);
+        LinearLayout ll_visit_time = baseViewHolder.getView(R.id.ll_visit_time);
+        TextView tv_add_time = baseViewHolder.getView(R.id.tv_add_time);
+        TextView tv_visit_number = baseViewHolder.getView(R.id.tv_visit_number);
+        TextView tv_chat = baseViewHolder.getView(R.id.tv_chat);
+        RelativeLayout rl_item = baseViewHolder.getView(R.id.rl_item);
+        RelativeLayout rl_level = baseViewHolder.getView(R.id.rl_level);
+        ImageView iv_level = baseViewHolder.getView(R.id.iv_level);
+        TextView tv_level = baseViewHolder.getView(R.id.tv_level);
+
+        if (mType == 0) {
+            ll_visit_time.setVisibility(View.VISIBLE);
+            tv_chat.setVisibility(View.GONE);
+
+            tv_add_time.setText(bean.getAdd_time() + "访问");
+            tv_visit_number.setText(bean.getVisit_times() + "次");
+        }else if (mType == 1) {
+            ll_visit_time.setVisibility(View.GONE);
+            tv_chat.setVisibility(View.VISIBLE);
+
+            tv_chat.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    NimUIKit.startP2PSession(mContext, bean.getUserid() + "");
+                }
+            });
+        }
+
+
+        photo.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
+        name.setText(bean.getNickname());
+
+//        if (1 == bean.getIs_watch()) {
+//            redPoint.setVisibility(View.GONE);
+//        } else {
+//            redPoint.setVisibility(View.VISIBLE);
+//        }
+
+//        if (0 == bean.getVip()) {
+//            ivMemberSign.setVisibility(View.VISIBLE);
+//            ivMemberSign.setImageResource(R.drawable.ic_pvip);
+//        } else if (1 == bean.getVip()) {
+//            ivMemberSign.setVisibility(View.VISIBLE);
+//            ivMemberSign.setImageResource(R.drawable.ic_gvip);
+//        } else {
+//            ivMemberSign.setVisibility(View.GONE);
+//        }
+
+        if (bean.getVip() == 0 || bean.getVip() == 1) {
+            ivMemberSign.setVisibility(View.VISIBLE);
+        }else {
+            ivMemberSign.setVisibility(View.GONE);
+        }
+
+        int level = bean.getLevel();
+        tv_level.setText(level + "");
+        if (bean.getGender() == 1) {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1);
+                iv_level.setImageResource(R.mipmap.ic_modle_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2);
+                iv_level.setImageResource(R.mipmap.ic_modle_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3);
+                iv_level.setImageResource(R.mipmap.ic_modle_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4);
+                iv_level.setImageResource(R.mipmap.ic_modle_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5);
+                iv_level.setImageResource(R.mipmap.ic_modle_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6);
+                iv_level.setImageResource(R.mipmap.ic_modle_6);
+            }
+        }else {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg1);
+                iv_level.setImageResource(R.mipmap.ic_use_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg2);
+                iv_level.setImageResource(R.mipmap.ic_use_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg3);
+                iv_level.setImageResource(R.mipmap.ic_use_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg4);
+                iv_level.setImageResource(R.mipmap.ic_use_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg5);
+                iv_level.setImageResource(R.mipmap.ic_use_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg6);
+                iv_level.setImageResource(R.mipmap.ic_use_6);
+            }
+        }
+
+
+        if (TextUtils.isEmpty(bean.getSignature())) {
+            tv_sign.setVisibility(View.INVISIBLE);
+        }else {
+            tv_sign.setVisibility(View.VISIBLE);
+            tv_sign.setText(bean.getSignature());
+        }
+
+        if (bean.getOnline_status() == 0) {
+            rl_online_bg.setBackgroundResource(R.drawable.look_me_not_online_bg);
+            tv_online.setText("离线");
+        }else if (bean.getOnline_status() == 1) {
+            rl_online_bg.setBackgroundResource(R.drawable.look_me_online_bg);
+            tv_online.setText("在线");
+        }else if (bean.getOnline_status() == 2) {
+            rl_online_bg.setBackgroundResource(R.drawable.look_me_activi_bg);
+            tv_online.setText("活跃");
+        }
+
+        rl_item.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(mContext, MainPageActivity.class);
+                intent.putExtra("userId", bean.getUserid());
+                mContext.startActivity(intent);        }
+        });
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainPageCommentAdapter.java

@@ -0,0 +1,144 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.model.main.MainPageCommentInfoBean;
+import com.xuebiping.bolizhuzi.utils.StrU;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+
+public class MainPageCommentAdapter extends BaseQuickAdapter<MainPageCommentInfoBean, BaseViewHolder> {
+
+    private Context mContext;
+    private int[] mImage_bg = new int[]{R.drawable.shape_comment1_bg, R.drawable.shape_comment2_bg, R.drawable.shape_comment3_bg, R.drawable.shape_comment4_bg, R.drawable.shape_comment5_bg};
+
+    public MainPageCommentAdapter(int layoutResId, Context context) {
+        super(layoutResId);
+        this.mContext = context;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, MainPageCommentInfoBean bean) {
+        SimpleDraweeView list_photo = baseViewHolder.getView(R.id.list_photo);
+        TextView tv_name = baseViewHolder.getView(R.id.tv_name);
+        RelativeLayout rl_level = baseViewHolder.getView(R.id.rl_level);
+        ImageView iv_level = baseViewHolder.getView(R.id.iv_level);
+        TextView tv_level = baseViewHolder.getView(R.id.tv_level);
+        TextView tv_comment1 = baseViewHolder.getView(R.id.tv_comment1);
+        TextView tv_comment2 = baseViewHolder.getView(R.id.tv_comment2);
+        TextView tv_comment3 = baseViewHolder.getView(R.id.tv_comment3);
+
+        list_photo.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
+        tv_name.setText(bean.getNickname());
+
+        int level = bean.getLevel();
+        tv_level.setText(level + "");
+        if (bean.getGender() == 1) {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg1);
+                iv_level.setImageResource(R.mipmap.ic_modle_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg2);
+                iv_level.setImageResource(R.mipmap.ic_modle_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg3);
+                iv_level.setImageResource(R.mipmap.ic_modle_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg4);
+                iv_level.setImageResource(R.mipmap.ic_modle_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg5);
+                iv_level.setImageResource(R.mipmap.ic_modle_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_modle_bg6);
+                iv_level.setImageResource(R.mipmap.ic_modle_6);
+            }
+        }else {
+            if (level > 0 && level <= 15) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg1);
+                iv_level.setImageResource(R.mipmap.ic_use_1);
+            } else if (level > 15 && level <= 30) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg2);
+                iv_level.setImageResource(R.mipmap.ic_use_2);
+            } else if (level > 30 && level <= 45) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg3);
+                iv_level.setImageResource(R.mipmap.ic_use_3);
+            } else if (level > 45 && level <= 60) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg4);
+                iv_level.setImageResource(R.mipmap.ic_use_4);
+            } else if (level > 60 && level <= 75) {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg5);
+                iv_level.setImageResource(R.mipmap.ic_use_5);
+            } else {
+                rl_level.setBackgroundResource(R.mipmap.ic_use_bg6);
+                iv_level.setImageResource(R.mipmap.ic_use_6);
+            }
+        }
+
+        List<String> labels = bean.getLabels();
+        if (labels != null && labels.size() > 0) {
+            if (labels.size() == 1) {
+                tv_comment1.setVisibility(View.VISIBLE);
+                tv_comment2.setVisibility(View.GONE);
+                tv_comment3.setVisibility(View.GONE);
+
+                tv_comment1.setText(labels.get(0));
+
+                if (bean.getAttitude() == 1) {  //喜欢
+                    int x = (int) (Math.random() * 5);
+                    tv_comment1.setBackgroundResource(mImage_bg[x]);
+                }else {
+                    tv_comment1.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                }
+            }else if (labels.size() == 2) {
+                tv_comment1.setVisibility(View.VISIBLE);
+                tv_comment2.setVisibility(View.VISIBLE);
+                tv_comment3.setVisibility(View.GONE);
+
+                tv_comment1.setText(labels.get(0));
+                tv_comment2.setText(labels.get(1));
+
+                if (bean.getAttitude() == 1) {  //喜欢
+                    int x = (int) (Math.random() * 5);
+                    tv_comment1.setBackgroundResource(mImage_bg[x]);
+                    int x2 = (int) (Math.random() * 5);
+                    tv_comment2.setBackgroundResource(mImage_bg[x2]);
+                }else {
+                    tv_comment1.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                    tv_comment2.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                }
+            }else {
+                tv_comment1.setVisibility(View.VISIBLE);
+                tv_comment2.setVisibility(View.VISIBLE);
+                tv_comment3.setVisibility(View.VISIBLE);
+
+                tv_comment1.setText(labels.get(0));
+                tv_comment2.setText(labels.get(1));
+                tv_comment3.setText(labels.get(2));
+
+                if (bean.getAttitude() == 1) {  //喜欢
+                    int x = (int) (Math.random() * 5);
+                    tv_comment1.setBackgroundResource(mImage_bg[x]);
+                    int x2 = (int) (Math.random() * 5);
+                    tv_comment2.setBackgroundResource(mImage_bg[x2]);
+                    int x3 = (int) (Math.random() * 5);
+                    tv_comment2.setBackgroundResource(mImage_bg[x3]);
+                }else {
+                    tv_comment1.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                    tv_comment2.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                    tv_comment3.setBackgroundResource(R.drawable.shape_comment_dislike_bg);
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainRecommendAdapter.java

@@ -0,0 +1,256 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.cardview.widget.CardView;
+
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.xuebiping.bolizhuzi.R;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.utils.SPUtils;
+import com.xuebiping.bolizhuzi.utils.StrU;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
+
+import org.jetbrains.annotations.NotNull;
+
+public class MainRecommendAdapter extends BaseQuickAdapter<AnchorBean, BaseViewHolder> {
+
+    private Context mContext;
+    private int mTabType;  //1代表推荐  2代表语聊  0代表其他
+
+    public MainRecommendAdapter(int layoutResId, Context context) {
+        super(layoutResId);
+        this.mContext = context;
+    }
+
+    public MainRecommendAdapter(int layoutResId, Context context, int tabType) {
+        super(layoutResId);
+        this.mContext = context;
+        this.mTabType = tabType;
+    }
+
+    @Override
+    protected void convert(@NotNull BaseViewHolder baseViewHolder, AnchorBean bean) {
+        recommend(baseViewHolder,bean);
+    }
+
+    private void recommend(BaseViewHolder baseViewHolder, AnchorBean bean) {
+
+        CardView card_view = baseViewHolder.getView(R.id.card_view);
+        LinearLayout ll_svip_price = baseViewHolder.getView(R.id.ll_svip_price);
+        LinearLayout ll_svip_price2 = baseViewHolder.getView(R.id.ll_svip_price2);
+        TextView tv_member_price = baseViewHolder.getView(R.id.tv_member_price);
+        TextView tv_member_price2 = baseViewHolder.getView(R.id.tv_member_price2);
+        SimpleDraweeView list_photo = baseViewHolder.getView(R.id.ri_cover);
+        TextView tv_name = baseViewHolder.getView(R.id.tv_name);
+        TextView tv_signature = baseViewHolder.getView(R.id.tv_signature);
+        TextView tv_price = baseViewHolder.getView(R.id.tv_price);
+        View view_online_status = baseViewHolder.getView(R.id.view_online_status);
+        TextView tv_online_status = baseViewHolder.getView(R.id.tv_online_status);
+
+        LinearLayout ll_star = baseViewHolder.getView(R.id.ll_star);
+        LinearLayout ll_star2 = baseViewHolder.getView(R.id.ll_star2);
+
+        ImageView iv_star_1 = baseViewHolder.getView(R.id.iv_star_1);
+        ImageView iv_star_2 = baseViewHolder.getView(R.id.iv_star_2);
+        ImageView iv_star_3 = baseViewHolder.getView(R.id.iv_star_3);
+        ImageView iv_star_4 = baseViewHolder.getView(R.id.iv_star_4);
+        ImageView iv_star_5 = baseViewHolder.getView(R.id.iv_star_5);
+
+        ImageView iv_star_12 = baseViewHolder.getView(R.id.iv_star_12);
+        ImageView iv_star_22 = baseViewHolder.getView(R.id.iv_star_22);
+        ImageView iv_star_32 = baseViewHolder.getView(R.id.iv_star_32);
+        ImageView iv_star_42 = baseViewHolder.getView(R.id.iv_star_42);
+        ImageView iv_star_52 = baseViewHolder.getView(R.id.iv_star_52);
+
+        if (mTabType == 1) {
+            int recommend_layout_change = SPUtils.getInt(mContext, "recommend_layout_change");
+            if (recommend_layout_change == 0) {  //0代表2格  1代表1格
+                LinearLayout.LayoutParams layoutParams =
+                        new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) mContext.getResources().getDimension(R.dimen.dp230));
+                card_view.setLayoutParams(layoutParams);
+
+
+                tv_name.setTextSize(12);
+                tv_name.setMaxEms(5);
+                tv_signature.setTextSize(10);
+                tv_signature.setTextColor(Color.parseColor("#80FFFFFF"));
+                tv_signature.setMaxEms(6);
+                tv_price.setTextSize(8);
+
+                if (bean.getMember_discount_price() == 0) {
+                    ll_svip_price.setVisibility(View.GONE);
+                    ll_svip_price2.setVisibility(View.GONE);
+                } else {
+                    ll_svip_price.setVisibility(View.VISIBLE);
+                    ll_svip_price2.setVisibility(View.GONE);
+                    tv_member_price.setText(bean.getMember_discount_price() + "金币/分");
+                }
+
+                ll_star.setVisibility(View.VISIBLE);
+                ll_star2.setVisibility(View.GONE);
+                setStarLevel(bean, iv_star_1, iv_star_2, iv_star_3, iv_star_4, iv_star_5);
+
+            }else if (recommend_layout_change == 1) {
+                LinearLayout.LayoutParams layoutParams =
+                        new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) mContext.getResources().getDimension(R.dimen.dp336));
+                card_view.setLayoutParams(layoutParams);
+
+                tv_name.setTextSize(16);
+                tv_name.setMaxEms(8);
+                tv_signature.setTextSize(14);
+                tv_signature.setTextColor(Color.WHITE);
+                tv_signature.setMaxEms(12);
+                tv_price.setTextSize(12);
+
+                if (bean.getMember_discount_price() == 0) {
+                    ll_svip_price.setVisibility(View.GONE);
+                    ll_svip_price2.setVisibility(View.GONE);
+                } else {
+                    ll_svip_price.setVisibility(View.GONE);
+                    ll_svip_price2.setVisibility(View.VISIBLE);
+                    tv_member_price2.setText(bean.getMember_discount_price() + "金币/分");
+                }
+
+                ll_star.setVisibility(View.GONE);
+                ll_star2.setVisibility(View.VISIBLE);
+                setStarLevel(bean, iv_star_12, iv_star_22, iv_star_32, iv_star_42, iv_star_52);
+            }
+
+            tv_price.setText(bean.getPrice() + "金币/分");
+
+        }else if (mTabType == 2) {
+            int voice_layout_change = SPUtils.getInt(mContext, "voice_layout_change");
+            if (voice_layout_change == 0) {  //0代表2格  1代表1格
+                LinearLayout.LayoutParams layoutParams =
+                        new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) mContext.getResources().getDimension(R.dimen.dp230));
+                card_view.setLayoutParams(layoutParams);
+
+                tv_name.setTextSize(12);
+                tv_name.setMaxEms(5);
+                tv_signature.setTextSize(10);
+                tv_signature.setTextColor(Color.parseColor("#80FFFFFF"));
+                tv_signature.setMaxEms(6);
+                tv_price.setTextSize(8);
+
+                ll_star.setVisibility(View.VISIBLE);
+                ll_star2.setVisibility(View.GONE);
+                setStarLevel(bean, iv_star_1, iv_star_2, iv_star_3, iv_star_4, iv_star_5);
+            }else if (voice_layout_change == 1) {
+                LinearLayout.LayoutParams layoutParams =
+                        new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) mContext.getResources().getDimension(R.dimen.dp336));
+                card_view.setLayoutParams(layoutParams);
+
+                tv_name.setTextSize(16);
+                tv_name.setMaxEms(8);
+                tv_signature.setTextSize(14);
+                tv_signature.setTextColor(Color.WHITE);
+                tv_signature.setMaxEms(12);
+                tv_price.setTextSize(12);
+
+                ll_star.setVisibility(View.GONE);
+                ll_star2.setVisibility(View.VISIBLE);
+                setStarLevel(bean, iv_star_12, iv_star_22, iv_star_32, iv_star_42, iv_star_52);
+            }
+
+            ll_svip_price.setVisibility(View.GONE);
+            ll_svip_price2.setVisibility(View.GONE);
+
+            tv_price.setText(bean.getVoice_price() + "金币/分");
+        }else {
+            LinearLayout.LayoutParams layoutParams =
+                    new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, (int) mContext.getResources().getDimension(R.dimen.dp336));
+            card_view.setLayoutParams(layoutParams);
+
+            tv_name.setTextSize(16);
+            tv_name.setMaxEms(8);
+            tv_signature.setTextSize(14);
+            tv_signature.setTextColor(Color.WHITE);
+            tv_signature.setMaxEms(12);
+            tv_price.setTextSize(12);
+
+            if (bean.getMember_discount_price() == 0) {
+                ll_svip_price.setVisibility(View.GONE);
+                ll_svip_price2.setVisibility(View.GONE);
+            } else {
+                ll_svip_price.setVisibility(View.GONE);
+                ll_svip_price2.setVisibility(View.VISIBLE);
+                tv_member_price2.setText(bean.getMember_discount_price() + "金币/分");
+            }
+
+            ll_star.setVisibility(View.GONE);
+            ll_star2.setVisibility(View.VISIBLE);
+            setStarLevel(bean, iv_star_12, iv_star_22, iv_star_32, iv_star_42, iv_star_52);
+
+            tv_price.setText(bean.getPrice() + "金币/分");
+        }
+
+        list_photo.setImageURI(StrU.getResourcePath(bean.getCover(), mContext));
+        tv_name.setText(bean.getNickname());
+        tv_signature.setText(bean.getSignature());
+
+        if (bean.getOnline_status() == 0) {
+            view_online_status.setBackgroundResource(R.drawable.shape_999999_oval_bg);
+            tv_online_status.setText("离线");
+        }else if (bean.getOnline_status() == 1) {
+            view_online_status.setBackgroundResource(R.drawable.shape_6ce4b7_oval_bg);
+            tv_online_status.setText("在线");
+        }else if (bean.getOnline_status() == 2) {
+            view_online_status.setBackgroundResource(R.drawable.shape_f2b854_oval_bg);
+            tv_online_status.setText("活跃");
+        }
+
+        card_view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                Intent intent = new Intent(mContext, MainPageActivity.class);
+                intent.putExtra("userId", bean.getUserid());
+                mContext.startActivity(intent);
+            }
+        });
+
+    }
+
+    private void setStarLevel(AnchorBean bean, ImageView ivStar1, ImageView ivStar2, ImageView ivStar3, ImageView ivStar4, ImageView ivStar5) {
+        if (bean.getStar_level() == 1) {
+            ivStar1.setVisibility(View.VISIBLE);
+            ivStar2.setVisibility(View.GONE);
+            ivStar3.setVisibility(View.GONE);
+            ivStar4.setVisibility(View.GONE);
+            ivStar5.setVisibility(View.GONE);
+        } else if (bean.getStar_level() == 2) {
+            ivStar1.setVisibility(View.VISIBLE);
+            ivStar2.setVisibility(View.VISIBLE);
+            ivStar3.setVisibility(View.GONE);
+            ivStar4.setVisibility(View.GONE);
+            ivStar5.setVisibility(View.GONE);
+        } else if (bean.getStar_level() == 3) {
+            ivStar1.setVisibility(View.VISIBLE);
+            ivStar2.setVisibility(View.VISIBLE);
+            ivStar3.setVisibility(View.VISIBLE);
+            ivStar4.setVisibility(View.GONE);
+            ivStar5.setVisibility(View.GONE);
+        } else if (bean.getStar_level() == 4) {
+            ivStar1.setVisibility(View.VISIBLE);
+            ivStar2.setVisibility(View.VISIBLE);
+            ivStar3.setVisibility(View.VISIBLE);
+            ivStar4.setVisibility(View.VISIBLE);
+            ivStar5.setVisibility(View.GONE);
+        } else if (bean.getStar_level() == 5) {
+            ivStar1.setVisibility(View.VISIBLE);
+            ivStar2.setVisibility(View.VISIBLE);
+            ivStar3.setVisibility(View.VISIBLE);
+            ivStar4.setVisibility(View.VISIBLE);
+            ivStar5.setVisibility(View.VISIBLE);
+        }
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MainViewPagerAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 
 import androidx.fragment.app.Fragment;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/MsgCallListAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -9,9 +9,9 @@ import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.settings.greeting.TextGrettingListActivity;
+import com.xuebiping.bolizhuzi.view.settings.greeting.TextGrettingListActivity;
 
 import org.jetbrains.annotations.NotNull;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/OneKeyAttentionAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import androidx.recyclerview.widget.RecyclerView;
@@ -8,10 +8,10 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.im.uikit.common.ui.imageview.HeadImageView;
+import com.xuebiping.bolizhuzi.im.uikit.common.ui.imageview.HeadImageView;
-import com.fengliyan.tianlesue.model.main.AttentionBean;
+import com.xuebiping.bolizhuzi.model.main.AttentionBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/Recommend1ListAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,11 +8,11 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
-import com.fengliyan.tianlesue.model.main.AnchorListBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorListBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 import com.facebook.drawee.view.SimpleDraweeView;
 
 import java.util.ArrayList;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/RecommendListAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,11 +8,11 @@ import android.widget.BaseAdapter;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.AnchorBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorBean;
-import com.fengliyan.tianlesue.model.main.AnchorListBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorListBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 import com.facebook.drawee.view.SimpleDraweeView;
 
 import java.util.ArrayList;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/RedEnvelopesAdpater.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -7,13 +7,13 @@ import android.widget.TextView;
 
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.base.RecyclerLoadAdapter;
+import com.xuebiping.bolizhuzi.controller.base.RecyclerLoadAdapter;
-import com.fengliyan.tianlesue.controller.main.manager.MainManager;
+import com.xuebiping.bolizhuzi.controller.main.manager.MainManager;
-import com.fengliyan.tianlesue.model.main.RedEnvelopesBean;
+import com.xuebiping.bolizhuzi.model.main.RedEnvelopesBean;
-import com.fengliyan.tianlesue.utils.GlideUtils;
+import com.xuebiping.bolizhuzi.utils.GlideUtils;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBackBase;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBackBase;
 
 import java.util.ArrayList;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/ScaleTransitionPagerTitleView.java

@@ -0,0 +1,40 @@
+package com.xuebiping.bolizhuzi.controller.main.adapter;
+
+import android.content.Context;
+
+import net.lucode.hackware.magicindicator.buildins.commonnavigator.titles.ColorTransitionPagerTitleView;
+
+/**
+ * 带颜色渐变和缩放的指示器标题
+ * 博客: http://hackware.lucode.net
+ * Created by hackware on 2016/6/26.
+ */
+public class ScaleTransitionPagerTitleView extends ColorTransitionPagerTitleView {
+    private float mMinScale = 0.75f;
+
+    public ScaleTransitionPagerTitleView(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void onEnter(int index, int totalCount, float enterPercent, boolean leftToRight) {
+        super.onEnter(index, totalCount, enterPercent, leftToRight);    // 实现颜色渐变
+        setScaleX(mMinScale + (1.0f - mMinScale) * enterPercent);
+        setScaleY(mMinScale + (1.0f - mMinScale) * enterPercent);
+    }
+
+    @Override
+    public void onLeave(int index, int totalCount, float leavePercent, boolean leftToRight) {
+        super.onLeave(index, totalCount, leavePercent, leftToRight);    // 实现颜色渐变
+        setScaleX(1.0f + (mMinScale - 1.0f) * leavePercent);
+        setScaleY(1.0f + (mMinScale - 1.0f) * leavePercent);
+    }
+
+    public float getMinScale() {
+        return mMinScale;
+    }
+
+    public void setMinScale(float minScale) {
+        mMinScale = minScale;
+    }
+}

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/SearchAdapter.java

@@ -1,16 +1,17 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.main.SearchBean;
+import com.xuebiping.bolizhuzi.model.main.SearchBean;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,19 +54,23 @@ public class SearchAdapter extends BaseAdapter {
             holder = (Holder) view.getTag();
         }
 
-        if (0 == bean.getVip()) {
+//        if (0 == bean.getVip()) {
-            holder.ivMemberSign.setVisibility(View.VISIBLE);
+//            holder.ivMemberSign.setVisibility(View.VISIBLE);
-            holder.ivMemberSign.setImageResource(R.drawable.ic_pvip);
+//            holder.ivMemberSign.setImageResource(R.drawable.ic_pvip);
-        } else if (1 == bean.getVip()) {
+//        } else if (1 == bean.getVip()) {
-            holder.ivMemberSign.setVisibility(View.VISIBLE);
+//            holder.ivMemberSign.setVisibility(View.VISIBLE);
-            holder.ivMemberSign.setImageResource(R.drawable.ic_gvip);
+//            holder.ivMemberSign.setImageResource(R.drawable.ic_gvip);
-        } else {
+//        } else {
-            holder.ivMemberSign.setVisibility(View.GONE);
+//            holder.ivMemberSign.setVisibility(View.GONE);
-        }
+//        }
 
         holder.mPhoto.setImageURI(StrU.getResourcePath(bean.getAvatar(), mContext));
         holder.mName.setText(bean.getNickname());
-        holder.mInfo.setText(bean.getCity() + " | " + bean.getAge() + "岁");
+//        holder.mInfo.setText(bean.getCity() + " | " + bean.getAge() + "岁");
+        if (!TextUtils.isEmpty(bean.getSignature())) {
+            holder.mInfo.setText(bean.getSignature());
+        }
+
         holder.mTime.setText(bean.getDateline());
         view.setTag(holder);
         return view;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/VideoAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -10,16 +10,16 @@ import android.widget.TextView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.google.gson.Gson;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.constant.ConsUser;
+import com.xuebiping.bolizhuzi.controller.constant.ConsUser;
-import com.fengliyan.tianlesue.model.main.websocket.NoticeBean;
+import com.xuebiping.bolizhuzi.model.main.websocket.NoticeBean;
-import com.fengliyan.tianlesue.model.main.websocket.NoticeGiftBean;
+import com.xuebiping.bolizhuzi.model.main.websocket.NoticeGiftBean;
-import com.fengliyan.tianlesue.model.main.websocket.WebSocketChatBean;
+import com.xuebiping.bolizhuzi.model.main.websocket.WebSocketChatBean;
-import com.fengliyan.tianlesue.utils.SPUtils;
+import com.xuebiping.bolizhuzi.utils.SPUtils;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.BaseApplication;
+import com.xuebiping.bolizhuzi.view.base.BaseApplication;
-import com.fengliyan.tianlesue.view.main.utils.JumpUtils;
+import com.xuebiping.bolizhuzi.view.main.utils.JumpUtils;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/adapter/ViewHolder.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.adapter;
+package com.xuebiping.bolizhuzi.controller.main.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/manager/GlobalManager.java

@@ -1,11 +1,11 @@
-package com.fengliyan.tianlesue.controller.main.manager;
+package com.xuebiping.bolizhuzi.controller.main.manager;
 
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpRequest;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpResult;
-import com.fengliyan.tianlesue.view.base.utils.task.HttpWithUiTask;
+import com.xuebiping.bolizhuzi.view.base.utils.task.HttpWithUiTask;
 import com.fengliyan.http.httprequest.HttpMethod;
 import com.fengliyan.http.httprequest.TType;
 import com.google.gson.internal.LinkedTreeMap;

app/src/main/java/com/xuebiping/bolizhuzi/controller/main/manager/MainManager.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.main.manager;
+package com.xuebiping.bolizhuzi.controller.main.manager;
 
 import android.app.Activity;
 import android.text.TextUtils;
@@ -9,45 +9,47 @@ import com.fengliyan.http.httprequest.HttpMethod;
 import com.fengliyan.http.httprequest.HttpRequestFactory;
 import com.fengliyan.http.httprequest.OkHttp.CaiWebSocket;
 import com.fengliyan.http.httprequest.TType;
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.model.login.bean.LoginBean;
+import com.xuebiping.bolizhuzi.model.login.bean.LoginBean;
-import com.fengliyan.tianlesue.model.main.AnchorListBean;
+import com.xuebiping.bolizhuzi.model.main.AnchorListBean;
-import com.fengliyan.tianlesue.model.main.AttentionDialogBean;
+import com.xuebiping.bolizhuzi.model.main.AttentionDialogBean;
-import com.fengliyan.tianlesue.model.main.BlackBean;
+import com.xuebiping.bolizhuzi.model.main.BlackBean;
-import com.fengliyan.tianlesue.model.main.CallBean;
+import com.xuebiping.bolizhuzi.model.main.CallBean;
-import com.fengliyan.tianlesue.model.main.ChannelAnchorBean;
+import com.xuebiping.bolizhuzi.model.main.ChannelAnchorBean;
-import com.fengliyan.tianlesue.model.main.ChatShootBean;
+import com.xuebiping.bolizhuzi.model.main.ChatShootBean;
-import com.fengliyan.tianlesue.model.main.CloseGreetBean;
+import com.xuebiping.bolizhuzi.model.main.CloseGreetBean;
-import com.fengliyan.tianlesue.model.main.ComplaintListBean;
+import com.xuebiping.bolizhuzi.model.main.ComplaintListBean;
-import com.fengliyan.tianlesue.model.main.DialogAdBean;
+import com.xuebiping.bolizhuzi.model.main.DialogAdBean;
-import com.fengliyan.tianlesue.model.main.FreeVideoBean;
+import com.xuebiping.bolizhuzi.model.main.FreeVideoBean;
-import com.fengliyan.tianlesue.model.main.GiftReceivedBean;
+import com.xuebiping.bolizhuzi.model.main.GiftReceivedBean;
-import com.fengliyan.tianlesue.model.main.GlobalConfigBean;
+import com.xuebiping.bolizhuzi.model.main.GlobalConfigBean;
-import com.fengliyan.tianlesue.model.main.GroupCallBean;
+import com.xuebiping.bolizhuzi.model.main.GroupCallBean;
-import com.fengliyan.tianlesue.model.main.GuardListBean;
+import com.xuebiping.bolizhuzi.model.main.GuardListBean;
-import com.fengliyan.tianlesue.model.main.IsKidModelBean;
+import com.xuebiping.bolizhuzi.model.main.IsKidModelBean;
-import com.fengliyan.tianlesue.model.main.MainBean;
+import com.xuebiping.bolizhuzi.model.main.LookWechatBean;
-import com.fengliyan.tianlesue.model.main.MainPageAnchorBean;
+import com.xuebiping.bolizhuzi.model.main.MainBean;
-import com.fengliyan.tianlesue.model.main.MainPageBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageAnchorBean;
-import com.fengliyan.tianlesue.model.main.MainPageSwitchSwerviceNumBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageBean;
-import com.fengliyan.tianlesue.model.main.PrizeBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageCommentListBean;
-import com.fengliyan.tianlesue.model.main.RedEnvelopesBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageSwitchSwerviceNumBean;
-import com.fengliyan.tianlesue.model.main.RedEnvlopesRedwarsBean;
+import com.xuebiping.bolizhuzi.model.main.PrizeBean;
-import com.fengliyan.tianlesue.model.main.SearchListBean;
+import com.xuebiping.bolizhuzi.model.main.RedEnvelopesBean;
-import com.fengliyan.tianlesue.model.main.SkillAnchorBean;
+import com.xuebiping.bolizhuzi.model.main.RedEnvlopesRedwarsBean;
-import com.fengliyan.tianlesue.model.main.SystemVersionBean;
+import com.xuebiping.bolizhuzi.model.main.SearchListBean;
-import com.fengliyan.tianlesue.model.main.UserGenderListBean;
+import com.xuebiping.bolizhuzi.model.main.SkillAnchorBean;
-import com.fengliyan.tianlesue.model.main.VersionBean;
+import com.xuebiping.bolizhuzi.model.main.SystemVersionBean;
-import com.fengliyan.tianlesue.model.main.VideoFeeBean;
+import com.xuebiping.bolizhuzi.model.main.UserGenderListBean;
-import com.fengliyan.tianlesue.model.main.VideoGuardBean;
+import com.xuebiping.bolizhuzi.model.main.VersionBean;
-import com.fengliyan.tianlesue.model.main.websocket.WebSocketRequestBean;
+import com.xuebiping.bolizhuzi.model.main.VideoFeeBean;
-import com.fengliyan.tianlesue.model.settings.BackPackListBean;
+import com.xuebiping.bolizhuzi.model.main.VideoGuardBean;
-import com.fengliyan.tianlesue.model.user.bean.UserLiteBean;
+import com.xuebiping.bolizhuzi.model.main.websocket.WebSocketRequestBean;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.model.settings.BackPackListBean;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.model.user.bean.UserLiteBean;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.task.HttpWithUiTask;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.task.HttpWithUiTask;
 import com.fengliyan.uikit.dialog.GiftListBean;
 
 import java.util.List;
@@ -246,6 +248,31 @@ public class MainManager {
             }
         };
 
+//        task.start();
+        task.start(false);
+    }
+
+    public static void getHomeData(BaseActivity activity,
+                                        String type,
+                                        final int page,
+                                        HttpUiCallBack<ChannelAnchorBean> httpUiCallBack) {
+        HttpWithUiTask<ChannelAnchorBean> task = new HttpWithUiTask<ChannelAnchorBean>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<ChannelAnchorBean> run() throws Exception {
+                final String url = ConstUrl.HOME_DATA;
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<ChannelAnchorBean>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("type", type)
+                        .addParam("page", page + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
 //        task.start();
         task.start(false);
     }
@@ -364,6 +391,27 @@ public class MainManager {
         task.start();
     }
 
+    public static void getWechatIntimacy(BaseActivity activity,
+                                       final int to_uid, HttpUiCallBack<LookWechatBean> httpUiCallBack) {
+        HttpWithUiTask<LookWechatBean> task = new HttpWithUiTask<LookWechatBean>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<LookWechatBean> run() throws Exception {
+                final String url = ConstUrl.WECHAT_INTIMACY;
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<LookWechatBean>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("to_uid", to_uid + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start();
+    }
+
     public static void getAllChannels(BaseActivity activity,
                                       HttpUiCallBack<List<SkillAnchorBean>> httpUiCallBack) {
         HttpWithUiTask<List<SkillAnchorBean>> task = new HttpWithUiTask<List<SkillAnchorBean>>(activity, httpUiCallBack) {
@@ -600,7 +648,7 @@ public class MainManager {
                         .setResultType(new TType<HttpResult<MainPageAnchorBean>>() {
 
                         }).setHttpMethod(HttpMethod.POST)
-                        .addParam("status", status + "")
+                        .addParam("value", status + "")
                         .setUrl(url);
 
                 HttpRequest request = builder.build();
@@ -611,6 +659,28 @@ public class MainManager {
         task.start();
     }
 
+    public static void changeVideoStatus2(BaseActivity activity,
+                                         final int status,
+                                         HttpUiCallBack<MainPageAnchorBean> httpUiCallBack) {
+        HttpWithUiTask<MainPageAnchorBean> task = new HttpWithUiTask<MainPageAnchorBean>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<MainPageAnchorBean> run() throws Exception {
+                final String url = ConstUrl.SET_DO_NOT_DISTURB;
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<MainPageAnchorBean>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("do_not_disturb", status + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start(false);
+    }
+
     public static void changeswitchServiceNum(BaseActivity activity,
                                               final int status,
                                               HttpUiCallBack<MainPageSwitchSwerviceNumBean> httpUiCallBack) {
@@ -904,6 +974,54 @@ public class MainManager {
         task.start();
     }
 
+    public static void getMainCommentList(BaseActivity activity,
+                                          final String uid,
+                                         final int page,
+                                         HttpUiCallBack<MainPageCommentListBean> httpUiCallBack) {
+        HttpWithUiTask<MainPageCommentListBean> task = new HttpWithUiTask<MainPageCommentListBean>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<MainPageCommentListBean> run() throws Exception {
+                String url = ConstUrl.MAIN_COMMENT_LIST;
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<MainPageCommentListBean>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("user_id", uid)
+                        .addParam("page", page + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start(false);
+    }
+
+    public static void getGenderActiveList(BaseActivity activity,
+                                         final int gender,
+                                         final int page,
+                                         HttpUiCallBack<UserGenderListBean> httpUiCallBack) {
+        HttpWithUiTask<UserGenderListBean> task = new HttpWithUiTask<UserGenderListBean>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<UserGenderListBean> run() throws Exception {
+                String url = ConstUrl.GET_ACTIVE_USERS;
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<UserGenderListBean>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("gender", gender + "")
+                        .addParam("page", page + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start(false);
+    }
+
     public static void getSystemVersion(BaseActivity activity,
                                         HttpUiCallBack<SystemVersionBean> httpUiCallBack) {
         HttpWithUiTask<SystemVersionBean> task = new HttpWithUiTask<SystemVersionBean>(activity, httpUiCallBack) {
@@ -963,7 +1081,7 @@ public class MainManager {
             }
         };
 
-        task.start();
+        task.start(false);
     }
 
     public static void evaluateVideo(BaseActivity activity,
@@ -991,6 +1109,35 @@ public class MainManager {
         task.start();
     }
 
+    public static void evaluateVideo2(BaseActivity activity,
+                                     final String roomId,
+                                     final int score,
+                                     int attitude,
+                                     String label_names,
+                                     HttpUiCallBack<Object> httpUiCallBack) {
+        HttpWithUiTask<Object> task = new HttpWithUiTask<Object>(activity, httpUiCallBack) {
+            @Override
+            protected HttpResult<Object> run() throws Exception {
+                String url = ConstUrl.EVALUATE_VIDEO;
+
+                HttpRequest.Builder builder = new HttpRequest.Builder()
+                        .setResultType(new TType<HttpResult<Object>>() {
+
+                        }).setHttpMethod(HttpMethod.POST)
+                        .addParam("room_id", roomId)
+                        .addParam("score", score + "")
+                        .addParam("attitude", attitude + "")
+                        .addParam("label_names", label_names + "")
+                        .setUrl(url);
+
+                HttpRequest request = builder.build();
+                return request.request();
+            }
+        };
+
+        task.start();
+    }
+
     /**
      * 用户活跃更新
      *

app/src/main/java/com/xuebiping/bolizhuzi/controller/news/manager/ChatAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.news.manager;
+package com.xuebiping.bolizhuzi.controller.news.manager;
 
 import android.content.Context;
 import android.content.Intent;
@@ -13,16 +13,16 @@ import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.constant.ConsUser;
+import com.xuebiping.bolizhuzi.controller.constant.ConsUser;
-import com.fengliyan.tianlesue.model.news.ChatBean;
+import com.xuebiping.bolizhuzi.model.news.ChatBean;
-import com.fengliyan.tianlesue.utils.SPUtils;
+import com.xuebiping.bolizhuzi.utils.SPUtils;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.base.utils.ToolKit;
+import com.xuebiping.bolizhuzi.view.base.utils.ToolKit;
-import com.fengliyan.tianlesue.view.dynamics.activity.ImageDisplayActivity;
+import com.xuebiping.bolizhuzi.view.dynamics.activity.ImageDisplayActivity;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
-import com.fengliyan.tianlesue.view.main.utils.JumpUtils;
+import com.xuebiping.bolizhuzi.view.main.utils.JumpUtils;
-import com.fengliyan.tianlesue.view.news.fragment.NewFragment;
+import com.xuebiping.bolizhuzi.view.news.fragment.NewFragment;
 import com.fengliyan.messaging.ChatManager;
 import com.fengliyan.messaging.CustomAttachment;
 import com.fengliyan.messaging.SysInfoDoubleImageAttachment;

app/src/main/java/com/xuebiping/bolizhuzi/controller/news/manager/NewAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.news.manager;
+package com.xuebiping.bolizhuzi.controller.news.manager;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -7,12 +7,12 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.user.manager.UserManager;
+import com.xuebiping.bolizhuzi.controller.user.manager.UserManager;
-import com.fengliyan.tianlesue.model.news.RecentContactBean;
+import com.xuebiping.bolizhuzi.model.news.RecentContactBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.base.utils.ToolKit;
+import com.xuebiping.bolizhuzi.view.base.utils.ToolKit;
-import com.fengliyan.tianlesue.view.news.fragment.NewFragment;
+import com.xuebiping.bolizhuzi.view.news.fragment.NewFragment;
 import com.fengliyan.messaging.ChatManager;
 import com.facebook.drawee.view.SimpleDraweeView;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/news/manager/NewsManager.java

@@ -1,16 +1,16 @@
-package com.fengliyan.tianlesue.controller.news.manager;
+package com.xuebiping.bolizhuzi.controller.news.manager;
 
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.model.main.MainPageBean;
+import com.xuebiping.bolizhuzi.model.main.MainPageBean;
-import com.fengliyan.tianlesue.model.news.ChatSettingBean;
+import com.xuebiping.bolizhuzi.model.news.ChatSettingBean;
-import com.fengliyan.tianlesue.model.news.ChatTipBean;
+import com.xuebiping.bolizhuzi.model.news.ChatTipBean;
-import com.fengliyan.tianlesue.model.news.CustomRemarkBean;
+import com.xuebiping.bolizhuzi.model.news.CustomRemarkBean;
-import com.fengliyan.tianlesue.model.news.IMCostBean;
+import com.xuebiping.bolizhuzi.model.news.IMCostBean;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpRequest;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpResult;
-import com.fengliyan.tianlesue.view.base.utils.task.HttpWithUiTask;
+import com.xuebiping.bolizhuzi.view.base.utils.task.HttpWithUiTask;
 import com.fengliyan.http.httprequest.HttpMethod;
 import com.fengliyan.http.httprequest.TType;
 

app/src/main/java/com/xuebiping/bolizhuzi/controller/rank/MibiRankAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.rank;
+package com.xuebiping.bolizhuzi.controller.rank;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,10 +8,10 @@ import android.widget.BaseAdapter;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.model.settings.NewRankBean;
+import com.xuebiping.bolizhuzi.model.settings.NewRankBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
-import com.fengliyan.tianlesue.view.main.MainPageActivity;
+import com.xuebiping.bolizhuzi.view.main.MainPageActivity;
 import com.facebook.drawee.view.SimpleDraweeView;
 
 import java.util.ArrayList;

app/src/main/java/com/xuebiping/bolizhuzi/controller/register/manager/RegisterManager.java

@@ -1,16 +1,16 @@
-package com.fengliyan.tianlesue.controller.register.manager;
+package com.xuebiping.bolizhuzi.controller.register.manager;
 
 import com.fengliyan.http.httprequest.HttpMethod;
 import com.fengliyan.http.httprequest.TType;
 import com.fengliyan.http.httprequest.UploadFile;
-import com.fengliyan.tianlesue.controller.constant.ConstUrl;
+import com.xuebiping.bolizhuzi.controller.constant.ConstUrl;
-import com.fengliyan.tianlesue.model.login.bean.LoginBean;
+import com.xuebiping.bolizhuzi.model.login.bean.LoginBean;
-import com.fengliyan.tianlesue.model.login.bean.NickNameBean;
+import com.xuebiping.bolizhuzi.model.login.bean.NickNameBean;
-import com.fengliyan.tianlesue.view.base.BaseActivity;
+import com.xuebiping.bolizhuzi.view.base.BaseActivity;
-import com.fengliyan.tianlesue.view.base.utils.HttpUiCallBack;
+import com.xuebiping.bolizhuzi.view.base.utils.HttpUiCallBack;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpRequest;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpRequest;
-import com.fengliyan.tianlesue.view.base.utils.http.HttpResult;
+import com.xuebiping.bolizhuzi.view.base.utils.http.HttpResult;
-import com.fengliyan.tianlesue.view.base.utils.task.HttpWithUiTask;
+import com.xuebiping.bolizhuzi.view.base.utils.task.HttpWithUiTask;
 
 import java.util.Map;
 
@@ -194,6 +194,8 @@ public class RegisterManager {
                 builder.addParam("cityId", (String) map.get("city"));
                 builder.addParam("birthday", (String) map.get("birthday"));
                 builder.addParam("job", (String) map.get("job"));
+                builder.addParam("height", (String) map.get("height"));
+                builder.addParam("school", (String) map.get("school"));
                 builder.addParam("del_video", (String) map.get("del_video"));
                 if (null != map.get("inviteId") && !"".equals(map.get("inviteId"))) {
                     builder.addParam("invite_code", (String) map.get("inviteId"));

app/src/main/java/com/xuebiping/bolizhuzi/controller/settings/adapter/AddSkillRecyclerAdapter.java

@@ -1,4 +1,4 @@
-package com.fengliyan.tianlesue.controller.settings.adapter;
+package com.xuebiping.bolizhuzi.controller.settings.adapter;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,10 +9,10 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.fengliyan.tianlesue.R;
+import com.xuebiping.bolizhuzi.R;
-import com.fengliyan.tianlesue.controller.main.adapter.ViewHolder;
+import com.xuebiping.bolizhuzi.controller.main.adapter.ViewHolder;
-import com.fengliyan.tianlesue.model.main.SkillAnchorBean;
+import com.xuebiping.bolizhuzi.model.main.SkillAnchorBean;
-import com.fengliyan.tianlesue.utils.StrU;
+import com.xuebiping.bolizhuzi.utils.StrU;
 
 import java.util.ArrayList;
 import java.util.List;