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_material_detial.xml

@@ -47,7 +47,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:textColor="@color/color_333333"
-                            android:textSize="@dimen/sp_17"
+                            android:textSize="@dimen/dp_17"
                             android:textStyle="bold"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
@@ -59,7 +59,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginTop="@dimen/dp_11"
                             android:textColor="@color/color_758199"
-                            android:textSize="@dimen/sp_12"
+                            android:textSize="@dimen/dp_12"
                             app:layout_constraintEnd_toStartOf="@id/iv_win"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@id/tv_title"
@@ -113,7 +113,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="@dimen/dp_10"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_17"
+                                android:textSize="@dimen/dp_17"
                                 app:layout_constraintStart_toEndOf="@id/iv_avatar"
                                 app:layout_constraintTop_toTopOf="parent"
                                 tools:text="长红状元" />
@@ -130,7 +130,7 @@
                                 android:minWidth="@dimen/dp_50"
                                 android:minHeight="@dimen/dp_15"
                                 android:textColor="@color/color_FC7436"
-                                android:textSize="@dimen/sp_10"
+                                android:textSize="@dimen/dp_10"
                                 app:layout_constraintStart_toStartOf="@id/tv_name"
                                 app:layout_constraintTop_toBottomOf="@id/tv_name"
                                 tools:text="近6中5"
@@ -148,7 +148,7 @@
                                 android:minHeight="@dimen/dp_15"
                                 android:paddingStart="@dimen/dp_7"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_10"
+                                android:textSize="@dimen/dp_10"
                                 app:layout_constraintStart_toEndOf="@id/tv_rate_tag"
                                 app:layout_constraintTop_toBottomOf="@id/tv_name"
                                 app:layout_goneMarginStart="0dp"
@@ -180,7 +180,7 @@
                                     android:layout_marginStart="@dimen/dp_5"
                                     android:gravity="center"
                                     android:textColor="@color/white"
-                                    android:textSize="@dimen/sp_9"
+                                    android:textSize="@dimen/dp_9"
                                     tools:text="关注" />
                             </LinearLayout>
 
@@ -201,7 +201,7 @@
                                     android:layout_marginStart="@dimen/dp_5"
                                     android:text="近期战绩"
                                     android:textColor="@color/color_334300"
-                                    android:textSize="@dimen/sp_13"
+                                    android:textSize="@dimen/dp_13"
                                     app:layout_constraintStart_toEndOf="@id/iv_top"
                                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -231,7 +231,7 @@
                                     android:layout_height="wrap_content"
                                     android:layout_marginTop="@dimen/dp_14"
                                     android:textColor="@color/color_333333"
-                                    android:textSize="@dimen/sp_13"
+                                    android:textSize="@dimen/dp_13"
                                     app:layout_constraintStart_toStartOf="parent"
                                     app:layout_constraintTop_toBottomOf="@id/tv_top"
                                     tools:text="20年多年资深球迷，精研赛事基本面，对指数有独到见解。尤其擅长主流赛事" />
@@ -255,7 +255,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="@dimen/dp_5"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 app:layout_constraintStart_toEndOf="@id/iv_match_top"
                                 app:layout_constraintTop_toTopOf="parent"
                                 tools:text="竞足" />
@@ -276,7 +276,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="@dimen/dp_14"
                                 android:textColor="@color/color_758199"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 app:layout_constraintStart_toEndOf="@id/tv_type"
                                 app:layout_constraintTop_toTopOf="parent"
                                 tools:text="意甲 12-12  20:30" />
@@ -303,7 +303,7 @@
                                     android:maxEms="8"
                                     android:maxLines="1"
                                     android:textColor="@color/color_FC7436"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     tools:text="菲尔特菲尔特菲尔特菲尔特" />
 
                                 <ImageView
@@ -326,7 +326,7 @@
                                     android:layout_marginEnd="@dimen/dp_12"
                                     android:gravity="center"
                                     android:textColor="@color/color_FC7436"
-                                    android:textSize="@dimen/sp_17"
+                                    android:textSize="@dimen/dp_17"
                                     android:textStyle="bold"
                                     tools:text="0-2" />
 
@@ -350,7 +350,7 @@
                                     android:maxEms="8"
                                     android:maxLines="1"
                                     android:textColor="@color/color_FC7436"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     tools:text="斯图加特" />
 
                             </RelativeLayout>
@@ -377,7 +377,7 @@
                                     android:text="让球"
                                     app:layout_constraintBottom_toTopOf="@+id/ll_bad"
                                     android:textColor="@color/color_333333"
-                                    android:textSize="@dimen/sp_13"
+                                    android:textSize="@dimen/dp_13"
                                     android:textStyle="bold"
                                     app:layout_constraintEnd_toStartOf="@id/view_place1"
                                     app:layout_constraintStart_toStartOf="parent"
@@ -407,7 +407,7 @@
                                     android:gravity="center"
                                     android:text="已完结"
                                     android:textColor="@color/color_333333"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     android:textStyle="bold"
                                     app:layout_constraintBottom_toTopOf="@id/ll_bad"
                                     app:layout_constraintEnd_toStartOf="@id/view_place2"
@@ -435,7 +435,7 @@
                                     android:id="@+id/ll_bad"
                                     android:layout_width="0dp"
                                     android:layout_height="@dimen/dp_45"
-                                    android:background="@color/selector_red_detail_background_color"
+                                    android:background="@drawable/selector_red_detail_background_color"
                                     android:gravity="center"
                                     android:orientation="vertical"
                                     app:layout_constraintBottom_toBottomOf="parent"
@@ -450,7 +450,7 @@
                                         android:gravity="center"
                                         android:text="0"
                                         android:textColor="@color/color_FC7436"
-                                        android:textSize="@dimen/sp_12"
+                                        android:textSize="@dimen/dp_12"
                                         android:textStyle="bold" />
                                 </LinearLayout>
 
@@ -458,7 +458,7 @@
                                     android:id="@+id/ll_main"
                                     android:layout_width="0dp"
                                     android:layout_height="@dimen/dp_45"
-                                    android:background="@color/selector_red_detail_background_color"
+                                    android:background="@drawable/selector_red_detail_background_color"
                                     android:gravity="center"
                                     android:orientation="vertical"
                                     app:layout_constraintEnd_toStartOf="@id/ll_tie"
@@ -470,7 +470,7 @@
                                         android:layout_height="wrap_content"
                                         android:text="主胜"
                                         android:textColor="@color/selector_red_detail_text_color"
-                                        android:textSize="@dimen/sp_12"
+                                        android:textSize="@dimen/dp_12"
                                         android:textStyle="bold" />
 
                                     <TextView
@@ -479,7 +479,7 @@
                                         android:layout_height="wrap_content"
                                         android:gravity="center"
                                         android:textColor="@color/selector_red_detail_text_color"
-                                        android:textSize="@dimen/sp_12"
+                                        android:textSize="@dimen/dp_12"
                                         android:textStyle="bold"
                                         tools:text="0" />
                                 </LinearLayout>
@@ -495,7 +495,7 @@
                                     android:id="@+id/ll_tie"
                                     android:layout_width="0dp"
                                     android:layout_height="@dimen/dp_45"
-                                    android:background="@color/selector_red_detail_background_color"
+                                    android:background="@drawable/selector_red_detail_background_color"
                                     android:gravity="center"
                                     android:orientation="vertical"
                                     app:layout_constraintEnd_toStartOf="@id/ll_guest"
@@ -507,7 +507,7 @@
                                         android:layout_height="wrap_content"
                                         android:text="平局"
                                         android:textColor="@color/selector_red_detail_text_color"
-                                        android:textSize="@dimen/sp_12"
+                                        android:textSize="@dimen/dp_12"
                                         android:textStyle="bold" />
 
                                     <TextView
@@ -516,7 +516,7 @@
                                         android:layout_height="wrap_content"
                                         android:gravity="center"
                                         android:textColor="@color/selector_red_detail_text_color"
-                                        android:textSize="@dimen/sp_12"
+                                        android:textSize="@dimen/dp_12"
                                         android:textStyle="bold"
                                         tools:text="0" />
                                 </LinearLayout>
@@ -533,7 +533,7 @@
                                     android:id="@+id/ll_guest"
                                     android:layout_width="0dp"
                                     android:layout_height="@dimen/dp_45"
-                                    android:background="@color/selector_red_detail_background_color"
+                                    android:background="@drawable/selector_red_detail_background_color"
                                     android:gravity="center"
                                     android:orientation="vertical"
                                     app:layout_constraintEnd_toEndOf="parent"
@@ -545,7 +545,7 @@
                                         android:layout_height="wrap_content"
                                         android:text="客胜"
                                         android:textColor="@color/selector_red_detail_text_color"
-                                        android:textSize="@dimen/sp_12" />
+                                        android:textSize="@dimen/dp_12" />
 
                                     <TextView
                                         android:id="@+id/tv_guest"
@@ -553,7 +553,7 @@
                                         android:layout_height="wrap_content"
                                         android:gravity="center"
                                         android:textColor="@color/selector_red_detail_text_color"
-                                        android:textSize="@dimen/sp_12"
+                                        android:textSize="@dimen/dp_12"
                                         android:textStyle="bold"
                                         tools:text="0" />
                                 </LinearLayout>
@@ -581,7 +581,7 @@
                                 android:layout_marginStart="@dimen/dp_7"
                                 android:text="方案详情"
                                 android:textColor="@color/color_334300"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 android:textStyle="bold" />
 
                         </LinearLayout>

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_red_detial.xml

@@ -41,7 +41,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_17"
+                        android:textSize="@dimen/dp_17"
                         android:textStyle="bold"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
@@ -53,7 +53,7 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/dp_11"
                         android:textColor="@color/color_AAAAAA"
-                        android:textSize="@dimen/sp_12"
+                        android:textSize="@dimen/dp_12"
                         app:layout_constraintEnd_toStartOf="@id/iv_win"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toBottomOf="@id/tv_title"
@@ -106,7 +106,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/dp_10"
                             android:textColor="@color/color_333333"
-                            android:textSize="@dimen/sp_17"
+                            android:textSize="@dimen/dp_17"
                             app:layout_constraintStart_toEndOf="@id/iv_avatar"
                             app:layout_constraintTop_toTopOf="parent"
                             tools:text="长红状元" />
@@ -123,7 +123,7 @@
                             android:minWidth="@dimen/dp_36"
                             android:minHeight="@dimen/dp_13"
                             android:textColor="@color/color_FC7436"
-                            android:textSize="@dimen/sp_7"
+                            android:textSize="@dimen/dp_7"
                             android:textStyle="bold"
                             android:visibility="gone"
                             app:layout_constraintStart_toStartOf="@id/tv_name"
@@ -143,7 +143,7 @@
                             android:minWidth="@dimen/dp_22"
                             android:minHeight="@dimen/dp_13"
                             android:textColor="@color/color_FC7436"
-                            android:textSize="@dimen/sp_7"
+                            android:textSize="@dimen/dp_7"
                             android:textStyle="bold"
                             app:layout_constraintStart_toEndOf="@id/tv_type"
                             app:layout_constraintTop_toTopOf="@id/tv_type"
@@ -160,7 +160,7 @@
                             android:background="@mipmap/icon_continue_red_bg"
                             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连红" />
@@ -190,7 +190,7 @@
                                 android:layout_marginStart="@dimen/dp_5"
                                 android:gravity="center"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_9"
+                                android:textSize="@dimen/dp_9"
                                 tools:text="关注" />
                         </LinearLayout>
 
@@ -220,7 +220,7 @@
                             android:layout_height="wrap_content"
                             android:layout_marginStart="@dimen/dp_21"
                             android:textColor="@color/color_333333"
-                            android:textSize="@dimen/sp_12"
+                            android:textSize="@dimen/dp_12"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toTopOf="parent"
                             tools:text="意甲 12-12  20:30" />
@@ -247,7 +247,7 @@
                                 android:maxEms="8"
                                 android:maxLines="1"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/dp_12"
                                 tools:text="菲尔特菲尔特菲尔特菲尔特" />
 
                             <ImageView
@@ -269,7 +269,7 @@
                                 android:layout_marginEnd="@dimen/dp_12"
                                 android:gravity="center"
                                 android:textColor="@color/color_C50000"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/dp_12"
                                 android:textStyle="bold"
                                 tools:text="0-2" />
 
@@ -293,7 +293,7 @@
                                 android:maxEms="8"
                                 android:maxLines="1"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/dp_12"
                                 tools:text="斯图加特" />
 
                         </RelativeLayout>
@@ -320,7 +320,7 @@
                                 android:text="让球"
 
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/dp_12"
                                 android:textStyle="bold"
                                 app:layout_constraintEnd_toStartOf="@id/view_place1"
                                 app:layout_constraintStart_toStartOf="parent"
@@ -341,7 +341,7 @@
                                 android:gravity="center"
                                 android:text="已完结"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/dp_12"
                                 android:textStyle="bold"
                                 app:layout_constraintEnd_toStartOf="@id/view_place2"
                                 app:layout_constraintStart_toEndOf="@id/view_place1"
@@ -368,7 +368,7 @@
                                 android:id="@+id/ll_bad"
                                 android:layout_width="0dp"
                                 android:layout_height="@dimen/dp_45"
-                                android:background="@color/selector_red_detail_background_color"
+                                android:background="@drawable/selector_red_detail_background_color"
                                 android:gravity="center"
                                 android:orientation="vertical"
                                 app:layout_constraintEnd_toStartOf="@id/ll_main"
@@ -381,7 +381,7 @@
                                     android:layout_height="wrap_content"
                                     android:gravity="center"
                                     android:textColor="@color/color_FF0000"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     android:textStyle="bold"
                                     android:text="0" />
                             </LinearLayout>
@@ -390,7 +390,7 @@
                                 android:id="@+id/ll_main"
                                 android:layout_width="0dp"
                                 android:layout_height="@dimen/dp_45"
-                                android:background="@color/selector_red_detail_background_color"
+                                android:background="@drawable/selector_red_detail_background_color"
                                 android:gravity="center"
                                 android:orientation="vertical"
                                 app:layout_constraintEnd_toStartOf="@id/ll_tie"
@@ -402,7 +402,7 @@
                                     android:layout_height="wrap_content"
                                     android:text="主胜"
                                     android:textColor="@color/selector_red_detail_text_color"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     android:textStyle="bold" />
 
                                 <TextView
@@ -411,7 +411,7 @@
                                     android:layout_height="wrap_content"
                                     android:gravity="center"
                                     android:textColor="@color/selector_red_detail_text_color"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     android:textStyle="bold"
                                     tools:text="0" />
                             </LinearLayout>
@@ -427,7 +427,7 @@
                                 android:id="@+id/ll_tie"
                                 android:layout_width="0dp"
                                 android:layout_height="@dimen/dp_45"
-                                android:background="@color/selector_red_detail_background_color"
+                                android:background="@drawable/selector_red_detail_background_color"
                                 android:gravity="center"
                                 android:orientation="vertical"
                                 app:layout_constraintEnd_toStartOf="@id/ll_guest"
@@ -439,7 +439,7 @@
                                     android:layout_height="wrap_content"
                                     android:text="平局"
                                     android:textColor="@color/selector_red_detail_text_color"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     android:textStyle="bold" />
 
                                 <TextView
@@ -448,7 +448,7 @@
                                     android:layout_height="wrap_content"
                                     android:gravity="center"
                                     android:textColor="@color/selector_red_detail_text_color"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     android:textStyle="bold"
                                     tools:text="0" />
                             </LinearLayout>
