[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：添加接口

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

@@ -4,6 +4,7 @@ import android.util.Log
 import com.game.luckyfarm.UnityPlayerActivity
 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.library.net.BaseObserver
@@ -52,10 +53,13 @@ class GameActivity : UnityPlayerActivity() {
         GameApiClient.gameApi.getGameHomeInfo().compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<HomeInfoEntity>() {
                 override fun onSuccess(result: HomeInfoEntity?) {
+                    Log.d("wxw", "获取首页信息" +Utils.obj2Str(result))
+
                     callback?.onHomeSuccess(true, Utils.obj2Str(result))
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "获取首页信息 error")
                     callback?.onHomeSuccess(false, errorMsg + "")
                 }
             })
@@ -76,6 +80,7 @@ class GameActivity : UnityPlayerActivity() {
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "地块列表 error")
                     callback?.onFarmLandListSuccess(false, errorMsg + "")
                 }
             })
@@ -98,18 +103,20 @@ class GameActivity : UnityPlayerActivity() {
                 }
             })
     }
+
     //解锁地块
     fun getUnlockLand(callback: IUnitySendMessageCallback?, id: Int, type: Int) {
+        Log.d("wxw", "解锁地块 id" + id + "type" + type)
         GameApiClient.gameApi.getUnlockLand(id, type).compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
                     Log.d("wxw", "解锁地块" + Utils.obj2Str(result))
-                    callback?.onCloudSpeedSuccess(true, Utils.obj2Str(result))
+                    callback?.onLandUnLockSuccess(true, Utils.obj2Str(result))
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
                     Log.d("wxw", "解锁地块 error")
-                    callback?.onCloudSpeedSuccess(false, errorMsg + "")
+                    callback?.onLandUnLockSuccess(false, errorMsg + "")
                 }
             })
     }
@@ -120,17 +127,34 @@ class GameActivity : UnityPlayerActivity() {
             .subscribe(object : BaseObserver<StatusEntity>() {
                 override fun onSuccess(result: StatusEntity?) {
                     Log.d("wxw", "加速剂" + Utils.obj2Str(result))
-                    callback?.onCloudSpeedSuccess(true, Utils.obj2Str(result))
+                    callback?.onUseAcceleratorsSuccess(true, Utils.obj2Str(result))
                 }
 
                 override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
                     Log.d("wxw", "加速剂 error")
-                    callback?.onCloudSpeedSuccess(false, errorMsg + "")
+                    callback?.onUseAcceleratorsSuccess(false, errorMsg + "")
                 }
             })
     }
+
+    //金币购买种子
+    fun getBuySeed(callback: IUnitySendMessageCallback?, id: Int) {
+        GameApiClient.gameApi.getBuySeed(id).compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<StatusEntity>() {
+                override fun onSuccess(result: StatusEntity?) {
+                    Log.d("wxw", "金币购买种子" + Utils.obj2Str(result))
+                    callback?.onBuySeedSuccess(true, Utils.obj2Str(result))
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "金币购买种子 error")
+                    callback?.onBuySeedSuccess(false, errorMsg + "")
+                }
+            })
+    }
+
     //仓库
-    fun getWareHouseData(callback: IUnitySendMessageCallback?,  id: Int){
+    fun getWareHouseData(callback: IUnitySendMessageCallback?, id: Int) {
         GameApiClient.gameApi.getWareHouseData(id).compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<List<LandListEntity>>() {
                 override fun onSuccess(result: List<LandListEntity>?) {
@@ -148,5 +172,21 @@ class GameActivity : UnityPlayerActivity() {
             })
     }
 
+    //订单数据
+    fun getOrderData(callback: IUnitySendMessageCallback?) {
+        GameApiClient.gameApi.getOrderData().compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<OrderListEntity>() {
+                override fun onSuccess(result: OrderListEntity?) {
+                    Log.d("wxw", "订单数据" + Utils.obj2Str(result))
+                    callback?.onOrderListSuccess(true, Utils.obj2Str(result))
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "订单数据 error")
+                    callback?.onOrderListSuccess(false, errorMsg + "")
+                }
+            })
+    }
+
 
 }
\ No newline at end of file

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

@@ -13,6 +13,14 @@ interface IUnitySendMessageCallback {
 
     fun onFarmLandListSuccess(isSuccess: Boolean, result: String)
 
+    fun onLandUnLockSuccess(isSuccess: Boolean, result: String)
+
+    fun onUseAcceleratorsSuccess(isSuccess: Boolean, result: String)
+
+    fun onBuySeedSuccess(isSuccess: Boolean, result: String)
+
     fun onHomeWareListSuccess(isSuccess: Boolean, result: String)
 
+    fun onOrderListSuccess(isSuccess: Boolean, result: String)
+
 }
