Merge remote-tracking branch 'origin/master'

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

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.ym.quwei.guessing">
+    package="com.ym.xync">
 
 
     <uses-permission android:name="android.permission.INTERNET" />

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

@@ -213,5 +213,55 @@ class GameActivity : UnityPlayerActivity() {
             })
     }
 
+    //订单领取
+    fun getOrderReceive(callback: IUnitySendMessageCallback?) {
+        GameApiClient.gameApi.getOrderReceive().compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<StatusEntity>() {
+                override fun onSuccess(result: StatusEntity?) {
+                    Log.d("wxw", "订单领取" + Utils.obj2Str(result))
+                    callback?.onOrderReceiveSuccess(true, Utils.obj2Str(result))
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "订单领取 error")
+                    callback?.onOrderReceiveSuccess(false, errorMsg + "")
+                }
+            })
+    }
+
+    //看视频领取种子
+    fun getVideoSeedReceive(callback: IUnitySendMessageCallback?,id: Int) {
+        GameApiClient.gameApi.getVideoSeedReceive(id).compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<StatusEntity>() {
+                override fun onSuccess(result: StatusEntity?) {
+                    result?.id = id
+                    Log.d("wxw", "看视频领取种子" + Utils.obj2Str(result))
+                    callback?.onIncrVideoSeedSuccess(true, Utils.obj2Str(result))
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "看视频领取种子 error")
+                    callback?.onIncrVideoSeedSuccess(false, errorMsg + "")
+                }
+            })
+    }
+
+    //看视频领取加速剂
+    fun getVideoAcceleratorsReceive(callback: IUnitySendMessageCallback?) {
+        GameApiClient.gameApi.getVideoAcceleratorsReceive().compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<StatusEntity>() {
+                override fun onSuccess(result: StatusEntity?) {
+                    Log.d("wxw", "看视频领取加速剂" + Utils.obj2Str(result))
+                    callback?.onIncrVideoAcceleratorsSuccess(true, Utils.obj2Str(result))
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                    Log.d("wxw", "看视频领取加速剂 error")
+                    callback?.onIncrVideoAcceleratorsSuccess(false, errorMsg + "")
+                }
+            })
+    }
+
+
 
 }
\ No newline at end of file

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

@@ -6,21 +6,27 @@ package com.ym.game
  * @detail :
  */
 interface IUnitySendMessageCallback {
-
+    //主页
     fun onHomeSuccess(isSuccess: Boolean, result: String)
-
+    //云朵加速
     fun onCloudSpeedSuccess(isSuccess: Boolean, result: String)
-
+    //土地列表
     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)
+    //订单领取
+    fun onOrderReceiveSuccess(isSuccess: Boolean, result: String)
+    //看视频获得种子
+    fun onIncrVideoSeedSuccess(isSuccess: Boolean, result: String)
+    //看视频获得加速剂
+    fun onIncrVideoAcceleratorsSuccess(isSuccess: Boolean, result: String)
 
 }
\ No newline at end of file

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

