yinmeng/yinmeng-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除flutter(家里电脑跑不起来-_-!!)

Browse Source
This commit is contained in:
memory
2022-09-15 21:11:20 +08:00
parent 6768e8b1f8
commit 40c24da965
19 changed files with 1 additions and 1042 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/src/main/java/com/yizhuan/erban/MainActivity.java
View File

@@ -132,7 +132,6 @@ import java.lang.ref.WeakReference;
import java.util.List;
import java.util.concurrent.TimeUnit;
import io.flutter.embedding.android.FlutterFragment;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -387,9 +386,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
}
onParseIntent();
handleNimIntent();
if (tempFragment instanceof FlutterFragment) {
((FlutterFragment) tempFragment).onNewIntent(intent);
}
}
private void onParseIntent() {
@@ -464,9 +460,6 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
} catch (Exception e) {
e.printStackTrace();
}
if (tempFragment instanceof FlutterFragment) {
((FlutterFragment) tempFragment).onBackPressed();
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -965,42 +958,4 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
@Override
public void onPostResume() {
super.onPostResume();
if (tempFragment instanceof FlutterFragment) {
((FlutterFragment) tempFragment).onPostResume();
}
}
@Override
public void onRequestPermissionsResult(
int requestCode,
@NonNull String[] permissions,
@NonNull int[] grantResults
) {
if (tempFragment instanceof FlutterFragment) {
tempFragment.onRequestPermissionsResult(
requestCode,
permissions,
grantResults
);
}
}
@Override
public void onUserLeaveHint() {
if (tempFragment instanceof FlutterFragment) {
((FlutterFragment) tempFragment).onUserLeaveHint();
}
}
@Override
public void onTrimMemory(int level) {
super.onTrimMemory(level);
if (tempFragment instanceof FlutterFragment) {
((FlutterFragment) tempFragment).onTrimMemory(level);
}
}
}

11
app/src/main/java/com/yizhuan/erban/flutter/ChannelConstants.java
View File

@@ -1,11 +0,0 @@
package com.yizhuan.erban.flutter;
public class ChannelConstants {
public static final String CHANNEL_NAME = "com.mango.flutter.xplan";
public static final String METHOD_NAME_GETDIAMOND = "getDiamond";
public static final String METHOD_NAME_GETDEVICEINFO = "getDeviceInfo";
public static final String METHOD_NAME_GETAUTH = "getAuth";
public static final String METHOD_NAME_GETENCODEPWD = "getEncodePwd";
public static final String METHOD_NAME_NOTIFYSHOWINVITE = "notifyShowInvite";
}

29
app/src/main/java/com/yizhuan/erban/flutter/RouterConstants.java
View File

@@ -1,29 +0,0 @@
package com.yizhuan.erban.flutter;
public class RouterConstants {
public static final String NATIVE_PAGE_CHARGE = "charge";
public static final String NATIVE_PAGE_BIND = "bindGameAccount";
public static final String NATIVE_PAGE_INVITE = "invite";
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_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_CHATROOM_ID = "chatRoomID";
public static final String NATIVE_PAGE_ARG_FROM_TYPE = "chatRoomFromType";
public static final String NATIVE_PAGE_ARG_FROM_UID = "chatRoomFromUid";
public static final String NATIVE_PAGE_ARG_FROM_NICK = "chatRoomFromNick";
public static final String FLUTTER_PAGE_MAIN = "/";
public static final String FLUTTER_PAGE_MAIN_DEBUG = "debug";
public static final String FLUTTER_PAGE_SPLASH = "splash";
public static final String FLUTTER_PAGE_MALL = "mall";
public static final String FLUTTER_PAGE_RECORD = "quotaRecord";
public static final String FLUTTER_PAGE_BAG = "bag";
public static final String FLUTTER_PAGE_PERFORMANCE = "performance";
public static final String FLUTTER_PAGE_MATCH_DETAIL = "matchDetail";
public static final String FLUTTER_PAGE_PRIZE = "prize";
public static final String FLUTTER_PAGE_ARG_MATCH_ID = "matchId";
}

77
app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostCallback.java
View File

