Merge remote-tracking branch 'origin/develop_cache' into develop_cache

# Conflicts:
#	library/src/main/java/com/ym/library/net/ITaskApi.kt

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

@@ -134,52 +134,58 @@ object MainDialog {
         }
 
 //        shwoAd(adType, context, layoutAd)
-        AdManager.loadFeedAd(ADConfig.AD_IMG_FADE,(context as Activity), ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat())-20,265), object :
-            ZXADExpressListener {
-            override fun onError(p1: String?) {
+        AdManager.loadFeedAd(
+            ADConfig.AD_IMG_FADE,
+            (context as Activity),
+            ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 20, 265),
+            object :
+                ZXADExpressListener {
+                override fun onError(p1: String?) {
 
-            }
+                }
 
-            override fun onNativeExpressAdLoad(p0: MutableList<TTNativeExpressAd>?) {
-            }
+                override fun onNativeExpressAdLoad(p0: MutableList<TTNativeExpressAd>?) {
+                }
 
-            override fun onAdClicked(newsEntity: NewsEntity) {
-            }
+                override fun onAdClicked(newsEntity: NewsEntity) {
+                }
 
-            override fun onAdShow(newsEntity: NewsEntity) {
-            }
+                override fun onAdShow(newsEntity: NewsEntity) {
+                }
 
-            override fun onRenderFail(s: String) {
-            }
+                override fun onRenderFail(s: String) {
+                }
 
-            override fun onRenderSuccess() {
-            }
+                override fun onRenderSuccess() {
+                }
 
-            override fun onDownloadFinished() {
-            }
+                override fun onDownloadFinished() {
+                }
 
-            override fun onInstalled() {
-            }
+                override fun onInstalled() {
+                }
 
-            override fun onDownloadFailed() {
-            }
+                override fun onDownloadFailed() {
+                }
 
-            override fun onDownloadPaused() {
-            }
+                override fun onDownloadPaused() {
+                }
 
-            override fun onDownloadActive() {
-            }
+                override fun onDownloadActive() {
+                }
 
-            override fun onIdle() {
-            }
+                override fun onIdle() {
+                }
 
-            override fun onFail() {
-            }
+                override fun onFail() {
+                }
 
-            override fun onSuccess() {
-            }
+                override fun onSuccess() {
+                }
 
-        },layoutAd)
+            },
+            layoutAd
+        )
 
         mDialogView.findViewById<TextView>(R.id.btn_get_drop_happy_accept).setOnClickListener {
             mDialog.dismiss()
@@ -346,52 +352,58 @@ object MainDialog {
             mDialog.dismiss()
             mListener.onCloseViewSuccess(true)
         }
-        AdManager.loadFeedAd(ADConfig.AD_IMG_FADE,(context as Activity), ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat())-20,265), object :
-            ZXADExpressListener {
-            override fun onError(p1: String?) {
+        AdManager.loadFeedAd(
+            ADConfig.AD_IMG_FADE,
+            (context as Activity),
+            ZXADSizeConfig(Utils.px2dip(PhoneUtils.getScreenWidth(context).toFloat()) - 40, 220),
+            object :
+                ZXADExpressListener {
+                override fun onError(p1: String?) {
 
-            }
+                }
 
-            override fun onNativeExpressAdLoad(p0: MutableList<TTNativeExpressAd>?) {
-            }
+                override fun onNativeExpressAdLoad(p0: MutableList<TTNativeExpressAd>?) {
+                }
 
-            override fun onAdClicked(newsEntity: NewsEntity) {
-            }
+                override fun onAdClicked(newsEntity: NewsEntity) {
+                }
 
-            override fun onAdShow(newsEntity: NewsEntity) {
-            }
+                override fun onAdShow(newsEntity: NewsEntity) {
+                }
 
-            override fun onRenderFail(s: String) {
-            }
+                override fun onRenderFail(s: String) {
+                }
 
-            override fun onRenderSuccess() {
-            }
+                override fun onRenderSuccess() {
+                }
 
-            override fun onDownloadFinished() {
-            }
+                override fun onDownloadFinished() {
+                }
 
-            override fun onInstalled() {
-            }
+                override fun onInstalled() {
+                }
 
-            override fun onDownloadFailed() {
-            }
+                override fun onDownloadFailed() {
+                }
 
-            override fun onDownloadPaused() {
-            }
+                override fun onDownloadPaused() {
+                }
 
-            override fun onDownloadActive() {
-            }
+                override fun onDownloadActive() {
+                }
 
-            override fun onIdle() {
-            }
+                override fun onIdle() {
+                }
 
-            override fun onFail() {
-            }
+                override fun onFail() {
+                }
 
-            override fun onSuccess() {
-            }
+                override fun onSuccess() {
+                }
 
-        },layoutAd)
+            },
+            layoutAd
+        )
 
         mDialog.setCanceledOnTouchOutside(false)
         mDialog.setCancelable(false)

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

@@ -27,11 +27,13 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_centerHorizontal="true"
-                    android:layout_marginLeft="@dimen/dp_20"
+                    android:layout_marginLeft="@dimen/dp_10"
                     android:layout_marginTop="@dimen/dp_15"
-                    android:layout_marginRight="@dimen/dp_20"
+                    android:layout_marginRight="@dimen/dp_10"
                     android:background="@mipmap/icon_content_bg"
-                    android:orientation="horizontal">
+                    android:orientation="horizontal"
+                    android:paddingLeft="@dimen/dp_30"
+                    android:paddingRight="@dimen/dp_30">
 
                     <LinearLayout
                         android:layout_width="wrap_content"
@@ -161,9 +163,9 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="18dp"
             android:layout_marginTop="5dp"
+            android:layout_marginRight="18dp"
             android:background="@color/white"
-            android:visibility="gone"
-            android:layout_marginRight="18dp" />
+            android:visibility="gone" />
 
     </LinearLayout>
 

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

@@ -65,7 +65,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="25dp"
-            android:text="每日12:00 18:00 21：00 00:00重置"
+            android:text="每日12:00 18:00 21:00 00:00重置"
             android:textColor="@color/white"
             android:textSize="16sp" />