[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：修改icon

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

 package com.ym.game
 
-import android.content.Intent
 import android.os.Bundle
 import android.util.Log
 import com.anythink.core.api.ATAdInfo
 import com.anythink.core.api.AdError
 import com.game.luckyfarm.UnityPlayerActivity
-import com.tencent.ep.commonbase.api.AppContext.context
 import com.ym.game.module.HomeInfoEntity
 import com.ym.game.module.LandListEntity
 import com.ym.game.module.OrderListEntity
 import com.ym.game.module.StatusEntity
 import com.ym.game.net.GameApiClient
-import com.ym.game.view.HomeWareActivity
 import com.ym.game.view.SiginDropsPopupwindow
 import com.ym.game.view.TurntableDialog
-import com.ym.library.module.AdEntity
+import com.ym.library.AppliContext
 import com.ym.library.net.BaseObserver
 import com.ym.library.net.RxSchedulers
 import com.ym.library.rxbus.RxBusConstant
 import com.ym.library.rxbus.RxBusUtil
-import com.ym.library.utils.EventUtils
 import com.ym.library.utils.SettingPreference
 import com.ym.library.utils.Utils
+import com.ym.library.widget.LoadingDialog
 import com.ym.module.toponad.AdID
 import com.ym.module.toponad.ToponManager
 import com.ym.module.toponad.listener.ToponRewardListener
+import com.ym.xync.R
+import org.jetbrains.anko.runOnUiThread
 
 /**
  * @author (wangXuewei)
@@ -33,11 +32,19 @@ import com.ym.module.toponad.listener.ToponRewardListener
  * @detail :
  */
 class GameActivity : UnityPlayerActivity() {
+    private var mLoading: LoadingDialog? = null
+    private val mContext = AppliContext.get()
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         if (SettingPreference.getIsShowGuide()) {
             SettingPreference.setIsShowGuide(false)
         }
+        mLoading = LoadingDialog.getLoadingDialog(
+            mContext,"",
+            true,
+            true
+        )
+        mLoading?.dismiss()
         TurntableDialog.initTurntableAnim()
 
     }
@@ -69,7 +76,7 @@ class GameActivity : UnityPlayerActivity() {
                 Log.d("wxw", "onRewardedVideoAdPlayStart")
             }
 
-        }, AdID.mPlacementId_rewardvideo_all)
+        }, AdID.mPlacementId_Reward_video_luck_farm)
     }
 
     /**
@@ -136,7 +143,6 @@ class GameActivity : UnityPlayerActivity() {
             .subscribe(object : BaseObserver<HomeInfoEntity>() {
                 override fun onSuccess(result: HomeInfoEntity?) {
                     Log.d("wxw", "获取首页信息" + Utils.obj2Str(result))
-
                     callback?.onHomeSuccess(true, Utils.obj2Str(result))
                 }
 
@@ -172,6 +178,7 @@ class GameActivity : UnityPlayerActivity() {
      * 云朵加速
      * */
     fun getCloudSpeed(callback: IUnitySendMessageCallback?) {
+        Log.d("wxw", "云朵加速")
         GameApiClient.gameApi.getCloudSpeed().compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
@@ -290,7 +297,7 @@ class GameActivity : UnityPlayerActivity() {
     }
 
     //看视频领取种子
-    fun getVideoSeedReceive(callback: IUnitySendMessageCallback?,id: Int) {
+    fun getVideoSeedReceive(callback: IUnitySendMessageCallback?, id: Int) {
         GameApiClient.gameApi.getVideoSeedReceive(id).compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
@@ -307,7 +314,7 @@ class GameActivity : UnityPlayerActivity() {
     }
 
     //看视频领取加速剂
-    fun getVideoAcceleratorsReceive(callback: IUnitySendMessageCallback?,id: Int) {
+    fun getVideoAcceleratorsReceive(callback: IUnitySendMessageCallback?, id: Int) {
         GameApiClient.gameApi.getVideoAcceleratorsReceive(id).compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {

app/src/main/java/com/ym/muisc/activity/SplashActivity.kt

@@ -112,7 +112,7 @@ class SplashActivity : BaseActivity(), SplashContract.View {
                     override fun onAdLoaded() {
                     }
                 },
-                AdID.mPlacementId_splash_all
+                AdID.mPlacementId_splash_luck_farm
             //TODO TestAdID
             )
         } else {

library/src/main/res/values/strings.xml

@@ -17,5 +17,5 @@
     <string name="permission_phone_str">读取电话的状态权限\n</string>
     <string name="permission_soarse_location_str">访问范围性的定位权限\n</string>
     <string name="permission_fine_location_str">访问精良的定位权限\n</string>
-
+    <string name="wait_ing2"></string>
 </resources>
\ No newline at end of file

toponad/src/main/java/com/ym/module/toponad/AdID.kt

@@ -4,8 +4,8 @@ object AdID {
 
 //    const val appid = "a5f505b7e5c2df"
 //    const val appKey = "fcb6f45247863c40802d8a98a776212c"
-    const val appid = "a5aa1f9deda26d"
-    const val appKey = "4f7b9ac17decb9babec83aac078742c7"
+    const val appid = "a5f890fb71c764"
+    const val appKey = "fcb6f45247863c40802d8a98a776212c"
 
     const val mPlacementId_native_all = "b5aa1fa2cae775"
     const val mPlacementId_native_mintegral = "b5aa1fa85b86d5"
@@ -79,7 +79,10 @@ object AdID {
     const val mPlacementId_daily_task_time_period_signin_bigimag = "b5f5c779697ca4"// 每日任务时段签到大图
     const val mPlacementId_daily_task_time_period_signin_video = "b5f5c77aaa19f6"// 每日任务时段签到激励视频
 
-
+    //幸运农场
+    const val mPlacementId_splash_luck_farm = "b5f890fca2ffc5"// 农场开屏
+    const val mPlacementId_primeval_luck_farm = "b5f890ff07e488"// 农场原生
+    const val mPlacementId_Reward_video_luck_farm = "b5f891001be20b"// 农场激励视频
 
 
 }
\ No newline at end of file