@@ -1,77 +0,0 @@
package com.yizhuan.erban.flutter;
import android.content.Context;
import android.os.Build;
import com.idlefish.flutterboost.FlutterBoost;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.erban.flutter.event.ShowInviteEvent;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
import com.yizhuan.xchat_android_library.utils.AppUtils;
import com.yizhuan.xchat_android_library.utils.DeviceUuidFactory;
import com.yizhuan.xchat_android_library.utils.SystemUtils;
import com.yizhuan.xchat_android_library.utils.VersionUtil;
import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
import org.greenrobot.eventbus.EventBus;
import java.util.HashMap;
import java.util.Map;
import io.flutter.embedding.engine.FlutterEngine;
import io.flutter.plugin.common.MethodChannel;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
public class XplanFlutterBoostCallback implements FlutterBoost.Callback {
private MethodChannel mMethodChannel;
@Override
public void onStart(FlutterEngine engine) {
Context context = XChatApplication.instance();
mMethodChannel = new MethodChannel(engine.getDartExecutor(), ChannelConstants.CHANNEL_NAME);
mMethodChannel.setMethodCallHandler(((call, result) -> {
if (call.method.equals(ChannelConstants.METHOD_NAME_GETDIAMOND)) {
PayModel.get().getWalletInfo()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(walletInfo -> {
result.success(walletInfo.diamonds);
});
} else if (call.method.equals(ChannelConstants.METHOD_NAME_GETDEVICEINFO)) {
Map<String, String> httpParams = new HashMap<>();
httpParams.put("os", "android");
httpParams.put("osVersion", Build.VERSION.RELEASE);
httpParams.put("app", XChatConstants.APP_MARK);
httpParams.put("ispType", String.valueOf(SystemUtils.getIspType(context)));
httpParams.put("netType", String.valueOf(SystemUtils.getNetworkType(context)));
httpParams.put("model", SystemUtils.getPhoneModel());
httpParams.put("appVersion", VersionUtil.getLocalName(context));
httpParams.put("appVersionCode", String.valueOf(AppUtils.getVersionCode(context)));
httpParams.put("deviceId", DeviceUuidFactory.getDeviceId(context));
httpParams.put("channel", AppMetaDataUtil.getChannelID());
result.success(httpParams);
} else if (call.method.equals(ChannelConstants.METHOD_NAME_GETAUTH)) {
Map<String, String> headerParams = new HashMap<>();
headerParams.put("pub_uid", String.valueOf(AuthModel.get().getCurrentUid()));
headerParams.put("pub_ticket", AuthModel.get().getTicket());
result.success(headerParams);
} else if (call.method.equals(ChannelConstants.METHOD_NAME_GETENCODEPWD)) {
try {
result.success(DESUtils.DESAndBase64Encrypt(String.valueOf(call.arguments)));
} catch (Exception e) {
result.error("", "", null);
}
} else if (call.method.equals(ChannelConstants.METHOD_NAME_NOTIFYSHOWINVITE)) {
EventBus.getDefault().post(new ShowInviteEvent(Boolean.valueOf(call.arguments.toString())));
} else {
result.notImplemented();
}
}));
}
}

102
app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java
View File

