diff --git a/app/build.gradle b/app/build.gradle index 5ab2a95d7..17c84d429 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -202,6 +202,7 @@ android { } def Lombok = "1.16.20" +def useFlutterAar = Boolean.parseBoolean(with_flutter_aar) dependencies { api fileTree(dir: 'libs', include: ['*.jar']) @@ -290,18 +291,33 @@ dependencies { implementation files('libs/msa_mdid_1.0.13.aar') implementation 'com.huawei.hms:push:4.0.4.301' implementation fileTree(dir: 'libs', include: ['oppo-mcssdk-2.0.2.jar']) - // xplan flutter module - implementation project(path: ':flutter') - implementation project(path: ':flutter_boost') implementation files('libs/humesdk-1.0.0.aar') + + // xplan flutter module + if (useFlutterAar) { + implementation 'com.mango.flutter.xplan:flutter_release:1.0' + } else { + implementation project(path: ':flutter') + implementation project(path: ':flutter_boost') + } } +String storageUrl = System.env.FLUTTER_STORAGE_BASE_URL ?: "https://storage.googleapis.com" + repositories { flatDir { dirs 'aliyun-libs', 'quick-pass-libs', 'com.huawei.agconnect' } mavenCentral() + + maven { + url '../xplan-flutter/build/host/outputs/repo' + } + + maven { + url "$storageUrl/download.flutter.io" + } } android.applicationVariants.all { variant -> diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 8e5ff720e..301a890d4 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -1,5 +1,20 @@ package com.yizhuan.erban.application; +import static com.yizhuan.xchat_android_constants.XChatConstants.HW_APP_ID; +import static com.yizhuan.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; +import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_ID; +import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_KEY; +import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_CERTIFICATE_NAME; +import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_ID; +import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_KEY; +import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_CERTIFICATE_NAME; +import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_SECRET; +import static com.yizhuan.xchat_android_constants.XChatConstants.VIVO_CERTIFICATE_NAME; +import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_ID; +import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_KEY; +import static com.yizhuan.xchat_android_constants.XChatConstants.XM_CERTIFICATE_NAME; +import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; + import android.annotation.SuppressLint; import android.annotation.TargetApi; import android.app.ActivityManager; @@ -18,10 +33,6 @@ import android.util.Log; import androidx.multidex.MultiDex; -import com.alibaba.security.biometrics.activity.ALBiometricsActivity; -import com.alibaba.security.biometrics.activity.ALBiometricsDialogActivity; -import com.alibaba.security.realidentity.activity.RPTakePhotoActivity; -import com.alibaba.security.realidentity.activity.RPWebViewActivity; import com.alibaba.security.rp.RPSDK; import com.bumptech.glide.request.target.ViewTarget; import com.bytedance.hume.readapk.HumeSDK; @@ -44,15 +55,12 @@ import com.netease.nimlib.sdk.mixpush.NIMPushClient; import com.netease.nimlib.sdk.msg.MessageNotifierCustomization; import com.netease.nimlib.sdk.msg.constant.MsgTypeEnum; import com.netease.nimlib.sdk.msg.model.IMMessage; -import com.netease.nis.quicklogin.ui.ProtocolDetailActivity; -import com.netease.nis.quicklogin.ui.YDQuickLoginActivity; import com.opensource.svgaplayer.SVGAParser; import com.orhanobut.logger.AndroidLogAdapter; import com.orhanobut.logger.Logger; import com.scwang.smartrefresh.header.MaterialHeader; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.footer.ClassicsFooter; -import com.soundcloud.android.crop.CropImageActivity; import com.tencent.bugly.Bugly; import com.tencent.bugly.beta.Beta; import com.tencent.bugly.crashreport.CrashReport; @@ -111,7 +119,6 @@ import com.yizhuan.xchat_android_library.utils.SystemUtils; import com.yizhuan.xchat_android_library.utils.VersionUtil; import com.yizhuan.xchat_android_library.utils.codec.MD5Utils; import com.yizhuan.xchat_android_library.utils.config.BasicConfig; -import com.zhihu.matisse.ui.MatisseActivity; import org.greenrobot.eventbus.EventBus; @@ -123,21 +130,6 @@ import io.reactivex.plugins.RxJavaPlugins; import io.realm.Realm; import io.realm.RealmConfiguration; -import static com.yizhuan.xchat_android_constants.XChatConstants.HW_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.HW_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.MZ_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.OPPO_SECRET; -import static com.yizhuan.xchat_android_constants.XChatConstants.VIVO_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_ID; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_APP_KEY; -import static com.yizhuan.xchat_android_constants.XChatConstants.XM_CERTIFICATE_NAME; -import static com.yizhuan.xchat_android_core.im.custom.bean.CustomAttachment.CUSTOM_MSG_HEADER_TYPE_OPEN_ROOM_NOTI; - /** * @author chenran * @date 2017/2/11 diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java index 2264baa51..a4b739039 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/manager/AvRoomDataManager.java @@ -34,6 +34,7 @@ import com.yizhuan.xchat_android_core.room.ktv.event.KtvEvent; import com.yizhuan.xchat_android_core.room.bean.RoomModeType; import com.yizhuan.xchat_android_core.super_admin.SuperAdminDataMrg; import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil; +import com.yizhuan.xchat_android_core.utils.LogUtils; import com.yizhuan.xchat_android_core.utils.StringUtils; import com.yizhuan.xchat_android_library.rxbus.RxBus; import com.yizhuan.xchat_android_library.utils.ListUtils; @@ -208,6 +209,7 @@ public final class AvRoomDataManager { chatRoomDataRelease(); //清空缓存 IMNetEaseManager.get().mCacheRoomQueueInfo = null; + LogUtils.d("---------清除AvRoomDataManager数据完成---------"); } public static AvRoomDataManager get() { diff --git a/gradle.properties b/gradle.properties index 3375adc96..8a58f83d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,5 @@ with_jenkins=false ndk_abi_filters=arm version_name=3.3.0 -version_code=330 \ No newline at end of file +version_code=330 +with_flutter_aar=true \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 959ba4554..e55c3cb48 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,8 @@ include ':core' include ':library' include ':nim_uikit' // 添加 flutter module 依赖 -setBinding(new Binding([gradle: this])) -evaluate(new File(settingsDir, - '/xplan-flutter/.android/include_flutter.groovy')) \ No newline at end of file +if (!Boolean.parseBoolean(with_flutter_aar)){ + setBinding(new Binding([gradle: this])) + evaluate(new File(settingsDir, + '/xplan-flutter/.android/include_flutter.groovy')) +}