@@ -465,7 +465,7 @@
                                 android:id="@+id/ll_guest"
                                 android:layout_width="0dp"
                                 android:layout_height="@dimen/dp_45"
-                                android:background="@color/selector_red_detail_background_color"
+                                android:background="@drawable/selector_red_detail_background_color"
                                 android:gravity="center"
                                 android:orientation="vertical"
                                 app:layout_constraintEnd_toEndOf="parent"
@@ -477,7 +477,7 @@
                                     android:layout_height="wrap_content"
                                     android:text="客胜"
                                     android:textColor="@color/selector_red_detail_text_color"
-                                    android:textSize="@dimen/sp_12" />
+                                    android:textSize="@dimen/dp_12" />
 
                                 <TextView
                                     android:id="@+id/tv_guest"
@@ -485,7 +485,7 @@
                                     android:layout_height="wrap_content"
                                     android:gravity="center"
                                     android:textColor="@color/selector_red_detail_text_color"
-                                    android:textSize="@dimen/sp_12"
+                                    android:textSize="@dimen/dp_12"
                                     android:textStyle="bold"
                                     tools:text="0" />
                             </LinearLayout>
@@ -515,7 +515,7 @@
                         android:layout_marginStart="@dimen/dp_7"
                         android:text="方案详情"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_12"
+                        android:textSize="@dimen/dp_12"
                         android:textStyle="bold" />
 
                 </LinearLayout>

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>

app/src/main/res/layout/dialog_pay_tip_web.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_15" />
+                android:textSize="@dimen/dp_15" />
 
             <View
                 android:layout_width="match_parent"
@@ -66,7 +66,7 @@
                 android:gravity="center"
                 android:text="添加客服，了解更多精彩活动"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/dp_15" />
 
 
         </LinearLayout>

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

@@ -18,9 +18,9 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_15"
         android:gravity="center"
-        android:text="登陆失败"
+        android:text="登录失败"
         android:textColor="@color/black"
-        android:textSize="@dimen/sp_17"
+        android:textSize="@dimen/dp_17"
         android:textStyle="bold" />
 
     <TextView
@@ -35,7 +35,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_width="match_parent"
@@ -55,7 +55,7 @@
             android:gravity="center"
             android:text="取消"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <TextView
             android:id="@+id/tv_right"
@@ -66,7 +66,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/dialog_sign.xml

@@ -16,7 +16,7 @@
         android:gravity="center"
         android:text="签到免费赠送观看次数"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_17"
+        android:textSize="@dimen/dp_17"
         android:textStyle="bold" />
 
     <TextView
@@ -28,7 +28,7 @@
         android:gravity="center"
         android:text="@string/string_sign_success"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_17" />
+        android:textSize="@dimen/dp_17" />
 
     <LinearLayout
         android:gravity="center"
@@ -50,7 +50,7 @@
                 <TextView
                     android:layout_marginTop="77dp"
                     android:layout_centerHorizontal="true"
-                    android:textSize="@dimen/sp_14"
+                    android:textSize="@dimen/dp_14"
                     android:text="@string/string_sign_success_tes"
                     android:textColor="@color/text_vip_mine"
                     android:id="@+id/tv_sign_days"
@@ -61,7 +61,7 @@
                     android:layout_marginTop="@dimen/dp_10"
                     android:layout_below="@id/tv_sign_days"
                     android:textColor="@color/text_vip_mine"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     android:text="每连续登录一天送一次观看次数"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>

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

@@ -21,7 +21,7 @@
             android:layout_marginStart="@dimen/dp_17"
             android:layout_marginTop="@dimen/dp_41"
             android:textColor="@color/color_FC7436"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:text="澳洲甲" />
@@ -63,7 +63,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/dp_13"
                     tools:text="蟑螂恶霸" />
 
                 <TextView
@@ -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="房间号：123456" />
             </LinearLayout>
 
@@ -103,7 +103,7 @@
             android:layout_marginStart="@dimen/dp_7"
             android:text="主播公告"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             app:layout_constraintStart_toEndOf="@id/iv_notice"
            app:layout_constraintTop_toTopOf="@id/iv_notice"/>
 
@@ -115,7 +115,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_14"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             tools:text="欲望从无止境 顶多暂时收敛" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 

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

@@ -87,7 +87,7 @@
                         android:layout_marginBottom="@dimen/dp_10"
                         tools:text="最热"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_17" />
+                        android:textSize="@dimen/dp_17" />
 
                 </LinearLayout>
 

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

@@ -25,7 +25,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/dp_31"
                 android:layout_gravity="center"
-                android:layout_marginTop="@dimen/sp_17"
+                android:layout_marginTop="@dimen/dp_17"
                 android:background="@drawable/shape_live_bg"
                 android:orientation="horizontal"
                 android:padding="@dimen/dp_2">

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

@@ -34,9 +34,9 @@
                 <TextView
 
                     android:layout_marginTop="@dimen/dp_10"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     android:textColor="@color/grey_normal"
-                    android:text="登陆账号关注喜欢的主播"
+                    android:text="登录账号关注喜欢的主播"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
 
@@ -65,7 +65,7 @@
                 android:textStyle="bold"
                 android:layout_marginStart="@dimen/dp_15"
                 android:layout_marginTop="@dimen/dp_10"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:textColor="@color/black"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

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

@@ -27,9 +27,9 @@
 
             <TextView
                 android:layout_marginTop="@dimen/dp_10"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textColor="@color/grey_normal"
-                android:text="登陆账号预约想看的赛事"
+                android:text="登录账号预约想看的赛事"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
             <ImageView

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

@@ -35,7 +35,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:textColor="#FC7034"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="@string/string_movie_detail" />
             <TextView
                 android:visibility="gone"
@@ -44,7 +44,7 @@
                 android:text="举报"
                 android:gravity="center"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:id="@+id/tv_report"
                 android:layout_width="48dp"
                 android:layout_height="@dimen/dp_20"/>
@@ -77,7 +77,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:textColor="@color/color_FF0000"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="@string/string_movie_detail" />
         </LinearLayout>
     </LinearLayout>
@@ -131,7 +131,7 @@
             android:layout_weight="1"
             android:layout_gravity="center_vertical"
             android:gravity="center_vertical"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:textColor="#757575"
             android:text="登录后，即可开始聊天"
             android:layout_width="0dp"
@@ -150,7 +150,7 @@
 
         <TextView
             android:text="发送"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             android:gravity="center"
             android:textColor="@color/white"
             android:background="@drawable/shape_send_message"

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

@@ -11,7 +11,7 @@
 <TextView
     android:layout_marginTop="@dimen/dp_10"
     android:textColor="@color/black"
-    android:textSize="@dimen/sp_15"
+    android:textSize="@dimen/dp_15"
     android:text="主播赛程"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"/>

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

@@ -68,7 +68,7 @@
                             android:maxLines="1"
                             android:text="房间号/房间名/主播名"
                             android:textColor="@color/color_999999"
-                            android:textSize="@dimen/sp_12" />
+                            android:textSize="@dimen/dp_12" />
                     </RelativeLayout>
 
 
@@ -106,12 +106,12 @@
                         app:tl_indicator_start_color="#FFA56A"
                         app:tl_indicator_style="NORMAL"
                         app:tl_indicator_width="@dimen/dp_20"
-                        app:tl_select_textsize="@dimen/sp_13"
+                        app:tl_select_textsize="@dimen/dp_13"
                         app:tl_tab_width="@dimen/dp_90"
                         app:tl_textBold="SELECT"
                         app:tl_textSelectColor="#FC7034"
                         app:tl_textUnselectColor="@color/color_959DB0"
-                        app:tl_textsize="@dimen/sp_13"
+                        app:tl_textsize="@dimen/dp_13"
                         app:tl_underline_color="@color/transparent" />
 
                 </LinearLayout>

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

@@ -87,7 +87,7 @@
                                     android:layout_weight="1"
                                     android:text="精选专家"
                                     android:textColor="@color/color_333333"
-                                    android:textSize="@dimen/sp_17"
+                                    android:textSize="@dimen/dp_17"
                                     android:textStyle="bold" />
 
                                 <LinearLayout
@@ -106,7 +106,7 @@
                                         android:gravity="center"
                                         android:text="名家"
                                         android:textColor="@color/selector_specialist"
-                                        android:textSize="@dimen/sp_12" />
+                                        android:textSize="@dimen/dp_12" />
 
                                     <TextView
                                         android:id="@+id/tv_win_rate"
@@ -118,7 +118,7 @@
                                         android:gravity="center"
                                         android:text="胜率"
                                         android:textColor="@color/selector_specialist"
-                                        android:textSize="@dimen/sp_12" />
+                                        android:textSize="@dimen/dp_12" />
 
                                     <TextView
                                         android:id="@+id/tv_continue_red"
@@ -130,7 +130,7 @@
                                         android:gravity="center"
                                         android:text="连红"
                                         android:textColor="@color/selector_specialist"
-                                        android:textSize="@dimen/sp_12" />
+                                        android:textSize="@dimen/dp_12" />
 
                                 </LinearLayout>
 
@@ -183,7 +183,7 @@
                                     android:layout_weight="1"
                                     android:text="焦点赛程"
                                     android:textColor="@color/color_333333"
-                                    android:textSize="@dimen/sp_17"
+                                    android:textSize="@dimen/dp_17"
                                     android:textStyle="bold" />
 
                                 <TextView
@@ -192,7 +192,7 @@
                                     android:layout_marginEnd="@dimen/dp_10"
                                     android:text="完整"
                                     android:textColor="@color/color_758199"
-                                    android:textSize="@dimen/sp_15" />
+                                    android:textSize="@dimen/dp_15" />
 
                                 <ImageView
                                     android:layout_width="wrap_content"
@@ -249,7 +249,7 @@
                             android:gravity="center"
                             android:text="有料"
                             android:textColor="@color/color_333333"
-                            android:textSize="@dimen/sp_17"
+                            android:textSize="@dimen/dp_17"
                             android:textStyle="bold" />
 
 
@@ -288,12 +288,12 @@
                 app:tl_indicator_height="@dimen/dp_4"
                 app:tl_indicator_style="NORMAL"
                 app:tl_indicator_width="@dimen/dp_24"
-                app:tl_select_textsize="@dimen/sp_13"
+                app:tl_select_textsize="@dimen/dp_13"
                 app:tl_tab_width="@dimen/dp_60"
                 app:tl_textBold="BOTH"
                 app:tl_textSelectColor="@color/color_FC7034"
                 app:tl_textUnselectColor="@color/color_959DB0"
-                app:tl_textsize="@dimen/sp_13"
+                app:tl_textsize="@dimen/dp_13"
                 app:tl_underline_color="@color/transparent" />
 
             <androidx.viewpager2.widget.ViewPager2

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

@@ -31,12 +31,12 @@
                 app:tl_indicator_height="@dimen/dp_2"
                 app:tl_indicator_style="NORMAL"
                 app:tl_indicator_width="@dimen/dp_20"
-                app:tl_select_textsize="@dimen/sp_13"
+                app:tl_select_textsize="@dimen/dp_13"
                 app:tl_tab_width="@dimen/dp_72"
                 app:tl_textBold="SELECT"
                 app:tl_textSelectColor="@color/color_FC7436"
                 app:tl_textUnselectColor="@color/color_959DB0"
-                app:tl_textsize="@dimen/sp_13"
+                app:tl_textsize="@dimen/dp_13"
                 app:tl_underline_color="@color/transparent" />
         </LinearLayout>
 

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

@@ -96,7 +96,7 @@
                         android:layout_marginStart="@dimen/dp_5"
                         android:text="热门直播"
                         android:textColor="@color/black"
-                        android:textSize="@dimen/sp_14"
+                        android:textSize="@dimen/dp_14"
                         android:textStyle="bold" />
                 </LinearLayout>
 

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

@@ -62,7 +62,7 @@
                                 android:layout_weight="1"
                                 android:text="分析数据"
                                 android:textColor="@color/color_FC7436"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
 
                             <TextView
                                 android:id="@+id/tv_history"
@@ -71,7 +71,7 @@
                                 android:background="@mipmap/bg_analysis_data"
                                 android:gravity="center"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/dp_12"
                                 tools:text="历史交锋：2胜 0平 0负" />
                         </LinearLayout>
 
@@ -108,7 +108,7 @@
                                 android:layout_marginStart="@dimen/dp_10"
                                 android:text="积分榜"
                                 android:textColor="@color/color_FC7436"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
                         </LinearLayout>
 
 
@@ -132,7 +132,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="@dimen/dp_5"
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 tools:text="巴塞罗那" />
                         </LinearLayout>
 
@@ -164,7 +164,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="@dimen/dp_5"
                                 android:textColor="@color/black"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 tools:text="巴塞罗那" />
                         </LinearLayout>
 

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

@@ -29,7 +29,7 @@
                     android:layout_height="wrap_content"
                     android:text="赛况"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_18" />
+                    android:textSize="@dimen/dp_18" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/mRecyclerView"
@@ -235,7 +235,7 @@
                     android:layout_marginTop="@dimen/dp_10"
                     android:text="技术统计"
                     android:textColor="@color/black"
-                    android:textSize="@dimen/sp_18" />
+                    android:textSize="@dimen/dp_18" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_tech"

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

@@ -50,12 +50,12 @@
                     app:tl_indicator_start_color="#FFBA69"
                     app:tl_indicator_style="BLOCK"
                     app:tl_indicator_width="@dimen/dp_62"
-                    app:tl_select_textsize="@dimen/sp_13"
+                    app:tl_select_textsize="@dimen/dp_13"
                     app:tl_tab_width="@dimen/dp_62"
                     app:tl_textBold="SELECT"
                     app:tl_textSelectColor="@color/white"
                     app:tl_textUnselectColor="#FC7034"
-                    app:tl_textsize="@dimen/sp_13"
+                    app:tl_textsize="@dimen/dp_13"
                     app:tl_underline_color="@color/transparent" />
             </LinearLayout>
 

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

@@ -44,7 +44,7 @@
                         android:layout_marginStart="@dimen/dp_5"
                         android:text="水星"
                         android:textColor="@color/main_color"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="@dimen/dp_13" />
                 </LinearLayout>
 
                 <HorizontalScrollView
@@ -83,7 +83,7 @@
                         android:layout_marginStart="@dimen/dp_5"
                         android:text="水星"
                         android:textColor="@color/main_color"
-                        android:textSize="@dimen/sp_13" />
+                        android:textSize="@dimen/dp_13" />
                 </LinearLayout>
 
                 <HorizontalScrollView

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

@@ -32,12 +32,12 @@
                 app:tl_indicator_height="@dimen/dp_2"
                 app:tl_indicator_style="NORMAL"
                 app:tl_indicator_width="@dimen/dp_20"
-                app:tl_select_textsize="@dimen/sp_13"
+                app:tl_select_textsize="@dimen/dp_13"
                 app:tl_tab_width="@dimen/dp_85"
                 app:tl_textBold="SELECT"
                 app:tl_textSelectColor="#FC7034"
                 app:tl_textUnselectColor="@color/color_959DB0"
-                app:tl_textsize="@dimen/sp_13"
+                app:tl_textsize="@dimen/dp_13"
                 app:tl_underline_color="@color/transparent" />
 
         </LinearLayout>

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

@@ -57,7 +57,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"
                             android:textStyle="bold"
                             tools:text="只蹦不哒的小僵尸" />
 
@@ -85,7 +85,7 @@
                                 android:paddingStart="@dimen/dp_5"
                                 android:paddingEnd="@dimen/dp_5"
                                 android:textColor="@color/text_vip_new"
