[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：合并

.idea/misc.xml

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

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

@@ -255,7 +255,6 @@ class GameActivity : UnityPlayerActivity() {
                     callback?.onHomeWareListSuccess(false, errorMsg + "")
                 }
             })
-
     }
 
     //订单数据

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

@@ -19,10 +19,6 @@ import com.ym.library.utils.EventUtils
 import com.ym.library.utils.LogUtils
 import com.ym.library.utils.Utils
 import com.ym.xync.R
-import com.ym.module.toponad.AdID
-import com.ym.module.toponad.ToponManager
-import com.ym.module.toponad.listener.ToponRewardListener
-import com.ym.xync.R
 
 /**
  *Craeted by ${junqi.li}