1.更新部分代码

Former-commit-id: c2a36da Former-commit-id: b3f539f
afkT · Jan 22, 2022 · 6e72694 · 6e72694
1 parent 38a0b7d
commit 6e72694
Show file tree

Hide file tree

Showing 18 changed files with 146 additions and 60 deletions.
diff --git a/app/src/main/java/afkt/project/ui/activity/CornerLabelActivity.kt b/app/src/main/java/afkt/project/ui/activity/CornerLabelActivity.kt
@@ -4,12 +4,12 @@ import afkt.project.R
 import afkt.project.base.app.BaseActivity
 import afkt.project.base.config.RouterPath
 import afkt.project.databinding.ActivityCornerLabelBinding
+import afkt.project.util.AppSize
 import android.view.Gravity
 import android.view.View
 import android.widget.FrameLayout
 import com.alibaba.android.arouter.facade.annotation.Route
 import dev.utils.app.ListenerUtils
-import dev.utils.app.SizeUtils
 import dev.utils.common.RandomUtils
 
 /**
@@ -81,7 +81,7 @@ class CornerLabelActivity : BaseActivity<ActivityCornerLabelBinding>() {
             R.id.vid_btn_height1_minus_tv -> {
                 if (mText1Height < 8) return
                 mText1Height -= 2f
-                convertPx = SizeUtils.sp2px(mText1Height).toFloat()
+                convertPx = AppSize.sp2pxf(mText1Height)
                 labelView.setTextHeight1(convertPx)
                 labelView.setPaddingTop(convertPx)
                 labelView.setPaddingCenter(convertPx / 3)
@@ -90,7 +90,7 @@ class CornerLabelActivity : BaseActivity<ActivityCornerLabelBinding>() {
             R.id.vid_btn_height1_plus_tv -> {
                 if (mText1Height > 30) return
                 mText1Height += 2f
-                convertPx = SizeUtils.sp2px(mText1Height).toFloat()
+                convertPx = AppSize.sp2pxf(mText1Height)
                 labelView.setTextHeight1(convertPx)
                 labelView.setPaddingTop(convertPx)
                 labelView.setPaddingCenter(convertPx / 3)
@@ -107,13 +107,13 @@ class CornerLabelActivity : BaseActivity<ActivityCornerLabelBinding>() {
             R.id.vid_btn_height2_minus_tv -> {
                 if (mText2Height < 4) return
                 mText2Height -= 2f
-                convertPx = SizeUtils.sp2px(mText2Height).toFloat()
+                convertPx = AppSize.sp2pxf(mText2Height)
                 labelView.setTextHeight2(convertPx)
             }
             R.id.vid_btn_height2_plus_tv -> {
                 if (mText2Height > 20) return
                 mText2Height += 2f
-                convertPx = SizeUtils.sp2px(mText2Height).toFloat()
+                convertPx = AppSize.sp2pxf(mText2Height)
                 labelView.setTextHeight2(convertPx)
             }
         }

diff --git a/app/src/main/java/afkt/project/ui/activity/FlexboxLayoutManagerActivity.kt b/app/src/main/java/afkt/project/ui/activity/FlexboxLayoutManagerActivity.kt
@@ -5,6 +5,7 @@ import afkt.project.base.app.BaseActivity
 import afkt.project.base.config.RouterPath
 import afkt.project.databinding.BaseViewRecyclerviewBinding
 import afkt.project.ui.adapter.TextAdapter
+import afkt.project.util.AppSize
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
@@ -14,7 +15,6 @@ import com.google.android.flexbox.FlexboxLayoutManager
 import com.google.android.flexbox.JustifyContent
 import dev.base.widget.BaseTextView
 import dev.utils.app.ResourceUtils
-import dev.utils.app.SizeUtils
 import dev.utils.app.helper.quick.QuickHelper
 import dev.utils.common.ChineseUtils
 import dev.utils.common.RandomUtils
@@ -39,8 +39,8 @@ class FlexboxLayoutManagerActivity : BaseActivity<BaseViewRecyclerviewBinding>()
         val parent = binding.vidRv.parent as? ViewGroup
         // 根布局处理
         QuickHelper.get(parent).setPadding(
-            0, 0, SizeUtils.dp2px(5F),
-            SizeUtils.dp2px(5F)
+            0, 0, AppSize.dp2px(5F),
+            AppSize.dp2px(5F)
         )
 
         val view = QuickHelper.get(BaseTextView(this))

diff --git a/app/src/main/java/afkt/project/ui/activity/FlowLikeActivity.kt b/app/src/main/java/afkt/project/ui/activity/FlowLikeActivity.kt
@@ -25,9 +25,9 @@ class FlowLikeActivity : BaseActivity<ActivityFlowLikeBinding>() {
 //        // 设置动画时间
 //        binding.vidFlv.animDuration = 2000
 //        // 设置图标宽度
-//        binding.vidFlv.iconWidth = SizeUtils.dp2px(30f)
+//        binding.vidFlv.iconWidth = AppSize.dp2px(30f)
 //        // 设置图标高度
-//        binding.vidFlv.iconHeight = SizeUtils.dp2px(30f)
+//        binding.vidFlv.iconHeight = AppSize.dp2px(30f)
 //
 //        // 设置漂浮图标
 //        val lists: MutableList<Drawable> = ArrayList()

diff --git a/app/src/main/java/afkt/project/ui/activity/ItemStickyActivity.kt b/app/src/main/java/afkt/project/ui/activity/ItemStickyActivity.kt
@@ -6,6 +6,7 @@ import afkt.project.base.config.RouterPath
 import afkt.project.databinding.BaseViewRecyclerviewBinding
 import afkt.project.model.bean.ItemStickyBean
 import afkt.project.ui.adapter.ItemStickyAdapter
+import afkt.project.util.AppSize
 import android.view.View
 import android.view.ViewGroup
 import com.alibaba.android.arouter.facade.annotation.Route
@@ -16,7 +17,6 @@ import com.gavin.com.library.listener.PowerGroupListener
 import dev.engine.DevEngine
 import dev.utils.DevFinal
 import dev.utils.app.ResourceUtils
-import dev.utils.app.SizeUtils
 import dev.utils.app.TextViewUtils
 import dev.utils.app.helper.quick.QuickHelper
 import dev.utils.common.ChineseUtils
@@ -66,7 +66,7 @@ class ItemStickyActivity : BaseActivity<BaseViewRecyclerviewBinding>() {
 
         val decoration1 = PowerfulStickyDecoration.Builder
             .init(listener)
-            .setGroupHeight(SizeUtils.dp2px(50.0f))
+            .setGroupHeight(AppSize.dp2px(50F))
 //            // 重置 span ( 注意 : 使用 GridLayoutManager 时必须调用 )
 //            .resetSpan(mRecyclerView, (GridLayoutManager) manager)
             .build()
@@ -82,8 +82,8 @@ class ItemStickyActivity : BaseActivity<BaseViewRecyclerviewBinding>() {
         val decoration = StickyDecoration.Builder.init(groupListener)
             .setGroupBackground(ResourceUtils.getColor(R.color.color_f7))
             .setGroupTextColor(ResourceUtils.getColor(R.color.color_33))
-            .setGroupTextSize(SizeUtils.sp2px(15.0f))
-            .setTextSideMargin(SizeUtils.dp2px(10.0f))
+            .setGroupTextSize(AppSize.sp2px(15.0f))
+            .setTextSideMargin(AppSize.dp2px(10.0f))
             .build()
 
         // 初始化布局管理器、适配器

diff --git a/app/src/main/java/afkt/project/ui/activity/ProgressBarActivity.kt b/app/src/main/java/afkt/project/ui/activity/ProgressBarActivity.kt
@@ -24,7 +24,7 @@ class ProgressBarActivity : BaseActivity<ActivityProgressbarBinding>() {
 
 //        // 内外圆环 + 数字 + 无扇形
 //        binding.vidLpb1.setProgressStyle(LoadProgressBar.ProgressStyle.RINGS)
-//            .setOuterRingWidth(SizeUtils.dp2px(5f).toFloat()) // 内环宽度
+//            .setOuterRingWidth(AppSize.dp2px(5F).toFloat()) // 内环宽度
 //            .setOuterRingColor(ResourceUtils.getColor(R.color.khaki)) // 内环颜色
 //            .setProgressColor(ResourceUtils.getColor(R.color.color_88)).isCanvasNumber =
 //            true // 是否绘制数字
@@ -36,7 +36,7 @@ class ProgressBarActivity : BaseActivity<ActivityProgressbarBinding>() {
 //
 //        // 扇形 + 数字 + 外圆环
 //        binding.vidLpb3.setProgressStyle(LoadProgressBar.ProgressStyle.ARC_FAN_SHAPED)
-//            .setOuterRingWidth(SizeUtils.dp2px(1f).toFloat()) // 内环宽度
+//            .setOuterRingWidth(AppSize.dp2px(1f).toFloat()) // 内环宽度
 //            .setOuterRingColor(Color.RED) // 内环颜色
 //            .setProgressColor(ResourceUtils.getColor(R.color.mediumturquoise)) // 进度颜色
 //            .setNumberTextColor(Color.parseColor("#FB7D00")).isCanvasNumber = true // 是否绘制数字

diff --git a/app/src/main/java/afkt/project/ui/activity/QRCodeCreateActivity.kt b/app/src/main/java/afkt/project/ui/activity/QRCodeCreateActivity.kt
@@ -4,6 +4,7 @@ import afkt.project.R
 import afkt.project.base.app.BaseActivity
 import afkt.project.base.config.RouterPath
 import afkt.project.databinding.ActivityQrcodeCreateBinding
+import afkt.project.util.AppSize
 import android.content.Intent
 import android.graphics.Bitmap
 import android.text.TextUtils
@@ -46,7 +47,7 @@ class QRCodeCreateActivity : BaseActivity<ActivityQrcodeCreateBinding>() {
                     showToast(false, "请输入生成二维码内容")
                     return
                 }
-                val size = SizeUtils.dp2px(200f)
+                val size = AppSize.dp2px(200f)
                 // 创建二维码
                 DevEngine.getBarCode().encodeBarCode(
                     BarCodeData[text, size].setIcon(selectBitmap)

diff --git a/app/src/main/java/afkt/project/ui/activity/ViewAssistActivity.kt b/app/src/main/java/afkt/project/ui/activity/ViewAssistActivity.kt
@@ -5,12 +5,12 @@ import afkt.project.base.app.BaseActivity
 import afkt.project.base.config.RouterPath
 import afkt.project.databinding.ActivityViewAssistBinding
 import afkt.project.model.item.ButtonValue
+import afkt.project.util.AppSize
 import android.view.LayoutInflater
 import android.view.View
 import com.alibaba.android.arouter.facade.annotation.Route
 import dev.utils.app.HandlerUtils
 import dev.utils.app.ListenerUtils
-import dev.utils.app.SizeUtils
 import dev.utils.app.ViewUtils
 import dev.utils.app.toast.ToastTintUtils
 import dev.widget.assist.ViewAssist
@@ -39,7 +39,7 @@ class ViewAssistActivity : BaseActivity<ActivityViewAssistBinding>() {
     }
 
     private fun errorType() {
-        ViewUtils.setPadding(binding.vidFl, SizeUtils.dp2px(50f))
+        ViewUtils.setPadding(binding.vidFl, AppSize.dp2px(50f))
         viewAssist.register(ViewAssist.TYPE_ING, object : ViewAssist.Adapter {
             override fun onCreateView(
                 assist: ViewAssist,

diff --git a/app/src/main/java/afkt/project/ui/adapter/GPUFilterACVAdapter.kt b/app/src/main/java/afkt/project/ui/adapter/GPUFilterACVAdapter.kt
@@ -2,6 +2,7 @@ package afkt.project.ui.adapter
 
 import afkt.project.R
 import afkt.project.model.bean.ACVFileBean
+import afkt.project.util.AppSize
 import android.content.Context
 import android.view.Gravity
 import android.view.View
@@ -10,7 +11,6 @@ import android.widget.BaseAdapter
 import android.widget.Gallery
 import dev.base.widget.BaseTextView
 import dev.utils.app.ResourceUtils
-import dev.utils.app.SizeUtils
 import dev.utils.app.helper.quick.QuickHelper
 
 /**
@@ -64,7 +64,7 @@ class GPUFilterACVAdapter(
     private fun createTextView(position: Int): BaseTextView {
         val acvFileBean = getItem(position)
         val isSelect = (selectPosition == position)
-        val width = SizeUtils.dp2px(100f)
+        val width = AppSize.dp2px(100f)
         val layoutParams = Gallery.LayoutParams(
             width, Gallery.LayoutParams.MATCH_PARENT
         )

diff --git a/app/src/main/java/afkt/project/ui/adapter/GPUFilterAdapter.kt b/app/src/main/java/afkt/project/ui/adapter/GPUFilterAdapter.kt
@@ -2,6 +2,7 @@ package afkt.project.ui.adapter
 
 import afkt.project.R
 import afkt.project.model.item.FilterItem
+import afkt.project.util.AppSize
 import android.content.Context
 import android.view.Gravity
 import android.view.View
@@ -10,7 +11,6 @@ import android.widget.BaseAdapter
 import android.widget.Gallery
 import dev.base.widget.BaseTextView
 import dev.utils.app.ResourceUtils
-import dev.utils.app.SizeUtils
 import dev.utils.app.helper.quick.QuickHelper
 
 /**
@@ -61,7 +61,7 @@ class GPUFilterAdapter(
     private fun createTextView(position: Int): BaseTextView {
         val filterItem = getItem(position)
         val isSelect = (selectPosition == position)
-        val width = SizeUtils.dp2px(100f)
+        val width = AppSize.dp2px(100f)
         val layoutParams = Gallery.LayoutParams(
             width, Gallery.LayoutParams.MATCH_PARENT
         )

diff --git a/app/src/main/java/afkt/project/ui/dialog/BottomSheetDialog.kt b/app/src/main/java/afkt/project/ui/dialog/BottomSheetDialog.kt
@@ -1,6 +1,7 @@
 package afkt.project.ui.dialog
 
 import afkt.project.R
+import afkt.project.util.AppSize
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -10,7 +11,6 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dev.utils.app.ResourceUtils
-import dev.utils.app.SizeUtils
 
 /**
  * detail: Material BottomSheetDialog
@@ -43,7 +43,7 @@ class BottomSheetDialog : BottomSheetDialogFragment() {
 
             mBehavior = BottomSheetBehavior.from(this)
             // 默认显示高度
-            mBehavior.peekHeight = SizeUtils.dp2px(290F)
+            mBehavior.peekHeight = AppSize.dp2px(290F)
             mBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
         }
     }

diff --git a/app/src/main/java/afkt/project/ui/widget/render/LoadingRenderer.java b/app/src/main/java/afkt/project/ui/widget/render/LoadingRenderer.java
@@ -11,7 +11,7 @@
 import android.view.animation.Animation;
 import android.view.animation.LinearInterpolator;
 
-import dev.utils.app.SizeUtils;
+import afkt.project.util.AppSize;
 
 public abstract class LoadingRenderer {
     private static final long  ANIMATION_DURATION = 1333;
@@ -101,8 +101,8 @@ void setBounds(Rect bounds) {
     }
 
     private void initParams(Context context) {
-        mWidth  = SizeUtils.dp2px(DEFAULT_SIZE);
-        mHeight = SizeUtils.dp2px(DEFAULT_SIZE);
+        mWidth  = AppSize.INSTANCE.dp2px(DEFAULT_SIZE);
+        mHeight = AppSize.INSTANCE.dp2px(DEFAULT_SIZE);
 
         mDuration = ANIMATION_DURATION;
     }

diff --git a/app/src/main/java/afkt/project/ui/widget/render/circle/jump/DanceLoadingRenderer.java b/app/src/main/java/afkt/project/ui/widget/render/circle/jump/DanceLoadingRenderer.java
@@ -14,7 +14,7 @@
 import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 
 import afkt.project.ui.widget.render.LoadingRenderer;
-import dev.utils.app.SizeUtils;
+import afkt.project.util.AppSize;
 
 public class DanceLoadingRenderer
         extends LoadingRenderer {
@@ -90,9 +90,9 @@ private DanceLoadingRenderer(Context context) {
     }
 
     private void initialize(Context context) {
-        mStrokeWidth     = SizeUtils.dp2px(DEFAULT_STROKE_WIDTH);
-        mCenterRadius    = SizeUtils.dp2px(DEFAULT_CENTER_RADIUS);
-        mDanceBallRadius = SizeUtils.dp2px(DEFAULT_DANCE_BALL_RADIUS);
+        mStrokeWidth     = AppSize.INSTANCE.dp2px(DEFAULT_STROKE_WIDTH);
+        mCenterRadius    = AppSize.INSTANCE.dp2px(DEFAULT_CENTER_RADIUS);
+        mDanceBallRadius = AppSize.INSTANCE.dp2px(DEFAULT_DANCE_BALL_RADIUS);
 
         setColor(DEFAULT_COLOR);
         setInsets((int) mWidth, (int) mHeight);

diff --git a/app/src/main/java/afkt/project/ui/widget/render/scenery/ElectricFanLoadingRenderer.java b/app/src/main/java/afkt/project/ui/widget/render/scenery/ElectricFanLoadingRenderer.java
@@ -33,7 +33,7 @@
 
 import afkt.project.R;
 import afkt.project.ui.widget.render.LoadingRenderer;
-import dev.utils.app.SizeUtils;
+import afkt.project.util.AppSize;
 
 public class ElectricFanLoadingRenderer
         extends LoadingRenderer {
@@ -133,12 +133,12 @@ private ElectricFanLoadingRenderer(Context context) {
     private void initialize(Context context) {
         mMode = MODE_NORMAL;
 
-        mWidth                = SizeUtils.dp2px(DEFAULT_WIDTH);
-        mHeight               = SizeUtils.dp2px(DEFAULT_HEIGHT);
-        mTextSize             = SizeUtils.dp2px(DEFAULT_TEXT_SIZE);
-        mStrokeWidth          = SizeUtils.dp2px(DEFAULT_STROKE_WIDTH);
-        mCenterRadius         = SizeUtils.dp2px(DEFAULT_CENTER_RADIUS);
-        mProgressCenterRadius = SizeUtils.dp2px(DEFAULT_PROGRESS_CENTER_RADIUS);
+        mWidth                = AppSize.INSTANCE.dp2px(DEFAULT_WIDTH);
+        mHeight               = AppSize.INSTANCE.dp2px(DEFAULT_HEIGHT);
+        mTextSize             = AppSize.INSTANCE.dp2px(DEFAULT_TEXT_SIZE);
+        mStrokeWidth          = AppSize.INSTANCE.dp2px(DEFAULT_STROKE_WIDTH);
+        mCenterRadius         = AppSize.INSTANCE.dp2px(DEFAULT_CENTER_RADIUS);
+        mProgressCenterRadius = AppSize.INSTANCE.dp2px(DEFAULT_PROGRESS_CENTER_RADIUS);
 
         mProgressColor           = DEFAULT_PROGRESS_COLOR;
         mProgressBgColor         = DEFAULT_PROGRESS_BGCOLOR;

diff --git a/app/src/main/java/afkt/project/ui/widget/render/shapechange/CircleBroodLoadingRenderer.java b/app/src/main/java/afkt/project/ui/widget/render/shapechange/CircleBroodLoadingRenderer.java
@@ -14,7 +14,7 @@
 import android.view.animation.Interpolator;
 
 import afkt.project.ui.widget.render.LoadingRenderer;
-import dev.utils.app.SizeUtils;
+import afkt.project.util.AppSize;
 
 public class CircleBroodLoadingRenderer
         extends LoadingRenderer {
@@ -113,11 +113,11 @@ private CircleBroodLoadingRenderer(Context context) {
     }
 
     private void initialize(Context context) {
-        mWidth  = SizeUtils.dp2px(DEFAULT_WIDTH);
-        mHeight = SizeUtils.dp2px(DEFAULT_HEIGHT);
+        mWidth  = AppSize.INSTANCE.dp2px(DEFAULT_WIDTH);
+        mHeight = AppSize.INSTANCE.dp2px(DEFAULT_HEIGHT);
 
-        mMaxMotherOvalSize    = SizeUtils.dp2px(MAX_MATHER_OVAL_SIZE);
-        mBasicChildOvalRadius = SizeUtils.dp2px(MIN_CHILD_OVAL_RADIUS);
+        mMaxMotherOvalSize    = AppSize.INSTANCE.dp2px(MAX_MATHER_OVAL_SIZE);
+        mBasicChildOvalRadius = AppSize.INSTANCE.dp2px(MIN_CHILD_OVAL_RADIUS);
 
         mOvalColor           = DEFAULT_OVAL_COLOR;
         mOvalDeepColor       = DEFAULT_OVAL_DEEP_COLOR;

diff --git a/app/src/main/java/afkt/project/ui/widget/render/shapechange/CoolWaitLoadingRenderer.java b/app/src/main/java/afkt/project/ui/widget/render/shapechange/CoolWaitLoadingRenderer.java
@@ -15,7 +15,7 @@
 import android.view.animation.Interpolator;
 
 import afkt.project.ui.widget.render.LoadingRenderer;
-import dev.utils.app.SizeUtils;
+import afkt.project.util.AppSize;
 
 public class CoolWaitLoadingRenderer
         extends LoadingRenderer {
@@ -67,10 +67,10 @@ private CoolWaitLoadingRenderer(Context context) {
     }
 
     private void initialize(Context context) {
-        mWidth            = SizeUtils.dp2px(DEFAULT_WIDTH);
-        mHeight           = SizeUtils.dp2px(DEFAULT_HEIGHT);
-        mStrokeWidth      = SizeUtils.dp2px(DEFAULT_STROKE_WIDTH);
-        mWaitCircleRadius = SizeUtils.dp2px(WAIT_CIRCLE_RADIUS);
+        mWidth            = AppSize.INSTANCE.dp2px(DEFAULT_WIDTH);
+        mHeight           = AppSize.INSTANCE.dp2px(DEFAULT_HEIGHT);
+        mStrokeWidth      = AppSize.INSTANCE.dp2px(DEFAULT_STROKE_WIDTH);
+        mWaitCircleRadius = AppSize.INSTANCE.dp2px(WAIT_CIRCLE_RADIUS);
 
 //        mTopColor = Color.parseColor("#FF1B78DD");
         mTopColor    = Color.WHITE;