1、修复bug

app/src/main/java/com/hupu/tv/player/app/api/GankNetworkTransformer.kt

@@ -55,7 +55,7 @@ class GankNetworkTransformer<T> @JvmOverloads constructor(mView: IBaseDisplay?,
                 .doOnError(Consumer { throwable: Throwable ->
                     //RxJava2NullException 交给RxCallback处理
                     if (throwable !is RxJava3NullException) {
-                        mView.showError(throwable)
+                        mView.showError(throwable,true)
                     }
                 })
                 .compose(mView.bindToLifecycle())

app/src/main/java/com/hupu/tv/player/app/api/HostUrl.kt

@@ -50,12 +50,12 @@ interface HostUrl {
 
 
         /**
-         * 登陆接口
+         * 登录接口
          */
         const val POST_LOGIN = "capi/user/login"
 
         /**
-         * 登陆注册接口
+         * 登录注册接口
          */
         const val POST_LOGIN_LIVE = "user/register"
 
@@ -401,7 +401,7 @@ interface HostUrl {
         const val POST_USER_FORGET_PASSWORD = "user/forgotPassword"
 
         /**
-         * 设置登陆密码
+         * 设置登录密码
          */
         const val POST_USER_SETTING_PASSWORD = "user/userSetLoginPwd"
 
@@ -539,14 +539,14 @@ interface HostUrl {
 
         /**
          * 获取用户关注的主播列表
-         * 需要登陆可用
+         * 需要登录可用
          */
         const val POST_MATCH_USER_ANCHOR = "match/userGetAnchorList"
 
 
         /**
          * 获取用户关注的比赛列表
-         * 需要登陆可用
+         * 需要登录可用
          */
         const val POST_MATCH_USER_MATCH = "match/userGetReserveMatch"
 

app/src/main/java/com/hupu/tv/player/app/api/RetrofitService.kt

@@ -138,13 +138,13 @@ interface RetrofitService {/*@Field("is_new") int is_new*/
     fun getWinnerListParam(@Body requestBody: RequestBody): Observable<BaseBean<List<String>>>
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_LOGIN)
     fun login(@Body requestBody: RequestBody): Observable<BaseBean<UserBean>>
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_LOGIN_LIVE)
     fun loginLive(@Body requestBody: RequestBody): Observable<BaseBean<String>>
@@ -159,61 +159,61 @@ interface RetrofitService {/*@Field("is_new") int is_new*/
     ): Observable<BaseBean<String>>
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_LOGIN_PASSWORD)
     fun loginPassword(@Body requestBody: RequestBody): Observable<BaseBean<String>>
 
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_FEEDBACK)
     fun feedBack(@Body requestBody: RequestBody): Observable<BaseBean<String>>
 
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @FormUrlEncoded
     @POST(HostUrl.POST_TEST)
     fun postTest(@Field("phone") phone: String, @Field("password") password: String): Observable<BaseBean<String>>
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_FEEDBACK_LIST)
     fun getFeedBackList(): Observable<BaseBean<String>>
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_FEEDBACK_TYPE)
     fun getFeedBackTypeList(): Observable<BaseBean<String>>
 
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_USER_CODE)
     fun getSmsCode(@Body requestBody: RequestBody): Observable<BaseBean<String>>
 
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_USER_FORGET_PASSWORD)
     fun forgetPassword(@Body requestBody: RequestBody): Observable<BaseBean<String>>
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_USER_SETTING_PASSWORD)
     fun settingPassword(@Body requestBody: RequestBody): Observable<BaseBean<String>>
 
 
     /**
-     * 登陆接口
+     * 登录接口
      */
     @POST(HostUrl.POST_VERIFICATION_SMS_CODE)
     fun verficationSmsCode(@Body requestBody: RequestBody): Observable<BaseBean<String>>

app/src/main/java/com/hupu/tv/player/app/app/App.kt

 package com.hupu.tv.player.app.app
 
 
+import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.widget.ImageView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.multidex.MultiDex
+import com.blankj.utilcode.util.AppUtils
+import com.blankj.utilcode.util.LogUtils
 import com.hupu.tv.player.app.BuildConfig
 import com.hyphenate.chat.EMClient
 import com.hyphenate.chat.EMOptions
@@ -24,6 +28,7 @@ import com.softgarden.baselibrary.utils.ScreenUtil
 import com.umeng.analytics.MobclickAgent
 import com.umeng.commonsdk.UMConfigure
 import com.hupu.tv.player.app.R
+import com.hupu.tv.player.app.ui.activity.SplashActivity
 import com.hupu.tv.player.app.ui.im.ChatPresenter
 import com.hupu.tv.player.app.ui.im.EaseChatRowDelegate
 import com.hupu.tv.player.app.utils.CommonUtils
@@ -38,6 +43,7 @@ import com.yhao.floatwindow.Screen
 import tv.danmaku.ijk.media.exo2.Exo2PlayerManager
 import tv.danmaku.ijk.media.exo2.ExoPlayerCacheManager
 import tv.danmaku.ijk.media.player.IjkMediaPlayer
