多多菜园1.0.3上线

.gitignore

@@ -29,3 +29,4 @@ guesssong/*.iml
 happyplay/*.iml
 userinfo/*.iml
 antearn.jks
+game/src/main/assets/bin/Data/

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

app/src/main/java/com/ym/game/GameActivity.kt

@@ -974,6 +974,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
         ).subscribe(object : BaseObserver<ExchangeEntity>() {
             override fun onSuccess(result: ExchangeEntity?) {
                 if (result != null) {
+                    callUnity("OrderView", "getOrderData", "")
                     MainDialog?.showWithDraw(
                         this@GameActivity,
                         result?.status ?: 0,

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

@@ -23,6 +23,7 @@ import android.widget.RelativeLayout
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.airbnb.lottie.LottieAnimationView
+import com.google.gson.annotations.Until
 import com.ym.admodule.config.AdManager
 import com.ym.admodule.listener.ZXADVideoListener
 import com.ym.ddcy.R
@@ -293,7 +294,9 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
                                 mPresenter?.onecleanPuzzle()
                             }
                             override fun onError(errorMsg: String?) {
-                                mPresenter?.onecleanPuzzle()
+                               // mPresenter?.onecleanPuzzle()
+                                Log.e("MXL","ERROR")
+                                Utils.showToast(context,"加载失败请重试")
                             }
                         })
                 })
@@ -332,7 +335,7 @@ object PuzzleDialog : PuzzleContract.View, OnRecycleItemClickListener<PuzzleEnti
                     }
 
                     override fun onError(errorMsg: String?) {
-                        mPresenter?.noputPuzzleData(data.index)
+                       // mPresenter?.noputPuzzleData(data.index)
                     }
                 })
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+    android:background="@drawable/layer_splash"
     android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/splash_container"
         android:layout_width="match_parent"
+        android:layout_marginBottom="80dp"
         android:layout_height="match_parent" />
 
 
@@ -24,16 +26,5 @@
         android:textColor="@android:color/white"
         android:visibility="gone" />
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:background="@color/white"
-        android:padding="@dimen/dp_30">
 
-        <ImageView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:src="@drawable/duoduokaipingye" />
-    </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file

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

@@ -34,7 +34,7 @@ object AdUtils {
 
                 override fun onAdShow() {
                     Utils.showToast(activity, "看完视频可获得奖励")
-                  //  AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_VIDEO, activity!!)
+                  // AdManager.loadNextCacheRewardVideoAd(ADConfig.AD_VIDEO, activity!!)
                 }
 
                 override fun onAdVideoBarClick() {}
@@ -51,6 +51,9 @@ object AdUtils {
         try {
             view.postDelayed(object :Runnable {
                 override fun run() {
+                    if(activity?.isFinishing){
+                        return
+                    }
                     activity?.runOnUiThread() {
                         AdManager.showFeedAd(
                             ADConfig.AD_IMG_FADE,

library/src/main/res/drawable/layer_splash.xml

@@ -2,10 +2,10 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- 整体的背景颜色 -->
     <item android:drawable="@android:color/white" />
-    <item>
+    <item android:width="360dp" android:height="80dp" android:gravity="bottom|center_horizontal">
         <!-- 中间的图片 -->
         <bitmap
-            android:gravity="bottom"
+            android:gravity="center"
             android:src="@drawable/duoduokaipingye" />
     </item>
 </layer-list>
\ No newline at end of file