王鹏鹏 2 лет назад
Родитель
Сommit
f94b6a065e

+ 1 - 0
.idea/misc.xml

@@ -163,6 +163,7 @@
         <entry key="..\:/workspace/hcp-pad/imageselector/src/main/res/layout/activity_clip_image.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/imageselector/src/main/res/layout/activity_image_select.xml" value="0.23697916666666666" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_im_chat.xml" value="0.155" />
+        <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_item_live_broadcast.xml" value="0.16" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast.xml" value="0.219" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast_btn.xml" value="0.171" />
         <entry key="..\:/workspace/hcp-pad/livebroadcast/src/main/res/drawable/bg_live_broadcast_button.xml" value="0.219" />

+ 5 - 3
baselib/src/main/java/com/yingyangfly/baselib/dialog/LoadingDialog.kt

@@ -11,6 +11,7 @@ import androidx.appcompat.widget.AppCompatImageView
 import com.bumptech.glide.Glide
 import com.yingyangfly.baselib.R
 import com.yingyangfly.baselib.utils.AppUtil
+import com.yingyangfly.baselib.utils.ViewTool
 
 /**
  * Loading
@@ -29,12 +30,13 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
 
     fun initViews() {
         val inflater = LayoutInflater.from(context)
-        mView = inflater.inflate(R.layout.dialog_loading, null)
+//        mView = inflater.inflate(R.layout.dialog_loading, null)
+        mView = ViewTool.inflateLayoutPixelsById(context, R.layout.dialog_loading, 1194, 834)
         setContentView(mView!!)
         fishImage = findViewById(R.id.fishImage)
         ovlImage = findViewById(R.id.ovlImage)
         setCanceledOnTouchOutside(false)
-        setDialogLayout(context, window!!)
+        setDialogLayout(window!!)
         init()
     }
 
@@ -45,7 +47,7 @@ class LoadingDialog constructor(context: Context) : AlertDialog(context, R.style
             .into(fishImage!!)
     }
 
-    private fun setDialogLayout(context: Context, dialogWindow: Window) {
+    private fun setDialogLayout(dialogWindow: Window) {
         dialogWindow.setLayout(
             ViewGroup.LayoutParams.MATCH_PARENT,
             ViewGroup.LayoutParams.MATCH_PARENT