-                                android:textSize="@dimen/sp_12"
+                                android:textSize="@dimen/dp_12"
                                 tools:text="有效期：100天" />
                         </LinearLayout>
 
@@ -119,12 +119,12 @@
                             android:layout_marginStart="@dimen/dp_5"
                             android:text="绑定手机号码"
                             android:textColor="@color/white"
-                            android:textSize="@dimen/sp_10" />
+                            android:textSize="@dimen/dp_10" />
                     </LinearLayout>
 
                     <TextView
                         android:gravity="center"
-                        android:textSize="@dimen/sp_10"
+                        android:textSize="@dimen/dp_10"
                         android:layout_marginEnd="@dimen/dp_10"
                         android:layout_alignParentTop="true"
                         android:layout_alignEnd="@id/ll_bind_phone"
@@ -166,7 +166,7 @@
                             android:gravity="bottom"
                             android:text="联系客服"
                             android:textColor="@color/text_blue"
-                            android:textSize="@dimen/sp_15" />
+                            android:textSize="@dimen/dp_15" />
 
                         <RelativeLayout
                             android:layout_width="@dimen/dp_25"
@@ -189,7 +189,7 @@
                                 android:gravity="center"
                                 android:text="1"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_9" />
+                                android:textSize="@dimen/dp_9" />
                         </RelativeLayout>
 
 
@@ -219,7 +219,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="观影次数"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_16"
+                                android:textSize="@dimen/dp_16"
                                 android:textStyle="bold" />
 
                             <TextView
@@ -232,7 +232,7 @@
                                 android:textStyle="bold"
                                 android:text="无限次"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_16" />
+                                android:textSize="@dimen/dp_16" />
                         </LinearLayout>
 
                         <LinearLayout
@@ -251,7 +251,7 @@
                                 android:layout_height="wrap_content"
                                 android:text="钱包余额"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_16"
+                                android:textSize="@dimen/dp_16"
                                 android:textStyle="bold" />
 
                             <TextView
@@ -263,7 +263,7 @@
                                 android:textStyle="bold"
                                 tools:text="100.00"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_16" />
+                                android:textSize="@dimen/dp_16" />
                         </LinearLayout>
 
                     </LinearLayout>
@@ -295,7 +295,7 @@
                             android:layout_weight="1"
                             android:text="@string/string_vip_type_normal"
                             android:textColor="@color/white"
-                            android:textSize="@dimen/sp_17"
+                            android:textSize="@dimen/dp_17"
                             android:textStyle="bold" />
 
                         <TextView
@@ -415,7 +415,7 @@
                             android:layout_marginStart="@dimen/dp_11"
                             android:text="加入用户群,红包天天领"
                             android:textColor="@color/text_red"
-                            android:textSize="@dimen/sp_16" />
+                            android:textSize="@dimen/dp_16" />
 
 
                     </LinearLayout>
@@ -470,7 +470,7 @@
                             android:layout_weight="1"
                             android:text="我的收藏"
                             android:textColor="@color/normal_text_3"
-                            android:textSize="@dimen/sp_16" />
+                            android:textSize="@dimen/dp_16" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -478,7 +478,7 @@
                             android:layout_gravity="center"
                             android:text="查看更多"
                             android:textColor="@color/normal_text_3"
-                            android:textSize="@dimen/sp_13"
+                            android:textSize="@dimen/dp_13"
                             android:visibility="gone" />
 
                         <ImageView
@@ -522,7 +522,7 @@
                             android:layout_weight="1"
                             android:text="历史播放"
                             android:textColor="@color/normal_text_3"
-                            android:textSize="@dimen/sp_16" />
+                            android:textSize="@dimen/dp_16" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -530,7 +530,7 @@
                             android:layout_gravity="center"
                             android:text="查看更多"
                             android:textColor="@color/mine_more_text"
-                            android:textSize="@dimen/sp_13"
+                            android:textSize="@dimen/dp_13"
                             android:visibility="gone" />
 
                         <ImageView
@@ -574,7 +574,7 @@
                             android:layout_weight="1"
                             android:text="下载管理"
                             android:textColor="@color/normal_text_3"
-                            android:textSize="@dimen/sp_16" />
+                            android:textSize="@dimen/dp_16" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -582,7 +582,7 @@
                             android:layout_gravity="center"
                             android:text="查看更多"
                             android:textColor="@color/mine_more_text"
-                            android:textSize="@dimen/sp_13"
+                            android:textSize="@dimen/dp_13"
                             android:visibility="gone" />
 
                         <ImageView
@@ -626,7 +626,7 @@
                             android:layout_weight="1"
                             android:text="我的付费"
                             android:textColor="@color/normal_text_3"
-                            android:textSize="@dimen/sp_16" />
+                            android:textSize="@dimen/dp_16" />
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -634,7 +634,7 @@
                             android:layout_gravity="center"
                             android:text="查看更多"
                             android:textColor="@color/normal_text_3"
-                            android:textSize="@dimen/sp_13"
+                            android:textSize="@dimen/dp_13"
                             android:visibility="gone" />
 
                         <ImageView

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

@@ -62,7 +62,7 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:textColor="@color/color_333333"
-                        android:textSize="@dimen/sp_19"
+                        android:textSize="@dimen/dp_19"
                         android:textStyle="bold"
                         tools:text="猪猪侠" />
 
@@ -112,7 +112,7 @@
                                 android:layout_marginStart="@dimen/dp_10"
                                 android:text="等级"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_13" />
+                                android:textSize="@dimen/dp_13" />
 
                             <TextView
                                 android:id="@+id/tv_level"
@@ -120,7 +120,7 @@
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="@dimen/dp_8"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_17"
+                                android:textSize="@dimen/dp_17"
                                 android:textStyle="bold"
                                 tools:text="LV.1" />
 
@@ -155,7 +155,7 @@
                                 android:layout_marginStart="@dimen/dp_10"
                                 android:text="金币"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_13" />
+                                android:textSize="@dimen/dp_13" />
 
                             <TextView
                                 android:id="@+id/tv_coin"
@@ -164,7 +164,7 @@
                                 android:layout_marginStart="@dimen/dp_8"
                                 android:text="0"
                                 android:textColor="@color/white"
-                                android:textSize="@dimen/sp_17"
+                                android:textSize="@dimen/dp_17"
                                 android:textStyle="bold" />
 
 
@@ -201,7 +201,7 @@
                                 android:layout_weight="1"
                                 android:text="消息中心"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
 
 
                             <ImageView
@@ -235,7 +235,7 @@
                                 android:layout_weight="1"
                                 android:text="我的关注"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
 
 
                             <ImageView
@@ -269,7 +269,7 @@
                                 android:layout_weight="1"
                                 android:text="我的预约"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
 
 
                             <ImageView
@@ -303,7 +303,7 @@
                                 android:layout_weight="1"
                                 android:text="举报"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -311,7 +311,7 @@
                                 android:layout_gravity="center"
                                 android:text="查看更多"
                                 android:textColor="@color/normal_text_3"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 android:visibility="gone" />
 
                             <ImageView
@@ -346,7 +346,7 @@
                                 android:layout_weight="1"
                                 android:text="账号与绑定"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -354,7 +354,7 @@
                                 android:layout_gravity="center"
                                 android:text="查看更多"
                                 android:textColor="@color/mine_more_text"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 android:visibility="gone" />
 
                             <ImageView
@@ -388,7 +388,7 @@
                                 android:layout_weight="1"
                                 android:text="关于我们"
                                 android:textColor="@color/color_333333"
-                                android:textSize="@dimen/sp_15" />
+                                android:textSize="@dimen/dp_15" />
 
                             <TextView
                                 android:layout_width="wrap_content"
@@ -396,7 +396,7 @@
                                 android:layout_gravity="center"
                                 android:text="查看更多"
                                 android:textColor="@color/normal_text_3"
-                                android:textSize="@dimen/sp_13"
+                                android:textSize="@dimen/dp_13"
                                 android:visibility="gone" />
 
                             <ImageView

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

@@ -85,7 +85,7 @@
                         android:layout_marginBottom="@dimen/dp_10"
                         tools:text="最热"
                         android:textColor="@color/white"
-                        android:textSize="@dimen/sp_16" />
+                        android:textSize="@dimen/dp_16" />
 
                 </LinearLayout>
 

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

@@ -35,13 +35,13 @@
                 android:hint="@string/main_search_hint"
                 android:paddingStart="@dimen/dp_10"
                 android:textColorHint="@color/white"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
 
             <ImageView
                 android:id="@+id/iv_search"
                 android:layout_gravity="center"
                 android:src="@mipmap/icon_main_search"
-                android:layout_marginEnd="@dimen/sp_14"
+                android:layout_marginEnd="@dimen/dp_14"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
         </LinearLayout>
@@ -68,10 +68,10 @@
             android:layout_height="wrap_content"
             android:background="@color/transparent"
             app:tl_indicator_color="@color/transparent"
-            app:tl_select_textsize="@dimen/sp_20"
+            app:tl_select_textsize="@dimen/dp_20"
             app:tl_tab_padding_none_first="true"
             app:tl_textBold="SELECT"
-            app:tl_textsize="@dimen/sp_17"
+            app:tl_textsize="@dimen/dp_17"
             app:tl_underline_color="@color/transparent" />
 
         <androidx.viewpager.widget.ViewPager

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

@@ -30,10 +30,10 @@
             <TextView
                 android:id="@+id/tv_title_rank"
                 android:textStyle="bold"
-                android:layout_marginStart="@dimen/sp_15"
+                android:layout_marginStart="@dimen/dp_15"
                 android:layout_centerVertical="true"
                 android:textColor="@color/text_normal"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="用户点赞排行" />
@@ -52,10 +52,10 @@
                     android:src="@mipmap/icon_rank"
                     android:layout_width="@dimen/dp_13"
                     android:layout_height="@dimen/dp_11"/>
-                <Spinner
+                <dpinner
 
                     android:background="@null"
-                    android:id="@+id/spinner"
+                    android:id="@+id/dpinner"
                     android:layout_width="@dimen/dp_50"
                     android:layout_height="wrap_content"
                     android:dropDownVerticalOffset="@dimen/dp_20"/>

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

@@ -29,7 +29,7 @@
             app:tl_indicator_height="2dp"
             app:tl_textSelectColor="@color/white"
             app:tl_textUnselectColor="@color/main_second_unselect"
-            app:tl_textsize="@dimen/sp_16" />
+            app:tl_textsize="@dimen/dp_16" />
 
 
     </RelativeLayout>

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

@@ -31,7 +31,7 @@
                 android:layout_marginStart="@dimen/dp_5"
                 android:text="近期战绩"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 app:layout_constraintStart_toEndOf="@id/iv_top"
                 app:layout_constraintTop_toTopOf="parent" />
 
@@ -61,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:text="近"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_label"
@@ -80,7 +80,7 @@
                     android:layout_height="wrap_content"
                     android:text="远"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
 
@@ -102,12 +102,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_13"
+                app:tl_select_textsize="@dimen/dp_13"
                 app:tl_tab_width="@dimen/dp_60"
                 app:tl_textBold="SELECT"
                 app:tl_textSelectColor="@color/color_959DB0"
                 app:tl_textUnselectColor="@color/color_758199"
-                app:tl_textsize="@dimen/sp_13"
+                app:tl_textsize="@dimen/dp_13"
                 app:tl_underline_color="@color/transparent" />
 
             <com.flyco.tablayout.widget.NestedScrollableHost

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

@@ -23,12 +23,12 @@
             android:layout_height="45dp"
             android:background="@color/transparent"
             app:tl_indicator_color="@color/red"
-            app:tl_select_textsize="@dimen/sp_16"
+            app:tl_select_textsize="@dimen/dp_16"
             app:tl_tab_padding_none_first="false"
             app:tl_textUnselectColor="@color/star_title_un_select"
             app:tl_textBold="NONE"
             app:tl_indicator_style="BLOCK"
-            app:tl_textsize="@dimen/sp_16"
+            app:tl_textsize="@dimen/dp_16"
             app:tl_indicator_margin_left="5dp"
             app:tl_indicator_margin_right="5dp"
             app:tl_indicator_corner_radius="@dimen/dp_20"

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

@@ -26,7 +26,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="right"
             app:indexBarPressBackground="@color/white"
-            app:indexBarTextSize="@dimen/sp_12"/>
+            app:indexBarTextSize="@dimen/dp_12"/>
 
         <TextView
             android:layout_centerInParent="true"
@@ -37,7 +37,7 @@
             android:background="@drawable/shape_side_bar_bg"
             android:gravity="center"
             android:textColor="@android:color/white"
-            android:textSize="48sp"
+            android:textSize="48dp"
             android:visibility="gone"
             tools:text="A"
             tools:visibility="visible"/>

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

@@ -17,7 +17,7 @@
         android:layout_marginTop="@dimen/dp_5"
         tools:text="乔曼"
         android:layout_gravity="center"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         android:id="@+id/tv_actor_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>

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

@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_6"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             tools:text="巴塞罗那-3胜2平0负" />
     </LinearLayout>
 
@@ -52,7 +52,7 @@
             android:gravity="center"
             android:text="VS"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:textStyle="bold" />
 
         <ImageView
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_10"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             tools:text="巴塞罗那-3胜2平0负" />
     </LinearLayout>
 

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

@@ -25,7 +25,7 @@
 
         <TextView
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             android:id="@+id/tv_anchor_name"
             tools:text="无敌猪猪侠"
             android:layout_width="wrap_content"
@@ -34,7 +34,7 @@
         <TextView
             android:layout_marginTop="@dimen/dp_5"
             android:textColor="@color/color_858585"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             android:id="@+id/tv_room"
             tools:text="CBA 浙江广厦 vs 山西汾酒"
             android:layout_width="wrap_content"

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

@@ -12,7 +12,7 @@
         android:paddingTop="@dimen/dp_10"
         android:paddingBottom="@dimen/dp_10"
         tools:text="@string/main_search_hint"
-        android:textSize="@dimen/sp_18"
+        android:textSize="@dimen/dp_18"
         android:textColor="@color/white"
         android:id="@+id/tv_title"
         android:layout_width="match_parent"
@@ -21,7 +21,7 @@
     <TextView
         tools:text="@string/string_movie_detail"
         android:layout_marginTop="@dimen/dp_10"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:textColor="@color/white_60"
         android:id="@+id/tv_content"
         android:layout_width="match_parent"

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

@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:text="金币"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
 
             <TextView
                 android:textColor="@color/black"
@@ -42,7 +42,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_10"
                 android:layout_weight="1"
-                android:textSize="@dimen/sp_20"
+                android:textSize="@dimen/dp_20"
                 android:textStyle="bold"
                 tools:text="15" />
 
@@ -56,7 +56,7 @@
                 android:paddingBottom="@dimen/dp_8"
                 android:text="赠送"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:textStyle="bold" />
         </LinearLayout>
     </LinearLayout>

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

@@ -19,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/selector_vip_text"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             tools:text="月卡" />
 
         <LinearLayout
@@ -33,7 +33,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
@@ -41,7 +41,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/selector_vip_text"
-                android:textSize="@dimen/sp_18"
+                android:textSize="@dimen/dp_18"
                 android:textStyle="bold"
                 tools:text="30.00" />
         </LinearLayout>
@@ -53,7 +53,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/white_40"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             tools:text="¥60" />
 
         <TextView
@@ -67,7 +67,7 @@
             android:paddingEnd="@dimen/dp_8"
             android:paddingBottom="@dimen/dp_1"
             android:textColor="@color/text_deep_vip"