@@ -1,102 +0,0 @@
package com.yizhuan.erban.flutter;
import android.content.Context;
import android.content.Intent;
import com.idlefish.flutterboost.FlutterBoost;
import com.idlefish.flutterboost.FlutterBoostDelegate;
import com.idlefish.flutterboost.containers.FlutterBoostActivity;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.ui.login.BindPhoneActivity;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.setting.ModifyPwdActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.withdraw.BinderAlipayActivity;
import com.yizhuan.xchat_android_core.UriProvider;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.StatisticModel;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import java.util.HashMap;
import java.util.Map;
import io.flutter.embedding.android.FlutterActivityLaunchConfigs;
public class XplanFlutterBoostDelegate implements FlutterBoostDelegate {
@Override
public void pushNativeRoute(String pageName, Map<String, Object> arguments) {
if (pageName == null) {
return;
}
if (pageName.equals(RouterConstants.NATIVE_PAGE_CHARGE)) {
ChargeActivity.start(FlutterBoost.instance().currentActivity());
return;
}
if (pageName.equals(RouterConstants.NATIVE_PAGE_BIND)) {
CommonWebViewActivity.start(FlutterBoost.instance().currentActivity(), UriProvider.getLinkAccountUrl());
return;
}
if (pageName.equals(RouterConstants.NATIVE_PAGE_BIND_PAYMENT_PWD)) {
Context context = FlutterBoost.instance().currentActivity();
if (UserModel.get().getCacheLoginUserInfo().isBindPhone()) {
ModifyPwdActivity.start(context, ModifyPwdActivity.PAY_PWD);
} else {
BindPhoneActivity.start(context);
}
return;
}
if (pageName.equals(RouterConstants.NATIVE_PAGE_BIND_ALIPAY)) {
Context context = FlutterBoost.instance().currentActivity();
if (UserModel.get().getCacheLoginUserInfo().isBindPhone()) {
Intent intent = new Intent(context, BinderAlipayActivity.class);
context.startActivity(intent);
} else {
BindPhoneActivity.start(context);
}
return;
}
if (pageName.equals(RouterConstants.NATIVE_PAGE_WEBVIEW)) {
String url = (String) arguments.get(RouterConstants.NATIVE_PAGE_ARG_WEBVIEW_URL);
if (url == null || url.isEmpty()) {
return;
}
Context context = FlutterBoost.instance().currentActivity();
Intent intent = new Intent(context, CommonWebViewActivity.class);
intent.putExtra("url", url);
intent.putExtra("from", "xplan_flutter");
context.startActivity(intent);
return;
}
if (pageName.equals(RouterConstants.NATIVE_PAGE_INVITE)) {
CommonWebViewActivity.start(FlutterBoost.instance().currentActivity(), UriProvider.getGameShareUrl());
return;
}
if (pageName.equals(RouterConstants.NATIVE_PAGE_CHATROOM)) {
StatisticManager.Instance().onEvent(StatisticsProtocol.EVENT_OPERATIONAL_ROOM_SUCCESS, "赛事详情成功进入聊天室 ");
long uid = Long.valueOf((Integer) arguments.get(RouterConstants.NATIVE_PAGE_ARG_CHATROOM_ID));
int fromType = arguments.containsKey(RouterConstants.NATIVE_PAGE_ARG_FROM_TYPE) ?
(Integer) arguments.get(RouterConstants.NATIVE_PAGE_ARG_FROM_TYPE) : 0;
String fromUid = arguments.containsKey(RouterConstants.NATIVE_PAGE_ARG_FROM_UID) ?
(String) arguments.get(RouterConstants.NATIVE_PAGE_ARG_FROM_UID) : "";
String fromNick = arguments.containsKey(RouterConstants.NATIVE_PAGE_ARG_FROM_UID) ?
(String) arguments.get(RouterConstants.NATIVE_PAGE_ARG_FROM_NICK) : "";
AVRoomActivity.startForFromType(FlutterBoost.instance().currentActivity(), uid, fromType, fromNick, fromUid);
return;
}
}
@Override
public void pushFlutterRoute(String pageName, String uniqueId, Map<String, Object> arguments) {
if (arguments == null) {
arguments = new HashMap<>();
}
Intent intent = new FlutterBoostActivity.CachedEngineIntentBuilder(FlutterBoostActivity.class, FlutterBoost.ENGINE_ID)
.backgroundMode(FlutterActivityLaunchConfigs.BackgroundMode.opaque)
.destroyEngineWithActivity(false)
.url(pageName)
.urlParams(arguments)
.build(FlutterBoost.instance().currentActivity());
FlutterBoost.instance().currentActivity().startActivity(intent);
}
}

9
app/src/main/java/com/yizhuan/erban/flutter/event/ShowInviteEvent.java
View File

@@ -1,9 +0,0 @@
package com.yizhuan.erban.flutter.event;
public class ShowInviteEvent {
public boolean mShowInvite;
public ShowInviteEvent(boolean show) {
mShowInvite = show;
}
}

27
app/src/main/java/com/yizhuan/erban/home/fragment/GameFragment.java
View File

@@ -1,27 +0,0 @@
package com.yizhuan.erban.home.fragment;
import androidx.annotation.Nullable;
import com.idlefish.flutterboost.containers.FlutterBoostFragment;
import com.yizhuan.erban.R;
import io.flutter.embedding.android.DrawableSplashScreen;
import io.flutter.embedding.android.SplashScreen;
public class GameFragment extends FlutterBoostFragment {
@Nullable
@Override
public SplashScreen provideSplashScreen() {
return new DrawableSplashScreen(getResources().getDrawable(R.drawable.bg_flutter_splash));
}
@Override
public void setUserVisibleHint(boolean isVisibleToUser) {
try {
super.setUserVisibleHint(isVisibleToUser);
} catch (Exception e) {
e.printStackTrace();
}
}
}

4
app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java
View File

