[提交人]：王雪伟

[提交简述] ：幸福农场
[实现方案] ：订单activity

app/src/main/AndroidManifest.xml

@@ -53,6 +53,9 @@
         <activity
             android:name="com.ym.game.view.HomeWareActivity"
             android:exported="true" />
+        <activity
+            android:name="com.ym.game.view.OrderListActivity"
+            android:exported="true" />
         <activity
             android:name="com.ym.game.GameActivity"
             android:exported="true" />

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
@@ -12,6 +13,7 @@ import com.ym.game.module.OrderListEntity
 import com.ym.game.module.StatusEntity
 import com.ym.game.net.GameApiClient
 import com.ym.game.view.MainDialog
+import com.ym.game.view.OrderListActivity
 import com.ym.game.view.SiginDropsPopupwindow
 import com.ym.game.view.TurntableDialog
 import com.ym.library.AppliContext
@@ -353,12 +355,18 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
             })
     }
 
+    fun jumpOrderDialog(){
+        var inten = Intent(this,OrderListActivity::class.java)
+        inten.putExtra("orderJson",mOrderString)
+        startActivity(inten)
+    }
     //订单数据
     fun getOrderData(callback: IUnitySendMessageCallback?) {
         GameApiClient.gameApi.getOrderData().compose(RxSchedulers.observableIO2Main())
             .subscribe(object : BaseObserver<OrderListEntity>() {
                 override fun onSuccess(result: OrderListEntity?) {
                     mOrderString=Utils.obj2Str(result)
+                    jumpOrderDialog()
                     Log.d("wxw", "订单数据" + Utils.obj2Str(result))
                     callback?.onOrderListSuccess(true, Utils.obj2Str(result))
                 }

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

 package com.ym.game.view
 
+import android.util.Log
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.ym.game.adapter.GameOrderListAdapter
 import com.ym.game.module.OrderListEntity
@@ -11,6 +12,8 @@ import kotlinx.android.synthetic.main.activity_order_list.*
  * @author (wangXuewei)
  * @datetime 2020-10-18 16:30 GMT+8
  * @detail :
+ *
+ *
  */
 class OrderListActivity: BaseActivity() {
     private var orderListAdapter: GameOrderListAdapter? = null;
@@ -20,10 +23,14 @@ class OrderListActivity: BaseActivity() {
 
     override fun init() {
        var orderStr= intent.getStringExtra("orderJson")
-        val str2Obj = str2Obj(orderStr, OrderListEntity::class.java)as OrderListEntity
-        //猜歌任务列表
-        orderListAdapter = GameOrderListAdapter()
-        id_rel_game_order_list?.adapter = orderListAdapter
-        id_rel_game_order_list?.layoutManager = LinearLayoutManager(this)
+        Log.d("wxw","orderStr"+orderStr);
+        if (orderStr!=null&&!orderStr.equals("")){
+            val str2Obj = str2Obj(orderStr, OrderListEntity::class.java)as OrderListEntity
+            //猜歌任务列表
+            orderListAdapter = GameOrderListAdapter()
+            id_rel_game_order_list?.adapter = orderListAdapter
+            id_rel_game_order_list?.layoutManager = LinearLayoutManager(this)
+        }
+
     }
 }
\ No newline at end of file