修改bug

app/src/main/java/com/ym/game/application/BaseApplication.kt

@@ -31,7 +31,7 @@ class BaseApplication : MultiDexApplication() {
         //第一步初始化 application
         AppliContext.init(this)
         // Config.init(this)
-        NetConfig.setBase_Url(NetConfig.Environment.DEV)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
+        NetConfig.setBase_Url(NetConfig.Environment.PRODUCT)// TODO 上线之后提成成  NetConfig.Environment.PRODUCT
 
         Constant.appLs = "afcbef40e31631d3"//appls
         AdManager.init(this)

app/src/main/java/com/ym/game/view/MainDialog.kt

@@ -327,7 +327,7 @@ object MainDialog {
             (context as Activity),
             ZXADSizeConfig(
                 Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56,
-                (Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56) * 0.66.toInt()
+                ((Utils.px2dip(context.windowManager?.defaultDisplay?.width!!.toFloat()) - 56) * 0.66).toInt()
             ),
             object :
                 ZXADExpressListener {

app/src/main/java/com/ym/game/view/SpeedWaterPopupWindow.kt

@@ -103,7 +103,7 @@ class SpeedWaterPopupWindow : PopupWindow(), SpeedWaterContract.View,
                         )
                     }
                     4 -> {
-                        EventUtils.onEvent("click_receive_coin_task_video_btn", "领金币任务视频")
+                        EventUtils.onEvent("click_jiasuji_task_video_btn", "领加速剂任务视频")
                         AdManager.loadRewardVideoAd(
                             ADConfig.AD_REWARD_VIDIO,
                             (mContext as Activity),

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

@@ -5,36 +5,45 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="600dp"
+        android:layout_height="590dp"
         android:layout_centerInParent="true"
         android:layout_marginLeft="9dp"
         android:layout_marginRight="9dp">
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="532dp"
+            android:layout_height="520dp"
             android:layout_alignParentBottom="true"
             android:scaleType="fitXY"
             android:src="@mipmap/icon_main_dialog_get_drops_bg" />
 
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="568dp"
-            android:layout_centerInParent="true"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_10">
+            android:layout_height="577dp"
+            android:layout_centerInParent="true">
+
+            <RelativeLayout
+                android:layout_width="@dimen/dp_50"
+                android:layout_height="@dimen/dp_40"
+                android:layout_alignParentRight="true"
+                android:layout_marginTop="76dp">
+
+
+            </RelativeLayout>
 
             <ImageView
                 android:id="@+id/iv_dialog_close"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:layout_marginTop="62dp"
+                android:layout_marginTop="76dp"
                 android:src="@mipmap/icon_new_close" />
 
             <ImageView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
                 android:scaleType="fitXY"
                 android:src="@mipmap/icon_recode_bg" />
 
@@ -42,10 +51,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/iv_dialog_close"
+                android:layout_marginLeft="@dimen/dp_10"
+                android:layout_marginRight="@dimen/dp_10"
                 android:orientation="vertical">
 
 
-
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rl_record"
                     android:layout_width="match_parent"

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

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/dp_6">
 
     <RelativeLayout

library/src/main/res/layout/dialog_get_diamand.xml

@@ -50,7 +50,7 @@
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="35dp"
-                    android:src="@drawable/icon_top_bg" />
+                    android:src="@drawable/icon_get_diamand" />
 
                 <TextView
                     android:id="@+id/id_tv_gongxi_get"
@@ -61,7 +61,7 @@
                     android:text="恭喜获得钻石"
                     android:textColor="@color/white"
                     android:textSize="20sp"
-                    android:visibility="visible" />
+                    android:visibility="invisible" />
 
                 <LinearLayout
                     android:id="@+id/id_ll_content"

userinfo/src/main/java/com/ym/userinfo/module/activity/SettingActivity.kt

@@ -3,6 +3,7 @@ package com.ym.userinfo.module.activity
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.util.Log
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
 import com.umeng.analytics.MobclickAgent
 import com.ym.library.Constant
@@ -58,12 +59,13 @@ class SettingActivity : BaseActivity() {
             val updateVersionManager = this?.let { it1 -> UpdateVersionManager(it1) }
             updateVersionManager?.checkUpdate(true)
         }
+
         AdManager.loadFeedAd(
             ADConfig.AD_IMG_FADE,
             this,
             ZXADSizeConfig(
                 Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 58,
-                (Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 58) * 0.66.toInt()
+                ((Utils.px2dip(windowManager?.defaultDisplay?.width!!.toFloat()) - 58) * 0.66).toInt()
             ),
             object :
                 ZXADExpressListener {