@@ -25,7 +25,6 @@ import com.yizhuan.erban.ui.im.chat.MsgViewHolderGift;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderHello;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderLevel;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderLottery;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderMatch;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderOnline;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPackage;
import com.yizhuan.erban.ui.im.chat.MsgViewHolderRedPacket;
@@ -159,9 +158,6 @@ public class ImInitHelper {
NimUIKit.registerMsgItemViewHolder(WorldDynamicAttachment.class, WorldDynamicShareViewHolder.class);
NimUIKit.registerMsgItemViewHolder(ChatHintAttachment.class, MsgViewHolderChatHint.class);
NimUIKit.registerMsgItemViewHolder(MatchAttachment.class, MsgViewHolderMatch.class);
//技能卡
NimUIKit.registerMsgItemViewHolder(SkillMsgAttachment.class, MsgViewHolderSkill.class);
//CP

2
app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java
View File

@@ -38,7 +38,6 @@ import com.yizhuan.erban.ui.patriarch.PatriarchModeActivity;
import com.yizhuan.erban.ui.pay.ChargeActivity;
import com.yizhuan.erban.ui.setting.FeedbackActivity;
import com.yizhuan.erban.ui.setting.ModifyPwdActivity;
import com.yizhuan.erban.ui.setting.ScheduleManageActivity;
import com.yizhuan.erban.ui.user.UserInfoActivity;
import com.yizhuan.erban.ui.webview.CommonWebViewActivity;
import com.yizhuan.erban.ui.withdraw.BinderAlipayActivity;
@@ -307,7 +306,6 @@ public class RouterHandler {
break;
case RouterType.SCHEDULE_MANAGE:
//赛程管理
ScheduleManageActivity.Companion.start(context);
break;
case RouterType.VISITOR_LIST:
//访客记录

68
app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java
View File

@@ -1,68 +0,0 @@
package com.yizhuan.erban.ui.im.chat;
import android.content.Intent;
import android.widget.TextView;
import com.idlefish.flutterboost.FlutterBoost;
import com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase;
import com.netease.nim.uikit.common.ui.recyclerview.adapter.BaseMultiItemFetchLoadAdapter;
import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
import com.yizhuan.erban.MainActivity;
import com.yizhuan.erban.R;
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 java.util.HashMap;
/**
* <p> 文字消息holder </p>
*
* @author jiahui
* @date 2018/1/10
*/
public class MsgViewHolderMatch extends MsgViewHolderBase {
private TextView mTvMsg;
private MatchAttachment matchAttachment;
public MsgViewHolderMatch(BaseMultiItemFetchLoadAdapter adapter) {
super(adapter);
}
@Override
protected int getContentResId() {
return R.layout.layout_msg_view_holder_match;
}
@Override
protected void inflateContentView() {
mTvMsg = findViewById(R.id.tv_msg);
}
@Override
protected void bindContentView() {
CharSequence text = "";
MsgAttachment attachment = message.getAttachment();
if (attachment instanceof MatchAttachment) {
matchAttachment = (MatchAttachment) attachment;
text = matchAttachment.getContent();
}
mTvMsg.setText(text);
}
@Override
protected void onItemClick() {
if (matchAttachment != null && matchAttachment.isNeedForwardToMatchDetail()) {
HashMap<String, Object> args = new HashMap<>();
args.put(RouterConstants.FLUTTER_PAGE_ARG_MATCH_ID, matchAttachment.getMatchId());
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;
}
}
}

5
app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java
View File

@@ -5,16 +5,12 @@ import android.view.View;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import com.idlefish.flutterboost.FlutterBoost;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.ui.utils.ImageLoadKt;
import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.Env;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import java.util.ArrayList;
/**
* Created by chenran on 2017/10/16.
@@ -25,7 +21,6 @@ public class LabActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_lab);
findViewById(R.id.rb_flutter_test).setOnClickListener(v -> FlutterBoost.instance().open("/", null));
findViewById(R.id.rb_vap_test).setOnClickListener(v ->
ImageLoadKt.loadAnim(
findViewById(R.id.anim_vap_test),

46
app/src/main/java/com/yizhuan/erban/ui/setting/ScheduleManageActivity.kt
View File

@@ -1,46 +0,0 @@
package com.yizhuan.erban.ui.setting
import android.content.Context
import android.content.Intent
import android.view.View
import com.idlefish.flutterboost.FlutterBoost
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseBindingActivity
import com.yizhuan.erban.databinding.ActivityScheduleManageBinding
import com.yizhuan.erban.flutter.RouterConstants
import com.yizhuan.erban.ui.webview.CommonWebViewActivity
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
@ActLayoutRes(R.layout.activity_schedule_manage)
class ScheduleManageActivity : BaseBindingActivity<ActivityScheduleManageBinding>() {
override fun init() {
initTitleBar("赛程管理")
mBinding.click = this
}
override fun onClick(v: View) {
super.onClick(v)
when (v.id) {
R.id.match_quota_record -> FlutterBoost.instance()
.open(RouterConstants.FLUTTER_PAGE_RECORD, null)
R.id.match_prize -> FlutterBoost.instance()
.open(RouterConstants.FLUTTER_PAGE_PRIZE, null)
R.id.match_performance -> FlutterBoost.instance()
.open(RouterConstants.FLUTTER_PAGE_PERFORMANCE, null)
R.id.match_bag -> FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_BAG, null)
R.id.match_mall -> FlutterBoost.instance().open(RouterConstants.FLUTTER_PAGE_MALL, null)
R.id.tv_link_account -> CommonWebViewActivity.start(
this,
UriProvider.getLinkAccountUrl()
)
}
}
companion object {
fun start(context: Context) {
val intent = Intent(context, ScheduleManageActivity::class.java)
context.startActivity(intent)
}
}
}