@@ -16,10 +16,19 @@ public class OrderListEntity {
      * awardCash : 5
      */
 
+    private int status;
     private int orderLevel;
     private int awardCash;
     private List<FarmOrderDataListBean> farmOrderDataList;
 
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
     public int getOrderLevel() {
         return orderLevel;
     }
@@ -55,7 +64,20 @@ public class OrderListEntity {
         private int id;
         private int ownNum;
         private int targetNum;
-        private Object imgUrl;
+        private String name;
+        private String imgUrl;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public void setImgUrl(String imgUrl) {
+            this.imgUrl = imgUrl;
+        }
 
         public int getId() {
             return id;
@@ -84,9 +106,5 @@ public class OrderListEntity {
         public Object getImgUrl() {
             return imgUrl;
         }
-
-        public void setImgUrl(Object imgUrl) {
-            this.imgUrl = imgUrl;
-        }
     }
 }

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

@@ -6,9 +6,27 @@ package com.ym.game.module;
  * @detail :
  */
 public class StatusEntity {
+    private int id;
     private int status;
     private int num;
     private int cloudSecond;
+    private int awardCash;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getAwardCash() {
+        return awardCash;
+    }
+
+    public void setAwardCash(int awardCash) {
+        this.awardCash = awardCash;
+    }
 
     public int getStatus() {
         return status;

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

@@ -95,6 +95,14 @@ interface IGameApi {
      */
     @GET(NetConfig.Game.URL_GAME_TURNTABLE_LIST)
     fun getTurntableList(): Observable<Response<TurntableEntity>>
+    /**
+     * 订单领取
+     * @param
+     * @paramq
+     * @return
+     */
+    @POST(NetConfig.Game.URL_GAME_ORDER_RECEIVE)
+    fun getOrderReceive(): Observable<Response<StatusEntity>>
 
     //抽奖结果
     @POST(NetConfig.Game.URL_GAME_FARM_LOTTERY)
@@ -106,4 +114,21 @@ interface IGameApi {
     //
     @GET(NetConfig.Game.URL_GAME_FARM_DAILY_TASK)
     fun getOrchardDailyTask(): Observable<Response<List<WateringTaskEntity>>>
+    /**
+     * 看视频获得种子
+     * @param
+     * @paramq
+     * @return
+     */
+    @POST(NetConfig.Game.URL_GAME_INCR_SEED)
+    fun getVideoSeedReceive(@Query("id") id: Int): Observable<Response<StatusEntity>>
+
+    /**
+     * 看视频获得加速剂
+     * @param
+     * @paramq
+     * @return
+     */
+    @POST(NetConfig.Game.URL_GAME_INCR_ACCELERATORS)
+    fun getVideoAcceleratorsReceive(): Observable<Response<StatusEntity>>
 }
\ No newline at end of file

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

@@ -41,7 +41,7 @@ import com.ym.muisc.contract.MainContract
 import com.ym.muisc.module.BreakRedPaperEntity
 import com.ym.muisc.module.MainEntity
 import com.ym.muisc.presenter.MainPresenter
-import com.ym.quwei.guessing.R
+import com.ym.xync.R
 import com.ym.task.module.bean.DoubleReceiveBean
 import com.ym.task.module.fragment.SoundTaskFragment
 import com.ym.userinfo.module.UserInfoFragment

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

@@ -11,7 +11,7 @@ import com.gyf.immersionbar.BarHide
 import com.gyf.immersionbar.ImmersionBar
 import com.umeng.analytics.MobclickAgent
 import com.ym.game.GameActivity
-import com.ym.quwei.guessing.R
+import com.ym.xync.R
 import com.ym.library.Constant
 import com.ym.library.module.AdEntity
 import com.ym.library.module.ReportEntity

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

@@ -6,7 +6,7 @@ import com.bytedance.sdk.openadsdk.*
 import com.google.gson.Gson
 import com.qq.e.comm.managers.GDTADManager
 import com.umeng.analytics.MobclickAgent
-import com.ym.quwei.guessing.R
+import com.ym.xync.R
 import com.ym.library.Constant
 import com.ym.library.module.ReportEntity
 import com.ym.library.net.BaseActivity

app/src/main/java/com/ym/muisc/adapter/BreakRedPaperAdapter.kt

@@ -10,7 +10,7 @@ import android.widget.ProgressBar
 import android.widget.RelativeLayout
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
-import com.ym.quwei.guessing.R
+import com.ym.xync.R
 import com.ym.library.base.BaseRecyclerAdapter
 import com.ym.module.guesssong.listener.OnRecycleItemClickListener
 import com.ym.muisc.module.BreakRedPaperEntity

app/src/main/java/com/ym/muisc/utils/CenterDialog.kt

@@ -11,7 +11,7 @@ import android.text.style.ForegroundColorSpan
 import android.view.Gravity
 import android.view.View
 import android.widget.TextView
-import com.ym.quwei.guessing.R
+import com.ym.xync.R
 import com.ym.library.base.BaseDialog
 import com.ym.library.net.NetConfig
 import com.ym.library.utils.JumpUtils

app/src/main/java/com/ym/quwei/guessing/wxapi/WXEntryActivity.java

-package com.ym.quwei.guessing.wxapi;
+package com.ym.xync.wxapi;
 
 import com.umeng.socialize.weixin.view.WXCallbackActivity;
 

app/version.properties

-PACKAGE_NAME=com.ym.quwei.guessing
+PACKAGE_NAME=com.ym.xync
 VERSION_CODE=1
 VERSION_NAME=1.0.0
\ No newline at end of file

library/src/main/java/com/ym/library/net/IUserApi.kt

@@ -14,7 +14,7 @@ interface IUserApi {
      *
      * @return
      */
-    @GET( "api/v1/version/com.ym.quwei.guessing")
+    @GET( "api/v1/version/com.ym.xync")
     fun getVersion(): Observable<Response<VersionEntity>>
 
     /**

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

@@ -233,6 +233,7 @@ public class NetConfig {
     }
 
     public static class Game{
+        public static final String URL_GAME_AD_VIDEO_REPORT="app/v1/game/report";//看视频上报
         public static final String URL_GAME_BUY_SEED="app/v1/game/farm/buy_seed";//金币购买种子
         public static final String URL_GAME_CLOUD_SPEED="app/v1/game/farm/cloud_speed";//云朵加速
         public static final String URL_GAME_DO_WD="app/v1/game/farm/do_wd";//发起提现
@@ -240,6 +241,7 @@ public class NetConfig {
         public static final String URL_GAME_LIST_LAND="app/v1/game/farm/list_land";//地块列表
         public static final String URL_GAME_OPEN_BOX="app/v1/game/farm/open_box";//开宝箱
         public static final String URL_GAME_ORDER_DATA="app/v1/game/farm/order_data";//订单数据
+        public static final String URL_GAME_ORDER_RECEIVE="app/v1/game/farm/order_receive";//订单领取
         public static final String URL_GAME_UNLOCK_LAND="app/v1/game/farm/unlock_land";//解锁地块/种植种子/收获果实
         public static final String URL_GAME_USE_ACCELERATORS="app/v1/game/farm/use_accelerators";//加速剂加速
         public static final String URL_GAME_WAREHOUSE_DATA="app/v1/game/farm/warehouseData";//仓库列表
@@ -249,5 +251,8 @@ public class NetConfig {
         public static final String URL_GAME_FARM_LIST="app/v1/game/farm/sign_list";//签到列表
         public static final String URL_GAME_FARM_DAILY_TASK="app/v1/game/farm/daily_task";//每日任务
 
+        public static final String URL_GAME_INCR_SEED="app/v1/game/farm/incr_seed";//看视频获得种子
+        public static final String URL_GAME_INCR_ACCELERATORS="app/v1/game/farm/incr_accelerators";//看视频获得加速剂
+
     }
 }