Commit c55f5e62 authored by wangxuewei's avatar wangxuewei

[提交人]:王雪伟

[提交简述] :幸福农场
[实现方案] :订单activity
parent 43901445
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
<activity <activity
android:name="com.ym.game.view.HomeWareActivity" android:name="com.ym.game.view.HomeWareActivity"
android:exported="true" /> android:exported="true" />
<activity
android:name="com.ym.game.view.OrderListActivity"
android:exported="true" />
<activity <activity
android:name="com.ym.game.GameActivity" android:name="com.ym.game.GameActivity"
android:exported="true" /> android:exported="true" />
......
package com.ym.game package com.ym.game
import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.util.Log import android.util.Log
import com.anythink.core.api.ATAdInfo import com.anythink.core.api.ATAdInfo
...@@ -12,6 +13,7 @@ import com.ym.game.module.OrderListEntity ...@@ -12,6 +13,7 @@ import com.ym.game.module.OrderListEntity
import com.ym.game.module.StatusEntity import com.ym.game.module.StatusEntity
import com.ym.game.net.GameApiClient import com.ym.game.net.GameApiClient
import com.ym.game.view.MainDialog import com.ym.game.view.MainDialog
import com.ym.game.view.OrderListActivity
import com.ym.game.view.SiginDropsPopupwindow import com.ym.game.view.SiginDropsPopupwindow
import com.ym.game.view.TurntableDialog import com.ym.game.view.TurntableDialog
import com.ym.library.AppliContext import com.ym.library.AppliContext
...@@ -353,12 +355,18 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback { ...@@ -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?) { fun getOrderData(callback: IUnitySendMessageCallback?) {
GameApiClient.gameApi.getOrderData().compose(RxSchedulers.observableIO2Main()) GameApiClient.gameApi.getOrderData().compose(RxSchedulers.observableIO2Main())
.subscribe(object : BaseObserver<OrderListEntity>() { .subscribe(object : BaseObserver<OrderListEntity>() {
override fun onSuccess(result: OrderListEntity?) { override fun onSuccess(result: OrderListEntity?) {
mOrderString=Utils.obj2Str(result) mOrderString=Utils.obj2Str(result)
jumpOrderDialog()
Log.d("wxw", "订单数据" + Utils.obj2Str(result)) Log.d("wxw", "订单数据" + Utils.obj2Str(result))
callback?.onOrderListSuccess(true, Utils.obj2Str(result)) callback?.onOrderListSuccess(true, Utils.obj2Str(result))
} }
......
package com.ym.game.view package com.ym.game.view
import android.util.Log
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.ym.game.adapter.GameOrderListAdapter import com.ym.game.adapter.GameOrderListAdapter
import com.ym.game.module.OrderListEntity import com.ym.game.module.OrderListEntity
...@@ -11,6 +12,8 @@ import kotlinx.android.synthetic.main.activity_order_list.* ...@@ -11,6 +12,8 @@ import kotlinx.android.synthetic.main.activity_order_list.*
* @author (wangXuewei) * @author (wangXuewei)
* @datetime 2020-10-18 16:30 GMT+8 * @datetime 2020-10-18 16:30 GMT+8
* @detail : * @detail :
*
*
*/ */
class OrderListActivity: BaseActivity() { class OrderListActivity: BaseActivity() {
private var orderListAdapter: GameOrderListAdapter? = null; private var orderListAdapter: GameOrderListAdapter? = null;
...@@ -20,10 +23,14 @@ class OrderListActivity: BaseActivity() { ...@@ -20,10 +23,14 @@ class OrderListActivity: BaseActivity() {
override fun init() { override fun init() {
var orderStr= intent.getStringExtra("orderJson") var orderStr= intent.getStringExtra("orderJson")
Log.d("wxw","orderStr"+orderStr);
if (orderStr!=null&&!orderStr.equals("")){
val str2Obj = str2Obj(orderStr, OrderListEntity::class.java)as OrderListEntity val str2Obj = str2Obj(orderStr, OrderListEntity::class.java)as OrderListEntity
//猜歌任务列表 //猜歌任务列表
orderListAdapter = GameOrderListAdapter() orderListAdapter = GameOrderListAdapter()
id_rel_game_order_list?.adapter = orderListAdapter id_rel_game_order_list?.adapter = orderListAdapter
id_rel_game_order_list?.layoutManager = LinearLayoutManager(this) id_rel_game_order_list?.layoutManager = LinearLayoutManager(this)
} }
}
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment