[提交人]：王雪伟

[提交简述] ：幸运农场1.0.6
[实现方案] ：调整UI,修改广告比例

app/src/main/java/com/ym/game/adapter/WateringTaskAdpater.kt

 package com.ym.game.adapter
 
+import android.app.Activity
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -32,11 +33,11 @@ class WateringTaskAdpater :
     BaseRecyclerAdapter<WateringTaskEntity, WateringTaskAdpater.WateringTaskHolder> {
 
     private var type: Int = -1
-    private var mContext: Context? = null
+    private var mContext: Activity? = null
     private val listener: OnRecycleItemClickListener<WateringTaskEntity>
 
     constructor(
-        content: Context?,
+        content: Activity?,
         type: Int,
         listener: OnRecycleItemClickListener<WateringTaskEntity>
     ) : super() {

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

@@ -64,7 +64,7 @@ object MainDialog {
      * adType: 广告的类型
      */
     fun showgetWaterDrop(
-        context: Context?,
+        context: Activity?,
         type: Int,
         adType: String,
         rewardCount: Int,
@@ -132,12 +132,18 @@ object MainDialog {
                 tvGetDropCount.text = "+${rewardCount}"
             }
         }
-
+//        val myAdLayParam = layoutAd.layoutParams as LinearLayout.LayoutParams
+//        myAdLayParam.width = PhoneUtils.getScreenWidth(context) - Utils.dip2px(30)
+//        myAdLayParam.height = (PhoneUtils.getScreenWidth(context) * 0.66f).toInt()
+//        layoutAd.layoutParams = myAdLayParam
 //        shwoAd(adType, context, layoutAd)
         AdManager.loadFeedAd(
             ADConfig.AD_IMG_FADE,
-            (context as Activity),
-            ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56, 245),
+            (context),
+            ZXADSizeConfig(
+                Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56,
+                ((Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56) * 0.66).toInt()
+            ),
             object :
                 ZXADExpressListener {
                 override fun onError(p1: String?) {
@@ -270,7 +276,7 @@ object MainDialog {
     }
 
     fun showopenBox(
-        context: Context?,
+        context: Activity?,
         type: Int,
         adType: String,
         rewardCount: Int,
@@ -352,10 +358,18 @@ object MainDialog {
             mDialog.dismiss()
             mListener.onCloseViewSuccess(true)
         }
+//        val myAdLayParam = layoutAd.layoutParams as LinearLayout.LayoutParams
+//        myAdLayParam.width = PhoneUtils.getScreenWidth(context) - Utils.dip2px(30)
+//        myAdLayParam.height = (PhoneUtils.getScreenWidth(context) * 0.66f).toInt()
+//        layoutAd.layoutParams = myAdLayParam
+
         AdManager.loadFeedAd(
             ADConfig.AD_IMG_FADE,
             (context as Activity),
-            ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 56, 245),
+            ZXADSizeConfig(
+                Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 30,
+                ((Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 30) * 0.66).toInt()
+            ),
             object :
                 ZXADExpressListener {
                 override fun onError(p1: String?) {

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

@@ -49,14 +49,14 @@ class SiginDropsPopupwindow : PopupWindow(), WateringRewardContract.View,
     private val TAG = "Popupwindow"
     private var mListener: IDialogViewCloseCallback? = null
     private var view: View? = null
-    private var mContext: Context? = null
+    private var mContext: Activity? = null
     private var tvPopupSigninDrops: TextView? = null
     private var mPresenter: WateringRewardPresenter? = null
 
     private var singinDropsAdapter: SigninDropsAdapter? = null
     private var wateringTaskAdpater: WateringTaskAdpater? = null
 
-    fun init(mContext: Context?, mListener: IDialogViewCloseCallback) {
+    fun init(mContext: Activity?, mListener: IDialogViewCloseCallback) {
         this.mListener = mListener
         this.mContext = mContext
 //        ToponManager.initNativeAd((mContext as Activity), AdID.AD_DAILY_DRIP_BIGIMAGE)

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

@@ -44,7 +44,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     private var isStartAnim = true
     private var isUpdate = false
 
-    private var context: Context? = null
+    private var context: Activity? = null
     private var mDialog: Dialog? = null
 
     private var mLotteryResult: TurntableEntity.Turntable? = null
@@ -65,7 +65,7 @@ object TurntableDialog : TurntableUtils(), TurntableContract.View {
     /**
      *幸运转盘
      */
-    fun showTurntable(context: Context?, mListener: IDialogViewCloseCallback) {
+    fun showTurntable(context: Activity?, mListener: IDialogViewCloseCallback) {
         if (context == null) {
             return
         }

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

@@ -17,7 +17,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="80dp"
-            android:text="恭喜获得现金奖励"
+            android:text="恭喜获得现金红包"
             android:textColor="@color/white"
             android:textSize="36sp" />
 

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/dp_25"
+    android:layout_marginBottom="@dimen/dp_15"
     android:gravity="center"
     android:orientation="horizontal">
 

library/src/main/java/com/ym/library/utils/CenterDialog.kt

@@ -12,11 +12,9 @@ import android.util.Log
 import android.view.Gravity
 import android.view.View
 import android.webkit.WebView
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.RelativeLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.annotation.RequiresApi
+import androidx.fragment.app.Fragment
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
 import com.ym.library.Constant
 import com.ym.library.R
@@ -199,12 +197,20 @@ object CenterDialog : BaseDialog() {
         val tv_time = mDialogView.findViewById<TextView>(R.id.id_tv_dialog_datecoins_time)
         val img_close = mDialogView.findViewById<ImageView>(R.id.id_dialog_datecoins_close)
         val layouAd = mDialogView.findViewById<FrameLayout>(R.id.id_dialog_result_ad_layout)
+//
+//        val myAdLayParam = layouAd.layoutParams as LinearLayout.LayoutParams
+//        myAdLayParam.width = PhoneUtils.getScreenWidth(activity) - Utils.dip2px(30)
+//        myAdLayParam.height = (PhoneUtils.getScreenWidth(activity) * 0.66f).toInt()
+//        layouAd.layoutParams = myAdLayParam
 
 
         AdManager.loadFeedAd(
             ADConfig.AD_IMG_FADE,
             activity,
-            ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 30, 265),
+            ZXADSizeConfig(
+                Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 30,
+                ((Utils.px2dip(PhoneUtils.getScreenWidth(activity).toFloat()) - 30) * 0.66f).toInt()
+            ),
             object :
                 ZXADExpressListener {
                 override fun onError(p1: String?) {
@@ -248,6 +254,7 @@ object CenterDialog : BaseDialog() {
                 }
 
                 override fun onSuccess() {
+
                 }
 
             },

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

@@ -117,6 +117,7 @@
             android:layout_below="@+id/id_dialog_result_layout"
             android:layout_marginLeft="15dp"
             android:layout_marginTop="20dp"
+            android:visibility="gone"
             android:layout_marginRight="15dp"
             android:gravity="center"></FrameLayout>
 

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

@@ -4,6 +4,7 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.widget.CompoundButton
+import android.widget.LinearLayout
 import com.bytedance.sdk.openadsdk.TTNativeExpressAd
 import com.umeng.analytics.MobclickAgent
 import com.ym.library.Constant
@@ -44,9 +45,9 @@ class SettingActivity : BaseActivity() {
         id_notif_check.setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener { compoundButton, b ->
             SettingPreference.setNotice(b)
             //重试设备登录和获取用户信息
-            if (b){
+            if (b) {
                 RxBus.get().post("refresh_login", "open_notif")
-            }else{
+            } else {
                 RxBus.get().post("refresh_login", "close_notif")
             }
         })
@@ -70,10 +71,17 @@ class SettingActivity : BaseActivity() {
             val updateVersionManager = this?.let { it1 -> UpdateVersionManager(it1) }
             updateVersionManager?.checkUpdate(true)
         }
+//        val myAdLayParam = id_ad_frame_view.layoutParams as LinearLayout.LayoutParams
+//        myAdLayParam.width = PhoneUtils.getScreenWidth(this) - Utils.dip2px(30)
+//        myAdLayParam.height = (PhoneUtils.getScreenWidth(this) * 0.66f).toInt()
+//        id_ad_frame_view.layoutParams = myAdLayParam
         AdManager.loadFeedAd(
             ADConfig.AD_IMG_FADE,
             this,
-            ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 60, 265),
+            ZXADSizeConfig(
+                Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 60,
+                ((Utils.px2dip(PhoneUtils.getScreenWidth(this).toFloat()) - 60) * 0.66).toInt()
+            ),
             object :
                 ZXADExpressListener {
                 override fun onError(p1: String?) {