-            android:textSize="@dimen/sp_9"
+            android:textSize="@dimen/dp_9"
             tools:text="立省22元" />
     </LinearLayout>
 
@@ -83,5 +83,5 @@
         android:paddingBottom="@dimen/dp_1"
         android:text="热销"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/dp_12" />
 </RelativeLayout>
\ No newline at end of file

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

@@ -34,7 +34,7 @@
             android:layout_height="wrap_content"
             android:text="¥"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/dp_16"
             android:textStyle="bold" />
 
         <TextView
@@ -42,7 +42,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_22"
+            android:textSize="@dimen/dp_22"
             android:textStyle="bold"
             tools:text="30.00" />
 
@@ -52,7 +52,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_7"
             android:textColor="@color/white_40"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             tools:text="¥60" />
     </LinearLayout>
 
@@ -67,7 +67,7 @@
         android:layout_width="221dp"
         android:layout_height="wrap_content"
         tools:text="播放天数: 无限   |   下载次数: 无限 \n极速通道、空降嫩模活动优先、亚博VIP福利"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/dp_12" />
     <ImageView
         android:layout_marginBottom="@dimen/dp_40"
         android:id="@+id/iv_buy"

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

@@ -21,6 +21,6 @@
         android:layout_gravity="center"
         tools:text="50"
         android:textColor="@color/bg_red_2"
-        android:textSize="@dimen/sp_21"
+        android:textSize="@dimen/dp_21"
         android:textStyle="bold" />
 </LinearLayout>
\ No newline at end of file

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

@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:maxLines="1"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_15"
+        android:textSize="@dimen/dp_15"
         tools:text="#国产" />
 
 

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

@@ -69,7 +69,7 @@
                     android:gravity="center"
                     tools:text="5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_8" />
+                    android:textSize="@dimen/dp_8" />
 
             </LinearLayout>
             <TextView
@@ -81,7 +81,7 @@
                 android:gravity="start|center"
                 android:maxLines="2"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 tools:text="月上重火·透芝夫妇" />
 
             <TextView
@@ -90,7 +90,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_9"
                 android:textColor="@color/home_image_describe"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:visibility="gone"
                 tools:text="罗云熙陈珏琪共筑江湖" />
         </LinearLayout>

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

@@ -18,7 +18,7 @@
             android:ellipsize="end"
             android:gravity="center_vertical"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             android:id="@+id/tv_title"
             android:layout_width="0dp"
             android:layout_height="match_parent"

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

@@ -26,7 +26,7 @@
             android:layout_height="28dp"/>
         <TextView
             android:layout_marginTop="@dimen/dp_5"
-            android:textSize="@dimen/sp_11"
+            android:textSize="@dimen/dp_11"
             android:textColor="@color/white"
             tools:text="6789"
             android:id="@+id/tv_count"

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

@@ -26,7 +26,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/black"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         tools:text="666" />
 
     <TextView
@@ -35,6 +35,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/main_color"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="2金币" />
 </LinearLayout>
\ No newline at end of file

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

@@ -35,7 +35,7 @@
         android:singleLine="true"
         android:maxWidth="@dimen/dp_42"
         android:textColor="@color/movie_text"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="乔曼乔曼乔曼乔曼乔曼" />
 
 

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

@@ -32,7 +32,7 @@
             android:minWidth="@dimen/dp_56"
             android:text="资深专家"
             android:textColor="@color/color_FC7436"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             android:textStyle="bold" />
     </RelativeLayout>
 
@@ -43,5 +43,5 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_14"
         android:textColor="#2D363E"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/dp_12" />
 </LinearLayout>
\ No newline at end of file

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

@@ -27,7 +27,7 @@
         android:layout_marginTop="@dimen/dp_8"
         android:textColor="@color/mine_recycler_text"
         tools:text="月上重火·透芝夫妇"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/dp_14"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

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

@@ -27,7 +27,7 @@
         android:layout_marginTop="@dimen/dp_8"
         android:textColor="@color/mine_recycler_text"
         tools:text="月上重火·透芝夫妇"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/dp_14"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

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

@@ -53,7 +53,7 @@
                 android:ellipsize="end"
                 android:maxLines="2"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 tools:text="月上重火·透芝夫妇" />
 
 <!--            <ProgressBar-->
@@ -75,7 +75,7 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:textColor="@color/share_content"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="已看" />
 
                 <TextView
@@ -84,7 +84,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/share_content"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="12G" />
             </LinearLayout>
 

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

@@ -27,7 +27,7 @@
         android:layout_marginTop="@dimen/dp_8"
         android:textColor="@color/mine_recycler_text"
         tools:text="月上重火·透芝夫妇"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/dp_14"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

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

@@ -29,7 +29,7 @@
                     android:textColor="@color/mine_recycler_text"
                     android:layout_gravity="center"
                     tools:text="最新"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     android:id="@+id/tv_time"
                     android:layout_marginStart="@dimen/dp_4"
                     android:layout_width="0dp"
@@ -43,7 +43,7 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="@dimen/dp_4"
                     android:textColor="@color/mine_recycler_text"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="02:20:20" />
             </LinearLayout>
 
@@ -58,7 +58,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_9"
             android:textColor="@color/mine_recycler_text"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="月上重火·透芝夫妇" />
 
         <TextView
@@ -67,7 +67,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_2"
             android:textColor="@color/home_image_describe"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:visibility="gone"
             tools:text="罗云熙陈珏琪共筑江湖" />
     </LinearLayout>
@@ -77,7 +77,7 @@
         android:layout_alignParentEnd="true"
         android:text="VIP"
         android:textColor="@color/vip_text_color"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         android:layout_marginEnd="@dimen/dp_8"
         android:gravity="center"
         android:layout_marginTop="@dimen/dp_8"

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

@@ -18,7 +18,7 @@
         android:layout_marginTop="@dimen/dp_4"
         android:textColor="@color/normal_text_3"
         tools:text="分享推广"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

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

@@ -14,7 +14,7 @@
     android:paddingTop="@dimen/dp_3"
     android:paddingBottom="@dimen/dp_3"
     android:background="@drawable/shape_bg_label"
-    android:textSize="@dimen/sp_12"
+    android:textSize="@dimen/dp_12"
     android:id="@+id/tv_label"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"/>

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

@@ -19,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text_normal"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             tools:text="今天" />
         <TextView
             android:layout_marginStart="@dimen/dp_2"
@@ -28,7 +28,7 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textColor="@color/text_normal3"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             tools:text="CBA" />
 
         <TextView
@@ -36,7 +36,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@color/text_normal3"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             tools:text="15:00" />
     </LinearLayout>
     <LinearLayout
@@ -65,7 +65,7 @@
                 android:id="@+id/tv_team_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 tools:text="青岛国信海天" />
         </LinearLayout>
 

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

@@ -40,14 +40,14 @@
             android:layout_marginStart="@dimen/dp_7"
             tools:text="蝎子莱莱"
             android:textColor="@color/text_normal"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:id="@+id/tv_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
 
         <TextView
             android:layout_gravity="center"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:id="@+id/tv_level"
             android:textColor="@color/white"
             android:paddingStart="@dimen/dp_8"
@@ -64,7 +64,7 @@
     <TextView
         android:id="@+id/tv_reward"
         android:textColor="@color/grey_normal"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/dp_14"
         android:layout_marginEnd="@dimen/dp_10"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"

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

@@ -9,7 +9,7 @@
     android:gravity="center"
     android:paddingTop="@dimen/dp_6"
     android:paddingBottom="@dimen/dp_6"
-    android:textSize="@dimen/sp_13"
+    android:textSize="@dimen/dp_13"
     android:minWidth="70dp"
     android:id="@+id/tv_name"
     android:layout_width="wrap_content"

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

@@ -47,7 +47,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="@color/carefully_title"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             tools:text="@string/string_share_content_text" />
 
         <RelativeLayout
@@ -80,7 +80,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="8sp"
+                    android:textSize="8dp"
                     tools:text="756" />
             </LinearLayout>
 
@@ -94,7 +94,7 @@
                 android:layout_marginBottom="@dimen/dp_15"
                 android:gravity="center"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="44:45" />
 
 
@@ -141,7 +141,7 @@
                         android:gravity="start|center"
                         android:maxLines="1"
                         android:textColor="@color/carefully_label"
-                        android:textSize="@dimen/sp_11"
+                        android:textSize="@dimen/dp_11"
                         tools:text="国产/女优/丝袜" />
                 </LinearLayout>
             </LinearLayout>
@@ -170,7 +170,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/carefully_normal"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="2012-05-05发布" />
             </LinearLayout>
 
@@ -195,7 +195,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/carefully_normal"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="747" />
             </LinearLayout>
 

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

@@ -76,7 +76,7 @@
                     android:id="@+id/tv_like_count"
                     android:layout_marginStart="@dimen/dp_2"
                     android:layout_toEndOf="@id/iv_like_count"
-                    android:textSize="8sp"
+                    android:textSize="8dp"
                     android:textColor="@color/white"
                     tools:text="6299"
                     android:layout_width="wrap_content"
@@ -104,7 +104,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="9sp"
+                    android:textSize="9dp"
                     tools:text="756" />
             </LinearLayout>
 
@@ -118,7 +118,7 @@
                 android:layout_marginBottom="@dimen/dp_10"
                 android:gravity="center"
                 android:textColor="@color/white"
-                android:textSize="9sp"
+                android:textSize="9dp"
                 tools:text="44:45" />
 
 
@@ -142,7 +142,7 @@
                 android:ellipsize="end"
                 android:maxLines="2"
                 android:textColor="@color/carefully_title"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 tools:text="@string/string_share_content_text" />
         </LinearLayout>
         <LinearLayout
@@ -186,7 +186,7 @@
                         android:gravity="start|center"
                         android:maxLines="1"
                         android:textColor="@color/carefully_label"
-                        android:textSize="@dimen/sp_11"
+                        android:textSize="@dimen/dp_11"
                         tools:text="国产/女优/丝袜" />
                 </LinearLayout>
             </LinearLayout>
@@ -215,7 +215,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/carefully_normal"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="2012-05-05发布" />
             </LinearLayout>
 
@@ -239,7 +239,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/carefully_normal"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="747" />
             </LinearLayout>
 

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

@@ -21,7 +21,7 @@
             android:layout_height="wrap_content">
             <TextView
                 android:id="@+id/tv_title"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:textColor="@color/white"
                 android:layout_marginEnd="@dimen/dp_20"
                 android:layout_weight="1"
@@ -30,7 +30,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"/>
             <TextView
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:textColor="@color/mine_recycler_text"
                 android:layout_marginEnd="@dimen/dp_20"
                 android:layout_weight="1"

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

@@ -31,7 +31,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="@color/carefully_title"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             tools:text="@string/string_share_content_text" />
 
         <RelativeLayout
@@ -72,7 +72,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10"
+                    android:textSize="@dimen/dp_10"
                     tools:text="756" />
             </LinearLayout>
 
@@ -85,7 +85,7 @@
                 android:layout_marginEnd="@dimen/dp_18"
                 android:layout_marginBottom="@dimen/dp_11"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 tools:text="44:45" />
 
             <ImageView
@@ -136,7 +136,7 @@
                     android:maxLines="1"
                     android:maxWidth="250dp"
                     android:textColor="@color/carefully_label"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="国产/女优/丝袜" />
             </LinearLayout>
 
@@ -166,7 +166,7 @@
                     android:layout_marginStart="@dimen/dp_5"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:textColor="@color/text_normal2"
-                    android:textSize="@dimen/sp_15"
+                    android:textSize="@dimen/dp_15"
                     tools:text="747" />
             </LinearLayout>
 

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

@@ -51,7 +51,7 @@
                     android:id="@+id/tv_like_count"
                     android:layout_marginStart="@dimen/dp_2"
                     android:layout_toEndOf="@id/iv_like_count"
-                    android:textSize="9sp"
+                    android:textSize="9dp"
                     android:textColor="@color/white"
                     tools:text="6299"
                     android:layout_width="wrap_content"
@@ -86,7 +86,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_10"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_10"
+                    android:textSize="@dimen/dp_10"
                     tools:text="756" />
             </LinearLayout>
 
@@ -99,7 +99,7 @@
                 android:layout_marginEnd="@dimen/dp_18"
                 android:layout_marginBottom="@dimen/dp_5"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 tools:text="44:45" />
 
             <ImageView
@@ -135,7 +135,7 @@
                 android:ellipsize="end"
                 android:maxLines="2"
                 android:textColor="@color/carefully_title"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 tools:text="@string/string_share_content_text" />
         </LinearLayout>
 
@@ -178,7 +178,7 @@
                     android:maxLines="1"
                     android:maxWidth="250dp"
                     android:textColor="@color/carefully_label"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="国产/女优/丝袜" />
             </LinearLayout>
 
@@ -208,7 +208,7 @@
                     android:layout_marginStart="@dimen/dp_5"
                     android:layout_marginBottom="@dimen/dp_2"
                     android:textColor="@color/text_normal2"
-                    android:textSize="@dimen/sp_15"
+                    android:textSize="@dimen/dp_15"
                     tools:text="747" />
             </LinearLayout>
 

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

@@ -30,7 +30,7 @@
             android:layout_marginEnd="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_10"
             android:textColor="@color/carefully_title"
-            android:textSize="@dimen/sp_15"
+            android:textSize="@dimen/dp_15"
             tools:text="@string/string_share_content_text" />
 
         <RelativeLayout
@@ -63,7 +63,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="8sp"
+                    android:textSize="8dp"
                     tools:text="756" />
             </LinearLayout>
 
@@ -76,7 +76,7 @@
                 android:layout_marginEnd="@dimen/dp_18"
                 android:layout_marginBottom="@dimen/dp_15"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="44:45" />
 
         </RelativeLayout>
@@ -119,7 +119,7 @@
                     android:maxLines="1"
                     android:minWidth="84dp"
                     android:textColor="@color/carefully_label"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="国产/女优/丝袜" />
             </LinearLayout>
 
@@ -146,7 +146,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="2012-05-05发布" />
             </LinearLayout>
 
@@ -173,7 +173,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
-                    android:textSize="@dimen/sp_11"
+                    android:textSize="@dimen/dp_11"
                     tools:text="747" />
             </LinearLayout>
 

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

@@ -18,7 +18,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <TextView
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:textColor="@color/black"
             android:maxLines="1"
             android:ellipsize="end"
@@ -30,7 +30,7 @@
         <TextView
             android:textColor="@color/grey_normal"
             android:layout_marginTop="@dimen/dp_5"
-            android:textSize="@dimen/sp_11"
+            android:textSize="@dimen/dp_11"
             android:text="2021-05-27 12:41:19"
             android:id="@+id/tv_time"
             android:layout_width="wrap_content"

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

@@ -21,7 +21,7 @@
             <TextView
                 android:id="@+id/tv_title"
                 android:textStyle="bold"
-                android:textSize="@dimen/sp_20"
+                android:textSize="@dimen/dp_20"
                 android:textColor="@color/normal_text_3"
                 android:layout_weight="1"
                 android:gravity="start|center_vertical"

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

@@ -31,7 +31,7 @@
             android:minWidth="@dimen/dp_66"
             android:paddingHorizontal="@dimen/dp_10"
             android:textColor="@color/white"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             android:textStyle="bold"
             tools:background="@mipmap/bg_match_color"
             tools:text="球会友联球会友联球会友联" />