+import java.util.logging.Handler
 
 
 /**
@@ -46,6 +52,8 @@ import tv.danmaku.ijk.media.player.IjkMediaPlayer
  * @describe
  */
 class App : BaseApplication() {
+    private var oldOrientation = Configuration.ORIENTATION_PORTRAIT
+
     companion object {
         var instance: App? = null
             private set
@@ -77,9 +85,9 @@ class App : BaseApplication() {
 
     override fun onCreate() {
         super.onCreate()
-
+        oldOrientation = resources.configuration.orientation
         instance = this
-        UMConfigure.preInit(instance, null,null)
+        UMConfigure.preInit(instance, null, null)
         initCustomDialog()
         val isAgree = SPUtil[Constants.IS_AGREE, false] as Boolean
         if (isAgree) {
@@ -104,9 +112,31 @@ class App : BaseApplication() {
         initUmeng()
     }
 
+    override fun onConfigurationChanged(newConfig: Configuration) {
+        super.onConfigurationChanged(newConfig)
+        LogUtils.e("onConfigurationChanged newConfig = $newConfig")
+        if (newConfig.orientation != oldOrientation) {
+            oldOrientation = newConfig.orientation
+        }else{
+            //更改了系统设置 ，比如 更改字体大小 设置语言等
+            ActivityManager.instance.finishAll()
+            val intent = Intent(this, SplashActivity::class.java)
+            intent.addFlags(
+                Intent.FLAG_ACTIVITY_NEW_TASK
+                        or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK
+            )
+            startActivity(intent)
+            LogUtils.e("onConfigurationChanged relaunchApp")
+
+        }
+    }
+
     private fun initUmeng() {
 
-        val umChanelId = packageManager.getApplicationInfo(packageName, PackageManager.GET_META_DATA).metaData.getString("UMENG_CHANNEL_VALUE")
+        val umChanelId = packageManager.getApplicationInfo(
+            packageName,
+            PackageManager.GET_META_DATA
+        ).metaData.getString("UMENG_CHANNEL_VALUE")
 
 
         UMConfigure.init(

app/src/main/java/com/hupu/tv/player/app/event/RefreshNewsEvent.java

+package com.hupu.tv.player.app.event;
+
+/**
+ * @author by Dell
+ * @date on 2020/7/6
+ * @describe
+ */
+public class RefreshNewsEvent {
+}

app/src/main/java/com/hupu/tv/player/app/ui/activity/AccountSettingActivity.kt

@@ -38,17 +38,19 @@ class AccountSettingActivity : RefreshActivity<IBasePresenter>(),IBaseDisplay {
         ll_change_phone.setOnClickListener {
             startActivity(AccountBindActivity::class.java)
         }
-        ll_forget_password.setOnClickListener {
-            startActivity(ForgetPasswordActivity::class.java)
+        ll_setting_password.setOnClickListener {
+            startActivity(SettingPasswordActivity::class.java)
         }
         ll_edit_password.setOnClickListener {
             startActivity(EditPasswordActivity::class.java)
         }
-
-        ll_setting_password.setOnClickListener {
-            startActivity(SettingPasswordActivity::class.java)
+        ll_forget_password.setOnClickListener {
+            startActivity(ForgetPasswordActivity::class.java)
         }
 
+
+
+
     }
 
     override val ctx: Context?

app/src/main/java/com/hupu/tv/player/app/ui/activity/EditPasswordActivity.kt

@@ -70,7 +70,9 @@ class EditPasswordActivity : RefreshActivity<EdittPasswordActivityPresenter>(),
                 et_edit_password.transformationMethod = BiggerDotPasswordTransformationMethod()
             }
         }
-
+        iv_back.setOnClickListener {
+            onBackPressed()
+        }
         et_edit_password_confirm.transformationMethod = BiggerDotPasswordTransformationMethod()
         iv_show_password_confirm.setOnClickListener {
             iv_show_password_confirm.isSelected = !iv_show_password_confirm.isSelected

app/src/main/java/com/hupu/tv/player/app/ui/activity/ForgetPasswordActivity.kt

@@ -82,7 +82,7 @@ class ForgetPasswordActivity : RefreshActivity<ForgetPasswordActivityPresenter>(
                 CheckUtil.isIllegalPhone(et_forget_phone.text.toString(), "请填入正确的手机号") -> ""
                 et_forget_code.text.isNullOrEmpty() -> ToastUtil.s("请填入验证码")
                 et_forget_password.text.length < 6 || et_forget_password.text.length > 24 -> ToastUtil.s(
-                    "请输入6-24位密码"
+                    "请输入6-15位密码"
                 )
                 else -> presenter?.forgetPassword(
                     et_forget_phone.text.toString(),

app/src/main/java/com/hupu/tv/player/app/ui/activity/LiveActivity.kt

@@ -184,8 +184,8 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
         player.setFireText(fire)
         player.setOnBusinessListener(object : DanmakuVideoPlayer.OnBusinessListener {
             override fun onReload() {
-                player.setUpLazy(url, false, null, null, title)
-                player.startPlayLogic()
+                player.currentPlayer.setUpLazy(url, false, null, null, title)
+                player.currentPlayer.startPlayLogic()
             }
 
             override fun back() {
@@ -225,7 +225,7 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
         EMClient.getInstance().login(userName, "123456", object : EMCallBack {
             override fun onSuccess() {
                 runOnUiThread {
-                    addMessage("环信登陆成功")
+                    addMessage("环信登录成功")
                     initTabLayout()
                 }
             }
@@ -238,7 +238,7 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
                     if (code == 200) {
                         initTabLayout()
                     } else {
-                        addMessage("环信登陆失败:code : $code error : $error")
+                        addMessage("环信登录失败:code : $code error : $error")
                         if (code == 204) {
                             CommonUtils.copy(userName)
                             addMessage("用户id已经复制到剪切板，请粘贴发送于我，后台注册用户")
@@ -405,6 +405,8 @@ class LiveActivity : RefreshActivity<LiveActivityPresenter>(), LiveActivityConta
 
         if (bean?.roomStatus == 0) {
             iv_live_empty.visibility = View.VISIBLE
+            iv_back.visibility = View.VISIBLE
+            iv_back.setOnClickListener { finish() }
         } else {
             iv_live_empty.visibility = View.GONE
             initPlayer(bean?.hotNum.toString(), bean?.roomName ?: "", bean?.liveUrl ?: "")

app/src/main/java/com/hupu/tv/player/app/ui/activity/MainActivity.kt

@@ -128,8 +128,14 @@ class MainActivity : RefreshActivity<IBasePresenter>(), IBaseDisplay {
 
     fun toMineFragment() {
         if (UserHelper.isLogin()) {
+            if (VersionControl.showRedList()){
                 mTabLayout.currentTab = 4
                 mViewPager.currentItem = 4
+            }else{
+                mTabLayout.currentTab = 3
+                mViewPager.currentItem = 3
+            }
+
 
         } else {
             DialogUtils.showLogin(this)

app/src/main/java/com/hupu/tv/player/app/ui/activity/NewsDetailActivity.kt

@@ -18,9 +18,9 @@ import com.hupu.tv.player.app.bean.AssociateArticle
 import com.hupu.tv.player.app.bean.NewDetailEntity
 import com.hupu.tv.player.app.bean.NewsListTag
 import com.hupu.tv.player.app.bean.ShareBean
+import com.hupu.tv.player.app.event.RefreshPageEvent
 import com.hupu.tv.player.app.ui.adapter.NewsDetailListAdapter
 import com.hupu.tv.player.app.ui.adapter.NewsLabelAdapter
-import com.hupu.tv.player.app.ui.adapter.NewsListAdapter
 import com.hupu.tv.player.app.ui.contact.NewsDetailContact
 import com.hupu.tv.player.app.ui.presenter.NewsDetailPresenter
 import com.hupu.tv.player.app.utils.CommonUtils
@@ -35,6 +35,7 @@ import kotlinx.android.synthetic.main.layout_title.*
 import kotlinx.android.synthetic.main.layout_title.iv_left_icon
 import kotlinx.android.synthetic.main.layout_title.tv_title_middle
 import kotlinx.android.synthetic.main.layout_title_live.*
+import org.greenrobot.eventbus.EventBus
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
@@ -42,7 +43,8 @@ import java.util.regex.Pattern
 class NewsDetailActivity : RefreshActivity<NewsDetailPresenter>(), NewsDetailContact.Display {
     private var id = ""
     private var isOnPause = false
-    private var click = false
+    private var isLike = false
+
     private lateinit var moreAdapter: NewsDetailListAdapter
     private lateinit var newsLabelAdapter: NewsLabelAdapter
     override fun setToolbar(builder: BaseToolbar.Builder): BaseToolbar.Builder? {
@@ -97,7 +99,7 @@ class NewsDetailActivity : RefreshActivity<NewsDetailPresenter>(), NewsDetailCon
         }
         iv_right_icon.visibility = View.VISIBLE
         iv_right_icon.setImageResource(R.mipmap.icon_title_share)
-        iv_right_icon.onSingleClick{
+        iv_right_icon.onSingleClick {
             val shareBean = SPUtil.getSerializableObject<ShareBean>(Constants.COMMON_SHARE_BEAN)
             val shareIntent = Intent()
             shareIntent.action = Intent.ACTION_SEND;
@@ -124,7 +126,7 @@ class NewsDetailActivity : RefreshActivity<NewsDetailPresenter>(), NewsDetailCon
             ll_click_like.postDelayed({
                 ll_click_like.isClickable = true
             }, 3000)
-            presenter?.clickLike(id, click)
+            presenter?.clickLike(id, isLike)
         }
 
     }
@@ -357,22 +359,29 @@ class NewsDetailActivity : RefreshActivity<NewsDetailPresenter>(), NewsDetailCon
             }
         }
         setBaseInfo(entity)
-        tv_like_count.text = entity?.likeCount.toString()
+
         moreAdapter.setNewData(entity?.associateArticle)
 
     }
 
     private fun setBaseInfo(entity: NewDetailEntity?) {
-        tv_title.text = entity?.title
-        GlideUtils.loadAvatar(this, entity?.authorAvatar, iv_avatar)
-        tv_name.text = entity?.authorName
-        tv_time.text = entity?.releaseTime
-
+        entity?.let {
+            tv_title.text = it.title
+            GlideUtils.loadAvatar(this, it.authorAvatar, iv_avatar)
+            tv_name.text = it.authorName
+            tv_time.text = it.releaseTime
+            tv_like_count.text = it.likeCount.toString()
+            isLike = it.liked
+            iv_like_count.setImageResource(if (it.liked) R.mipmap.icon_detail_like_selected else R.mipmap.icon_news_like)
+        }
     }
 
     override fun onClickSuccess(click: Boolean) {
-        this.click = click
-        if (click) {
+        //网络错误，返回的结果是相同的
+//        EventBus.getDefault().post(RefreshPageEvent())
+
+        this.isLike = click
+        if (isLike) {
             iv_like_count.setImageResource(R.mipmap.icon_detail_like_selected)
             ToastUtil.s("点赞成功")
             val text = tv_like_count.text.toString().toInt()

app/src/main/java/com/hupu/tv/player/app/ui/activity/NickNameActivity.kt

@@ -45,7 +45,7 @@ class NickNameActivity : RefreshActivity<NickNameActivityPresenter>(), NickNameA
         CommonUtils.umengLogin()
         WaitDialog.dismiss()
         hideProgressDialog()
-        ToastUtil.s("登陆成功")
+        ToastUtil.s("登录成功")
         startActivity(MainActivity::class.java)
         finish()
     }

app/src/main/java/com/hupu/tv/player/app/ui/activity/RegisterActivity.kt

@@ -137,7 +137,7 @@ class RegisterActivity : RefreshActivity<RegisterActivityPresenter>(),
                 }
                 et_register_code.text.isNullOrEmpty() -> ToastUtil.s("请输入验证码")
                 et_register_password.text.length < 6 || et_register_password.text.length > 24 -> ToastUtil.s(
-                    "请输入6-24位密码"
+                    "请输入6-15位密码"
                 )
                 et_nick_name.text.isNullOrEmpty() -> ToastUtil.s("请输入昵称")
                 !cb_agree.isChecked -> ToastUtil.s("请阅读并同意《用户协议》和《隐私协议》")

app/src/main/java/com/hupu/tv/player/app/ui/activity/SettingPasswordActivity.kt

@@ -81,6 +81,9 @@ class SettingPasswordActivity : RefreshActivity<SettingPasswordActivityPresenter
                 et_setting_password_confirm.transformationMethod = BiggerDotPasswordTransformationMethod()
             }
         }
+        iv_back.setOnClickListener {
+            onBackPressed()
+        }
 
         iv_setting.onSingleClick {
             when {

app/src/main/java/com/hupu/tv/player/app/ui/activity/SpecialistDetailActivity.kt

@@ -173,11 +173,17 @@ class SpecialistDetailActivity : RefreshActivity<SpecialistDetailPresenter>(),
     override fun onFocus() {
         ToastUtil.s("关注成功")
         isFollow = true
+        val text = tv_follow_num.text.toString().toInt()
+        val successText = text + 1
+        tv_follow_num.text = successText.toString()
         setFollow()
     }
 
     override fun onCancelFocus() {
         ToastUtil.s("取消关注成功")
+        val text = tv_follow_num.text.toString().toInt()
+        val successText = text - 1
+        tv_follow_num.text = successText.toString()
         isFollow = false
         setFollow()
     }

app/src/main/java/com/hupu/tv/player/app/ui/activity/SplashActivity.kt

 package com.hupu.tv.player.app.ui.activity
 
 
-import android.Manifest
 import android.content.Context
 import android.content.Intent
 import android.util.Log
 import android.view.View
-import android.widget.FrameLayout
 import android.widget.TextView
-import com.blankj.utilcode.util.PermissionUtils
-import com.google.gson.JsonParseException
 import com.hupu.tv.player.app.BuildConfig
 import com.kongzue.dialog.util.BaseDialog
 import com.kongzue.dialog.v3.CustomDialog
 import com.mirkowu.basetoolbar.BaseToolbar
 
 
-import com.softgarden.baselibrary.network.ApiException
-import com.softgarden.baselibrary.utils.RxPermissionsUtil
 import com.softgarden.baselibrary.utils.SPUtil
-import com.softgarden.baselibrary.utils.ToastUtil
 import com.hupu.tv.player.app.R
 import com.hupu.tv.player.app.app.App
 import com.hupu.tv.player.app.app.Constants
@@ -29,11 +22,7 @@ import com.hupu.tv.player.app.ui.presenter.SplashActivityPresenter
 import com.hupu.tv.player.app.utils.*
 import com.mirkowu.statusbarutil.StatusBarUtil
 import com.softgarden.baselibrary.base.BaseActivity
-import com.softgarden.baselibrary.utils.DisplayUtil
 import kotlinx.android.synthetic.main.activity_splash.*
-import java.net.ConnectException
-import java.net.SocketTimeoutException
-import java.net.UnknownHostException
 
 
 class SplashActivity : RefreshActivity<SplashActivityPresenter>(), SplashActivityContact.Display {
@@ -63,7 +52,7 @@ class SplashActivity : RefreshActivity<SplashActivityPresenter>(), SplashActivit
         StatusBar.transportStatus(this@SplashActivity)
         addMessage("存储DeviceId=${DeviceUtils.getDeviceId(this@SplashActivity)}")
         addMessage("请求avatar")
-        presenter?.getAvatarUrl()
+        presenter?.getMainBanner()
     }
 
     override fun initialize() {

app/src/main/java/com/hupu/tv/player/app/ui/activity/SubscribeActivity.kt

@@ -15,6 +15,7 @@ import com.hupu.tv.player.app.ui.adapter.FollowMatchContentAdapter
 import com.hupu.tv.player.app.ui.contact.FollowMatchContract
 import com.hupu.tv.player.app.ui.presenter.FollowMatchPresenter
 import com.hupu.tv.player.app.utils.EmptyConfig
+import com.softgarden.baselibrary.utils.RecyclerViewUtil
 import com.softgarden.baselibrary.utils.ToastUtil
 import kotlinx.android.synthetic.main.activity_report.*
 import kotlinx.android.synthetic.main.layout_title_live.*
@@ -60,6 +61,7 @@ class SubscribeActivity : RefreshActivity<FollowMatchPresenter>(), FollowMatchCo
         mRecyclerView?.apply {
             adapter = contentAdapter
             layoutManager = LinearLayoutManager(activity)
+            RecyclerViewUtil.addItemDecoration(this@SubscribeActivity, this, R.color.transparent, Constants.item_divider_4 * 2)
         }
     }
 

app/src/main/java/com/hupu/tv/player/app/ui/adapter/FollowMatchContentAdapter.kt

@@ -25,7 +25,11 @@ class FollowMatchContentAdapter :
         helper: BaseViewHolder,
         item: MatchInfoEntity
     ) {
-        helper.getView<ImageView>(R.id.iv_subscribe).apply {
+        helper
+            .setGone(R.id.iv_guest_1, false)
+            .setGone(R.id.iv_guest_2, false)
+            .setGone(R.id.iv_guest_3, false)
+            .getView<ImageView>(R.id.iv_subscribe).apply {
                 setImageResource(
                     if (item.subscribe == true) {
                         R.mipmap.match_subscribe
@@ -39,12 +43,15 @@ class FollowMatchContentAdapter :
                             SubscribeEvent(
                                 item.id,
                                 !(item.subscribe ?: false),
-                            Constants.SUBSCRIBE_FOLLOW,helper.layoutPosition
+                                Constants.SUBSCRIBE_FOLLOW, helper.layoutPosition
                             )
                         )
                 }
             }
 
+        val homeTeam = item.homeTeam
+        val awayTeam = item.awayTeam
+
         var half = item.halftimeScore?.trim()?.split(":")
         var cornerKick = item.cornerKick?.split(":")
         if (half?.size == 0) {
@@ -64,7 +71,7 @@ class FollowMatchContentAdapter :
             Log.e("matchInfo", "cornerKick 1 ${cornerKick}")
             cornerKick = listOf(if (cornerKick[0].isEmpty()) "0" else cornerKick[0], "0")
         }
-        helper.setText(R.id.tv_time, "${item.matchDate} ${item.matchTime}")
+        helper.setText(R.id.tv_time, item.matchTime)
             .setText(
                 R.id.tv_info,
                 "半：${half?.get(0)?.trim() ?: 0}-${
@@ -75,18 +82,80 @@ class FollowMatchContentAdapter :
             )
             .getView<TextView>(R.id.tv_name).apply {
                 text = item.matchShortName
-                if (!item.sportsColor.isNullOrEmpty()) {
-                    setBackgroundColor(Color.parseColor(item.sportsColor))
+//                if (!item.sportsColor.isNullOrEmpty()) {
+//                    CommonUtils.drawableTint(R.mipmap.bg_match_color, item.sportsColor, this)
+////                    setBackgroundColor(Color.parseColor(item.sportsColor))
+//                }
+            }
+
+        when (item.status) {
+            Constants.MATCH_TITLE_SCHEDULE_ID -> {
+                helper
+                    .setGone(R.id.tv_home_score, false)
+                    .setGone(R.id.tv_away_score, false)
+                    .setText(R.id.tv_status_name, "未开")
+                    .getView<TextView>(R.id.tv_status).apply {
+                        text = " VS "
+                        setTextColor(mContext.getColor(R.color.color_758199))
+                    }
+
+            }
+            Constants.MATCH_TITLE_START_ID -> {
+
+
+                helper
+                    .setGone(R.id.tv_home_score, true)
+                    .setGone(R.id.tv_away_score, true)
+                    .setText(R.id.tv_status_name, "已开")
+                    .setText(R.id.tv_home_score, (homeTeam?.score ?: 0).toString())
+                    .setText(R.id.tv_away_score, (awayTeam?.score ?: 0).toString())
+                    .apply {
+                        getView<TextView>(R.id.tv_status).apply {
+                            text = " - "
+                            setTextColor(mContext.getColor(R.color.color_FC7436))
+                        }
+                        if (item.guides.isNullOrEmpty()) {
+                            setGone(R.id.iv_no_guest, true)
+                        } else {
+                            when (item.guides.size) {
+                                1 -> {
+                                    setGone(R.id.iv_guest_1, true)
+                                    GlideUtils.loadAvatar(itemView, item.guides[0].avatar, getView(R.id.iv_guest_1))
+                                }
+                                2 -> {
+                                    setGone(R.id.iv_guest_1, true)
+                                    setGone(R.id.iv_guest_2, true)
+                                    GlideUtils.loadAvatar(itemView, item.guides[0].avatar, getView(R.id.iv_guest_1))
+                                    GlideUtils.loadAvatar(itemView, item.guides[1].avatar, getView(R.id.iv_guest_2))
+                                }
+                                3 -> {
+                                    setGone(R.id.iv_guest_1, true)
+                                    setGone(R.id.iv_guest_2, true)
+                                    setGone(R.id.iv_guest_3, true)
+                                    GlideUtils.loadAvatar(itemView, item.guides[0].avatar, getView(R.id.iv_guest_1))
+                                    GlideUtils.loadAvatar(itemView, item.guides[1].avatar, getView(R.id.iv_guest_2))
+                                    GlideUtils.loadAvatar(itemView, item.guides[2].avatar, getView(R.id.iv_guest_3))
+                                }
+                            }
+                            setGone(R.id.iv_no_guest, false)
+                        }
+                    }
+
+
+            }
+            Constants.MATCH_TITLE_RESULT_ID -> {
+                helper
+                    .setGone(R.id.tv_home_score, true)
+                    .setGone(R.id.tv_away_score, true)
+                    .setText(R.id.tv_status_name, "完场")
+                    .setText(R.id.tv_home_score, (homeTeam?.score ?: 0).toString())
+                    .setText(R.id.tv_away_score, (awayTeam?.score ?: 0).toString())
+                    .getView<TextView>(R.id.tv_status).apply {
+                        text = " - "
+                        setTextColor(mContext.getColor(R.color.color_FC7436))
                     }
             }
-        helper.getView<TextView>(R.id.tv_status).text = when (item.status) {
-            Constants.MATCH_TITLE_SCHEDULE_ID -> "未"
-            Constants.MATCH_TITLE_START_ID -> (item.startedTime ?: 0).toString()
-            Constants.MATCH_TITLE_RESULT_ID -> "完"
-            else -> "未"
         }
-        val homeTeam = item.homeTeam
-        val awayTeam = item.awayTeam
         helper.setText(R.id.tv_home, homeTeam?.teamName).setText(R.id.tv_away, awayTeam?.teamName)
         GlideUtils.loadImage(
             helper.itemView,
@@ -100,8 +169,6 @@ class FollowMatchContentAdapter :
             helper.getView(R.id.iv_away),
             R.mipmap.place_holder_team_logo_small
         )
-        helper.setText(R.id.tv_home_score, (homeTeam?.score ?: 0).toString())
-            .setText(R.id.tv_away_score, (awayTeam?.score ?: 0).toString())
 
     }
 }
\ No newline at end of file

app/src/main/java/com/hupu/tv/player/app/ui/adapter/NewMatchContentAdapter.kt

@@ -27,8 +27,8 @@ class NewMatchContentAdapter(private val parentPosition: Int = 0) :
     ) {
         helper
             .setGone(R.id.iv_guest_1, false)
-            .setGone(R.id.iv_guest_1, false)
-            .setGone(R.id.iv_guest_1, false)
+            .setGone(R.id.iv_guest_2, false)
+            .setGone(R.id.iv_guest_3, false)
             .getView<ImageView>(R.id.iv_subscribe).apply {
                 setImageResource(
                     if (item.subscribe == true) {

app/src/main/java/com/hupu/tv/player/app/ui/contact/SplashActivityContact.kt

@@ -16,7 +16,7 @@ interface SplashActivityContact {
     interface Presenter{
         fun startNext()
         fun setTextView(tvMessage:TextView)
-        fun getAvatarUrl()
+        fun getMainBanner()
         fun getBannerList()
         fun addDownNum()
 

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MainContentAllFragment.kt

@@ -31,6 +31,7 @@ import com.hupu.tv.player.app.ui.adapter.LiveItemAdapter
 import com.hupu.tv.player.app.ui.adapter.LiveTopAdapter
 import com.hupu.tv.player.app.ui.contact.MainContentAllContract
 import com.hupu.tv.player.app.ui.presenter.MainContentAllPresenter
+import com.hupu.tv.player.app.utils.CommonUtils
 import com.hupu.tv.player.app.utils.DialogUtils
 import com.hupu.tv.player.app.widget.ImageCarousel
 import com.softgarden.baselibrary.utils.SPUtil
@@ -137,6 +138,9 @@ class MainContentAllFragment : RefreshFragment<MainContentAllPresenter>(),
             .setRevealWidth(30, 30)
             .setOnPageClickListener { clickedView: View?, position: Int ->
                 //点击事件
+                if (!list?.get(position)?.adUrl.isNullOrEmpty()){
+                    startActivity(CommonUtils.toWeb(list?.get(position)?.adUrl))
+                }
             }
             .setAdapter(HomeBannerAdapter()).create(list)
     }

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MainFragment.kt

@@ -111,8 +111,8 @@ class MainFragment : RefreshFragment<MainFragmentPresenter>(), MainFragmentConta
 //        SPUtil.put(Constants.SHOW_LIVE_CONFIG, true)
     }
 
-    override fun showError(throwable: Throwable) {
-        super.showError(throwable)
+    override fun showError(throwable: Throwable,isConfigStatus:Boolean) {
+        super.showError(throwable,isConfigStatus)
         mStatusLayoutManager.showErrorLayout()
     }
 

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MainNewsContentAllFragment.kt

@@ -15,6 +15,7 @@ import com.hupu.tv.player.app.app.Constants
 import com.hupu.tv.player.app.base.RefreshVP2Fragment
 import com.hupu.tv.player.app.base.ToolbarFragment
 import com.hupu.tv.player.app.bean.*
+import com.hupu.tv.player.app.event.RefreshNewsEvent
 import com.hupu.tv.player.app.event.VisibleEvent
 import com.hupu.tv.player.app.ui.activity.NewsDetailActivity
 import com.hupu.tv.player.app.ui.adapter.HomeBannerAdapter
@@ -62,6 +63,11 @@ class MainNewsContentAllFragment : RefreshVP2Fragment<MainNewsContentAllPresente
 
     }
 
+//    @Subscribe(threadMode = ThreadMode.MAIN)
+//    fun onRefreshNews(event:RefreshNewsEvent){
+//        onRefresh()
+//    }
+
     private fun initAdapter() {
         newsAdapter = NewsListAdapter()
         mRecyclerView?.layoutManager = LinearLayoutManager(requireContext())
@@ -95,8 +101,11 @@ class MainNewsContentAllFragment : RefreshVP2Fragment<MainNewsContentAllPresente
             .setRevealWidth(30, 30)
             .setOnPageClickListener { clickedView: View?, position: Int ->
                 //点击事件
+                if (!list?.get(position)?.adUrl.isNullOrEmpty()){
                     startActivity(CommonUtils.toWeb(list?.get(position)?.adUrl))
                 }
+
+            }
             .setAdapter(HomeBannerAdapter(true)).create(list)
     }
     override fun lazyLoad() {

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MainNewsContentNormalFragment.kt

@@ -73,8 +73,8 @@ class MainNewsContentNormalFragment : RefreshVP2Fragment<MainNewsContentNormalPr
         }
     }
 
-    override fun showError(throwable: Throwable) {
-        super.showError(throwable)
+    override fun showError(throwable: Throwable,isConfigStatus:Boolean) {
+        super.showError(throwable,isConfigStatus)
         mStatusLayoutManager.showErrorLayout()
     }
 

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MainNewsFragment.kt

@@ -67,8 +67,8 @@ class MainNewsFragment : RefreshFragment<MainNewsFragmentPresenter>(), MainNewsF
         tabLayout_main.setViewPager2(vp_main)
     }
 
-    override fun showError(throwable: Throwable) {
-        super.showError(throwable)
+    override fun showError(throwable: Throwable,isConfigStatus:Boolean) {
+        super.showError(throwable,isConfigStatus)
         mStatusLayoutManager.showErrorLayout()
     }
 

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MainPagerFragment.kt

@@ -463,8 +463,8 @@ class MainPagerFragment : RefreshFragment<MainPagerFragmentPresenter>(), MainPag
         }
     }
 
-    override fun showError(throwable: Throwable) {
-        super.showError(throwable)
+    override fun showError(throwable: Throwable,isConfigStatus:Boolean) {
+        super.showError(throwable,isConfigStatus)
         if (!isNeedLoadData) {
             return
         }

app/src/main/java/com/hupu/tv/player/app/ui/fragment/MatchContentFragment.kt

@@ -186,8 +186,8 @@ class MatchContentFragment : RefreshVP2Fragment<MatchContentPresenter>(),
 
     }
 
-    override fun showError(throwable: Throwable) {
-        super.showError(throwable)
+    override fun showError(throwable: Throwable,isConfigStatus:Boolean) {
+        super.showError(throwable,isConfigStatus)
         mStatusLayoutManager.showErrorLayout()
     }
 

app/src/main/java/com/hupu/tv/player/app/ui/presenter/LoginActivityPresenter.kt

@@ -67,7 +67,7 @@ class LoginActivityPresenter : IBasePresenter, LoginActivityContact.Present {
 //                        else {
 //                            DialogUtils.showReContact(mView as AppCompatActivity, object : DialogUtils.OnClickSingleListener {
 //                                override fun onClick() {
-//                                    mTvMessage?.text = mTvMessage?.text.toString() + "\n" + "重新登陆"
+//                                    mTvMessage?.text = mTvMessage?.text.toString() + "\n" + "重新登录"
 //                                    login(phone,nickName,smsCode,userAvatar)
 //                                }
 //                            })

app/src/main/java/com/hupu/tv/player/app/ui/presenter/NewsDetailPresenter.kt

 package com.hupu.tv.player.app.ui.presenter
 
 
+import com.hupu.tv.player.app.R
 import com.softgarden.baselibrary.base.IBaseDisplay
 import com.softgarden.baselibrary.base.IBasePresenter
 import com.softgarden.baselibrary.network.NetworkTransformer
@@ -12,6 +13,7 @@ import com.hupu.tv.player.app.bean.NewDetailEntity
 
 import com.hupu.tv.player.app.ui.contact.NewsDetailContact
 import com.hupu.tv.player.app.utils.JsonUtils
+import com.softgarden.baselibrary.network.RxJava3NullException
 
 
 /**
@@ -48,7 +50,7 @@ class NewsDetailPresenter : IBasePresenter, NewsDetailContact.Presenter {
         hashMap["id"] = id
         RetrofitClient.retrofitService
                 .clickNews(JsonUtils.toRequestBody(hashMap))
-                .compose(NetworkTransformer(mView))
+                .compose(NetworkTransformer(mView,isConfigStatus = false))
                 .subscribe(object : RxCallback<String>() {
                     override fun onSuccess(data: String?) {
                         mView?.onClickSuccess(!click)

app/src/main/java/com/hupu/tv/player/app/ui/presenter/SplashActivityPresenter.kt

@@ -41,20 +41,7 @@ class SplashActivityPresenter : IBasePresenter, SplashActivityContact.Presenter
         mTvMessage = tvMessage
     }
 
-    override fun getAvatarUrl() {
-        RetrofitClient.retrofitService
-            .getAvatarUrl()
-            .compose(NetworkTransformer(mView, false))
-            .subscribe(object : RxCallback<String>() {
-                override fun onSuccess(data: String?) {
-                    SPUtil.put(Constants.AVATAR_URL, data)
-                    mTvMessage?.text = mTvMessage?.text.toString() + "\n" + "请求头像成功：$data"
-                    getMainBanner()
-                }
-            })
-    }
-
-    private fun getMainBanner() {
+    override fun getMainBanner() {
         RetrofitClient.retrofitService
             .getBannerList(JsonUtils.toRequestBody(hashMapOf<String, Any>().apply {
                 put("adType", 8)
@@ -69,6 +56,8 @@ class SplashActivityPresenter : IBasePresenter, SplashActivityContact.Presenter
             })
     }
 
+
+
     private fun getConfig() {
         RetrofitClient.retrofitService
             .getLiveConfig()

app/src/main/java/com/hupu/tv/player/app/widget/danmuku/DanmakuVideoPlayer.kt

@@ -230,6 +230,7 @@ class DanmakuVideoPlayer : StandardGSYVideoPlayer {
         if (gsyBaseVideoPlayer != null) {
             val gsyVideoPlayer = gsyBaseVideoPlayer as DanmakuVideoPlayer
             gsyVideoPlayer.danmaKuShow = danmaKuShow
+            gsyVideoPlayer.onBusinessListener = onBusinessListener
 //            onPrepareDanmaku(gsyVideoPlayer)
         }
         return gsyBaseVideoPlayer

app/src/main/res/color/selector_label.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:state_selected="true" android:color="@color/color_FC7436"/>
-    <item android:state_selected="false" android:color="@color/white"/>
-    <item android:color="@color/white"/>
+    <item android:state_selected="false" android:color="@color/color_333333"/>
+    <item android:color="@color/color_333333"/>
 </selector>
\ No newline at end of file

app/src/main/res/color/selector_red_detail_background_color.xml → app/src/main/res/drawable/selector_red_detail_background_color.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="@color/transparent"/>
-    <item android:state_selected="false" android:color="@color/transparent"/>
-    <item android:color="@color/transparent"/>
+    <item android:state_selected="true" android:drawable="@color/transparent"/>
+    <item android:state_selected="false" android:drawable="@color/transparent"/>
+    <item android:drawable="@color/transparent"/>
 </selector>
\ No newline at end of file

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

@@ -22,7 +22,7 @@
         android:layout_marginTop="@dimen/dp_15"
         android:layout_below="@id/iv_about"
         android:layout_centerHorizontal="true"
-        android:textSize="23sp"
+        android:textSize="23dp"
         android:textColor="@color/black"
         android:textStyle="bold"
         android:text="球聚体育"
@@ -36,7 +36,7 @@
         android:layout_centerHorizontal="true"
         android:layout_below="@id/tv_name"
         android:textColor="@color/text_normal3"
-        android:textSize="@dimen/sp_17"
+        android:textSize="@dimen/dp_17"
         android:id="@+id/tv_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>

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

@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
         <TextView
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:textColor="@color/color_8B94A7"
             android:layout_marginTop="@dimen/dp_21"
             android:text="为了账户安全，我们需要验证身份"
@@ -38,13 +38,13 @@
             <TextView
                 android:text="中国"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:layout_marginStart="@dimen/dp_10"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
             <TextView
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
 
                 android:layout_marginStart="@dimen/dp_20"
                 tools:text="155 ****** 36"
@@ -69,7 +69,7 @@
                 android:layout_weight="1"
                 android:background="@null"
                 android:hint="请输入验证码"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textColor="@color/color_333333"
                 android:textColorHint="@color/color_758199"
                 android:layout_width="0dp"
@@ -81,7 +81,7 @@
                 android:id="@+id/tv_get_code"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textColor="@color/white"
                 android:text="获取验证码"
                 android:layout_width="@dimen/dp_84"
@@ -99,7 +99,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:background="@mipmap/bg_common_button"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             android:textColor="@color/white"
             android:layout_marginTop="@dimen/dp_56"
             android:text="下一步"

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

@@ -22,7 +22,7 @@
         android:layout_marginTop="@dimen/dp_21"
         android:text="输入并验证新号码，完成绑定"
         android:textColor="@color/color_8B94A7"
-        android:textSize="@dimen/sp_13" />
+        android:textSize="@dimen/dp_13" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -37,7 +37,7 @@
             android:layout_height="wrap_content"
             android:text="+86"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
         <EditText
             android:id="@+id/et_new_phone"
@@ -50,7 +50,7 @@
             android:inputType="number"
             android:textColor="@color/color_333333"
             android:textColorHint="@color/color_8B94A7"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
     </LinearLayout>
 
 
@@ -79,7 +79,7 @@
             android:inputType="number"
             android:textColor="@color/color_333333"
             android:textColorHint="@color/color_758199"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
         <com.hupu.tv.player.app.widget.TimerTextView
             android:id="@+id/tv_get_code"
@@ -90,7 +90,7 @@
             android:gravity="center"
             android:text="获取验证码"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_13" />
+            android:textSize="@dimen/dp_13" />
     </LinearLayout>
 
     <View
@@ -111,7 +111,7 @@
         android:gravity="center"
         android:text="确定"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_15" />
+        android:textSize="@dimen/dp_15" />
 
 
 </LinearLayout>
\ No newline at end of file

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

@@ -31,7 +31,7 @@
                 android:layout_weight="1"
                 android:text="更改绑定手机号码"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:drawablePadding="@dimen/dp_15"
                 app:drawableStartCompat="@mipmap/icon_user_phone" />
 
@@ -65,7 +65,7 @@
                 android:layout_weight="1"
                 android:text="设置密码"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
 
 
             <ImageView
@@ -97,7 +97,7 @@
                 android:layout_weight="1"
                 android:text="修改密码"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
 
 
             <ImageView
@@ -129,7 +129,7 @@
                 android:layout_weight="1"
                 android:text="忘记密码"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
 
 
             <ImageView

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

@@ -18,7 +18,7 @@
         android:layout_marginEnd="@dimen/dp_17"
         android:text="输入您的手机号码"
         android:textColor="@color/normal_text_3"
-        android:textSize="@dimen/sp_15" />
+        android:textSize="@dimen/dp_15" />
 
     <LinearLayout
         android:gravity="center"
@@ -37,13 +37,13 @@
             android:layout_height="wrap_content"
             android:text="+86"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
         <View
             android:layout_marginStart="@dimen/dp_13"
             android:background="@color/black"
             android:layout_width="1px"
-            android:layout_height="@dimen/sp_18"/>
+            android:layout_height="@dimen/dp_18"/>
 
         <EditText
             android:id="@+id/et_phone_number"
@@ -55,7 +55,7 @@
             android:hint="请输入手机号"
             android:textColor="@color/black"
             android:textColorHint="@color/normal_hint"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
     </LinearLayout>
 
@@ -79,7 +79,7 @@
             android:hint="请输入验证码"
             android:textColor="@color/white"
             android:textColorHint="@color/white_40"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
         <TextView
             android:id="@+id/tv_code"
@@ -87,7 +87,7 @@
             android:layout_height="wrap_content"
             android:text="获取验证码"
             android:textColor="@color/text_red"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
     </LinearLayout>
 
     <LinearLayout
@@ -111,7 +111,7 @@
             android:gravity="start"
             android:text="绑定手机号可获取更多免费播放次数"
             android:textColor="@color/text_red"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:visibility="visible" />
 
     </LinearLayout>

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

@@ -37,7 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 tools:text="小乔山之" />
 
             <TextView
@@ -46,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_7"
                 android:textColor="@color/text_normal_4"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/dp_11"
                 tools:text="简单的介绍简介：我是一个热爱表演的演员，" />
         </LinearLayout>
     </LinearLayout>

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

@@ -30,7 +30,7 @@
             android:layout_gravity="center"
             android:text="收藏的视频"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
     </LinearLayout>
 
@@ -60,7 +60,7 @@
             android:id="@+id/tv_select_all"
             android:gravity="center"
             android:text="全选"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/dp_16"
             android:textColor="@color/white"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -72,7 +72,7 @@
         <TextView
             android:id="@+id/tv_delete"
             android:textColor="@color/red"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/dp_16"
             android:gravity="center"
             android:text="删除"
             android:layout_width="wrap_content"

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

@@ -30,7 +30,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:background="@drawable/shape_get_code"
-            android:textSize="15sp"
+            android:textSize="15dp"
             android:layout_marginStart="@dimen/dp_15"
             android:layout_marginEnd="@dimen/dp_15"
             android:textColor="@color/white"

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

@@ -16,20 +16,23 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/dp_29"
-        android:paddingEnd="@dimen/dp_29">
+      >
 
         <ImageView
+            android:layout_marginStart="@dimen/dp_14"
+            android:padding="@dimen/dp_15"
             android:id="@+id/iv_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:layout_marginTop="@dimen/dp_25"
-            android:src="@mipmap/icon_login_back" />
+            android:src="@mipmap/icon_live_back_black" />
 
 
         <LinearLayout
+            android:paddingStart="@dimen/dp_29"
+            android:paddingEnd="@dimen/dp_29"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/iv_back"
@@ -39,16 +42,16 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="41dp"
+                android:layout_marginTop="@dimen/dp_25"
                 android:orientation="horizontal">
 
                 <TextView
                     android:textStyle="bold"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="忘记密码"
+                    android:text="修改密码"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_23" />
+                    android:textSize="@dimen/dp_23" />
             </LinearLayout>
 
 
@@ -70,7 +73,7 @@
                     android:layout_marginStart="@dimen/dp_10"
                     android:text="中国"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <View
                     android:layout_width="1dp"
@@ -89,7 +92,7 @@
                     android:inputType="phone"
                     android:textColor="@color/color_333333"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
             <View
@@ -117,7 +120,7 @@
                     android:hint="请输入验证码"
                     android:inputType="number"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <com.hupu.tv.player.app.widget.TimerTextView
                     android:id="@+id/tv_get_code"
@@ -131,7 +134,7 @@
                     android:paddingEnd="8dp"
                     android:text="获取验证码"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10" />
+                    android:textSize="@dimen/dp_10" />
             </LinearLayout>
             <View
                 android:layout_width="match_parent"
@@ -156,7 +159,7 @@
                     android:hint="输入6-24位登录密码"
                     android:inputType="textPassword"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <ImageView
                     android:id="@+id/iv_show_password"
@@ -189,7 +192,7 @@
                     android:hint="再次输入6-24位登录密码"
                     android:inputType="textPassword"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <ImageView
                     android:id="@+id/iv_show_password_confirm"
@@ -210,7 +213,7 @@
             <TextView
                 android:gravity="center"
                 android:text="提交"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:textColor="@color/white"
                 android:id="@+id/iv_edit_password"
                 android:layout_width="match_parent"

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

@@ -18,11 +18,11 @@
         android:layout_marginEnd="@dimen/dp_18"
         android:text="输入兑换码"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_15" />
+        android:textSize="@dimen/dp_15" />
 
     <EditText
         android:paddingStart="@dimen/dp_20"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/dp_14"
         android:textColor="@color/white"
         android:hint="输入兑换码，请注意大小写"
         android:textColorHint="@color/whiteAlpha30"
@@ -51,7 +51,7 @@
         android:layout_marginStart="@dimen/dp_18"
         android:layout_marginEnd="@dimen/dp_18"
         android:textColor="@color/white_60"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:text="兑换码有时效性，3天的兑换码，只能在这3天内兑换有效，且产
 生的权益只能在这三天内，时间一过，兑换码权益将会消失" />
 

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

@@ -18,7 +18,7 @@
         android:layout_marginEnd="@dimen/dp_18"
         android:text="推广兑换"
         android:textColor="@color/normal_text_3"
-        android:textSize="@dimen/sp_16" />
+        android:textSize="@dimen/dp_16" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -45,7 +45,7 @@
                 android:layout_weight="1"
                 android:text="我的推广人数"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <TextView
                 android:id="@+id/tv_nums"
@@ -54,7 +54,7 @@
                 android:layout_marginTop="@dimen/dp_5"
                 android:text="0人"
                 android:textColor="@color/text_red"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
         </LinearLayout>
 
         <TextView
@@ -72,7 +72,7 @@
         android:layout_marginEnd="@dimen/dp_18"
         android:text="推广5人可兑换VIP体验1个月，推广10人可兑换VIP体验3个月"
         android:textColor="@color/share_content"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/dp_12" />
 
     <TextView
         android:layout_width="wrap_content"
@@ -82,7 +82,7 @@
         android:layout_marginEnd="@dimen/dp_18"
         android:text="输入兑换码"
         android:textColor="@color/normal_text_3"
-        android:textSize="@dimen/sp_15" />
+        android:textSize="@dimen/dp_15" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -108,7 +108,7 @@
             android:hint="输入兑换码，请注意大小写"
             android:textColor="@color/normal_text_3"
             android:textColorHint="@color/normal_hint"
-            android:textSize="@dimen/sp_14" />
+            android:textSize="@dimen/dp_14" />
 
         <RelativeLayout
             android:layout_marginTop="@dimen/dp_8"
@@ -142,7 +142,7 @@
         android:text="兑换码有时效性，3天的兑换码，只能在这3天内兑换有效，且产
 生的权益只能在这三天内，时间一过，兑换码权益将会消失"
         android:textColor="@color/share_content"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/dp_12" />
 
 
 </LinearLayout>
\ No newline at end of file

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

@@ -16,20 +16,23 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/dp_29"
-        android:paddingEnd="@dimen/dp_29">
+     >
 
         <ImageView
+            android:layout_marginStart="@dimen/dp_14"
+            android:padding="@dimen/dp_15"
             android:id="@+id/iv_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:layout_marginTop="@dimen/dp_25"
-            android:src="@mipmap/icon_login_back" />
+            android:src="@mipmap/icon_live_back_black" />
 
 
         <LinearLayout
+            android:paddingStart="@dimen/dp_29"
+            android:paddingEnd="@dimen/dp_29"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/iv_back"
@@ -48,7 +51,7 @@
                     android:layout_height="wrap_content"
                     android:text="忘记密码"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_23" />
+                    android:textSize="@dimen/dp_23" />
             </LinearLayout>
 
 
@@ -70,7 +73,7 @@
                     android:layout_marginStart="@dimen/dp_10"
                     android:text="中国"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <View
                     android:layout_width="1dp"
@@ -89,7 +92,7 @@
                     android:inputType="phone"
                     android:textColor="@color/color_333333"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
             <View
@@ -117,7 +120,7 @@
                     android:hint="请输入验证码"
                     android:inputType="number"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <com.hupu.tv.player.app.widget.TimerTextView
                     android:id="@+id/tv_get_code"
@@ -131,7 +134,7 @@
                     android:paddingEnd="8dp"
                     android:text="获取验证码"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10" />
+                    android:textSize="@dimen/dp_10" />
             </LinearLayout>
             <View
                 android:layout_width="match_parent"
@@ -156,7 +159,7 @@
                     android:hint="输入6-24位登录密码"
                     android:inputType="textPassword"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <ImageView
                     android:id="@+id/iv_show_password"
@@ -177,7 +180,7 @@
             <TextView
                 android:gravity="center"
                 android:text="提交"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:textColor="@color/white"
                 android:id="@+id/iv_forget"
                 android:layout_width="match_parent"

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

@@ -23,14 +23,14 @@
             <TextView
                 android:id="@+id/tv_level"
                 android:textColor="@color/black"
-                android:textSize="33sp"
+                android:textSize="33dp"
                 tools:text="Lv.1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
             <TextView
                 android:text="当前等级"
                 android:textColor="@color/grey_normal"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
@@ -52,14 +52,14 @@
             <TextView
                 android:id="@+id/tv_experience"
                 android:textColor="@color/black"
-                android:textSize="33sp"
+                android:textSize="33dp"
                 tools:text="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
             <TextView
                 android:text="当前经验"
                 android:textColor="@color/grey_normal"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
 
@@ -78,14 +78,14 @@
             android:layout_height="150dp"
             android:layout_gravity="center"
             app:trp_max="100"
-            app:trp_numSize="22sp"
+            app:trp_numSize="22dp"
             app:trp_progressColor="@color/main_color"
             app:trp_roundColor="@color/level_circle"
             app:trp_roundWidth="6dip"
             app:trp_startAngle="270"
             app:trp_textShow="false"
             app:trp_textColor="@color/red"
-            app:trp_textSize="10sp" />
+            app:trp_textSize="10dp" />
         <TextView
             android:layout_marginTop="@dimen/dp_30"
             android:layout_centerHorizontal="true"
@@ -99,13 +99,13 @@
             android:id="@+id/tv_experience_other"
             tools:text="1"
             android:textColor="@color/main_color"
-            android:textSize="25sp"
+            android:textSize="25dp"
             android:layout_centerInParent="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
 
         <TextView
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             android:textColor="@color/white"
             android:paddingStart="@dimen/dp_5"
             android:paddingEnd="@dimen/dp_5"

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

@@ -58,12 +58,12 @@
             app:tl_indicator_color="@color/main_select"
             app:tl_indicator_width="@dimen/dp_24"
             app:tl_indicator_corner_radius="@dimen/dp_15"
-            app:tl_select_textsize="@dimen/sp_15"
+            app:tl_select_textsize="@dimen/dp_15"
             app:tl_tab_width="@dimen/dp_57"
             app:tl_textBold="SELECT"
             app:tl_textSelectColor="@color/main_select"
             app:tl_textUnselectColor="@color/color_959DB0"
-            app:tl_textsize="@dimen/sp_14"
+            app:tl_textsize="@dimen/dp_14"
             app:tl_underline_color="@color/transparent" />
 
         <LinearLayout
@@ -89,7 +89,7 @@
 
                 android:gravity="center"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 tools:text="关注" />
         </LinearLayout>
 
@@ -128,7 +128,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             tools:text="主播推荐QQ：1231234221" />
 
         <ImageView
@@ -146,4 +146,12 @@
         android:layout_centerInParent="true"
         android:visibility="gone" />
 
+    <ImageView
+        android:visibility="gone"
+        android:layout_margin="@dimen/dp_10"
+        android:src="@mipmap/icon_back"
+        android:id="@+id/iv_back"
+        android:layout_width="@dimen/dp_16"
+        android:layout_height="@dimen/dp_16"/>
+
 </RelativeLayout>
\ No newline at end of file

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

@@ -31,7 +31,7 @@
             android:layout_marginTop="@dimen/dp_25"
             android:text="快速注册"
             android:textColor="@color/color_2D363E"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:textStyle="bold" />
 
         <LinearLayout
@@ -58,18 +58,18 @@
                     android:id="@+id/tv_phone_login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="手机登陆"
+                    android:text="手机登录"
                     android:textColor="@drawable/selector_login"
-                    android:textSize="@dimen/sp_17" />
+                    android:textSize="@dimen/dp_17" />
 
                 <TextView
                     android:id="@+id/tv_password_login"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_19"
-                    android:text="密码登陆"
+                    android:text="密码登录"
                     android:textColor="@drawable/selector_login"
-                    android:textSize="@dimen/sp_17" />
+                    android:textSize="@dimen/dp_17" />
             </LinearLayout>
 
 
@@ -91,7 +91,7 @@
                     android:inputType="phone"
                     android:textColor="@color/color_2D363E"
                     android:textColorHint="@color/color_AAAAAA"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
             <View
@@ -120,7 +120,7 @@
                     android:inputType="number"
                     android:textColor="@color/color_2D363E"
                     android:textColorHint="@color/color_AAAAAA"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <com.hupu.tv.player.app.widget.TimerTextView
                     android:id="@+id/tv_get_code"
@@ -134,7 +134,7 @@
                     android:paddingEnd="8dp"
                     android:text="获取验证码"
                     android:textColor="@color/color_FC7034"
-                    android:textSize="@dimen/sp_10" />
+                    android:textSize="@dimen/dp_10" />
             </LinearLayout>
 
             <LinearLayout
@@ -153,11 +153,11 @@
                     android:layout_weight="1"
                     android:background="@null"
                     android:gravity="center_vertical"
-                    android:hint="请输入6-24位密码"
+                    android:hint="请输入6-15位密码"
                     android:inputType="textPassword"
                     android:textColor="@color/color_2D363E"
                     android:textColorHint="@color/color_AAAAAA"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <ImageView
                     android:id="@+id/iv_show_password"
@@ -193,7 +193,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/color_959DB0"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="注册登录即代表你已同意《用户协议》和《隐私协议》" />
             </LinearLayout>
 
@@ -206,7 +206,7 @@
                 android:gravity="center"
                 android:text="登录"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 android:textStyle="bold" />
 
 
@@ -217,7 +217,7 @@
                 android:layout_marginTop="@dimen/dp_14"
                 android:text="忘记密码?"
                 android:textColor="@color/color_FC7034"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
         </LinearLayout>
 

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

@@ -32,7 +32,7 @@
             app:tl_indicator_height="0dp"
             app:tl_textSelectColor="@color/main_select"
             app:tl_textUnselectColor="@color/main_unselect"
-            app:tl_textsize="@dimen/sp_8" />
+            app:tl_textsize="@dimen/dp_8" />
         <LinearLayout
             android:id="@+id/ll_star"
             android:layout_alignParentBottom="true"
@@ -53,7 +53,7 @@
                 android:layout_marginTop="@dimen/dp_6"
                 android:layout_gravity="center"
                 android:gravity="center"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 android:textColor="@color/main_unselect"
                 android:text="游戏"
                 android:layout_width="wrap_content"

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

@@ -32,7 +32,7 @@
             app:tl_indicator_height="0dp"
             app:tl_textSelectColor="@color/main_select"
             app:tl_textUnselectColor="@color/main_unselect"
-            app:tl_textsize="@dimen/sp_10" />
+            app:tl_textsize="@dimen/dp_10" />
     </RelativeLayout>
 
 

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

@@ -19,7 +19,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             tools:text="日职" />
 
         <ImageView
@@ -39,7 +39,7 @@
             android:layout_below="@id/tv_short_name"
             android:layout_centerHorizontal="true"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             tools:text="今天 18:35" />
 
 
@@ -72,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/dp_13"
                     tools:text="三选新凤凰" />
             </LinearLayout>
 
@@ -104,7 +104,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/dp_13"
                     tools:text="三选新凤凰" />
             </LinearLayout>
 
@@ -118,7 +118,7 @@
         android:layout_marginTop="@dimen/dp_10"
         android:text="主播"
         android:textColor="@color/black"
-        android:textSize="@dimen/sp_16" />
+        android:textSize="@dimen/dp_16" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/mRecyclerView"

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

@@ -28,7 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             tools:text="球聚体育发布2.0版本" />
 
 
@@ -59,6 +59,6 @@
         android:paddingStart="@dimen/dp_12"
         android:paddingEnd="@dimen/dp_12"
         android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         tools:text="球聚体育发布2.0版本迭代，增加有料，首页，我的页面 功能，球聚体育发布2.0版本迭代，增加有料，首页，我 的页面功能，球聚体育发布2.0版本迭代，增加有料，首 页，我的页面功能，球聚体育发布2.0版本迭代，增加有 料，首页，我的页面功能，" />
 </LinearLayout>
\ No newline at end of file

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

@@ -30,7 +30,7 @@
             android:layout_gravity="center"
             android:text="付费的视频"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
     </LinearLayout>
 
@@ -60,7 +60,7 @@
             android:id="@+id/tv_select_all"
             android:gravity="center"
             android:text="全选"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/dp_16"
             android:textColor="@color/white"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
@@ -72,7 +72,7 @@
         <TextView
             android:id="@+id/tv_delete"
             android:textColor="@color/red"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/dp_16"
             android:gravity="center"
             android:text="删除"
             android:layout_width="wrap_content"

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

@@ -52,7 +52,7 @@
                         android:layout_height="wrap_content"
                         tools:text="只蹦不哒的小僵尸"
                         android:textColor="@color/text_vip"
-                        android:textSize="@dimen/sp_18"
+                        android:textSize="@dimen/dp_18"
                         android:textStyle="bold" />
 
                     <ImageView
@@ -67,7 +67,7 @@
                     android:id="@+id/tv_vip_time"
                     android:layout_marginTop="@dimen/dp_9"
                     android:textColor="@color/text_vip"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="会员总时长：2020-12-23到期"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
@@ -98,7 +98,7 @@
             <TextView
                 android:visibility="gone"
                 android:layout_marginBottom="@dimen/dp_18"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:paddingStart="@dimen/dp_18"
                 android:textColor="@color/white"
                 android:text="请选择充值金额"
@@ -118,7 +118,7 @@
                 tools:text="选择《双月卡》套餐，每月可立省22元"
                 android:id="@+id/tv_buy_tips"
                 android:paddingStart="@dimen/dp_18"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textColor="@color/vip_buy_tips"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>

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

@@ -73,7 +73,7 @@
                         android:layout_height="wrap_content"
                         tools:text="只蹦不哒的小僵尸"
                         android:textColor="@color/text_vip_mine"
-                        android:textSize="@dimen/sp_18"
+                        android:textSize="@dimen/dp_18"
                         android:textStyle="bold" />
 
                     <ImageView
@@ -92,7 +92,7 @@
                     android:layout_marginTop="@dimen/dp_9"
                     tools:text="会员总时长：2020-12-23到期"
                     android:textColor="@color/text_vip_mine"
-                    android:textSize="@dimen/sp_14" />
+                    android:textSize="@dimen/dp_14" />
             </LinearLayout>
             <LinearLayout
                 android:layout_marginBottom="@dimen/dp_10"
@@ -106,7 +106,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/string_mine_vip_text"
                     android:textColor="@color/text_vip_mine"
-                    android:textSize="@dimen/sp_14" />
+                    android:textSize="@dimen/dp_14" />
 
                 <ImageView
                     android:visibility="gone"
@@ -129,7 +129,7 @@
         android:layout_marginEnd="@dimen/dp_18"
         android:layout_width="match_parent"
         android:layout_height="175dp"
-        android:layout_marginBottom="@dimen/sp_20"
+        android:layout_marginBottom="@dimen/dp_20"
         android:orientation="vertical">
 
         <LinearLayout

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

@@ -24,7 +24,7 @@
             />
 
         <TextView
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:textColor="@color/text_normal_4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -45,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:text="实付:￥"
                 android:textColor="@color/bg_red_2"
-                android:textSize="@dimen/sp_17"
+                android:textSize="@dimen/dp_17"
                 android:textStyle="bold" />
 
             <TextView
@@ -55,7 +55,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/bg_red_2"
-                android:textSize="@dimen/sp_21"
+                android:textSize="@dimen/dp_21"
                 android:textStyle="bold"
                 tools:text="999.99" />
         </LinearLayout>

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

@@ -43,7 +43,7 @@
             android:maxEms="5"
             android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             app:layout_constraintEnd_toStartOf="@id/tv_score"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_team_icon"
@@ -54,7 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/color_9B9B9B"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_back"
@@ -66,7 +66,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_5"
             android:textColor="@color/white_80"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_short_name"
@@ -81,7 +81,7 @@
             android:gravity="center"
             android:minWidth="@dimen/dp_105"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_28"
+            android:textSize="@dimen/dp_28"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_time"
@@ -100,7 +100,7 @@
             android:paddingEnd="@dimen/dp_12"
             android:paddingBottom="@dimen/dp_5"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintBaseline_toBaselineOf="@id/tv_team_name"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -126,7 +126,7 @@
             android:maxEms="5"
             android:maxLines="1"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tv_score"
             app:layout_constraintTop_toBottomOf="@id/iv_team_icon_away"
@@ -146,7 +146,7 @@
         app:tl_indicator_corner_radius="@dimen/dp_2"
         app:tl_indicator_margin_bottom="@dimen/dp_5"
         app:tl_indicator_width="@dimen/dp_24"
-        app:tl_select_textsize="@dimen/sp_15"
+        app:tl_select_textsize="@dimen/dp_15"
         app:tl_tab_width="60dp"
         app:tl_textBold="SELECT"
         app:tl_textSelectColor="@color/color_FC7436"

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

@@ -39,7 +39,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_17"
+                        android:textSize="@dimen/dp_17"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         tools:text="本泽马6分钟双响，克罗斯送攻皇马客场2-1力克毕尔巴" />
@@ -62,7 +62,7 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_13"
+                        android:textSize="@dimen/dp_13"
                         android:textStyle="bold"
                         app:layout_constraintStart_toEndOf="@id/iv_avatar"
                         app:layout_constraintTop_toTopOf="@id/iv_avatar"
@@ -74,7 +74,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp_3"
                         android:textColor="@color/color_BDC2CF"
-                        android:textSize="@dimen/sp_12"
+                        android:textSize="@dimen/dp_12"
                         app:layout_constraintStart_toStartOf="@id/tv_name"
                         app:layout_constraintTop_toBottomOf="@id/tv_name"
                         tools:text="2021-03-12" />
@@ -177,7 +177,7 @@
                                 android:layout_marginStart="@dimen/dp_10"
                                 android:text="相关文章"
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/sp_15"
+                                android:textSize="@dimen/dp_15"
                                 android:textStyle="bold" />
                         </LinearLayout>
 

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

@@ -24,7 +24,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <TextView
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/dp_14"
         android:textColor="@color/black"
         android:gravity="center_vertical"
         android:text="昵称："
@@ -36,7 +36,7 @@
         android:paddingTop="10dp"
         android:background="@null"
         android:hint="请输入昵称"
-        android:textSize="15sp"
+        android:textSize="15dp"
         android:textColorHint="@color/hint_color"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
@@ -59,7 +59,7 @@
         android:layout_gravity="center"
         android:gravity="center"
         android:background="@drawable/shape_get_code"
-        android:textSize="15sp"
+        android:textSize="15dp"
         android:textColor="@color/white"
         android:layout_marginTop="72dp"
         android:text="完成"

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

@@ -26,7 +26,7 @@
             android:layout_marginTop="22dp"
             android:text="选择双月卡的支付金额"
             android:textColor="@color/text_normal_4"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:text="¥"
                 android:textColor="@color/selector_vip_text"
-                android:textSize="@dimen/sp_8"
+                android:textSize="@dimen/dp_8"
                 android:textStyle="bold" />
 
             <TextView
@@ -49,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_4"
                 android:textColor="@color/text_red"
-                android:textSize="28sp"
+                android:textSize="28dp"
                 android:textStyle="bold"
                 tools:text="30.00" />
 
@@ -62,7 +62,7 @@
             android:layout_marginTop="39dp"
             android:text="支付方式"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:layout_marginTop="@dimen/dp_14"
@@ -72,7 +72,7 @@
 
         <TextView
             android:layout_marginTop="@dimen/dp_13"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             android:textColor="@color/normal_text_3"
             android:text="充值5-10分钟后，VIP到账，如有问题，请联系客服"
             android:layout_width="wrap_content"
@@ -88,7 +88,7 @@
         <TextView
             android:textStyle="bold"
             android:layout_marginTop="@dimen/dp_10"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:textColor="@color/text_red"
             android:gravity="center"
             android:text="随机立减，最高10%"
@@ -109,7 +109,7 @@
         <TextView
             android:gravity="center"
             android:layout_marginTop="58dp"
-            android:textSize="@dimen/sp_24"
+            android:textSize="@dimen/dp_24"
             android:textColor="@color/text_red"
             android:text="正在支付..."
             android:layout_width="match_parent"
@@ -117,7 +117,7 @@
 
         <TextView
             android:textColor="@color/text_normal_4"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:text="@string/string_pay_problem_tips"
             android:layout_marginTop="@dimen/dp_22"
             android:layout_width="match_parent"

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

@@ -104,7 +104,7 @@
 <!--            android:visibility="gone"-->
 <!--            android:orientation="horizontal"-->
 <!--            android:layout_marginTop="55dp"-->
-<!--            android:layout_marginStart="@dimen/sp_10"-->
+<!--            android:layout_marginStart="@dimen/dp_10"-->
 <!--            android:layout_width="match_parent"-->
 <!--            android:layout_height="@dimen/dp_50">-->
 <!--            <TextView-->
@@ -116,7 +116,7 @@
 <!--            <TextView-->
 <!--                android:text="layout"-->
 <!--                android:textColor="@color/white"-->
-<!--                android:layout_marginStart="@dimen/sp_10"-->
+<!--                android:layout_marginStart="@dimen/dp_10"-->
 <!--                android:id="@+id/tv_mode_2"-->
 <!--                android:layout_width="wrap_content"-->
 <!--                android:layout_height="wrap_content"/>-->
@@ -173,7 +173,7 @@
 <!--                android:layout_marginStart="@dimen/dp_10"-->
 <!--                android:src="@mipmap/icon_play_back"-->
 <!--                android:textColor="@color/white"-->
-<!--                android:textSize="@dimen/sp_14"-->
+<!--                android:textSize="@dimen/dp_14"-->
 <!--                android:visibility="gone"-->
 <!--                tools:text="标题" />-->
 
@@ -200,7 +200,7 @@
 <!--                android:layout_height="wrap_content"-->
 <!--                android:layout_centerInParent="true"-->
 <!--                android:textColor="@color/white"-->
-<!--                android:textSize="7sp"-->
+<!--                android:textSize="7dp"-->
 <!--                tools:text="100kb/s" />-->
 <!--        </RelativeLayout>-->
 
@@ -245,7 +245,7 @@
 <!--                    android:ellipsize="end"-->
 <!--                    android:singleLine="true"-->
 <!--                    android:textColor="@color/text_play_detail_color"-->
-<!--                    android:textSize="@dimen/sp_17"-->
+<!--                    android:textSize="@dimen/dp_17"-->
 <!--                    tools:text="传闻中的陈芊芊" />-->
 
 <!--                <ImageView-->
@@ -271,7 +271,7 @@
 
 <!--                    android:singleLine="true"-->
 <!--                    android:textColor="@color/text_normal"-->
-<!--                    android:textSize="@dimen/sp_12"-->
+<!--                    android:textSize="@dimen/dp_12"-->
 <!--                    android:visibility="gone"-->
 <!--                    tools:text="番号：100011" />-->
 
@@ -282,7 +282,7 @@
 <!--                    android:layout_weight="1"-->
 <!--                    android:singleLine="true"-->
 <!--                    android:textColor="@color/text_normal"-->
-<!--                    android:textSize="@dimen/sp_13"-->
+<!--                    android:textSize="@dimen/dp_13"-->
 <!--                    tools:text="视频ID：174" />-->
 
 <!--                <TextView-->
@@ -293,7 +293,7 @@
 <!--                    android:layout_weight="1"-->
 <!--                    android:singleLine="true"-->
 <!--                    android:textColor="@color/text_normal"-->
-<!--                    android:textSize="@dimen/sp_13"-->
+<!--                    android:textSize="@dimen/dp_13"-->
 <!--                    tools:text="0次播放" />-->
 
 <!--                <TextView-->
@@ -304,7 +304,7 @@
 <!--                    android:layout_weight="1"-->
 <!--                    android:singleLine="true"-->
 <!--                    android:textColor="@color/text_normal"-->
-<!--                    android:textSize="@dimen/sp_13"-->
+<!--                    android:textSize="@dimen/dp_13"-->
 <!--                    tools:text="0次播放" />-->
 <!--            </LinearLayout>-->
 
@@ -315,7 +315,7 @@
 <!--                android:layout_height="wrap_content"-->
 <!--                android:layout_marginTop="@dimen/dp_5"-->
 <!--                android:textColor="@color/text_normal"-->
-<!--                android:textSize="@dimen/sp_12"-->
+<!--                android:textSize="@dimen/dp_12"-->
 <!--                tools:text="传闻中的陈芊芊" />-->
 <!--            &lt;!&ndash;    点赞，收藏，下载，分享        &ndash;&gt;-->
 <!--            <androidx.recyclerview.widget.RecyclerView-->
@@ -353,7 +353,7 @@
 <!--                        android:layout_height="wrap_content"-->
 <!--                        android:text="点赞1234"-->
 <!--                        android:textColor="@color/text_normal2"-->
-<!--                        android:textSize="@dimen/sp_13" />-->
+<!--                        android:textSize="@dimen/dp_13" />-->
 <!--                </LinearLayout>-->
 
 
@@ -365,7 +365,7 @@
 <!--                    android:drawableStart="@drawable/selector_vip_like"-->
 <!--                    android:drawablePadding="@dimen/dp_5"-->
 <!--                    android:textColor="@color/selector_moive_like_fav"-->
-<!--                    android:textSize="@dimen/sp_14"-->
+<!--                    android:textSize="@dimen/dp_14"-->
 <!--                    android:visibility="gone"-->
 <!--                    tools:text="3.5W" />-->
 
@@ -378,7 +378,7 @@
 <!--                    android:drawablePadding="@dimen/dp_5"-->
 <!--                    android:text="0"-->
 <!--                    android:textColor="@color/selector_moive_like_fav"-->
-<!--                    android:textSize="@dimen/sp_14"-->
+<!--                    android:textSize="@dimen/dp_14"-->
 <!--                    android:visibility="gone" />-->
 
 <!--                <LinearLayout-->
@@ -402,7 +402,7 @@
 <!--                        android:gravity="start"-->
 <!--                        android:text="影片下载"-->
 <!--                        android:textColor="@color/text_normal2"-->
-<!--                        android:textSize="@dimen/sp_13" />-->
+<!--                        android:textSize="@dimen/dp_13" />-->
 <!--                </LinearLayout>-->
 
 <!--                <LinearLayout-->
@@ -427,7 +427,7 @@
 <!--                        android:layout_gravity="center"-->
 <!--                        android:text="赚会员"-->
 <!--                        android:textColor="@color/text_normal2"-->
-<!--                        android:textSize="@dimen/sp_13" />-->
+<!--                        android:textSize="@dimen/dp_13" />-->
 <!--                </LinearLayout>-->
 
 <!--            </LinearLayout>-->
@@ -461,7 +461,7 @@
 <!--                        android:gravity="center"-->
 <!--                        android:layout_gravity="center"-->
 <!--                        android:textColor="@color/white"-->
-<!--                        android:textSize="@dimen/sp_16"-->
+<!--                        android:textSize="@dimen/dp_16"-->
 <!--                        android:text="10"-->
 <!--                        android:id="@+id/tv_surplus_play_count"-->
 <!--                        android:layout_width="wrap_content"-->
@@ -483,7 +483,7 @@
 <!--                    android:layout_height="wrap_content"-->
 <!--                    android:textColor="@color/play_times_tips_text"-->
 <!--                    android:textStyle="bold"-->
-<!--                    android:textSize="@dimen/sp_10"-->
+<!--                    android:textSize="@dimen/dp_10"-->
 <!--                    android:text="@string/string_surplus_count_tip" />-->
 
 
@@ -523,7 +523,7 @@
 <!--                android:layout_marginTop="@dimen/dp_32"-->
 <!--                android:text="演员"-->
 <!--                android:textColor="@color/white"-->
-<!--                android:textSize="@dimen/sp_16"-->
+<!--                android:textSize="@dimen/dp_16"-->
 <!--                android:visibility="gone" />-->
 
 <!--            <androidx.recyclerview.widget.RecyclerView-->
@@ -552,7 +552,7 @@
 <!--                android:text="猜你喜欢"-->
 <!--                android:textStyle="bold"-->
 <!--                android:textColor="@color/black"-->
-<!--                android:textSize="@dimen/sp_15" />-->
+<!--                android:textSize="@dimen/dp_15" />-->
 
 <!--            <androidx.recyclerview.widget.RecyclerView-->
 <!--                android:id="@+id/recycler_like"-->
@@ -567,7 +567,7 @@
 <!--                android:layout_marginTop="@dimen/dp_15"-->
 <!--                android:text="热门推荐"-->
 <!--                android:textColor="@color/black"-->
-<!--                android:textSize="@dimen/sp_15" />-->
+<!--                android:textSize="@dimen/dp_15" />-->
 
 <!--            <androidx.recyclerview.widget.RecyclerView-->
 <!--                android:id="@+id/recycler_recommend"-->

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

@@ -30,9 +30,9 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginTop="@dimen/dp_25"
-            android:text="登陆"
+            android:text="登录"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             android:textStyle="bold" />
 
         <LinearLayout
@@ -55,7 +55,7 @@
                 android:layout_marginTop="@dimen/dp_41"
                 android:text="注册"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_23"
+                android:textSize="@dimen/dp_23"
                 android:textStyle="bold" />
 
             <LinearLayout
@@ -76,7 +76,7 @@
                     android:inputType="phone"
                     android:textColor="@color/color_2D363E"
                     android:textColorHint="@color/color_959DB0"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
             <View
@@ -104,7 +104,7 @@
                     android:inputType="number"
                     android:textColor="@color/color_2D363E"
                     android:textColorHint="@color/color_959DB0"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <com.hupu.tv.player.app.widget.TimerTextView
                     android:id="@+id/tv_get_code"
@@ -118,7 +118,7 @@
                     android:paddingEnd="8dp"
                     android:text="获取验证码"
                     android:textColor="@color/color_FC7034"
-                    android:textSize="@dimen/sp_10" />
+                    android:textSize="@dimen/dp_10" />
             </LinearLayout>
 
             <View
@@ -137,7 +137,7 @@
                 android:hint="请输入用户名"
                 android:textColor="@color/color_2D363E"
                 android:textColorHint="@color/color_959DB0"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <View
                 android:layout_width="match_parent"
@@ -163,7 +163,7 @@
                     android:inputType="textPassword"
                     android:textColor="@color/color_2D363E"
                     android:textColorHint="@color/color_959DB0"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <ImageView
                     android:id="@+id/iv_show_password"
@@ -198,7 +198,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/color_758199"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="注册登录即代表你已同意《用户协议》和《隐私协议》" />
             </LinearLayout>
 
@@ -211,7 +211,7 @@
                 android:gravity="center"
                 android:text="注册"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/dp_16" />
 
         </LinearLayout>
 

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

@@ -25,7 +25,7 @@
                 android:layout_marginTop="@dimen/dp_15"
                 android:text="选择原因"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/mRecyclerView"
@@ -36,7 +36,7 @@
             <TextView
                 android:layout_marginStart="@dimen/dp_15"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:layout_marginTop="@dimen/dp_10"
                 android:text="举报详情（选填）"
                 android:layout_width="wrap_content"
@@ -63,7 +63,7 @@
                     android:padding="@dimen/dp_10"
                     android:textColor="@color/black"
                     android:textColorHint="@color/grey_normal"
-                    android:textSize="@dimen/sp_14" />
+                    android:textSize="@dimen/dp_14" />
 
                 <TextView
                     android:id="@+id/tv_edit_number"
@@ -75,7 +75,7 @@
                     android:layout_marginBottom="@dimen/dp_10"
                     android:text="500"
                     android:textColor="@color/grey_normal"
-                    android:textSize="@dimen/sp_14" />
+                    android:textSize="@dimen/dp_14" />
 
             </RelativeLayout>
 
@@ -86,7 +86,7 @@
                 android:layout_gravity="center"
                 android:gravity="center"
                 android:background="@drawable/shape_get_code"
-                android:textSize="15sp"
+                android:textSize="15dp"
                 android:textColor="@color/white"
                 android:layout_marginTop="72dp"
                 android:text="提交"

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

@@ -52,7 +52,7 @@
                     android:singleLine="true"
                     android:textColor="@color/color_333333"
                     android:textColorHint="@color/color_A7A7A7"
-                    android:textSize="@dimen/sp_12" />
+                    android:textSize="@dimen/dp_12" />
             </RelativeLayout>
 
             <TextView
@@ -62,7 +62,7 @@
                 android:layout_marginStart="@dimen/dp_9"
                 android:text="取消"
                 android:textColor="@color/normal_title"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
         </LinearLayout>
 
@@ -91,7 +91,7 @@
                         android:layout_weight="1"
                         android:text="历史记录"
                         android:textColor="@color/normal_title"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="@dimen/dp_13" />
 
                     <TextView
                         android:id="@+id/iv_delete"
@@ -100,7 +100,7 @@
                         android:drawablePadding="@dimen/dp_5"
                         android:text="清空"
                         android:textColor="@color/color_9B9B9B"
-                        android:textSize="@dimen/sp_9"
+                        android:textSize="@dimen/dp_9"
                         app:drawableStartCompat="@mipmap/icon_delete_history" />
                 </LinearLayout>
 
@@ -129,7 +129,7 @@
                     android:layout_marginTop="@dimen/dp_29"
                     android:text="热门搜索"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/hot_search_data"

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

@@ -54,7 +54,7 @@
                     android:singleLine="true"
                     android:textColor="@color/color_333333"
                     android:textColorHint="@color/color_A7A7A7"
-                    android:textSize="@dimen/sp_12" />
+                    android:textSize="@dimen/dp_12" />
             </RelativeLayout>
 
             <TextView
@@ -64,7 +64,7 @@
                 android:layout_marginStart="@dimen/dp_9"
                 android:text="取消"
                 android:textColor="@color/normal_title"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
         </LinearLayout>
 
@@ -96,7 +96,7 @@
                         android:layout_weight="1"
                         android:text="历史记录"
                         android:textColor="@color/normal_title"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="@dimen/dp_13" />
 
                     <TextView
                         android:id="@+id/iv_delete"
@@ -105,7 +105,7 @@
                         android:drawablePadding="@dimen/dp_5"
                         android:text="清空"
                         android:textColor="@color/color_9B9B9B"
-                        android:textSize="@dimen/sp_9"
+                        android:textSize="@dimen/dp_9"
                         app:drawableStartCompat="@mipmap/icon_delete_history" />
                 </LinearLayout>
 
@@ -134,7 +134,7 @@
                     android:layout_marginTop="@dimen/dp_29"
                     android:text="热门搜索"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/hot_search_data"

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

@@ -25,7 +25,7 @@
                 android:layout_height="127dp"/>
 
             <TextView
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:layout_centerInParent="true"
                 android:layout_below="@id/iv_empty"
                 android:text="暂无下载视频"
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"/>
 
             <TextView
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_centerInParent="true"
                 android:layout_below="@id/tv_empty"
@@ -99,7 +99,7 @@
             android:paddingEnd="@dimen/dp_18"
             android:text="下载已完成"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_14" />
+            android:textSize="@dimen/dp_14" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:layout_below="@id/tv_more"
@@ -124,7 +124,7 @@
                 android:id="@+id/tv_select_all"
                 android:gravity="center"
                 android:text="全选"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:textColor="@color/normal_text_3"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -138,7 +138,7 @@
             <TextView
                 android:id="@+id/tv_delete"
                 android:textColor="@color/red"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:gravity="center"
                 android:text="删除"
                 android:layout_width="wrap_content"

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

@@ -35,7 +35,7 @@
                     android:layout_weight="1"
                     android:text="账号与绑定"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_15" />
+                    android:textSize="@dimen/dp_15" />
 
                 <ImageView
                     android:layout_width="@dimen/dp_8"
@@ -76,7 +76,7 @@
                         android:layout_weight="1"
                         android:text="消息推送"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <com.kyleduo.switchbutton.SwitchButton
                         android:id="@+id/switch_message"
@@ -105,7 +105,7 @@
                         android:layout_weight="1"
                         android:text="开播提醒"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <com.kyleduo.switchbutton.SwitchButton
                         android:id="@+id/switch_start_play"
@@ -135,7 +135,7 @@
                         android:layout_weight="1"
                         android:text="开赛提醒"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <com.kyleduo.switchbutton.SwitchButton
                         android:id="@+id/switch_start_match"
@@ -163,7 +163,7 @@
                         android:layout_weight="1"
                         android:text="小窗播放"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <com.kyleduo.switchbutton.SwitchButton
                         android:id="@+id/switch_start_small"
@@ -191,7 +191,7 @@
                         android:layout_weight="1"
                         android:text="后台播放"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <com.kyleduo.switchbutton.SwitchButton
                         android:id="@+id/switch_start_back"
@@ -230,7 +230,7 @@
                         android:layout_weight="1"
                         android:text="版本更新"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <TextView
                         android:id="@+id/tv_version"
@@ -267,7 +267,7 @@
                         android:layout_weight="1"
                         android:text="关于"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
 
                     <ImageView
@@ -297,7 +297,7 @@
                         android:layout_weight="1"
                         android:text="隐私协议"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
 
                     <ImageView
@@ -327,7 +327,7 @@
                         android:layout_weight="1"
                         android:text="用户协议"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
 
                     <ImageView
@@ -361,7 +361,7 @@
                 android:textStyle="bold"
                 android:text="注销账号"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="15dp" />
 
             <TextView
                 android:layout_marginTop="@dimen/dp_10"
@@ -374,7 +374,7 @@
                 android:textStyle="bold"
                 android:text="退出登录"
                 android:textColor="@color/white"
-                android:textSize="15sp" />
+                android:textSize="15dp" />
         </LinearLayout>
 
     </RelativeLayout>

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

@@ -16,20 +16,23 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/dp_29"
-        android:paddingEnd="@dimen/dp_29">
+       >
 
         <ImageView
+            android:layout_marginStart="@dimen/dp_14"
+            android:padding="@dimen/dp_15"
             android:id="@+id/iv_back"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:layout_marginTop="@dimen/dp_25"
-            android:src="@mipmap/icon_login_back" />
+            android:src="@mipmap/icon_live_back_black" />
 
 
         <LinearLayout
+            android:paddingStart="@dimen/dp_29"
+            android:paddingEnd="@dimen/dp_29"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/iv_back"
@@ -48,7 +51,7 @@
                     android:layout_height="wrap_content"
                     android:text="设置密码"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_23" />
+                    android:textSize="@dimen/dp_23" />
             </LinearLayout>
 
 
@@ -73,7 +76,7 @@
                     android:hint="输入6-24位登录密码"
                     android:inputType="textPassword"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <ImageView
                     android:id="@+id/iv_show_password"
@@ -108,7 +111,7 @@
                     android:hint="再次输入6-24位登录密码"
                     android:inputType="textPassword"
                     android:textColorHint="@color/color_758199"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <ImageView
                     android:id="@+id/iv_show_password_confirm"
@@ -130,7 +133,7 @@
             <TextView
                 android:gravity="center"
                 android:text="提交"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:textColor="@color/white"
                 android:id="@+id/iv_setting"
                 android:layout_width="match_parent"

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

@@ -17,7 +17,7 @@
         android:layout_marginBottom="@dimen/dp_20"
         android:text="推广领福利"
         android:textColor="@color/text_blue"
-        android:textSize="@dimen/sp_20"
+        android:textSize="@dimen/dp_20"
         android:textStyle="bold" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -49,7 +49,7 @@
                 android:layout_height="wrap_content"
                 android:text="推广人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textStyle="bold" />
 
             <TextView
@@ -57,7 +57,7 @@
                 android:layout_height="wrap_content"
                 android:text="5人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textStyle="bold" />
         </LinearLayout>
 
@@ -76,7 +76,7 @@
                 android:layout_height="wrap_content"
                 android:text="播放次数"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -84,7 +84,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 android:text="无数次"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
         <LinearLayout
@@ -103,7 +103,7 @@
                 android:layout_height="wrap_content"
                 android:text="下载次数"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -115,14 +115,14 @@
                     android:layout_height="wrap_content"
                     android:text="15"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_22" />
+                    android:textSize="@dimen/dp_22" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="次"
                     android:textColor="@color/text_blue"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
         </LinearLayout>
@@ -142,7 +142,7 @@
                 android:layout_height="wrap_content"
                 android:text="推广人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <LinearLayout
 
@@ -155,14 +155,14 @@
                     android:layout_height="wrap_content"
                     android:text="1"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_22" />
+                    android:textSize="@dimen/dp_22" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="个月"
                     android:textColor="@color/text_blue"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
@@ -188,7 +188,7 @@
                 android:layout_height="wrap_content"
                 android:text="推广人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textStyle="bold" />
 
             <TextView
@@ -196,7 +196,7 @@
                 android:layout_height="wrap_content"
                 android:text="10人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textStyle="bold" />
         </LinearLayout>
 
@@ -215,7 +215,7 @@
                 android:layout_height="wrap_content"
                 android:text="播放次数"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -223,7 +223,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 android:text="无数次"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
         <LinearLayout
@@ -242,7 +242,7 @@
                 android:layout_height="wrap_content"
                 android:text="下载次数"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -254,14 +254,14 @@
                     android:layout_height="wrap_content"
                     android:text="15"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_22" />
+                    android:textSize="@dimen/dp_22" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="次"
                     android:textColor="@color/text_blue"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
         </LinearLayout>
@@ -281,7 +281,7 @@
                 android:layout_height="wrap_content"
                 android:text="推广人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -293,14 +293,14 @@
                     android:layout_height="wrap_content"
                     android:text="3"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_22" />
+                    android:textSize="@dimen/dp_22" />
 
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="个月"
                     android:textColor="@color/text_blue"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -29,7 +29,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_19"
+                android:textSize="@dimen/dp_19"
                 tools:text="@string/string_share_friend_text" />
 
             <RelativeLayout
@@ -53,7 +53,7 @@
                     android:layout_marginBottom="@dimen/dp_15"
                     tools:text="@string/string_share_text"
                     android:textColor="@color/share_income"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/dp_13"
                     android:textStyle="bold" />
 
                 <ImageView
@@ -89,7 +89,7 @@
                         android:gravity="center"
                         android:text="复制分享链接"
                         android:textColor="@color/share_code_title"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <TextView
                         android:id="@+id/tv_share_link"
@@ -101,7 +101,7 @@
                         android:paddingStart="@dimen/dp_25"
                         android:paddingEnd="@dimen/dp_25"
                         android:textColor="@color/share_content"
-                        android:textSize="@dimen/sp_11"
+                        android:textSize="@dimen/dp_11"
                         tools:text="6546多个唱歌唱歌唱歌更好风光好" />
 
 
@@ -116,7 +116,7 @@
                         android:background="@drawable/shape_bg_button_red"
                         android:gravity="center"
                         android:text="复制链接"
-                        android:textSize="@dimen/sp_13"
+                        android:textSize="@dimen/dp_13"
                         android:textColor="@color/white" />
                 </LinearLayout>
 
@@ -140,7 +140,7 @@
                         android:gravity="center"
                         android:text="点击保存分享"
                         android:textColor="@color/share_code_title"
-                        android:textSize="@dimen/sp_15" />
+                        android:textSize="@dimen/dp_15" />
 
                     <RelativeLayout
 
@@ -174,7 +174,7 @@
             <TextView
                 android:layout_marginTop="@dimen/dp_7"
                 android:id="@+id/tv_share_content"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:textColor="@color/share_content"
                 tools:text="@string/string_share_text_tip"
                 android:layout_width="wrap_content"
@@ -216,7 +216,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 android:text="QQ"
                 android:textColor="@color/share_code_title"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
         <LinearLayout
@@ -239,7 +239,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 android:text="微信"
                 android:textColor="@color/share_code_title"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
         <LinearLayout
@@ -262,7 +262,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 android:text="微博"
                 android:textColor="@color/share_code_title"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
         <LinearLayout
@@ -285,7 +285,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 android:text="贴吧"
                 android:textColor="@color/share_code_title"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
         <LinearLayout
@@ -308,7 +308,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 android:text="知乎"
                 android:textColor="@color/share_code_title"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
 

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

@@ -45,7 +45,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_14"
             android:textColor="#2D363E"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             app:layout_constraintStart_toEndOf="@id/iv_avatar"
             app:layout_constraintTop_toTopOf="@id/iv_avatar"
             tools:text="幼恩Baby" />
@@ -55,7 +55,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/color_FC7034"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             app:layout_constraintTop_toTopOf="@id/tv_follow"
             app:layout_constraintBottom_toBottomOf="@id/tv_follow"
             app:layout_constraintEnd_toEndOf="parent"
@@ -70,7 +70,7 @@
             android:layout_marginTop="@dimen/dp_3"
             android:layout_marginEnd="@dimen/dp_14"
             android:textColor="#2D363E"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toStartOf="@id/tv_follow"
             app:layout_constraintStart_toStartOf="@id/tv_name"
             app:layout_constraintTop_toBottomOf="@id/tv_name"
@@ -79,16 +79,17 @@
         <TextView
             android:drawablePadding="@dimen/dp_2"
             android:id="@+id/tv_follow"
-            android:layout_width="@dimen/dp_48"
+            android:minWidth="@dimen/dp_48"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/dp_10"
             android:gravity="center"
             android:textColor="@color/color_2D363E"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintEnd_toStartOf="@id/tv_follow_num"
             app:layout_constraintTop_toTopOf="@id/tv_name"
             app:layout_constraintBottom_toBottomOf="@+id/tv_describe"
-            tools:text="关注"
+            tools:text="已关注"
             app:drawableStartCompat="@mipmap/icon_follow_sp" />
 
         <RelativeLayout
@@ -108,12 +109,12 @@
                 app:tl_indicator_height="@dimen/dp_3"
                 app:tl_indicator_style="NORMAL"
                 app:tl_indicator_width="@dimen/dp_24"
-                app:tl_select_textsize="@dimen/sp_14"
+                app:tl_select_textsize="@dimen/dp_14"
                 app:tl_tab_width="@dimen/dp_180"
                 app:tl_textBold="SELECT"
                 app:tl_textSelectColor="@color/color_FC7034"
                 app:tl_textUnselectColor="@color/color_2D363E"
-                app:tl_textsize="@dimen/sp_14"
+                app:tl_textsize="@dimen/dp_14"
                 app:tl_underline_color="@color/transparent" />
 
         </RelativeLayout>

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

@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 tools:text="小乔山之" />
 
             <TextView
@@ -45,7 +45,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_7"
                 android:textColor="@color/text_normal_4"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/dp_11"
                 tools:text="简单的介绍简介：我是一个热爱表演的演员，" />
         </LinearLayout>
     </LinearLayout>

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

@@ -16,7 +16,7 @@
 
         <TextView
             android:padding="@dimen/dp_15"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:textColor="@color/black"
             android:text="@string/string_user_agreement"
             android:lineSpacingExtra="@dimen/dp_4"

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

@@ -13,7 +13,7 @@
         android:id="@+id/tv_coin"
         android:layout_marginTop="@dimen/dp_50"
         android:layout_gravity="center_horizontal"
-        android:textSize="33sp"
+        android:textSize="33dp"
         tools:text="6"
         android:textColor="@color/black"
         android:layout_width="wrap_content"
@@ -23,7 +23,7 @@
         android:layout_gravity="center_horizontal"
         android:textColor="@color/text_normal3"
         android:text="当前金币"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/dp_14"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
     <View

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

@@ -35,7 +35,7 @@
                 android:layout_weight="1"
                 android:text="头像"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
 
             <ImageView
                 android:id="@+id/iv_avatar"
@@ -49,7 +49,7 @@
                 android:layout_height="@dimen/dp_13"
                 android:layout_gravity="center"
                 android:layout_marginStart="@dimen/dp_7"
-                android:layout_marginEnd="@dimen/sp_15"
+                android:layout_marginEnd="@dimen/dp_15"
                 android:src="@mipmap/icon_more" />
         </LinearLayout>
 
@@ -67,7 +67,7 @@
                 android:layout_weight="1"
                 android:text="昵称"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
 
             <TextView
                 android:id="@+id/tv_nick_name"
@@ -82,7 +82,7 @@
                 android:layout_height="@dimen/dp_13"
                 android:layout_gravity="center"
                 android:layout_marginStart="@dimen/dp_7"
-                android:layout_marginEnd="@dimen/sp_15"
+                android:layout_marginEnd="@dimen/dp_15"
                 android:src="@mipmap/icon_more" />
         </LinearLayout>
 
@@ -100,7 +100,7 @@
                 android:layout_weight="1"
                 android:text="性别"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
 
             <TextView
                 android:id="@+id/tv_sex"
@@ -115,7 +115,7 @@
                 android:layout_height="@dimen/dp_13"
                 android:layout_gravity="center"
                 android:layout_marginStart="@dimen/dp_7"
-                android:layout_marginEnd="@dimen/sp_15"
+                android:layout_marginEnd="@dimen/dp_15"
                 android:src="@mipmap/icon_more" />
         </LinearLayout>
 
@@ -133,7 +133,7 @@
                 android:layout_weight="1"
                 android:text="生日"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
 
             <TextView
                 android:id="@+id/tv_birthday"
@@ -148,7 +148,7 @@
                 android:layout_height="@dimen/dp_13"
                 android:layout_gravity="center"
                 android:layout_marginStart="@dimen/dp_7"
-                android:layout_marginEnd="@dimen/sp_15"
+                android:layout_marginEnd="@dimen/dp_15"
                 android:src="@mipmap/icon_more" />
         </LinearLayout>
     </LinearLayout>

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

@@ -16,7 +16,7 @@
 
         <TextView
             android:padding="@dimen/dp_15"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:textColor="@color/black"
             android:text="@string/string_user_private"
             android:lineSpacingExtra="@dimen/dp_4"

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

@@ -87,12 +87,12 @@
                 android:padding="@dimen/dp_10"
                 android:textColor="@color/black"
                 android:textColorHint="@color/grey_normal"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
 
             <TextView
                 android:layout_marginEnd="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/dp_10"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:text="500"
                 android:textColor="@color/grey_normal"
                 android:layout_alignParentEnd="true"
@@ -121,7 +121,7 @@
             android:textColorHint="@color/grey_normal"
             android:padding="@dimen/dp_10"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:gravity="top"
             android:hint="@string/string_user_feed_back_contact"
             android:layout_width="match_parent"
@@ -131,7 +131,7 @@
             android:layout_gravity="center"
             android:gravity="center"
             android:background="@drawable/shape_get_code"
-            android:textSize="15sp"
+            android:textSize="15dp"
             android:textColor="@color/white"
             android:layout_marginTop="72dp"
             android:text="提交"

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

@@ -36,7 +36,7 @@
                     android:layout_marginTop="@dimen/dp_22"
                     android:text="我的余额"
                     android:textColor="@color/withdraw_title"
-                    android:textSize="@dimen/sp_12" />
+                    android:textSize="@dimen/dp_12" />
 
                 <TextView
                     android:id="@+id/tv_my_balance"
@@ -45,7 +45,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_21"
+                    android:textSize="@dimen/dp_21"
                     tools:text="￥0.00" />
             </LinearLayout>
 
@@ -71,7 +71,7 @@
                     android:layout_marginTop="@dimen/dp_22"
                     android:text="总业绩"
                     android:textColor="@color/withdraw_title"
-                    android:textSize="@dimen/sp_12" />
+                    android:textSize="@dimen/dp_12" />
 
                 <TextView
                     android:id="@+id/tv_all"
@@ -80,7 +80,7 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_21"
+                    android:textSize="@dimen/dp_21"
                     tools:text="￥0.00" />
 
             </LinearLayout>
@@ -101,7 +101,7 @@
             android:layout_marginTop="@dimen/dp_30"
             android:text="推广明细"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -18,7 +18,7 @@
             android:gravity="center"
             android:text="@string/string_share_title_tips"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17" />
+            android:textSize="@dimen/dp_17" />
 
         <TextView
             android:id="@+id/tv_content"
@@ -32,7 +32,7 @@
             android:paddingEnd="@dimen/dp_21"
             android:text="@string/string_bind_phone"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
         <View
             android:layout_width="match_parent"
@@ -52,7 +52,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/dp_16" />
 
             <View
                 android:layout_width="1px"
@@ -67,7 +67,7 @@
                 android:gravity="center"
                 android:text="前往绑定"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/dp_16" />
 
 
         </LinearLayout>

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

@@ -29,7 +29,7 @@
             android:layout_marginStart="@dimen/dp_10"
             tools:text="长红状元"
             android:textColor="#2D363E"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             app:layout_constraintStart_toEndOf="@id/iv_avatar"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -46,7 +46,7 @@
             android:minWidth="@dimen/dp_50"
             tools:text="资深专家"
             android:textColor="@color/color_FC7436"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             android:textStyle="bold"
             android:visibility="visible"
 
@@ -65,7 +65,7 @@
             android:background="@drawable/shape_main_bg_color"
             android:gravity="center"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             app:layout_constraintStart_toEndOf="@id/tv_type"
             app:layout_constraintTop_toBottomOf="@id/tv_name"
             tools:text="2连红" />
@@ -75,7 +75,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textColor="@color/color_FC7034"
-            android:textSize="@dimen/sp_19"
+            android:textSize="@dimen/dp_19"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_name"
@@ -87,7 +87,7 @@
             android:gravity="center"
             android:layout_height="wrap_content"
             android:textColor="@color/color_959DB0"
-            android:textSize="@dimen/sp_11"
+            android:textSize="@dimen/dp_11"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBaseline_toBaselineOf="@id/tv_continue_red"
             tools:text="6中5" />
@@ -111,7 +111,7 @@
         android:ellipsize="end"
         tools:text="今日精选西甲：西汉姆联VS南安普敦（附比分参考）"
         android:textColor="#2D363E"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 

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

@@ -12,14 +12,17 @@
     android:orientation="vertical">
 
     <TextView
-        tools:text="中超"
+        tools:text="中超中超中超中超中超中超中超中超"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:id="@+id/tv_name"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:minWidth="@dimen/dp_87"
+        android:ellipsize="end"
+        android:maxLines="1"
+        app:layout_constraintEnd_toStartOf="@id/view"
         android:textColor="@color/color_758199"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"/>
 
     <TextView
@@ -29,7 +32,7 @@
         app:layout_constraintTop_toBottomOf="@id/tv_name"
         android:id="@+id/tv_time"
         android:layout_marginTop="@dimen/dp_4"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:textColor="@color/color_758199"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -53,7 +56,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@id/view"
         android:layout_marginStart="@dimen/dp_15"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:textColor="@color/color_758199"
         android:layout_width="0dp"
         android:layout_height="wrap_content"/>
@@ -68,7 +71,7 @@
         app:layout_constraintStart_toEndOf="@id/tv_score"
         app:layout_constraintEnd_toStartOf="@id/iv_more"
         android:layout_marginStart="@dimen/dp_6"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:textColor="@color/color_758199"
         android:layout_width="0dp"
         android:layout_height="wrap_content"/>
@@ -80,7 +83,7 @@
         app:layout_constraintStart_toEndOf="@id/tv_home_name"
         android:id="@+id/tv_score"
         tools:text="2-0"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:paddingHorizontal="@dimen/dp_5"
         android:background="@drawable/shape_item_score"
         android:textColor="@color/color_FC7034"

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

@@ -17,7 +17,7 @@
         app:layout_constraintTop_toTopOf="parent"
         android:id="@+id/tv_name"
         android:textStyle="bold"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:minWidth="@dimen/dp_87"
         android:textColor="@color/color_758199"
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
         app:layout_constraintTop_toBottomOf="@id/tv_name"
         android:id="@+id/tv_time"
         android:layout_marginTop="@dimen/dp_4"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:textColor="@color/color_758199"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -55,7 +55,7 @@
         app:layout_constraintStart_toEndOf="@id/view"
         app:layout_constraintEnd_toStartOf="@id/iv_more"
         android:layout_marginStart="@dimen/dp_15"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:textColor="@color/color_758199"
         android:layout_width="0dp"
         android:layout_height="wrap_content"/>

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

@@ -16,7 +16,7 @@
         android:paddingStart="@dimen/dp_14"
         android:paddingEnd="@dimen/dp_14"
         android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_15"
+        android:textSize="@dimen/dp_15"
         tools:text="今日精选西甲：西汉姆联VS南安普敦（附比分参考）" />
 
     <androidx.recyclerview.widget.RecyclerView
@@ -52,7 +52,7 @@
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
             android:textColor="@color/color_FC7436"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="竟足" />
 
         <TextView
@@ -60,7 +60,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/color_959DB0"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="7天前" />
     </LinearLayout>
 

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

@@ -20,7 +20,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/color_758199"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="意甲" />
@@ -31,7 +31,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_5"
             android:textColor="@color/color_758199"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             app:layout_constraintStart_toEndOf="@id/tv_short_name"
             app:layout_constraintTop_toTopOf="@id/tv_short_name"
             tools:text="17:30" />
@@ -54,7 +54,7 @@
             android:maxEms="4"
             android:maxLines="1"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintStart_toEndOf="@id/iv_home_logo"
             app:layout_constraintTop_toTopOf="@id/iv_home_logo"
             tools:text="尼基沃罗" />
@@ -77,7 +77,7 @@
             android:maxEms="4"
             android:maxLines="1"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             app:layout_constraintStart_toEndOf="@id/iv_away_logo"
             app:layout_constraintTop_toTopOf="@id/iv_away_logo"
             tools:text="尼基沃罗" />
@@ -91,7 +91,7 @@
             android:gravity="center"
             android:minWidth="@dimen/dp_36"
             android:textColor="@color/color_758199"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_home"
             tools:text="1.57" />
@@ -104,7 +104,7 @@
             android:gravity="center"
             android:minWidth="@dimen/dp_36"
             android:textColor="@color/color_758199"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintBottom_toBottomOf="@id/tv_away"
             app:layout_constraintTop_toTopOf="@id/tv_away"
@@ -120,7 +120,7 @@
             android:gravity="center"
             android:minWidth="@dimen/dp_36"
             android:textColor="@color/color_758199"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             app:layout_constraintEnd_toStartOf="@id/home_odd"
             app:layout_constraintTop_toTopOf="@id/tv_home"
             tools:text="1.57" />

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

@@ -22,7 +22,7 @@
             android:gravity="center"
             android:text="@string/string_share_title_tips"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             android:textStyle="bold" />
         <View
             android:layout_marginTop="@dimen/dp_11"
@@ -40,7 +40,7 @@
             android:paddingEnd="@dimen/dp_21"
             android:text="@string/string_pay_custom"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <View
             android:layout_marginTop="@dimen/dp_11"
@@ -62,7 +62,7 @@
                 android:textStyle="bold"
                 android:text="联系客服"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_17" />
+                android:textSize="@dimen/dp_17" />
 
             <View
                 android:layout_width="match_parent"
@@ -78,7 +78,7 @@
                 android:gravity="center"
                 android:text="忍痛放弃VIP"
                 android:textColor="@color/mine_recycler_text"
-                android:textSize="@dimen/sp_17" />
+                android:textSize="@dimen/dp_17" />
 
 
         </LinearLayout>

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

@@ -22,7 +22,7 @@
             android:gravity="center"
             android:text="@string/string_share_title_tips"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             android:textStyle="bold" />
 
         <TextView
@@ -36,7 +36,7 @@
             android:paddingEnd="@dimen/dp_21"
             tools:text="@string/string_contact_custom_text"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_13" />
+            android:textSize="@dimen/dp_13" />
 
         <View
             android:layout_marginTop="@dimen/dp_11"
@@ -59,7 +59,7 @@
                 android:textStyle="bold"
                 android:text="确认"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_17" />
+                android:textSize="@dimen/dp_17" />
 
         </LinearLayout>
 

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

@@ -22,7 +22,7 @@
             android:gravity="center"
             android:text="下拉刷新"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_14" />
+            android:textSize="@dimen/dp_14" />
     </LinearLayout>
 
     <LinearLayout

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

@@ -37,7 +37,7 @@
             <TextView
                 android:visibility="gone"
                 android:layout_marginLeft="@dimen/chat_nick_margin_left"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textColor="@color/white"
                 android:paddingStart="@dimen/dp_5"
                 android:paddingEnd="@dimen/dp_5"
@@ -51,7 +51,7 @@
                 android:textColor="#459CE4"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="无敌猪猪:"
                 tools:visibility="visible"
                 android:visibility="gone" />
@@ -65,7 +65,7 @@
 
                 android:lineSpacingExtra="1dp"
                 android:textColor="#ff000000"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="文案文案文案文案文文案文案文案文案文文案文案文案文案文文案文案文案文案文文案文案文案文案文文案文案文案文案文文案文案文案文案文文案文案文案文案文"/>
 
         </LinearLayout>

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

@@ -43,7 +43,7 @@
                 android:minHeight="@dimen/ease_chat_text_min_height"
                 android:textColor="#000000"
                 tools:text="环信"
-                android:textSize="15sp" />
+                android:textSize="15dp" />
         </RelativeLayout>
 
        <!--  <TextView
@@ -70,7 +70,7 @@
             android:layout_toLeftOf="@id/bubble"
             android:layout_marginRight="@dimen/ease_chat_ack_margin_bubble"
             android:text="@string/text_ack_msg"
-            android:textSize="12sp"
+            android:textSize="12dp"
             android:visibility="invisible" />
 
         <TextView
@@ -82,7 +82,7 @@
             android:layout_toLeftOf="@id/bubble"
             android:layout_marginRight="@dimen/ease_chat_ack_margin_bubble"
             android:text="@string/text_delivered_msg"
-            android:textSize="12sp"
+            android:textSize="12dp"
             android:visibility="invisible" />
 
         <ProgressBar

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

@@ -68,7 +68,7 @@
                 android:drawablePadding="@dimen/dp_10"
                 android:layout_weight="1"
                 tools:text="22330"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:drawableStart="@mipmap/icon_live_fire"
                 android:textColor="@color/white"
                 android:layout_width="0dp"
@@ -174,7 +174,7 @@
             android:layout_height="@dimen/dp_25"
             android:paddingLeft="10dp"
             android:textColor="@android:color/white"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <TextView
             android:visibility="gone"
@@ -185,7 +185,7 @@
             android:paddingEnd="@dimen/dp_8"
             android:background="@drawable/shape_play_title"
             android:text="复制"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:textColor="@color/white"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/dp_25"/>

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

@@ -22,7 +22,7 @@
             android:gravity="center"
             android:text="提示"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             android:textStyle="bold" />
         <View
             android:layout_marginTop="@dimen/dp_11"
@@ -40,7 +40,7 @@
             android:paddingEnd="@dimen/dp_21"
             android:text="您确定要注销账号吗，此操作不可逆！"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <View
             android:layout_marginTop="@dimen/dp_11"
@@ -62,7 +62,7 @@
                 android:gravity="center"
                 android:text="确定"
                 android:textColor="@color/share_content"
-                android:textSize="@dimen/sp_17" />
+                android:textSize="@dimen/dp_17" />
 
             <View
                 android:layout_width="1dp"
@@ -80,7 +80,7 @@
                 android:gravity="center"
                 android:text="取消"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_17" />
+                android:textSize="@dimen/dp_17" />
 
 
         </LinearLayout>

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

@@ -33,7 +33,7 @@
             <TextView
                 android:text="提示"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 android:textStyle="bold"
                 android:layout_marginTop="@dimen/dp_15"
                 android:layout_width="wrap_content"
@@ -50,7 +50,7 @@
                 android:layout_height="0dp"
                 android:layout_marginTop="@dimen/dp_20"
                 android:text="@string/string_first_login"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -76,7 +76,7 @@
                         android:gravity="center"
                         android:text="同意"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_15"
+                        android:textSize="@dimen/dp_15"
                         android:background="@drawable/shape_first_confirm"
                         android:id="@+id/tv_confirm"
                         android:layout_width="0dp"
@@ -102,7 +102,7 @@
                 android:textColor="@color/white"
                 android:background="@color/main_select"
                 android:text="用户协议"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
@@ -146,7 +146,7 @@
                 android:textColor="@color/white"
                 android:background="@color/main_select"
                 android:text="隐私协议"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 

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

@@ -19,7 +19,7 @@
             android:gravity="center"
             android:text="@string/string_share_title_tips"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17" />
+            android:textSize="@dimen/dp_17" />
 
         <TextView
             android:id="@+id/tv_content"
@@ -33,7 +33,7 @@
             android:paddingEnd="@dimen/dp_20"
             tools:text="亚博充值100赠送撸大神季卡，充值200送撸大神年卡\n\n更多优惠请联系客服"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
         <View
             android:layout_width="match_parent"
@@ -47,7 +47,7 @@
             android:gravity="center"
             tools:text="@string/string_float_content"
             android:textColor="@color/blue"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
     </LinearLayout>
 
 

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

@@ -10,7 +10,7 @@
         android:id="@+id/tv_title"
         tools:text="解说帝"
         android:textColor="@color/match_item_name"
-        android:textSize="@dimen/sp_17"
+        android:textSize="@dimen/dp_17"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 
@@ -19,7 +19,7 @@
         android:layout_marginTop="@dimen/dp_9"
         tools:text="由“孤独的狼”提供"
         android:textColor="#7D7D7D"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
 

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

@@ -40,12 +40,12 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_20"
                 android:text="无广告高清体育直播"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
 
             <TextView
                 android:gravity="center"
                 android:text="登录/快速注册"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 android:textColor="@color/white"
                 android:id="@+id/tv_login"
                 android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
                     android:layout_height="wrap_content"
                     android:lineSpacingExtra="@dimen/dp_2"
                     android:textColor="@color/color_6E6A87"
-                    android:textSize="@dimen/sp_14"
+                    android:textSize="@dimen/dp_14"
                     tools:text="注册登录即代表您已同意《用户协议 》和《隐私协议》" />
             </LinearLayout>
 
@@ -94,7 +94,7 @@
                 android:textColor="@color/white"
                 android:background="@color/main_select"
                 android:text="用户协议"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 
@@ -138,7 +138,7 @@
                 android:textColor="@color/white"
                 android:background="@color/main_select"
                 android:text="隐私协议"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 

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

@@ -36,7 +36,7 @@
                 android:textColor="@color/white"
                 android:background="@color/main_select"
                 tools:text="用户协议"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"/>
 

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

@@ -23,7 +23,7 @@
             android:gravity="center"
             android:text="信号源"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             android:textStyle="bold" />
 
         <View

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

@@ -19,7 +19,7 @@
             android:gravity="center"
             android:text="@string/string_share_title_tips"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17" />
+            android:textSize="@dimen/dp_17" />
 
         <TextView
             android:id="@+id/tv_content"
@@ -33,7 +33,7 @@
             android:paddingEnd="@dimen/dp_20"
             tools:text="亚博充值100赠送撸大神季卡，充值200送撸大神年卡\n\n更多优惠请联系客服"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_15" />
+            android:textSize="@dimen/dp_15" />
 
         <View
             android:layout_width="match_parent"
@@ -52,7 +52,7 @@
                 android:gravity="center"
                 android:text="下载亚博，充值领年卡VIP"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/dp_16" />
 
             <View
                 android:layout_width="match_parent"
@@ -66,7 +66,7 @@
                 android:gravity="center"
                 android:text="撸大神充值"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/dp_16" />
 
 
         </LinearLayout>