[Flutter]新增快速赛功能
This commit is contained in:
@@ -212,6 +212,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
|
|||||||
|
|
||||||
private static final String EXTRA_APP_QUIT = "APP_QUIT";
|
private static final String EXTRA_APP_QUIT = "APP_QUIT";
|
||||||
public static final String MSG_TAB = "msgTab";
|
public static final String MSG_TAB = "msgTab";
|
||||||
|
public static final String GAME_TAB = "gameTab";
|
||||||
|
|
||||||
private DragLayout avatarLayout;
|
private DragLayout avatarLayout;
|
||||||
private TextView tvName;//最小化窗口名称
|
private TextView tvName;//最小化窗口名称
|
||||||
@@ -532,9 +533,9 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
|
|||||||
if (!TextUtils.isEmpty(account)) {
|
if (!TextUtils.isEmpty(account)) {
|
||||||
NimP2PMessageActivity.start(this, account);
|
NimP2PMessageActivity.start(this, account);
|
||||||
}
|
}
|
||||||
} else if (intent.hasExtra("gameTab") && intent.getBooleanExtra("gameTab", false)) {
|
} else if (intent.hasExtra(GAME_TAB) && intent.getBooleanExtra(GAME_TAB, false)) {
|
||||||
if (mMainTabLayout != null) {
|
if (mMainTabLayout != null) {
|
||||||
mMainTabLayout.select(MainTabLayout.MAIN_TAB_POS_HOME);
|
mMainTabLayout.select(MainTabLayout.MAIN_TAB_POS_GAME);
|
||||||
}
|
}
|
||||||
} else if (intent.hasExtra(MSG_TAB) && intent.getBooleanExtra(MSG_TAB, false)) {
|
} else if (intent.hasExtra(MSG_TAB) && intent.getBooleanExtra(MSG_TAB, false)) {
|
||||||
if (mMainTabLayout != null) {
|
if (mMainTabLayout != null) {
|
||||||
|
@@ -7,8 +7,10 @@ public class RouterConstants {
|
|||||||
public static final String NATIVE_PAGE_BIND_PAYMENT_PWD = "bindPaymentPwd";
|
public static final String NATIVE_PAGE_BIND_PAYMENT_PWD = "bindPaymentPwd";
|
||||||
public static final String NATIVE_PAGE_BIND_ALIPAY = "bindAlipay";
|
public static final String NATIVE_PAGE_BIND_ALIPAY = "bindAlipay";
|
||||||
public static final String NATIVE_PAGE_WEBVIEW = "openWebview";
|
public static final String NATIVE_PAGE_WEBVIEW = "openWebview";
|
||||||
|
public static final String NATIVE_PAGE_CHATROOM = "chatRoom";
|
||||||
|
|
||||||
public static final String NATIVE_PAGE_ARG_WEBVIEW_URL = "webviewUrl";
|
public static final String NATIVE_PAGE_ARG_WEBVIEW_URL = "webviewUrl";
|
||||||
|
public static final String NATIVE_PAGE_ARG_CHATROOM_ID = "chatRoomID";
|
||||||
|
|
||||||
public static final String FLUTTER_PAGE_MAIN = "/";
|
public static final String FLUTTER_PAGE_MAIN = "/";
|
||||||
public static final String FLUTTER_PAGE_MAIN_DEBUG = "debug";
|
public static final String FLUTTER_PAGE_MAIN_DEBUG = "debug";
|
||||||
|
@@ -6,6 +6,7 @@ import android.content.Intent;
|
|||||||
import com.idlefish.flutterboost.FlutterBoost;
|
import com.idlefish.flutterboost.FlutterBoost;
|
||||||
import com.idlefish.flutterboost.FlutterBoostDelegate;
|
import com.idlefish.flutterboost.FlutterBoostDelegate;
|
||||||
import com.idlefish.flutterboost.containers.FlutterBoostActivity;
|
import com.idlefish.flutterboost.containers.FlutterBoostActivity;
|
||||||
|
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
|
||||||
import com.yizhuan.erban.ui.login.BinderPhoneActivity;
|
import com.yizhuan.erban.ui.login.BinderPhoneActivity;
|
||||||
import com.yizhuan.erban.ui.pay.ChargeActivity;
|
import com.yizhuan.erban.ui.pay.ChargeActivity;
|
||||||
import com.yizhuan.erban.ui.setting.ModifyPwdActivity;
|
import com.yizhuan.erban.ui.setting.ModifyPwdActivity;
|
||||||
@@ -68,6 +69,10 @@ public class XplanFlutterBoostDelegate implements FlutterBoostDelegate {
|
|||||||
CommonWebViewActivity.start(FlutterBoost.instance().currentActivity(), UriProvider.getGameShareUrl());
|
CommonWebViewActivity.start(FlutterBoost.instance().currentActivity(), UriProvider.getGameShareUrl());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (pageName.equals(RouterConstants.NATIVE_PAGE_CHATROOM)) {
|
||||||
|
AVRoomActivity.start(FlutterBoost.instance().currentActivity(), Long.valueOf((Integer) arguments.get(RouterConstants.NATIVE_PAGE_ARG_CHATROOM_ID)));
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -1,13 +1,16 @@
|
|||||||
package com.yizhuan.erban.ui.im.chat;
|
package com.yizhuan.erban.ui.im.chat;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
import android.widget.TextView;
|
import android.widget.TextView;
|
||||||
|
|
||||||
import com.idlefish.flutterboost.FlutterBoost;
|
import com.idlefish.flutterboost.FlutterBoost;
|
||||||
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
|
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
|
||||||
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
|
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
|
||||||
import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
|
import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
|
||||||
|
import com.yizhuan.erban.MainActivity;
|
||||||
import com.yizhuan.erban.R;
|
import com.yizhuan.erban.R;
|
||||||
import com.yizhuan.erban.flutter.RouterConstants;
|
import com.yizhuan.erban.flutter.RouterConstants;
|
||||||
|
import com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment;
|
||||||
import com.yizhuan.xchat_android_core.im.custom.bean.MatchAttachment;
|
import com.yizhuan.xchat_android_core.im.custom.bean.MatchAttachment;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
@@ -53,6 +56,13 @@ public class MsgViewHolderMatch extends MsgViewHolderBase {
|
|||||||
HashMap<String, Object> args = new HashMap<>();
|
HashMap<String, Object> args = new HashMap<>();
|
||||||
args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, matchAttachment.getMatchId());
|
args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, matchAttachment.getMatchId());
|
||||||
FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_MATCH_DETAIL, args);
|
FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_MATCH_DETAIL, args);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (matchAttachment != null && matchAttachment.getSecond() == CustomAttachment.CUSTOM_MSG_QUICK_DISMISS) {
|
||||||
|
Intent intent = new Intent();
|
||||||
|
intent.putExtra(MainActivity.GAME_TAB, true);
|
||||||
|
MainActivity.start(context, intent);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -386,6 +386,8 @@ public class CustomAttachment implements MsgAttachment {
|
|||||||
public static final int CUSTOM_MSG_MATCH = 74;
|
public static final int CUSTOM_MSG_MATCH = 74;
|
||||||
public static final int CUSTOM_MSG_MATCH_TICKET = 77;
|
public static final int CUSTOM_MSG_MATCH_TICKET = 77;
|
||||||
//public static final int CUSTOM_MSG_SUB_MATCH = 741;
|
//public static final int CUSTOM_MSG_SUB_MATCH = 741;
|
||||||
|
public static final int CUSTOM_MSG_QUICK_DISMISS = 745;
|
||||||
|
public static final int CUSTOM_MSG_QUICK_ENOUGH_QUOTA = 746;
|
||||||
|
|
||||||
public CustomAttachment() {
|
public CustomAttachment() {
|
||||||
|
|
||||||
|
Submodule xplan-flutter updated: 883d089fc8...5a7a0d8287
Reference in New Issue
Block a user