@@ -44,7 +44,7 @@
             android:layout_gravity="center"
             android:minWidth="@dimen/dp_84"
             android:textColor="@color/color_959DB0"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             android:textStyle="bold"
             android:visibility="visible"
             tools:text="半：0-1  角：0-1" />
@@ -59,7 +59,7 @@
 
             android:layout_marginEnd="@dimen/dp_14"
             android:textColor="@color/color_959DB0"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             android:textStyle="bold"
             tools:text="17:00" />
 
@@ -70,7 +70,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:textColor="@color/color_959DB0"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="未开" />
 
 
@@ -128,7 +128,7 @@
                     android:maxEms="5"
                     android:maxLines="1"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     android:textStyle="bold"
                     tools:text="帕森拉帕森拉帕拉帕" />
 
@@ -139,7 +139,7 @@
                     android:layout_marginStart="@dimen/dp_5"
                     android:gravity="center"
                     android:textColor="@color/color_FC7436"
-                    android:textSize="@dimen/sp_15"
+                    android:textSize="@dimen/dp_15"
                     android:textStyle="bold"
                     android:visibility="gone"
                     tools:text="0" />
@@ -151,7 +151,7 @@
                 android:layout_height="match_parent"
                 android:gravity="center"
                 android:textColor="@color/color_758199"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textStyle="bold"
                 tools:text=" VS " />
 
@@ -168,7 +168,7 @@
                     android:layout_marginEnd="@dimen/dp_5"
                     android:gravity="center"
                     android:textColor="@color/color_FC7436"
-                    android:textSize="@dimen/sp_15"
+                    android:textSize="@dimen/dp_15"
                     android:textStyle="bold"
                     android:visibility="gone"
                     tools:text="0" />
@@ -183,7 +183,7 @@
                     android:maxEms="5"
                     android:maxLines="1"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     android:textStyle="bold"
                     tools:text="帕森拉帕森拉帕森拉" />
 

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

@@ -20,7 +20,7 @@
             android:layout_toStartOf="@id/tv_left_score"
             android:maxLines="1"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_9"
+            android:textSize="@dimen/dp_9"
             tools:text="米尔" />
 
         <TextView
@@ -31,7 +31,7 @@
             android:layout_toStartOf="@id/ll_left_icon"
             android:layout_centerVertical="true"
             android:textColor="@color/text_normal"
-            android:textSize="@dimen/sp_9"
+            android:textSize="@dimen/dp_9"
             tools:text="0-0" />
 
         <LinearLayout
@@ -60,7 +60,7 @@
         android:layout_marginStart="@dimen/dp_10"
         android:layout_marginEnd="@dimen/dp_10"
         android:textColor="@color/black"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         tools:text="7" />
 
     <RelativeLayout
@@ -98,7 +98,7 @@
             android:layout_marginStart="@dimen/dp_5"
             android:layout_centerVertical="true"
             android:textColor="@color/text_normal"
-            android:textSize="@dimen/sp_9"
+            android:textSize="@dimen/dp_9"
             tools:text="0-0" />
 
 
@@ -112,7 +112,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:textColor="@color/text_normal"
-            android:textSize="@dimen/sp_9"
+            android:textSize="@dimen/dp_9"
             tools:text="米尔" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file

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

@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/grey_normal"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textStyle="bold"
                 tools:text="16:15" />
 
@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/grey_normal"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textStyle="bold"
                 tools:text="球会友谊" />
         </LinearLayout>
@@ -69,7 +69,7 @@
 
             <TextView
                 android:textStyle="bold"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:id="@+id/tv_home"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -107,7 +107,7 @@
 
             <TextView
                 android:textStyle="bold"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:id="@+id/tv_away"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"

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

@@ -28,7 +28,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
 
                 tools:text="16:15" />
 
@@ -38,7 +38,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:maxLines="1"
                 android:ellipsize="end"
                 tools:text="球会友谊" />
@@ -59,7 +59,7 @@
                 android:gravity="center"
                 android:text="0"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_17"
+                android:textSize="@dimen/dp_17"
                 android:textStyle="bold" />
 
             <TextView
@@ -69,7 +69,7 @@
                 android:textColor="@color/black"
                 android:textStyle="bold"
                 android:text=":"
-                android:textSize="@dimen/sp_17" />
+                android:textSize="@dimen/dp_17" />
 
             <TextView
                 android:id="@+id/tv_score_away"
@@ -79,7 +79,7 @@
                 android:gravity="center"
                 android:text="0"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_17"
+                android:textSize="@dimen/dp_17"
                 android:textStyle="bold" />
         </LinearLayout>
 
@@ -131,7 +131,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:textColor="@color/text_normal5"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/dp_13"
 
                     tools:text="帕森拉" />
             </LinearLayout>
@@ -145,7 +145,7 @@
                 android:gravity="center"
                 android:text="VS"
                 android:textColor="@color/match_vs"
-                android:textSize="@dimen/sp_17"
+                android:textSize="@dimen/dp_17"
                 android:textStyle="bold" />
 
             <LinearLayout
@@ -159,7 +159,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:textColor="@color/text_normal5"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/dp_13"
                     tools:text="佩斯克" />
 
                 <ImageView

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

@@ -66,7 +66,7 @@
        android:gravity="center"
        android:background="@drawable/shape_match_ouzhi"
        android:layout_marginStart="89dp"
-       android:textSize="8sp"
+       android:textSize="8dp"
        android:text="初"
        android:textColor="@color/white"
        android:layout_width="wrap_content"
@@ -76,7 +76,7 @@
         android:gravity="center"
         android:background="@drawable/shape_match_ouzhi"
         android:layout_marginStart="206dp"
-        android:textSize="8sp"
+        android:textSize="8dp"
         android:text="即"
         android:textColor="@color/white"
         android:layout_width="wrap_content"

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

@@ -20,7 +20,7 @@
         <TextView
             android:layout_marginStart="@dimen/dp_7"
             android:layout_gravity="center"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             tools:text="无敌猪猪侠"
             android:textColor="@color/black"
             android:id="@+id/tv_name"
@@ -67,7 +67,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_marginBottom="2dp"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 android:layout_alignParentStart="true"
                 android:id="@+id/tv_detail_type"
                 tools:text="虎子聊球"
@@ -87,7 +87,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -20,7 +20,7 @@
         <TextView
             android:layout_marginStart="@dimen/dp_7"
             android:layout_gravity="center"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             tools:text="无敌猪猪侠"
             android:textColor="@color/black"
             android:id="@+id/tv_name"
@@ -67,7 +67,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_marginBottom="2dp"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 android:layout_alignParentStart="true"
                 android:id="@+id/tv_detail_type"
                 tools:text="虎子聊球"
@@ -87,7 +87,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -72,7 +72,7 @@
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     android:textStyle="bold"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/iv_avatar"
@@ -86,13 +86,13 @@
                     android:layout_alignParentStart="true"
                     android:layout_alignParentBottom="true"
                     android:layout_marginTop="@dimen/dp_2"
-                    android:autoSizeMaxTextSize="@dimen/sp_11"
-                    android:autoSizeMinTextSize="@dimen/sp_6"
+                    android:autoSizeMaxTextSize="@dimen/dp_11"
+                    android:autoSizeMinTextSize="@dimen/dp_6"
                     android:autoSizeTextType="uniform"
                     android:ellipsize="end"
                     android:maxLines="1"
                     android:textColor="@color/color_959DB0"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     app:layout_constraintEnd_toStartOf="@id/tv_hot_num"
                     app:layout_constraintStart_toStartOf="@id/tv_title"
                     app:layout_constraintTop_toBottomOf="@id/tv_title"
@@ -111,7 +111,7 @@
                     android:drawablePadding="@dimen/dp_5"
                     android:gravity="center_vertical"
                     android:textColor="@color/color_959DB0"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     app:drawableStartCompat="@mipmap/icon_live_fire"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/tv_name"

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

@@ -16,7 +16,7 @@
         android:ellipsize="end"
         tools:text="梅根.沃克"
         android:textColor="@color/normal_text_3"
-        android:textSize="@dimen/sp_9" />
+        android:textSize="@dimen/dp_9" />
 
     <TextView
         android:id="@+id/tv_first"

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

@@ -16,7 +16,7 @@
     <TextView
         style="@style/style_match_text_middle"
         android:textStyle="bold"
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:layout_weight="1"
         android:gravity="center"
         android:text="VS" />

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

@@ -11,7 +11,7 @@
         android:id="@+id/tv_name"
         style="@style/style_text_match_top"
         android:layout_weight="1.25"
-        android:textSize="@dimen/sp_16"
+        android:textSize="@dimen/dp_16"
         android:gravity="start|center"
         android:text="赛况" />
 

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

@@ -29,7 +29,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textColor="@color/text_normal3"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="CBA" />
 
             <TextView
@@ -37,7 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/text_normal3"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="今天" />
 
             <TextView
@@ -46,7 +46,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/text_normal3"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="15：00" />
         </LinearLayout>
 
@@ -68,7 +68,7 @@
                 android:id="@+id/tv_team_name"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 tools:text="青岛国信海天" />
         </LinearLayout>
 
@@ -85,7 +85,7 @@
 
             <TextView
                 android:textStyle="bold"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/black"
                 android:id="@+id/tv_team_name_away"

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

@@ -37,7 +37,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="#959DB0"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="今天" />
 
             <TextView
@@ -45,7 +45,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="#959DB0"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="15：00" />
         </LinearLayout>
 
@@ -70,7 +70,7 @@
                 android:maxEms="5"
                 android:maxLines="1"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textStyle="bold"
                 tools:text="青岛国信海天" />
 
@@ -81,7 +81,7 @@
                 android:layout_marginEnd="@dimen/dp_10"
                 android:gravity="end"
                 android:textColor="@color/color_959DB0"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textStyle="bold"
                 tools:text="44" />
         </LinearLayout>
@@ -109,7 +109,7 @@
                 android:maxEms="5"
                 android:maxLines="1"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textStyle="bold"
                 tools:text="青岛国信海天" />
 
@@ -120,7 +120,7 @@
                 android:layout_marginEnd="@dimen/dp_10"
                 android:gravity="end"
                 android:textColor="@color/color_959DB0"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 android:textStyle="bold"
                 tools:text="44" />
         </LinearLayout>
@@ -145,7 +145,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textColor="@color/color_959DB0"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="CBA" />
 
             <!--            <TextView-->
@@ -163,7 +163,7 @@
             <!--                android:paddingBottom="@dimen/dp_2"-->
             <!--                tools:text="预约"-->
             <!--                android:textColor="@color/white"-->
-            <!--                android:textSize="@dimen/sp_9" />-->
+            <!--                android:textSize="@dimen/dp_9" />-->
 
             <ImageView
                 android:id="@+id/iv_subscribe"
@@ -181,7 +181,7 @@
                 android:layout_height="match_parent"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="@dimen/sp_8"
+                android:layout_marginEnd="@dimen/dp_8"
                 android:gravity="center_vertical"
                 android:orientation="horizontal"
                 android:visibility="visible">
@@ -192,7 +192,7 @@
                     android:layout_height="wrap_content"
                     android:text="直播中"
                     android:textColor="@color/color_FC7436"
-                    android:textSize="@dimen/sp_9" />
+                    android:textSize="@dimen/dp_9" />
 
                 <ImageView
                     android:id="@+id/iv_1"

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

@@ -29,7 +29,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 tools:text="球聚体育发布2.0版本" />
 
             <View
@@ -58,7 +58,7 @@
                     android:layout_height="wrap_content"
                     android:text="查看详情"
                     android:textColor="@color/color_FC7436"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
         </LinearLayout>

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

@@ -69,7 +69,7 @@
                     android:gravity="center"
                     tools:text="5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_8" />
+                    android:textSize="@dimen/dp_8" />
 
             </LinearLayout>
             <TextView
@@ -81,7 +81,7 @@
                 android:gravity="start|center"
                 android:maxLines="2"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 tools:text="月上重火·透芝夫妇" />
 
 
@@ -91,7 +91,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_9"
                 android:textColor="@color/home_image_describe"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:visibility="gone"
                 tools:text="罗云熙陈珏琪共筑江湖" />
         </LinearLayout>

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

@@ -8,7 +8,7 @@
     android:paddingBottom="@dimen/dp_10"
     tools:text="三天前"
     android:textColor="@color/normal_text_3"
-    android:textSize="@dimen/sp_14"
+    android:textSize="@dimen/dp_14"
     tools:background="@color/white">
 
 </TextView>
\ No newline at end of file

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

@@ -21,7 +21,7 @@
             android:layout_height="wrap_content">
             <TextView
                 android:id="@+id/tv_title"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 android:textColor="@color/white"
                 android:layout_marginEnd="@dimen/dp_20"
                 android:layout_weight="1"
@@ -30,7 +30,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"/>
             <TextView
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:textColor="@color/mine_recycler_text"
                 android:layout_marginEnd="@dimen/dp_20"
                 android:layout_weight="1"

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

@@ -27,7 +27,7 @@
                 android:layout_height="@dimen/dp_25">
                 <TextView
                     android:visibility="invisible"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     android:textColor="@color/mine_recycler_text"
                     android:layout_gravity="center"
                     tools:text="最新"
@@ -40,7 +40,7 @@
                     android:layout_marginEnd="@dimen/dp_4"
                     android:layout_gravity="center"
                     android:id="@+id/tv_total_time"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="02:20:20"
                     android:textColor="@color/mine_recycler_text"
                     android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="@color/mine_recycler_text"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="月上重火·透芝夫妇" />
 
         <TextView
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_2"
             android:textColor="@color/home_image_describe"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:visibility="gone"
             tools:text="罗云熙陈珏琪共筑江湖" />
     </LinearLayout>
@@ -81,7 +81,7 @@
         android:gravity="center"
         android:text="VIP"
         android:textColor="@color/vip_text_color"
-        android:textSize="@dimen/sp_13" />
+        android:textSize="@dimen/dp_13" />
 
 
 </RelativeLayout>
\ No newline at end of file

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

@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="756" />
         </LinearLayout>
         <TextView
@@ -51,7 +51,7 @@
             android:layout_marginEnd="@dimen/dp_4"
             android:layout_marginBottom="@dimen/dp_4"
             android:textColor="@color/white"
-            android:textSize="8sp"
+            android:textSize="8dp"
             tools:text="44:45" />
         <RelativeLayout
             android:paddingStart="@dimen/dp_3"
@@ -71,7 +71,7 @@
                 android:id="@+id/tv_like_count"
                 android:layout_marginStart="@dimen/dp_2"
                 android:layout_toEndOf="@id/iv_like_count"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 android:textColor="@color/white"
                 tools:text="6299"
                 android:layout_width="wrap_content"
@@ -90,7 +90,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="756" />
         </LinearLayout>
         <TextView
@@ -53,7 +53,7 @@
             android:layout_marginEnd="@dimen/dp_4"
             android:layout_marginBottom="@dimen/dp_4"
             android:textColor="@color/white"
-            android:textSize="8sp"
+            android:textSize="8dp"
             tools:text="44:45" />
         <RelativeLayout
             android:id="@+id/rl_like_count"
@@ -76,7 +76,7 @@
                 android:id="@+id/tv_like_count"
                 android:layout_marginStart="@dimen/dp_2"
                 android:layout_toEndOf="@id/iv_like_count"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 android:textColor="@color/white"
                 tools:text="6299"
                 android:layout_width="wrap_content"
@@ -98,7 +98,7 @@
         android:maxLines="2"
 
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="756" />
         </LinearLayout>
         <TextView
@@ -52,7 +52,7 @@
             android:layout_marginEnd="@dimen/dp_4"
             android:layout_marginBottom="@dimen/dp_4"
             android:textColor="@color/white"
-            android:textSize="8sp"
+            android:textSize="8dp"
             tools:text="44:45" />
         <RelativeLayout
             android:paddingStart="@dimen/dp_3"
@@ -72,7 +72,7 @@
                 android:id="@+id/tv_like_count"
                 android:layout_marginStart="@dimen/dp_2"
                 android:layout_toEndOf="@id/iv_like_count"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 android:textColor="@color/white"
                 tools:text="6299"
                 android:layout_width="wrap_content"
@@ -91,7 +91,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="756" />
         </LinearLayout>
         <TextView
@@ -53,7 +53,7 @@
             android:layout_marginEnd="@dimen/dp_4"
             android:layout_marginBottom="@dimen/dp_4"
             android:textColor="@color/white"
-            android:textSize="8sp"
+            android:textSize="8dp"
             tools:text="44:45" />
         <RelativeLayout
             android:id="@+id/rl_like_count"
@@ -76,7 +76,7 @@
                 android:id="@+id/tv_like_count"
                 android:layout_marginStart="@dimen/dp_2"
                 android:layout_toEndOf="@id/iv_like_count"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 android:textColor="@color/white"
                 tools:text="6299"
                 android:layout_width="wrap_content"
@@ -98,7 +98,7 @@
         android:maxLines="2"
 
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -19,7 +19,7 @@
             android:layout_alignParentEnd="true"
             android:text="VIP"
             android:textColor="@color/vip_text_color"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:layout_marginEnd="@dimen/dp_8"
             android:gravity="center"
             android:layout_marginTop="@dimen/dp_8"
@@ -37,7 +37,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_15"
+        android:textSize="@dimen/dp_15"
         tools:text="月上重火·透芝夫妇" />
 
     <TextView
@@ -49,7 +49,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/home_image_describe"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         tools:text="罗云熙陈珏琪共筑江湖" />
 
 </LinearLayout>
\ No newline at end of file

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

@@ -39,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="756" />
         </LinearLayout>
         <TextView
@@ -51,7 +51,7 @@
             android:layout_marginEnd="@dimen/dp_4"
             android:layout_marginBottom="@dimen/dp_4"
             android:textColor="@color/white"
-            android:textSize="8sp"
+            android:textSize="8dp"
             tools:text="44:45" />
         <RelativeLayout
             android:paddingStart="@dimen/dp_3"
@@ -71,7 +71,7 @@
                 android:id="@+id/tv_like_count"
                 android:layout_marginStart="@dimen/dp_2"
                 android:layout_toEndOf="@id/iv_like_count"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 android:textColor="@color/white"
                 tools:text="6299"
                 android:layout_width="wrap_content"
@@ -90,7 +90,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -30,7 +30,7 @@
                 android:ellipsize="end"
                 android:maxLines="2"
                 android:textColor="#2D363E"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 tools:text="国足战马代取胜无忧，用轮换 阵容刷净胜球" />
 
             <LinearLayout
@@ -63,7 +63,7 @@
                     android:layout_gravity="center"
                     android:layout_marginStart="@dimen/dp_7"
                     android:textColor="@color/color_666666"
-                    android:textSize="@dimen/sp_12"
+                    android:textSize="@dimen/dp_12"
                     tools:text="1" />
             </LinearLayout>
 

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

@@ -9,4 +9,4 @@
     tools:text="英超"
     android:paddingHorizontal="@dimen/dp_10"
     android:textColor="#FC7941"
-    android:textSize="@dimen/sp_12"/>
\ No newline at end of file
+    android:textSize="@dimen/dp_12"/>
\ No newline at end of file

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

@@ -23,7 +23,7 @@
             <TextView
                 android:id="@+id/tv_title"
                 android:textStyle="bold"
-                android:textSize="@dimen/sp_20"
+                android:textSize="@dimen/dp_20"
                 android:textColor="@color/normal_title_red"
                 android:layout_marginEnd="@dimen/dp_20"
                 android:layout_weight="1"
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"/>
             <TextView
                 android:id="@+id/tv_more"
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 android:textColor="@color/normal_text_3"
                 android:layout_marginEnd="@dimen/dp_3"
                 android:layout_weight="1"

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

@@ -22,7 +22,7 @@
             android:layout_marginStart="@dimen/dp_18"
             android:layout_gravity="center"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             android:text="微信支付"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>

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

@@ -49,7 +49,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="8sp"
+                    android:textSize="8dp"
                     tools:text="756" />
             </LinearLayout>
 
@@ -62,7 +62,7 @@
                 android:layout_marginEnd="@dimen/dp_4"
                 android:layout_marginBottom="@dimen/dp_4"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="44:45" />
 
         </RelativeLayout>
@@ -76,7 +76,7 @@
             android:ellipsize="end"
             android:maxLines="2"
             android:textColor="@color/text_recommend_title"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="月上重火·透芝夫妇" />
 
     </RelativeLayout>
@@ -110,7 +110,7 @@
             android:id="@+id/tv_like_count"
             android:layout_marginStart="@dimen/dp_2"
             android:layout_toEndOf="@id/iv_like_count"
-            android:textSize="8sp"
+            android:textSize="8dp"
             android:textColor="@color/white"
             tools:text="6299"
             android:layout_width="wrap_content"

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

@@ -22,7 +22,7 @@
             <TextView
                 android:id="@+id/tv_title"
                 android:textStyle="bold"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:textColor="@color/text_recommend_title"
                 android:layout_marginEnd="@dimen/dp_20"
                 android:layout_weight="1"
@@ -31,7 +31,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"/>
             <TextView
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 android:textColor="@color/text_recommend_title"
                 android:layout_marginEnd="@dimen/dp_3"
                 android:layout_weight="1"
@@ -67,7 +67,7 @@
                 android:layout_width="@dimen/dp_10"
                 android:layout_height="@dimen/dp_10"/>
             <TextView
-                android:textSize="@dimen/sp_10"
+                android:textSize="@dimen/dp_10"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/main_unselect"
                 android:gravity="center"

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

@@ -47,7 +47,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/dp_5"
                     android:textColor="@color/white"
-                    android:textSize="8sp"
+                    android:textSize="8dp"
                     tools:text="756" />
             </LinearLayout>
 
@@ -60,7 +60,7 @@
                 android:layout_marginEnd="@dimen/dp_4"
                 android:layout_marginBottom="@dimen/dp_4"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="44:45" />
 
         </RelativeLayout>
@@ -75,7 +75,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_9"
             android:textColor="@color/text_recommend_title"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="月上重火·透芝夫妇" />
 
         <TextView
@@ -84,7 +84,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_2"
             android:textColor="@color/home_image_describe"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:visibility="gone"
             tools:text="罗云熙陈珏琪共筑江湖" />
     </LinearLayout>
@@ -117,7 +117,7 @@
         android:id="@+id/tv_like_count"
         android:layout_marginStart="@dimen/dp_2"
         android:layout_toEndOf="@id/iv_like_count"
-        android:textSize="8sp"
+        android:textSize="8dp"
         android:textColor="@color/white"
         tools:text="6299"
         android:layout_width="wrap_content"

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

@@ -8,6 +8,6 @@
     android:id="@+id/tv_content"
     tools:text="红"
     android:textColor="@color/white"
-    android:textSize="@dimen/sp_13">
+    android:textSize="@dimen/dp_13">
 
 </TextView>
\ No newline at end of file

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

@@ -14,7 +14,7 @@
         android:ellipsize="end"
         android:maxLines="1"
         android:textColor="@color/text_normal6"
-        android:textSize="@dimen/sp_16"
+        android:textSize="@dimen/dp_16"
         tools:text="近18中17! (附带比分）美洲杯 玻利" />
 
     <RelativeLayout
@@ -58,7 +58,7 @@
             android:layout_height="match_parent"
             android:layout_weight="1"
             android:textColor="@color/red_text"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             tools:text="12小时前发布" />
 
         <TextView
@@ -68,7 +68,7 @@
             android:layout_height="match_parent"
             android:text="查看"
             android:textColor="@color/text_red_new"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/dp_12" />
     </LinearLayout>
 
 

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

@@ -13,7 +13,7 @@
         android:layout_width="@dimen/dp_18"
         android:layout_height="@dimen/dp_18"
         android:textColor="@color/selector_label"
-        android:textSize="@dimen/sp_11"
+        android:textSize="@dimen/dp_11"
         tools:text="黑" />
 
 

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

@@ -13,7 +13,7 @@
         android:layout_width="@dimen/dp_25"
         android:layout_height="@dimen/dp_25"
         android:textColor="@color/selector_label"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         tools:text="黑" />
 
 

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

@@ -35,7 +35,7 @@
             android:layout_marginStart="@dimen/dp_10"
             tools:text="长红状元"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             app:layout_constraintStart_toEndOf="@id/iv_avatar"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -53,7 +53,7 @@
             android:minHeight="@dimen/dp_13"
             tools:text="资深专家"
             android:textColor="@color/color_FC7436"
-            android:textSize="@dimen/sp_7"
+            android:textSize="@dimen/dp_7"
             android:textStyle="bold"
             android:visibility="gone"
             app:layout_constraintStart_toStartOf="@id/tv_name"
@@ -74,7 +74,7 @@
             android:layout_marginStart="@dimen/dp_6"
             app:layout_goneMarginStart="0dp"
             android:textColor="@color/color_FC7436"
-            android:textSize="@dimen/sp_7"
+            android:textSize="@dimen/dp_7"
             android:textStyle="bold"
             android:layout_marginTop="@dimen/dp_6"
             app:layout_constraintStart_toEndOf="@id/tv_type"
@@ -90,7 +90,7 @@
             android:background="@mipmap/icon_continue_red_bg"
             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连红" />
@@ -100,7 +100,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:textColor="@color/color_FC7436"
-            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"
@@ -112,7 +112,7 @@
             android:gravity="center"
             android:layout_height="wrap_content"
             android:textColor="@color/color_333333"
-            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" />
@@ -136,7 +136,7 @@
         android:layout_marginStart="@dimen/dp_19"
         android:layout_marginTop="6dp"
         android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_11"
+        android:textSize="@dimen/dp_11"
         android:id="@+id/tv_title"
         tools:text="CBA红单预测，起飞！"
         app:layout_constraintTop_toBottomOf="@id/view_line"
@@ -147,7 +147,7 @@
     <TextView
         tools:text="刚刚"
         android:textColor="@color/color_B4B4B4"
-        android:textSize="@dimen/sp_8"
+        android:textSize="@dimen/dp_8"
         android:layout_marginTop="@dimen/dp_3"
         app:layout_constraintStart_toStartOf="@id/tv_title"
         app:layout_constraintTop_toBottomOf="@id/tv_title"
@@ -164,7 +164,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         android:id="@+id/tv_more"
         android:textColor="@color/color_B4B4B4"
-        android:textSize="@dimen/sp_9"
+        android:textSize="@dimen/dp_9"
         android:text="点击查看"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

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

@@ -9,7 +9,7 @@
     <TextView
         android:paddingStart="@dimen/dp_15"
         android:textColor="@color/selector_report"
-        android:textSize="@dimen/sp_15"
+        android:textSize="@dimen/dp_15"
         android:id="@+id/tv_name"
         android:layout_width="match_parent"
         android:gravity="center_vertical"

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

@@ -18,7 +18,7 @@
         <TextView
             android:visibility="gone"
             android:text="今日"
-            android:textSize="@dimen/sp_13"
+            android:textSize="@dimen/dp_13"
             android:textColor="@color/selector_schedule"
             android:id="@+id/tv_today"
             android:layout_width="wrap_content"
@@ -27,7 +27,7 @@
         <TextView
 
             tools:text="12-30"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             android:textColor="@color/selector_schedule"
             android:id="@+id/tv_day"
             android:layout_width="wrap_content"
@@ -36,7 +36,7 @@
         <TextView
             android:layout_marginTop="@dimen/dp_3"
             tools:text="周一"
-            android:textSize="@dimen/sp_10"
+            android:textSize="@dimen/dp_10"
             android:textColor="@color/selector_schedule"
             android:id="@+id/tv_week"
             android:layout_width="wrap_content"

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

@@ -12,5 +12,5 @@
     android:paddingEnd="@dimen/dp_7"
     android:paddingBottom="@dimen/dp_2"
     android:textColor="@color/color_FF4747"
-    android:textSize="@dimen/sp_12"
+    android:textSize="@dimen/dp_12"
     tools:text="标签标签" />
\ No newline at end of file

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

@@ -13,5 +13,5 @@
     android:paddingEnd="@dimen/dp_7"
     android:paddingBottom="@dimen/dp_2"
     android:textColor="@color/color_333333"
-    android:textSize="@dimen/sp_12"
+    android:textSize="@dimen/dp_12"
     tools:text="标签标签" />
\ No newline at end of file

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

@@ -69,7 +69,7 @@
                     android:gravity="center"
                     tools:text="5"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_8" />
+                    android:textSize="@dimen/dp_8" />
 
             </LinearLayout>
             <TextView
@@ -81,7 +81,7 @@
                 android:gravity="start|center"
                 android:maxLines="2"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 tools:text="月上重火·透芝夫妇" />
 
 
@@ -91,7 +91,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/dp_9"
                 android:textColor="@color/home_image_describe"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 android:visibility="gone"
                 tools:text="罗云熙陈珏琪共筑江湖" />
         </LinearLayout>

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

@@ -26,7 +26,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
@@ -35,7 +35,7 @@
                 android:layout_height="wrap_content"
                 tools:text="5人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textStyle="bold" />
         </LinearLayout>
 
@@ -54,7 +54,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:id="@+id/tv_play_count"
@@ -63,7 +63,7 @@
                 android:layout_marginTop="@dimen/dp_3"
                 tools:text="无数次"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </LinearLayout>
 
         <LinearLayout
@@ -82,7 +82,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"
@@ -95,7 +95,7 @@
                     android:layout_marginTop="@dimen/dp_3"
                     tools:text="15次"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
 
         </LinearLayout>
@@ -115,7 +115,7 @@
                 android:layout_height="wrap_content"
                 android:text="推广人"
                 android:textColor="@color/text_blue"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
 
             <LinearLayout
 
@@ -129,7 +129,7 @@
                     android:layout_marginTop="@dimen/dp_3"
                     tools:text="3个月"
                     android:textColor="@color/white"
-                    android:textSize="@dimen/sp_13" />
+                    android:textSize="@dimen/dp_13" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

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

@@ -10,7 +10,7 @@
         android:layout_height="@dimen/dp_24"/>
 
     <TextView
-        android:textSize="@dimen/sp_11"
+        android:textSize="@dimen/dp_11"
         android:textColor="@color/sign_already"
         android:text="1天"
         android:layout_marginTop="@dimen/dp_13"

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

@@ -26,7 +26,7 @@
                 android:id="@+id/tv_title"
                 android:paddingStart="@dimen/dp_17"
                 android:paddingEnd="@dimen/dp_17"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 android:textColor="@color/white"
                 android:maxLines="1"
                 android:ellipsize="end"

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

@@ -40,7 +40,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/dp_5"
                 android:textColor="@color/white"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 tools:text="756" />
         </LinearLayout>
         <TextView
@@ -52,7 +52,7 @@
             android:layout_marginEnd="@dimen/dp_4"
             android:layout_marginBottom="@dimen/dp_4"
             android:textColor="@color/white"
