diff --git a/app/build.gradle b/app/build.gradle index fe71f2a95..533e7fa2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -172,7 +172,6 @@ android { } def Lombok = "1.18.10" -def useFlutterAar = Boolean.parseBoolean(with_flutter_aar) dependencies { implementation fileTree(dir: 'libs', include: ['*.jar','*.aar']) @@ -246,35 +245,17 @@ dependencies { //oppo推送需要 implementation 'commons-codec:commons-codec:1.6' - // xplan flutter module - if (useFlutterAar) { - implementation 'com.mango.flutter.xplan:flutter_release:1.0' - } else { - implementation project(path: ':flutter') - implementation project(path: ':flutter_boost') - } - api 'com.tencent.vasdolly:helper:3.0.3' implementation "io.github.tencent:vap:2.0.24" implementation 'com.github.mmin18:realtimeblurview:1.2.1' } -String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com" - repositories { flatDir { dirs 'aliyun-libs','com.huawei.agconnect' } mavenCentral() - - maven { - url '../xplan-flutter/build/host/outputs/repo' - } - - maven { - url "$storageUrl/download.flutter.io" - } } channel { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 69f7cbcb0..a282fc906 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,7 +37,6 @@ - @@ -144,7 +143,6 @@ android:process=":core" /> - - + + + + - + @@ -173,6 +175,7 @@ @@ -180,6 +183,7 @@ @@ -188,6 +192,7 @@ @@ -205,15 +210,11 @@ - - - - + @@ -251,14 +248,16 @@ + android:exported="false"> - + @@ -268,15 +267,13 @@ - - + @@ -294,7 +291,9 @@ - + @@ -310,7 +309,9 @@ - + @@ -358,7 +359,6 @@ - + @@ -394,7 +395,6 @@ + android:configChanges="keyboardHidden|orientation|screenSize" /> + + + + + + + + + + + + @@ -1091,7 +1109,6 @@ @@ -1172,19 +1189,6 @@ android:name=".ui.setting.ResetPasswordActivity" android:screenOrientation="portrait" /> - - - - - @@ -1248,9 +1252,6 @@ - } onParseIntent(); handleNimIntent(); - if (tempFragment instanceof FlutterFragment) { - ((FlutterFragment) tempFragment).onNewIntent(intent); - } } private void onParseIntent() { @@ -464,9 +460,6 @@ public class MainActivity extends BaseMvpActivity } catch (Exception e) { e.printStackTrace(); } - if (tempFragment instanceof FlutterFragment) { - ((FlutterFragment) tempFragment).onBackPressed(); - } } @Subscribe(threadMode = ThreadMode.MAIN) @@ -966,41 +959,4 @@ public class MainActivity extends BaseMvpActivity 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); - } - } } diff --git a/app/src/main/java/com/yizhuan/erban/flutter/ChannelConstants.java b/app/src/main/java/com/yizhuan/erban/flutter/ChannelConstants.java deleted file mode 100644 index e3a03175e..000000000 --- a/app/src/main/java/com/yizhuan/erban/flutter/ChannelConstants.java +++ /dev/null @@ -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"; -} diff --git a/app/src/main/java/com/yizhuan/erban/flutter/RouterConstants.java b/app/src/main/java/com/yizhuan/erban/flutter/RouterConstants.java deleted file mode 100644 index 01387df48..000000000 --- a/app/src/main/java/com/yizhuan/erban/flutter/RouterConstants.java +++ /dev/null @@ -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"; -} diff --git a/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostCallback.java b/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostCallback.java deleted file mode 100644 index c8e013b83..000000000 --- a/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostCallback.java +++ /dev/null @@ -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 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 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(); - } - })); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java b/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java deleted file mode 100644 index f1a697e53..000000000 --- a/app/src/main/java/com/yizhuan/erban/flutter/XplanFlutterBoostDelegate.java +++ /dev/null @@ -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 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 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); - } -} diff --git a/app/src/main/java/com/yizhuan/erban/flutter/event/ShowInviteEvent.java b/app/src/main/java/com/yizhuan/erban/flutter/event/ShowInviteEvent.java deleted file mode 100644 index 92c797ddf..000000000 --- a/app/src/main/java/com/yizhuan/erban/flutter/event/ShowInviteEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.yizhuan.erban.flutter.event; - -public class ShowInviteEvent { - public boolean mShowInvite; - - public ShowInviteEvent(boolean show) { - mShowInvite = show; - } -} diff --git a/app/src/main/java/com/yizhuan/erban/home/fragment/GameFragment.java b/app/src/main/java/com/yizhuan/erban/home/fragment/GameFragment.java deleted file mode 100644 index c2e97a1e6..000000000 --- a/app/src/main/java/com/yizhuan/erban/home/fragment/GameFragment.java +++ /dev/null @@ -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(); - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java b/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java index 280f0bb82..82523079c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/ImInitHelper.java @@ -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; @@ -51,7 +50,6 @@ import com.yizhuan.xchat_android_core.im.custom.bean.LevelUpAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.LotteryAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.LuckyMoneyTipsAttachment; -import com.yizhuan.xchat_android_core.im.custom.bean.MatchAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.NewbieHelloAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.NobleAttachment; import com.yizhuan.xchat_android_core.im.custom.bean.NoticeAttachment; @@ -160,8 +158,6 @@ public class ImInitHelper { NimUIKit.registerMsgItemViewHolder(ChatHintAttachment.class, MsgViewHolderChatHint.class); - NimUIKit.registerMsgItemViewHolder(MatchAttachment.class, MsgViewHolderMatch.class); - //技能卡 NimUIKit.registerMsgItemViewHolder(SkillMsgAttachment.class, MsgViewHolderSkill.class); //CP diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java index bc9b1f6bc..9145b4c6c 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java +++ b/app/src/main/java/com/yizhuan/erban/ui/im/RouterHandler.java @@ -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; @@ -305,10 +304,6 @@ public class RouterHandler { //青少年模式 PatriarchModeActivity.start(context); break; - case RouterType.SCHEDULE_MANAGE: - //赛程管理 - ScheduleManageActivity.Companion.start(context); - break; case RouterType.VISITOR_LIST: //访客记录 VisitorListActivity.start(context); diff --git a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java b/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java deleted file mode 100644 index 6083aa581..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/im/chat/MsgViewHolderMatch.java +++ /dev/null @@ -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; - -/** - *

文字消息holder

- * - * @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 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; - } - } -} diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java b/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java index a5ab9bfc1..7d434dd88 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/LabActivity.java @@ -5,15 +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; /** @@ -25,7 +22,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), diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/ScheduleManageActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/ScheduleManageActivity.kt deleted file mode 100644 index eae980181..000000000 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/ScheduleManageActivity.kt +++ /dev/null @@ -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() { - 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) - } - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lab.xml b/app/src/main/res/layout/activity_lab.xml index d5271b33f..5c076f340 100644 --- a/app/src/main/res/layout/activity_lab.xml +++ b/app/src/main/res/layout/activity_lab.xml @@ -42,18 +42,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d5d7edd70..d919abf07 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,6 @@ android.enableResourceOptimizations=false # mob MobSDK.spEdition=FP -with_flutter_aar=true with_jenkins=false only_arm64=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3a25c15eb..dc527a6be 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip \ No newline at end of file +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 4d9dcb241..b846ff878 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,7 @@ -include ':app', ':agora-ktv-kit-release', ':android_crop_lib' +include ':app' +include ':agora-ktv-kit-release' +include ':android_crop_lib' include ':trtc_release' include ':core' include ':library' include ':nim_uikit' -// 添加 flutter module 依赖 -if (!Boolean.parseBoolean(with_flutter_aar)){ - setBinding(new Binding([gradle: this])) - evaluate(new File(settingsDir, - '/xplan-flutter/.android/include_flutter.groovy')) -} diff --git a/xplan-flutter b/xplan-flutter deleted file mode 160000 index a46a357c5..000000000 --- a/xplan-flutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a46a357c589ca6b1905e25390864b85171e1cec9