\ No newline at end of file

app/src/main/java/com/ym/game/module/OrderListEntity.java

+package com.ym.game.module;
+
+import java.util.List;
+
+/**
+ * @author (wangXuewei)
+ * @datetime 2020-10-14 11:18 GMT+8
+ * @detail :
+ */
+public class OrderListEntity {
+
+
+    /**
+     * orderLevel : 0
+     * farmOrderDataList : [{"id":1,"ownNum":0,"targetNum":1,"imgUrl":null}]
+     * awardCash : 5
+     */
+
+    private int orderLevel;
+    private int awardCash;
+    private List<FarmOrderDataListBean> farmOrderDataList;
+
+    public int getOrderLevel() {
+        return orderLevel;
+    }
+
+    public void setOrderLevel(int orderLevel) {
+        this.orderLevel = orderLevel;
+    }
+
+    public int getAwardCash() {
+        return awardCash;
+    }
+
+    public void setAwardCash(int awardCash) {
+        this.awardCash = awardCash;
+    }
+
+    public List<FarmOrderDataListBean> getFarmOrderDataList() {
+        return farmOrderDataList;
+    }
+
+    public void setFarmOrderDataList(List<FarmOrderDataListBean> farmOrderDataList) {
+        this.farmOrderDataList = farmOrderDataList;
+    }
+
+    public static class FarmOrderDataListBean {
+        /**
+         * id : 1
+         * ownNum : 0
+         * targetNum : 1
+         * imgUrl : null
+         */
+
+        private int id;
+        private int ownNum;
+        private int targetNum;
+        private Object imgUrl;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public int getOwnNum() {
+            return ownNum;
+        }
+
+        public void setOwnNum(int ownNum) {
+            this.ownNum = ownNum;
+        }
+
+        public int getTargetNum() {
+            return targetNum;
+        }
+
+        public void setTargetNum(int targetNum) {
+            this.targetNum = targetNum;
+        }
+
+        public Object getImgUrl() {
+            return imgUrl;
+        }
+
+        public void setImgUrl(Object imgUrl) {
+            this.imgUrl = imgUrl;
+        }
+    }
+}

app/src/main/java/com/ym/game/module/StatusEntity.java

@@ -6,29 +6,10 @@ package com.ym.game.module;
  * @detail :
  */
 public class StatusEntity {
-    private int id;
-    private int ownNum;
-
     private int status;
     private int num;
     private int cloudSecond;
 
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public int getOwnNum() {
-        return ownNum;
-    }
-
-    public void setOwnNum(int ownNum) {
-        this.ownNum = ownNum;
-    }
-
     public int getStatus() {
         return status;
     }

app/src/main/java/com/ym/game/net/IGameApi.kt

@@ -2,6 +2,7 @@ package com.ym.game.net
 
 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.library.net.NetConfig
 import com.ym.library.net.Response
@@ -61,7 +62,14 @@ interface IGameApi {
      */
     @POST(NetConfig.Game.URL_GAME_USE_ACCELERATORS)
     fun getUseAccelerators(@Query("id") id: Int): Observable<Response<StatusEntity>>
-
+    /**
+     * 金币购买种子
+     * @param
+     * @param
+     * @return
+     */
+    @POST(NetConfig.Game.URL_GAME_BUY_SEED)
+    fun getBuySeed(@Query("id") id: Int): Observable<Response<StatusEntity>>
     /**
      * 仓库
      * @param id 仓库列表id
@@ -71,6 +79,14 @@ interface IGameApi {
     @GET(NetConfig.Game.URL_GAME_WAREHOUSE_DATA)
     fun getWareHouseData(@Query("type") id: Int): Observable<Response<List<LandListEntity>>>
 
+    /**
+     * 订单数据
+     * @param
+     * @paramq
+     * @return
+     */
+    @GET(NetConfig.Game.URL_GAME_ORDER_DATA)
+    fun getOrderData(): Observable<Response<OrderListEntity>>
 
 
 }
\ No newline at end of file

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

 <resources>
-    <string name="app_name">幸福农场</string>
+    <string name="app_name">幸运农场</string>
 </resources>

library/src/main/java/com/ym/library/net/NetConfig.java

@@ -245,7 +245,5 @@ public class NetConfig {
         public static final String URL_GAME_WAREHOUSE_DATA="app/v1/game/farm/warehouseData";//仓库列表
         public static final String URL_GAME_WITHDRAW_LIST="app/v1/game/farm/withdraw_list";//提现列表
 
-
-
     }
 }