-            android:textSize="8sp"
+            android:textSize="8dp"
             tools:text="44:45" />
         <RelativeLayout
             android:paddingStart="@dimen/dp_3"
@@ -72,7 +72,7 @@
                 android:id="@+id/tv_like_count"
                 android:layout_marginStart="@dimen/dp_2"
                 android:layout_toEndOf="@id/iv_like_count"
-                android:textSize="8sp"
+                android:textSize="8dp"
                 android:textColor="@color/white"
                 tools:text="6299"
                 android:layout_width="wrap_content"
@@ -91,7 +91,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/text_normal"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/dp_10"
         tools:text="月上重火·透芝夫妇" />
 
 

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

@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textColor="@color/movie_text"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         tools:text="乔曼" />
 
 

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

@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:textColor="@color/movie_text"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         tools:text="乔曼" />
 
 

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

@@ -11,11 +11,11 @@
         android:paddingBottom="@dimen/dp_10"
         android:id="@+id/tv_index"
         android:textStyle="bold"
-        android:paddingStart="@dimen/sp_15"
+        android:paddingStart="@dimen/dp_15"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@color/normal_title_red"
-        android:textSize="@dimen/sp_15"
+        android:textSize="@dimen/dp_15"
         tools:text="乔曼" />
 
 

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

@@ -24,7 +24,7 @@
             android:layout_height="5dp"/>
         <TextView
             android:layout_marginTop="@dimen/dp_5"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/dp_12"
             android:textColor="@color/grey_normal"
             android:layout_marginStart="@dimen/dp_10"
             android:layout_toEndOf="@id/view_point"
@@ -37,7 +37,7 @@
             android:textColor="@color/black"
             android:layout_marginTop="@dimen/dp_10"
             android:padding="@dimen/dp_10"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:background="@drawable/shape_bg_text_live"
             android:layout_below="@id/tv_time"
             android:layout_marginStart="@dimen/dp_15"

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

@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
     android:textColor="@color/white_90"
-    android:textSize="@dimen/sp_13"
+    android:textSize="@dimen/dp_13"
     android:maxLines="2"
     android:gravity="start"
     tools:text="测试文字测试文字测试文字">

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

@@ -17,7 +17,7 @@
         android:layout_marginStart="@dimen/dp_5"
         android:id="@+id/tv_content"
         android:textColor="@color/white_90"
-        android:textSize="@dimen/sp_13"
+        android:textSize="@dimen/dp_13"
         tools:text="测试文字测试文字测试文字"
         android:maxLines="1"
         android:gravity="start"

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

@@ -26,7 +26,7 @@
                 android:layout_gravity="center"
                 tools:text="@string/string_wallet_order_number"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
             <TextView
                 android:id="@+id/tv_buy_time"
                 android:layout_width="match_parent"
@@ -34,7 +34,7 @@
                 android:layout_gravity="center"
                 tools:text="@string/string_wallet_order_date"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
         </LinearLayout>
 
 
@@ -51,7 +51,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_15"
+                android:textSize="@dimen/dp_15"
                 tools:text="提现成功" />
 
             <TextView
@@ -61,7 +61,7 @@
                 android:layout_gravity="end"
                 android:gravity="end"
                 android:textColor="@color/text_normal_4"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/dp_14"
                 tools:text="@string/string_wallet_order_count" />
         </LinearLayout>
     </LinearLayout>

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

@@ -19,7 +19,7 @@
             android:layout_weight="1"
             android:text="￥100"
             android:textColor="@color/text_red"
-            android:textSize="@dimen/sp_14" />
+            android:textSize="@dimen/dp_14" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
                 android:textColor="@color/normal_text_3"
-                android:textSize="@dimen/sp_16"
+                android:textSize="@dimen/dp_16"
                 tools:text="提现成功" />
 
             <TextView
@@ -43,7 +43,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/text_normal_4"
-                android:textSize="@dimen/sp_13"
+                android:textSize="@dimen/dp_13"
                 tools:text="2020-08-26 10:30:17" />
         </LinearLayout>
     </LinearLayout>

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

@@ -30,6 +30,6 @@
         android:gravity="center"
         tools:text="115"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_9" />
+        android:textSize="@dimen/dp_9" />
 
 </LinearLayout>
\ No newline at end of file

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

@@ -30,6 +30,6 @@
         android:gravity="center"
         tools:text="5"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_8" />
+        android:textSize="@dimen/dp_8" />
 
 </LinearLayout>
\ No newline at end of file

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

@@ -21,7 +21,7 @@
         android:layout_gravity="center"
         android:text="暂无下载视频"
         android:textColor="@color/white"
-        android:textSize="@dimen/sp_16"
+        android:textSize="@dimen/dp_16"
         android:visibility="gone" />
 
     <TextView
@@ -32,7 +32,7 @@
         android:layout_marginTop="@dimen/dp_10"
         android:text="暂无数据"
         android:textColor="@color/grey_normal"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/dp_12" />
 
 
 </LinearLayout>
\ No newline at end of file

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

@@ -11,7 +11,7 @@
     android:layout_height="match_parent">
 
     <TextView
-        android:textSize="@dimen/sp_16"
+        android:textSize="@dimen/dp_16"
         android:layout_marginTop="@dimen/dp_10"
         android:layout_centerInParent="true"
         android:text="网络错误"
@@ -22,7 +22,7 @@
         android:layout_height="wrap_content"/>
 
     <TextView
-        android:textSize="@dimen/sp_12"
+        android:textSize="@dimen/dp_12"
         android:layout_marginTop="@dimen/dp_10"
         android:layout_centerInParent="true"
         android:layout_below="@id/tv_empty"
@@ -36,7 +36,7 @@
     <TextView
         android:background="@drawable/selector_empty"
         android:gravity="center"
-        android:textSize="@dimen/sp_15"
+        android:textSize="@dimen/dp_15"
         android:layout_marginTop="@dimen/dp_20"
         android:layout_centerInParent="true"
         android:layout_below="@id/tv_empty_hint"

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

@@ -15,7 +15,7 @@
         android:layout_marginBottom="@dimen/dp_5"
         android:id="@+id/tv_title"
         android:textStyle="bold"
-        android:textSize="@dimen/sp_20"
+        android:textSize="@dimen/dp_20"
         android:textColor="@color/normal_title_red"
         android:layout_marginEnd="@dimen/dp_20"
         android:gravity="start"

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

 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:textSize="@dimen/sp_12"
+    android:textSize="@dimen/dp_12"
     android:gravity="center"
     android:text="本站所有比赛和视频链接均由网友提供，并链接到其他网站播放"
     android:layout_alignParentBottom="true"

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

@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:textColor="@color/normal_text_3"
-            android:textSize="@dimen/sp_18"
+            android:textSize="@dimen/dp_18"
             tools:text="标题" />
         <!--        右侧图标-->
         <ImageView
@@ -47,7 +47,7 @@
             android:layout_alignParentRight="true"
             android:gravity="center_vertical"
             android:textColor="@color/text_red"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:visibility="gone" />
 
     </RelativeLayout>

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

@@ -25,7 +25,7 @@
         <TextView
             tools:text="标题"
             android:id="@+id/tv_title_middle"
-            android:textSize="@dimen/sp_18"
+            android:textSize="@dimen/dp_18"
             android:textColor="@color/black"
             android:layout_centerInParent="true"
             android:layout_width="wrap_content"
@@ -42,7 +42,7 @@
             android:textColor="@color/text_blue"
             android:visibility="gone"
             android:id="@+id/tv_title_right"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:gravity="center_vertical"
             android:layout_alignParentRight="true"
             android:layout_width="wrap_content"

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

@@ -29,7 +29,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_17"
+            android:textSize="@dimen/dp_17"
             android:textStyle="bold"
             tools:text="标题" />
 <!--        右侧图标-->
@@ -45,7 +45,7 @@
             android:textColor="@color/text_blue"
             android:visibility="gone"
             android:id="@+id/tv_title_right"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:gravity="center_vertical"
             android:layout_alignParentRight="true"
             android:layout_width="wrap_content"

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

@@ -27,7 +27,7 @@
             tools:text="标题"
             android:textStyle="bold"
             android:id="@+id/tv_title_middle"
-            android:textSize="@dimen/sp_18"
+            android:textSize="@dimen/dp_18"
             android:textColor="@color/black"
             android:layout_centerInParent="true"
             android:layout_width="wrap_content"
@@ -44,7 +44,7 @@
             android:textColor="@color/text_blue"
             android:visibility="gone"
             android:id="@+id/tv_title_right"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:gravity="center_vertical"
             android:layout_alignParentRight="true"
             android:layout_width="wrap_content"

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

@@ -26,7 +26,7 @@
         <TextView
             tools:text="标题"
             android:id="@+id/tv_title_middle"
-            android:textSize="@dimen/sp_19"
+            android:textSize="@dimen/dp_19"
             android:textColor="@color/white"
             android:layout_centerInParent="true"
             android:layout_width="wrap_content"
@@ -43,7 +43,7 @@
             android:textColor="@color/text_blue"
             android:visibility="gone"
             android:id="@+id/tv_title_right"
-            android:textSize="@dimen/sp_14"
+            android:textSize="@dimen/dp_14"
             android:gravity="center_vertical"
             android:layout_alignParentRight="true"
             android:layout_width="wrap_content"

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

@@ -20,7 +20,7 @@
         android:gravity="center"
         android:text="公告"
         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_20"
         tools:text="想要继续观看充值VIP或者联系客服"
         android:textColor="@color/black"
-        android:textSize="@dimen/sp_14" />
+        android:textSize="@dimen/dp_14" />
 
     <View
         android:layout_width="match_parent"
@@ -57,7 +57,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/main_follow_fragment.xml

@@ -20,11 +20,11 @@
             android:paddingTop="@dimen/dp_15"
             android:paddingEnd="@dimen/dp_10"
             app:tl_indicator_width="@dimen/dp_28"
-            app:tl_select_textsize="@dimen/sp_20"
+            app:tl_select_textsize="@dimen/dp_20"
             app:tl_textBold="SELECT"
             app:tl_textSelectColor="@color/black"
             app:tl_textUnselectColor="@color/black"
-            app:tl_textsize="@dimen/sp_17"
+            app:tl_textsize="@dimen/dp_17"
             app:tl_indicator_color="@color/main_select"
             app:tl_indicator_height="@dimen/dp_3"
             app:tl_indicator_style="NORMAL"

app/src/main/res/layout/main_message_title.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"
@@ -39,7 +39,7 @@
             android:padding="@dimen/dp_15"
             tools:text="体育直播公告"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
     </LinearLayout>
 

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

@@ -20,8 +20,8 @@
             android:layout_height="wrap_content">
             <com.flyco.tablayout.SlidingTabLayout
                 android:layout_marginTop="@dimen/dp_12"
-                app:tl_select_textsize="@dimen/sp_16"
-                app:tl_textsize="@dimen/sp_16"
+                app:tl_select_textsize="@dimen/dp_16"
+                app:tl_textsize="@dimen/dp_16"
                 app:tl_indicator_width="80dp"
                 app:tl_textSelectColor="@color/main_select_text"
                 app:tl_textUnselectColor="@color/main_unselect_text"

app/src/main/res/layout/main_share.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
@@ -37,7 +37,7 @@
             android:paddingEnd="@dimen/dp_21"
             tools:text="@string/string_share_content"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <View
             android:layout_width="match_parent"
@@ -57,7 +57,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"
@@ -72,7 +72,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/main_update.xml

@@ -41,7 +41,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_22"
+                    android:textSize="@dimen/dp_22"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     tools:text="发现新版本V2.0" />
@@ -52,9 +52,9 @@
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:paddingStart="@dimen/dp_15"
-                    android:paddingEnd="@dimen/sp_14"
+                    android:paddingEnd="@dimen/dp_14"
                     android:textColor="@color/color_6E6A87"
-                    android:textSize="@dimen/sp_13"
+                    android:textSize="@dimen/dp_13"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"

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

@@ -18,7 +18,7 @@
             android:gravity="center"
             android:text="温馨小贴士"
             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_text_pay"
             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/pay_tips.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
@@ -37,7 +37,7 @@
             android:paddingEnd="@dimen/dp_21"
             android:text="如已付款成功，数据有延迟，请耐心等待或点击“再次查询”，如超过5分钟，请到个人中心联系客服解决"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:textSize="@dimen/dp_16" />
 
         <View
             android:layout_width="match_parent"
@@ -57,7 +57,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"
@@ -72,7 +72,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/pay_vip.xml

@@ -18,7 +18,7 @@
             android:gravity="center"
             android:text="温馨小贴士"
             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_vip_play_movie"
             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="成为VIP"
                 android:textColor="@color/blue"
-                android:textSize="@dimen/sp_16" />
+                android:textSize="@dimen/dp_16" />
 
 
         </LinearLayout>

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

@@ -18,7 +18,7 @@
             android:gravity="center"
             android:text="温馨小贴士"
             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_vip_play_movie"
             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/selected_sex.xml

@@ -13,7 +13,7 @@
         android:gravity="center"
         android:text="男"
         android:textColor="@color/black"
-        android:textSize="@dimen/sp_16" />
+        android:textSize="@dimen/dp_16" />
 
     <View
         android:layout_width="match_parent"
@@ -27,5 +27,5 @@
         android:gravity="center"
         android:text="女"
         android:textColor="@color/black"
-        android:textSize="@dimen/sp_16" />
+        android:textSize="@dimen/dp_16" />
 </LinearLayout>
\ No newline at end of file

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

@@ -20,7 +20,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="@dimen/dp_10"
         tools:text="10:00/40:00"
-        android:textSize="@dimen/sp_12" />
+        android:textSize="@dimen/dp_12" />
 
     <ProgressBar
         android:layout_centerHorizontal="true"
@@ -29,7 +29,7 @@
         android:layout_width="100dp"
         android:layout_height="5dp"
         android:layout_below="@+id/tv_progress"
-        android:layout_marginTop="@dimen/sp_10"
+        android:layout_marginTop="@dimen/dp_10"
         android:max="100"
         android:progress="0" />
 

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

@@ -23,7 +23,7 @@
             android:gravity="center"
             android:text="VIP身份卡"
             android:textColor="@color/black"
-            android:textSize="@dimen/sp_16"
+            android:textSize="@dimen/dp_16"
             android:textStyle="bold" />
 
 
@@ -58,7 +58,7 @@
                 tools:text="路大神"
                 android:layout_marginTop="@dimen/dp_7"
                 android:textColor="@color/black"
-                android:textSize="@dimen/sp_14" />
+                android:textSize="@dimen/dp_14" />
             <ImageView
                 android:layout_marginTop="@dimen/dp_16"
                 android:layout_gravity="center"

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

@@ -10,6 +10,6 @@
     android:ellipsize="marquee"
     android:singleLine="true"
     android:gravity="start"
-    android:textSize="@dimen/sp_10">
+    android:textSize="@dimen/dp_10">
 
 </TextView>
\ No newline at end of file

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

@@ -9,6 +9,6 @@
     android:ellipsize="marquee"
     android:singleLine="true"
     android:gravity="end"
-    android:textSize="@dimen/sp_10">
+    android:textSize="@dimen/dp_10">
 
 </TextView>
\ No newline at end of file

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

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

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

@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="16sp"
+                android:textSize="16dp"
                 android:textStyle="bold"
                 android:visibility="gone"
                 tools:text=" @大致爱高清" />
@@ -67,7 +67,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_12"
+                android:textSize="@dimen/dp_12"
                 tools:text="只有 #允儿 的脸我才敢拉这么近" />
 
         </LinearLayout>
@@ -126,7 +126,7 @@
                 android:layout_marginTop="@dimen/dp_7"
                 android:gravity="center"
                 android:textColor="@color/white"
-                android:textSize="@dimen/sp_11"
+                android:textSize="@dimen/dp_11"
                 tools:text="22.5w" />
 
             <ImageView
@@ -145,7 +145,7 @@
                 android:layout_marginTop="@dimen/dp_7"
                 android:text="赚会员"
                 android:textColor="@color/white"
-                android:textSize="12sp" />
+                android:textSize="12dp" />
 
 
 

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

@@ -57,7 +57,7 @@
                 android:paddingBottom="3dp"
                 android:text="@string/button_pushtotalk"
                 android:textColor="#666666"
-                android:textSize="14sp" />
+                android:textSize="14dp" />
 
         </FrameLayout>
         <RelativeLayout
@@ -119,7 +119,7 @@
                 android:paddingTop="3dp"
                 android:paddingRight="10dp"
                 android:paddingBottom="3dp"
-                android:textSize="@dimen/sp_13" />
+                android:textSize="@dimen/dp_13" />
         </FrameLayout>
 
 
@@ -135,7 +135,7 @@
                 android:background="@drawable/shape_send_message"
                 android:text="@string/button_send"
                 android:textColor="@color/white"
-                android:textSize="16sp"
+                android:textSize="16dp"
                 android:visibility="visible" />
 
         </FrameLayout>

app/src/main/res/values/strings.xml

@@ -56,7 +56,7 @@
     <string name="string_carefully_time">%s发布</string>
     <string name="string_share_count">%s次</string>
     <string name="string_sign_success">已连续%d天签到成功</string>
-    <string name="string_sign_success_tes">已经连续登陆%d天</string>
+    <string name="string_sign_success_tes">已经连续登录%d天</string>
     <string name="string_share_friend_text">每邀请1人送3天会员10万部无限观看\n邀请好友注册，TA充值，你赚钱\n最高可获得90%%收益\n%1$s</string>
     <string name="string_share_content_text">亚洲最新萝莉御姐唯美海量高清视频，每日更新，真人1对1陪玩，还有现金红包领不停，快来看吧%s</string>
     <string name="string_vip_card">VIP身份卡</string>

app/src/main/res/values/styles.xml

@@ -24,7 +24,7 @@
 
 
     <style name="style_mine_more_title">
-        <item name="android:textSize">@dimen/sp_16</item>
+        <item name="android:textSize">@dimen/dp_16</item>
         <item name="android:textColor">@color/normal_text_3</item>
 
         <item name="android:layout_width">wrap_content</item>
@@ -53,7 +53,7 @@
     </style>
 
     <style name="style_mine_more_des">
-        <item name="android:textSize">@dimen/sp_15</item>
+        <item name="android:textSize">@dimen/dp_15</item>
         <item name="android:textColor">@color/mine_play_count_text</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -75,7 +75,7 @@
     <style name="style_button">
         <item name="android:textColor">@color/white</item>
         <item name="android:gravity">center</item>
-        <item name="android:textSize">@dimen/sp_17</item>
+        <item name="android:textSize">@dimen/dp_17</item>
         <item name="android:textStyle">bold</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:layout_width">match_parent</item>
@@ -106,7 +106,7 @@
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">@color/text_normal_4</item>
-        <item name="android:textSize">@dimen/sp_13</item>
+        <item name="android:textSize">@dimen/dp_13</item>
     </style>
 
     <style name="style_withdraw_content">
@@ -116,11 +116,11 @@
         <item name="android:layout_weight">1</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">@color/normal_text_3</item>
-        <item name="android:textSize">@dimen/sp_15</item>
+        <item name="android:textSize">@dimen/dp_15</item>
     </style>
 
     <style name="style_withdraw_info_title_left">
-        <item name="android:textSize">@dimen/sp_15</item>
+        <item name="android:textSize">@dimen/dp_15</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:textColor">@color/text_normal_4</item>
         <item name="android:layout_width">0dp</item>
@@ -129,7 +129,7 @@
     </style>
 
     <style name="style_withdraw_info_title_right_top">
-        <item name="android:textSize">@dimen/sp_15</item>
+        <item name="android:textSize">@dimen/dp_15</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:textColor">@color/normal_text_3</item>
         <item name="android:layout_width">wrap_content</item>
@@ -137,7 +137,7 @@
     </style>
 
     <style name="style_withdraw_info_title_right">
-        <item name="android:textSize">@dimen/sp_15</item>
+        <item name="android:textSize">@dimen/dp_15</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:textColor">@color/normal_text_3</item>
         <item name="android:layout_width">wrap_content</item>
@@ -158,7 +158,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">@dimen/dp_10</item>
         <item name="android:textColor">@color/normal_text_3</item>
-        <item name="android:textSize">@dimen/sp_16</item>
+        <item name="android:textSize">@dimen/dp_16</item>
     </style>
 
     <style name="style_withdraw_info_back">
@@ -173,7 +173,7 @@
     </style>
 
     <style name="style_withdraw_edit">
-        <item name="android:textSize">@dimen/sp_14</item>
+        <item name="android:textSize">@dimen/dp_14</item>
         <item name="android:textColor">@color/normal_text_3</item>
         <item name="android:textColorHint">@color/normal_hint</item>
         <item name="android:gravity">end</item>
@@ -201,7 +201,7 @@
     <style name="style_textView_join_vip">
         <item name="android:layout_marginTop">5dp</item>
         <item name="android:textColor">@color/normal_text_3</item>
-        <item name="android:textSize">@dimen/sp_13</item>
+        <item name="android:textSize">@dimen/dp_13</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
@@ -248,7 +248,7 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:textSize">@dimen/sp_10</item>
+        <item name="android:textSize">@dimen/dp_10</item>
     </style>
 
     <style name="style_text_team_content">
@@ -258,7 +258,7 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:textSize">@dimen/sp_10</item>
+        <item name="android:textSize">@dimen/dp_10</item>
     </style>
 
     <style name="style_match_view">
@@ -285,20 +285,20 @@
 
     <style name="style_match_left_text">
         <item name="android:layout_weight">1</item>
-        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textSize">@dimen/dp_12</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
 
     <style name="style_match_text_middle">
         <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">@dimen/sp_11</item>
+        <item name="android:textSize">@dimen/dp_11</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
 
     <style name="style_match_text_right">
-        <item name="android:textSize">@dimen/sp_10</item>
+        <item name="android:textSize">@dimen/dp_10</item>
         <item name="android:gravity">end</item>
         <item name="android:layout_weight">1</item>
         <item name="android:layout_width">0dp</item>
@@ -322,7 +322,7 @@
     <style name="style_text_data_example">
         <item name="android:drawablePadding">@dimen/dp_3</item>
         <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textSize">@dimen/dp_12</item>
         <item name="android:layout_marginStart">5dp</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -333,7 +333,7 @@
         <item name="android:paddingEnd">2dp</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_weight">1</item>
-        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textSize">@dimen/dp_12</item>
         <item name="android:textColor">@color/text_normal3</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">match_parent</item>
@@ -349,7 +349,7 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">@color/color_333333</item>
-        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textSize">@dimen/dp_12</item>
         <item name="android:layout_height">match_parent</item>
 
     </style>
@@ -361,21 +361,21 @@
         <item name="android:layout_weight">1</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:textColor">@color/color_758199</item>
-        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textSize">@dimen/dp_12</item>
         <item name="android:layout_height">@dimen/dp_31</item>
     </style>
 
     <style name="style_index_match">
         <item name="android:gravity">center</item>
         <item name="android:textColor">@color/selector_index_text_color</item>
-        <item name="android:textSize">@dimen/sp_13</item>
+        <item name="android:textSize">@dimen/dp_13</item>
         <item name="android:layout_width">@dimen/dp_62</item>
         <item name="android:layout_height">match_parent</item>
     </style>
 
     <style name="style_text_match_index_item">
         <item name="android:gravity">center</item>
-        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textSize">@dimen/dp_12</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:textColor">@color/color_758199</item>
         <item name="android:layout_height">@dimen/dp_31</item>
@@ -383,7 +383,7 @@
 
     <style name="style_text_match_index_item_content">
         <item name="android:gravity">center</item>
-        <item name="android:textSize">@dimen/sp_12</item>
+        <item name="android:textSize">@dimen/dp_12</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:textColor">@color/color_333333</item>
         <item name="android:layout_height">@dimen/dp_35</item>
@@ -392,7 +392,7 @@
     <style name="style_text_match_top">
         <item name="android:textColor">@color/text_normal6</item>
         <item name="android:gravity">center</item>
-        <item name="android:textSize">@dimen/sp_13</item>
+        <item name="android:textSize">@dimen/dp_13</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">0.5</item>
         <item name="android:layout_height">@dimen/dp_40</item>
@@ -400,7 +400,7 @@
     <style name="style_text_match_top_header">
         <item name="android:textColor">@color/text_normal5</item>
         <item name="android:gravity">center</item>
-        <item name="android:textSize">@dimen/sp_13</item>
+        <item name="android:textSize">@dimen/dp_13</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_weight">0.5</item>
         <item name="android:layout_height">@dimen/dp_40</item>

baselibrary/src/main/java/com/softgarden/baselibrary/base/BaseActivity.kt

@@ -339,7 +339,7 @@ abstract class BaseActivity<P : IBasePresenter?> : RxAppCompatActivity(), IBaseD
      *
      * @param t
      */
-    override fun showError(t: Throwable) {
+    override fun showError(t: Throwable, isConfigStatus: Boolean) {
         when (t) {
             is ConnectException -> {
                 ToastUtil.s(getString(R.string.base_connect_failed))
@@ -359,15 +359,21 @@ abstract class BaseActivity<P : IBasePresenter?> : RxAppCompatActivity(), IBaseD
             }
             is ApiException -> {
                 //通用的Api异常处理
+                if (isConfigStatus){
                     onApiException(t)
+                }else{
+                    ToastUtil.s(t.message)
+                }
 
             }
             else -> {
+                if (isConfigStatus) {
                     showCustomException(t)
-//                baseDelegate.showError(t)
+                }else{
+                    ToastUtil.s(t.message)
+                }
             }
         }
-        showErrorLayout()
     }
 
 
@@ -397,7 +403,7 @@ abstract class BaseActivity<P : IBasePresenter?> : RxAppCompatActivity(), IBaseD
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_LOGIN) {
             var eventId = 0
             if (data != null) eventId = data.getIntExtra(KEY_LOGIN_EVENT, 0)
-            backFromLogin(eventId) //从登陆界面返回  登录成功
+            backFromLogin(eventId) //从登录界面返回  登录成功
         }
     }
 

baselibrary/src/main/java/com/softgarden/baselibrary/base/BaseDialogFragment.kt

@@ -71,8 +71,8 @@ abstract class BaseDialogFragment<P : IBasePresenter> : RxAppCompatDialogFragmen
         if (activity is BaseActivity<*>) (activity as BaseActivity<*>?)!!.hideProgressDialog()
     }
 
-    override fun showError(throwable: Throwable) {
-        if (activity is BaseActivity<*>) (activity as BaseActivity<*>?)!!.showError(throwable)
+    override fun showError(throwable: Throwable,isConfigStatus:Boolean) {
+        if (activity is BaseActivity<*>) (activity as BaseActivity<*>?)!!.showError(throwable,isConfigStatus)
     }
 
     override fun onApiException(e: ApiException) {

baselibrary/src/main/java/com/softgarden/baselibrary/base/BaseFragment.kt

@@ -140,7 +140,7 @@ abstract class BaseFragment<P : IBasePresenter?> : RxFragment(), IBaseDisplay {
         if (activity is BaseActivity<*>) (activity as BaseActivity<*>?)!!.hideProgressDialog()
     }
 
-    override fun showError(throwable: Throwable) {
+    override fun showError(throwable: Throwable,isConfigStatus:Boolean) {
         showFragmentError(throwable)
     }
 
@@ -154,7 +154,7 @@ abstract class BaseFragment<P : IBasePresenter?> : RxFragment(), IBaseDisplay {
         if (resultCode == Activity.RESULT_OK && requestCode == REQUEST_LOGIN) {
             var eventId = 0
             if (data != null) eventId = data.getIntExtra(KEY_LOGIN_EVENT, 0)
-            backFromLogin(eventId) //从登陆界面返回  登录成功
+            backFromLogin(eventId) //从登录界面返回  登录成功
         }
     }
 

baselibrary/src/main/java/com/softgarden/baselibrary/base/BasePresenter.kt

@@ -42,8 +42,8 @@ open class BasePresenter : IBasePresenter, IBaseDisplay {
         mView?.hideProgressDialog()
     }
 
-    override fun showError(t: Throwable) {
-        mView?.showError(t)
+    override fun showError(t: Throwable,isConfigStatus:Boolean) {
+        mView?.showError(t,isConfigStatus)
     }
 
     override fun onApiException(e: ApiException) {

baselibrary/src/main/java/com/softgarden/baselibrary/base/IBaseDisplay.kt

@@ -17,7 +17,7 @@ interface IBaseDisplay {
     fun showProgressDialog()
     fun showProgressDialog(message: CharSequence?)
     fun hideProgressDialog()
-    fun showError(t: Throwable)
+    fun showError(t: Throwable,isConfigStatus:Boolean = true)
     fun onApiException(e: ApiException)
     fun onRequestFinish()
 

baselibrary/src/main/java/com/softgarden/baselibrary/network/NetworkTransformer.kt

@@ -22,7 +22,7 @@ import io.reactivex.rxjava3.schedulers.Schedulers
  * 2.加载网络时显示加载框 结束是隐藏
  * 3.控制RxJava生命周期，防止内存泄漏
  */
-class NetworkTransformer<T> constructor(mView: IBaseDisplay?, showLoading: Boolean = false) :
+class NetworkTransformer<T> constructor(mView: IBaseDisplay?, showLoading: Boolean = false,val isConfigStatus:Boolean = true) :
     ObservableTransformer<BaseBean<T>, T> {
     private val mView: IBaseDisplay
     private val showLoading: Boolean
@@ -35,7 +35,7 @@ class NetworkTransformer<T> constructor(mView: IBaseDisplay?, showLoading: Boole
                 if (!NetworkUtil.isConnected(mView.ctx)) {
 //                    NetworkUtil.showNoNetWorkDialog(mView.ctx)
 //                    mView.onRequestFinish()
-                    mView?.showError(Throwable("请检查网络"))
+                    mView?.showError(Throwable("请检查网络"),isConfigStatus)
                     disposable.dispose()
                 } else {
                     if (showLoading) mView.showProgressDialog()
@@ -53,7 +53,7 @@ class NetworkTransformer<T> constructor(mView: IBaseDisplay?, showLoading: Boole
             .doOnError(Consumer { throwable: Throwable ->
                 //RxJava2NullException 交给RxCallback处理
                 if (throwable !is RxJava3NullException) {
-                    mView.showError(throwable)
+                    mView.showError(throwable,isConfigStatus)
                 }
             })
             .compose(mView.bindToLifecycle())

baselibrary/src/main/java/com/softgarden/baselibrary/network/RxCallback.kt

@@ -29,7 +29,8 @@ abstract class RxCallback<T> : Callback<T> {
     }
 
     override fun onError(t: Throwable) {
-        if (t is RxJava3NullException) { //RxJava2不能发送null
+        if (t is RxJava3NullException) {
+            //RxJava2不能发送null
             onSuccess(null)
         } else if (t is ApiException) {
             //通用的Api异常处理