Compare commits

...

27 Commits

Author SHA1 Message Date
Max
e29884b40e feat:调整google-service.json配置,调整mob配置 2024-01-08 19:02:20 +08:00
Max
b4e700397f 同步peko:调整普通房/牌照房 主麦位置UI 2024-01-08 19:00:06 +08:00
Max
1d7740e593 feat:修改支付key 2024-01-08 16:40:38 +08:00
Max
5540d6c6bc feat:加密方式改为Native-SO 2024-01-08 16:01:45 +08:00
Max
5c1da135aa feat:替换新包相关资源配置:包名、签名、logo、域名等 2024-01-08 15:06:16 +08:00
Max
37bb28af69 同步hiyoo混淆规则:处理影响混淆的内部类AllServiceGiftProtocol 2024-01-07 19:18:16 +08:00
Max
acbecf1b51 同步hiyoo混淆规则:添加相关脚本,调整adbResGuard白名单 2024-01-07 19:09:59 +08:00
Max
463d9ec4b4 同步hiyoo混淆配置:增加aabResGuard与xml-class-guard依赖 2024-01-07 10:14:19 +08:00
Max
f4811c9fe5 同步hiyoo混淆配置:调整material版本为1.6.1(aab转apks失败) 2024-01-06 18:12:12 +08:00
Max
5ceb15f807 同步hiyoo混淆配置:调整混淆规则(减少范围) 2024-01-06 18:08:45 +08:00
Max
f7edaffd44 同步hiyoo混淆配置:清理无用类 2024-01-06 17:13:38 +08:00
Max
8bd9f91892 同步hiyoo混淆配置:处理影响打包的同名类Utils 2024-01-06 17:12:38 +08:00
Max
acfb446eb0 同步hiyoo混淆配置:处理影响打包同名类BaseViewHolder 2024-01-06 16:58:55 +08:00
Max
4daf77adb8 同步hiyoo混淆配置:处理影响打包同名类OnItemClickListener 2024-01-06 16:53:18 +08:00
Max
426bea9ac5 同步hiyoo混淆配置:处理影响打包的同名类 2024-01-06 16:44:56 +08:00
Max
7cf8865727 同步hiyoo混淆配置:清理影响打包的无用类 2024-01-06 16:41:12 +08:00
Max
c997896a9b 同步hiyoo混淆配置:ItemEventListener独立,避免干扰 2024-01-06 16:39:43 +08:00
Max
043b79553e 同步hiyoo混淆配置:处理xml%databind混淆导致引用错误 2024-01-06 16:38:19 +08:00
Max
2d002958cd 同步hiyoo混淆配置:io.agora.rtc2.UserInfo同类名混淆冲突调整 2024-01-06 16:17:16 +08:00
Max
be75ae855a 同步hiyoo混淆配置:kotlin扩展类文件隔离 2024-01-06 16:11:54 +08:00
Max
e30784cfc9 同步hiyoo混淆配置:ImageGestureListener冲突处理 2024-01-06 16:09:00 +08:00
Max
ebe6ee2918 同步hiyoo混淆配置:调整StringUtils 2024-01-06 14:55:20 +08:00
Max
c74873c837 同步hiyoo混淆配置:删除无用类ArrayUtils 2024-01-06 14:48:06 +08:00
Max
9b88c65f9c 同步hiyoo混淆配置:SystemUtils处理 2024-01-06 14:46:32 +08:00
Max
7679937945 同步hiyoo混淆配置:重命名Looger 2024-01-06 14:38:14 +08:00
Max
4fd2afe8e0 同步hiyoo混淆配置:重命名Looger 2024-01-06 14:36:03 +08:00
Max
7f6e82c7a8 同步hiyoo混淆配置:重命名TextUtils 2024-01-06 14:33:48 +08:00
597 changed files with 2619 additions and 3025 deletions

View File

View File

View File

@@ -4,14 +4,15 @@ apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android'
apply plugin: 'com.tencent.vasdolly'
apply from: '../mob.gradle'
apply plugin: "com.bytedance.android.aabResGuard"
apply plugin: "xml-class-guard"
def onlyArm64 = Boolean.parseBoolean(only_arm64)
android {
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
defaultConfig {
applicationId "com.vele.pekolive"
applicationId "app.repo.cam"
minSdkVersion MIN_SDK_VERSION.toInteger()
targetSdkVersion TARGET_SDK_VERSION.toInteger()
versionCode Integer.valueOf(version_code)
@@ -60,7 +61,7 @@ android {
if (abi == null) {
abi = "universal"
}
outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
outputFileName = "repo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
}
}
@@ -81,23 +82,13 @@ android {
signingConfigs {
v2 {
storeFile file('../pekolive.jks')
storePassword "peko2023"
keyAlias "pekolive"
keyPassword "peko2023"
storeFile file('../repo.jks')
storePassword "repo2023"
keyAlias "repo"
keyPassword "repo2023"
v2SigningEnabled true
v1SigningEnabled true
}
v1 {
storeFile file('../pekolive.jks')
storePassword "peko2023"
keyAlias "pekolive"
keyPassword "peko2023"
v2SigningEnabled false
v1SigningEnabled true
}
}
sourceSets {
@@ -148,7 +139,7 @@ android {
buildTypes {
def server_url_debug = '"http://beta.api.pekolive.com/"'
def server_url_release = '"https://api.pekolive.com/"'
def server_url_release = '"https://api.repo.cam/"'
debug {
println("minifyEnabled = " + minify_enabled)
@@ -303,7 +294,7 @@ dependencies {
implementation 'com.contrarywind:wheelview:4.1.0'
implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158'
implementation 'com.google.android.material:material:1.9.0'
implementation 'com.google.android.material:material:1.6.1'
}
channel {
@@ -311,7 +302,7 @@ channel {
outputDir = new File(project.buildDir, "channelapk")
//多渠道包的命名规则,默认为:${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
def only64 = onlyArm64 ? "-only64" : ""
apkNameFormat = 'piko-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
apkNameFormat = 'repo-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
//快速模式生成渠道包时不进行校验速度可以提升10倍以上默认为false
fastMode = false
//buildTime的时间格式默认格式yyyyMMdd-HHmmss
@@ -319,3 +310,143 @@ channel {
//低内存模式仅针对V2签名默认为false只把签名块、中央目录和EOCD读取到内存不把最大头的内容块读取到内存在手机上合成APK时可以使用该模式
lowMemory = false
}
aabResGuard {
mappingFile = file("aab-res-guard-mapping.txt").toPath() // Mapping file used for incremental obfuscation
whiteList = [ // White list rules
"*.R.raw.*",
"*.R.drawable.icon",
//谷歌服务
"*.R.string.default_web_client_id",
"*.R.string.firebase_database_url",
"*.R.string.gcm_defaultSenderId",
"*.R.string.google_api_key",
"*.R.string.google_app_id",
"*.R.string.google_crash_reporting_api_key",
"*.R.string.google_storage_bucket",
"*.R.string.project_id",
//所有涉及到 getResources().getIdentifier 对应的资源ID
"*.R.array.a1",
"*.R.string.s1",
"*.R.mipmap.m1",
"*.R.dimen.d1",
"*.R.integer.int1",
//Firebase Crashlytics
"*.R.string.com.crashlytics.*",
"*.R.bool.com.crashlytics.useFirebaseAppId",
"*.R.string.com.crashlytics.useFirebaseAppId",
"*.R.bool.com.crashlytics.CollectDeviceIdentifiers",
"*.R.string.com.crashlytics.CollectDeviceIdentifiers",
"*.R.bool.com.crashlytics.CollectUserIdentifiers",
"*.R.string.com.crashlytics.CollectUserIdentifiers",
"*.R.string.com.crashlytics.ApiEndpoint",
"*.R.string.io.fabric.android.build_id",
"*.R.string.com.crashlytics.android.build_id",
"*.R.bool.com.crashlytics.RequireBuildId",
"*.R.string.com.crashlytics.RequireBuildId",
"*.R.bool.com.crashlytics.CollectCustomLogs",
"*.R.string.com.crashlytics.CollectCustomLogs",
"*.R.bool.com.crashlytics.Trace",
"*.R.string.com.crashlytics.Trace",
"*.R.string.com.crashlytics.CollectCustomKeys",
"*.R.string.com.google.firebase.crashlytics.mapping_file_id",
"*.R.string.com.google.firebase.crashlytics.unity_version"
]
obfuscatedBundleFileName = "duplicated-app.aab" // Obfuscated file name, must end with '.aab'
mergeDuplicatedRes = true // Whether to allow the merge of duplicate resources
enableFilterFiles = false // Whether to allow filter files
filterList = [ // file filter rules
// "*/arm64-v8a/*",
// "META-INF/*"
]
enableFilterStrings = false // switch of filter strings
unusedStringPath = file("unused.txt").toPath() // strings will be filtered in this file
languageWhiteList = ["en", "zh"] // keep en,en-xx,zh,zh-xx etc. remove others.
}
//以下均为非必须
xmlClassGuard {
findAabConstraintReferencedIds = true
//用于增量混淆的 mapping 文件
mappingFile = file("xml-class-mapping.txt")
//更改manifest文件的package属性即包名
packageChange = ["com.yizhuan.erban": "com.c.r"]
moveDir = [
"com.zhihu.matisse.internal.entity" : "fddbcec",
"com.yizhuan.xchat_android_library.easyphoto.models.album.entity" : "dafefbfcbdbe",
"com.chuhai.utils" : "cbeccaebfacee",
"com.yizhuan.xchat_android_library.utils" : "afeaaebba",
"com.yizhuan.erban.base" : "cceceecedec",
"com.yizhuan.xchat_android_library.common.base" : "efdbbabccaaf",
"com.yizhuan.erban.public_chat_hall.msg" : "cbfce",
"com.netease.nim.uikit.common.ui.recyclerview.adapter" : "dddeefacdcbfcbd",
"com.yizhuan.erban.ui.list" : "ffbbbeedfdddd",
"com.yizhuan.xchat_android_library.list" : "efcebcafccfff",
"com.yizhuan.erban.ui.im.avtivity" : "fbabadeadfbeab",
"com.netease.nim.uikit.business.session.activity" : "fbfacfcef",
"com.yizhuan.erban.common.util" : "dfffbcadbaecffd",
"com.netease.nim.uikit.common.util.media" : "bdbeeecbddacffef",
"com.netease.nim.uikit.common.media.picker.util" : "dcfdaddda",
"com.yizhuan.xchat_android_core.utils" : "eebaabdaacfdc",
"com.yizhuan.xchat_android_library.easyphoto.utils.bitmap" : "cafbbeeaccf",
"com.yizhuan.xchat_android_library.net.rxnet.manager" : "edeaeebedbddd",
"com.yizhuan.xchat_android_library.utils.cache" : "fafcafaecadbbab",
"com.yizhuan.erban.ui.pay" : "fdafbddcdeceeed",
"com.yizhuan.erban.pay.adapter" : "bcaacecbabacecdfb",
"com.yizhuan.erban.public_chat_hall.msg.viewholder" : "bedbdbf",
"com.netease.nim.uikit.business.chatroom.viewholder" : "aadeeeeda",
"com.yizhuan.erban.common.widget" : "aeccddabefcaaad",
"com.netease.nim.uikit.common.ui.imageview" : "baaabaffdafcee",
"com.soundcloud.android.crop" : "dcdfeaddbddfdbff",
"com.netease.nim.uikit.common.media.picker.activity" : "feaccce",
"com.yizhuan.erban.common.permission" : "bbbebcbdfbaadba",
"com.yizhuan.xchat_android_library.easypermisssion" : "dbcdcbabdfdefd",
"com.yizhuan.erban.module" : "ffccffc",
"com.netease.nim.uikit.business.session.constant" : "bebcdeebec",
"com.netease.nim.uikit.common.util.log.sdk.util" : "beebacccee",
"com.yizhuan.erban.ui.utils" : "bceafa",
"com.yizhuan.erban.ui.gift.util" : "aaaaffcaec",
"com.zhihu.matisse.engine.impl" : "eaedaafed",
"com.yizhuan.xchat_android_library.common.glide" : "ddcefebecddfacade",
"com.yizhuan.erban.friend" : "bffeaceaaed",
"com.yizhuan.erban.share" : "baadcaabfdcfdef",
"com.yizhuan.treasure_box.model" : "ffbefbdaaca",
"com.yizhuan.xchat_android_core.radish" : "cbaaafeb",
"com.yizhuan.xchat_android_library.easyphoto.engine" : "aeeebbccbfde",
"com.yizhuan.xchat_android_core.module_hall.income.bean" : "eaeebbdabcce",
"com.yizhuan.xchat_android_core.bills.bean" : "fcafacceabd",
"com.jph.takephoto.uitl" : "babbcdefdca",
"com.netease.nim.uikit.common.ui.recyclerview.loadmore" : "fbafabef",
"com.yizhuan.erban.ui.widget" : "accfffcddadfeefffafad",
"com.yizhuan.xchat_android_library.easyphoto.ui.dialog" : "dcbfaeffceafafade",
"com.yizhuan.erban.common.widget.dialog" : "aeedfefafd",
"com.yizhuan.erban.ui.im.fragment" : "eeceacedadfffff",
"com.netease.nim.uikit.business.session.fragment" : "facbafcfbefdcfccb",
"com.netease.nim.uikit.business.session.module.list" : "ffdfafebdbdaea",
"com.yizhuan.erban.ui.im.chat" : "aafeeecfaa",
"com.netease.nim.uikit.business.session.viewholder" : "dfafaeecf",
"com.yizhuan.erban.base.list" : "cecbbffbab",
"com.netease.nim.uikit.common.ui.recyclerview.entity" : "accaacebcfc",
"com.yizhuan.erban.ui.widget.password" : "ddefafca",
"com.yizhuan.erban.pay.interfaces" : "fafeddcdbeaa",
"com.yizhuan.erban.community.photo" : "daaccefbafac",
"com.yizhuan.erban.ui.user.adapter" : "aabafbccfaf",
"com.netease.nim.uikit.common.ui.recyclerview.holder" : "bbeaabadfdfeee",
"com.netease.nim.uikit.common.ui.recyclerview.util" : "bddceccecb",
"com.netease.nim.uikit.common.ui.recyclerview.listener" : "bafbafebdffacbdafe",
"com.yizhuan.erban.ui.widget.recyclerview.decoration" : "cddeddddd",
"com.netease.nim.uikit.common.ui.recyclerview.decoration" : "aefdcc",
"com.yizhuan.tutu.room_chat" : "afeefeddae",
"com.yizhuan.erban.bank_card" : "cdfcdafdabcccbfab",
"com.yizhuan.tutu.music" : "deebbdbefbbc",
"com.yizhuan.erban.team.adapter" : "aaefddefe",
"com.netease.nim.uikit.business.team.adapter" : "bfbdeedbcbbc",
"com.zhihu.matisse.internal.utils" : "fbdeaebfabae",
"com.netease.nim.uikit.impl.preference" : "acacff",
"com.netease.nim.uikit.business.preference" : "ccdedacaac",
"com.yizhuan.erban.avroom.widget" : "fbaebeeefabde",
"com.yizhuan.xchat_android_library.widget" : "aefdcddaaee",
]
}

View File

@@ -1,36 +1,26 @@
{
"project_info": {
"project_number": "656602722869",
"project_id": "pekolive-30f9e",
"storage_bucket": "pekolive-30f9e.appspot.com"
"project_number": "557443720422",
"project_id": "repo-32561",
"storage_bucket": "repo-32561.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
"mobilesdk_app_id": "1:557443720422:android:d5d1480109b8af15b54727",
"android_client_info": {
"package_name": "com.vele.pekolive"
"package_name": "app.repo.cam"
}
},
"oauth_client": [
{
"client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
"client_type": 3
}
],
"oauth_client": [],
"api_key": [
{
"current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
"current_key": "AIzaSyC2L4szjA4Le5D5_dq0a4PUDxJSCf8XuEI"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
"client_type": 3
}
]
"other_platform_oauth_client": []
}
}
}

185
app/proguard-rules.pro vendored
View File

@@ -233,10 +233,9 @@
# TODO 网络加载 一些业务bean gson 时候混淆问题
-keep class org.json.** {*;}
-dontwarn com.yizhuan.xchat_android_core.**
-keep class com.yizhuan.xchat_android_core.** {*;}
-keep class com.yizhuan.treasure_box.bean.** {*;}
-keep class com.yizhuan.erban.avroom.bean.** {*;}
-keep class com.yizhuan.**.bean.** {*;}
-keep class com.yizhuan.**.result.** {*;}
-keep class com.yizhuan.**.entity.** {*;}
#百度统计
@@ -479,4 +478,180 @@
}
-keep public class com.android.installreferrer.**{ *; }
-keep public class * extends java.lang.Exception
-keep public class * extends java.lang.Exception
-keep public class com.alibaba.android.arouter.routes.**{*;}
-keep public class com.alibaba.android.arouter.facade.**{*;}
-keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
-keep class b.** { *; }
-keep class cc.** { *; }
-keep public class * extends b.QQ
-keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
-dontwarn com.yizhuan.erban.ui.im.recent.holder.**
-keep class com.yizhuan.erban.ui.im.recent.holder.** {*;}
-keep class aafeeecfaa.** {*;}
-keep class com.yizhuan.erban.luckymoney.viewholder.** {*;}
-keep class baadcaabfdcfdef.viewholder.** {*;}
-keep class cbfce.viewholder.** {*;}
-keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;}
-keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;}
-dontwarn com.yizhuan.erban.bindadapter.**
-keep class com.yizhuan.erban.bindadapter.** {*;}
-keep class com.yizhuan.**.bean.** {*;}
-keep class com.yizhuan.**.result.** {*;}
-keep class com.yizhuan.**.entity.** {*;}
-keep class g.GL{*;}
-keep class bc.BV{*;}
-keep class d.BD {*;}
-keep class com.yizhuan.xchat_android_library.easyphoto.models.** { *; }
-keep class fn.** { *; }
-keep class com.jph.takephoto.** { *; }
-dontwarn com.jph.takephoto.**
-keep class babbcdefdca.** { *; }
-dontwarn babbcdefdca.**
-keep class dd.** { *; }
-dontwarn dd.**
-keep public class * extends bbeaabadfdfeee.RecyclerViewHolder {*;}
-keep public class * extends dfafaeecf.MsgViewHolderBase {*;}
-keep class h.** {*;}
-keep class k.** {*;}
-keep class w.** {*;}
-keep class bb.** {*;}
-keep class bd.** {*;}
-keep class be.** {*;}
-keep class bi.** {*;}
-keep class bl.** {*;}
-keep class ce.** {*;}
-keep class cm.** {*;}
-keep class h.J {*;}
-keep class h.K {*;}
-keep class k.N {*;}
-keep class w.BJ {*;}
-keep class bb.BU {*;}
-keep class bd.BX {*;}
-keep class be.BY {*;}
-keep class bd.CB {*;}
-keep class bi.CF {*;}
-keep class be.CG {*;}
-keep class bl.CK {*;}
-keep class bi.CP {*;}
-keep class bb.DG {*;}
-keep class bb.DX {*;}
-keep class ce.EL {*;}
-keep class bi.ES {*;}
-keep class bd.FH {*;}
-keep class bb.FJ {*;}
-keep class cm.FW {*;}
-keep class h.UD {*;}
-keep class h.UE {*;}
-keep class h.UF {*;}
-keep class h.UG {*;}
-keep class h.UH {*;}
-keep class h.UI {*;}
-keep class w.VA {*;}
-keep class w.VB {*;}
-keep class w.VC {*;}
-keep class w.VD {*;}
-keep class w.VE {*;}
-keep class w.VF {*;}
-keep class w.VG {*;}
-keep class w.VH {*;}
-keep class w.VI {*;}
-keep class w.VJ {*;}
-keep class w.VK {*;}
-keep class w.VL {*;}
-keep class w.VM {*;}
-keep class bb.WY {*;}
-keep class bb.WZ {*;}
-keep class bb.XA {*;}
-keep class bb.XB {*;}
-keep class bb.XC {*;}
-keep class bb.XD {*;}
-keep class bb.XE {*;}
-keep class bb.XF {*;}
-keep class bb.XG {*;}
-keep class bb.XH {*;}
-keep class bb.XI {*;}
-keep class bb.XJ {*;}
-keep class bb.XK {*;}
-keep class bb.XL {*;}
-keep class bb.XM {*;}
-keep class bb.XN {*;}
-keep class bb.XO {*;}
-keep class bb.XP {*;}
-keep class bb.XQ {*;}
-keep class bb.XR {*;}
-keep class bb.XS {*;}
-keep class bb.XT {*;}
-keep class bb.XU {*;}
-keep class bb.XV {*;}
-keep class bb.XW {*;}
-keep class bb.XX {*;}
-keep class bb.XY {*;}
-keep class bd.YC {*;}
-keep class bd.YD {*;}
-keep class bd.YE {*;}
-keep class be.YF {*;}
-keep class be.YG {*;}
-keep class be.YH {*;}
-keep class be.YI {*;}
-keep class be.YJ {*;}
-keep class be.YK {*;}
-keep class be.YL {*;}
-keep class be.YM {*;}
-keep class be.YN {*;}
-keep class bl.ZD {*;}
-keep class bl.ZE {*;}
-keep class bl.ZF {*;}
-keep class bl.ZG {*;}
-keep class bl.ZH {*;}
-keep class bl.ZI {*;}
-keep class bl.ZJ {*;}
-keep class bl.ZK {*;}
-keep class bl.ZL {*;}
-keep class bl.ZM {*;}
-keep class bl.ZN {*;}
-keep class bl.ZO {*;}
-keep class bl.ZP {*;}
-keep class ce.BDC {*;}
-keep class ce.BDD {*;}
-keep class ce.BDE {*;}
-keep class ce.BDF {*;}
-keep class ce.BDG {*;}
-keep class ce.BDH {*;}
-keep class ce.BDI {*;}
-keep class ce.BDJ {*;}
-keep class ce.BDK {*;}
-keep class ce.BDL {*;}
-keep class ce.BDM {*;}
-keep class ce.BDN {*;}
-keep class ce.BDO {*;}
-keep class ce.BDP {*;}
-keep class ce.BDQ {*;}
-keep class ce.BDR {*;}
-keep class ce.BDS {*;}
-keep class ce.BDT {*;}
-keep class ce.BDU {*;}
-keep class ce.BDV {*;}
-keep class ce.BDW {*;}
-keep class ce.BDX {*;}
-keep class ce.BDY {*;}
-keep class ce.BDZ {*;}
-keep class ce.BEA {*;}
-keep class ce.BEB {*;}
-keep class ce.BEC {*;}
-keep class ce.BED {*;}
-keep class ce.BEE {*;}
-keep class ce.BEF {*;}
-keep class ce.BEG {*;}
-keep class ce.BEH {*;}
-keep class ce.BEI {*;}
-keep class ce.BEJ {*;}
-keep class cm.BFD {*;}
-keep class cm.BFE {*;}
-keep class cm.BFF {*;}
-keep class cm.BFG {*;}

View File

@@ -122,7 +122,7 @@
<data
android:host="main"
android:scheme="pikoapp" />
android:scheme="repoapp" />
</intent-filter>
</activity>
@@ -161,7 +161,7 @@
如果 SDKOptions 中提供了,取 SDKOptions 中的值。
-->
<activity
android:name="com.vele.pekolive.lineapi.LineAuthenticationCallbackActivity"
android:name="app.repo.cam.lineapi.LineAuthenticationCallbackActivity"
android:exported="true"
android:launchMode="singleTask"
android:noHistory="true">
@@ -222,7 +222,7 @@
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="Piko"
android:label="Repo"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->

View File

@@ -1,4 +1,4 @@
package com.vele.pekolive.lineapi;
package app.repo.cam.lineapi;
import cn.sharesdk.line.LineHandlerActivity;

View File

@@ -15,7 +15,7 @@ import com.yizhuan.erban.other.activity.SplashActivity;
import com.yizhuan.xchat_android_core.linked.LinkedModel;
import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.TextUtils;
import com.yizhuan.xchat_android_core.utils.CoreTextUtils;
import java.util.HashMap;
import java.util.List;
@@ -49,7 +49,7 @@ public class AgentActivity extends AppCompatActivity implements SceneRestorable
if (roomuid != null) {
linkedInfo.setRoomUid(roomuid);
}
if (TextUtils.isEmptyText(roomuid) && uid != null) {
if (CoreTextUtils.isEmptyText(roomuid) && uid != null) {
linkedInfo.setRoomUid(uid);
}
if (uid != null) {

View File

@@ -112,9 +112,10 @@ import com.yizhuan.xchat_android_core.user.event.LoginUserInfoUpdateEvent;
import com.yizhuan.xchat_android_core.user.event.NeedBindPhoneEvent;
import com.yizhuan.xchat_android_core.user.event.NeedCompleteInfoEvent;
import com.yizhuan.xchat_android_core.user.event.NeedVerifyBoundAuthCodeEvent;
import com.yizhuan.xchat_android_core.utils.CoreLogger;
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.yizhuan.xchat_android_core.utils.StringFormatUtils;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.threadmgr.ThreadPoolManager;
@@ -568,7 +569,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
.subscribe(new BeanObserver<Boolean>() {
@Override
public void onErrorMsg(String error) {
com.yizhuan.xchat_android_core.utils.Logger.info("isBoundAuthCode", error);
CoreLogger.info("isBoundAuthCode", error);
}
@Override
@@ -820,8 +821,8 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
GameHomeModel.get().getRoomShortcut()
.compose(bindUntilEvent(ActivityEvent.DESTROY))
.subscribe(uid -> {
if (StringUtils.toLong(uid) != 0) {
AVRoomActivity.start(context, StringUtils.toLong(uid));
if (StringFormatUtils.toLong(uid) != 0) {
AVRoomActivity.start(context, StringFormatUtils.toLong(uid));
}
},
Throwable::printStackTrace);

View File

@@ -108,7 +108,7 @@ public class UIHelper {
public static void showMonsterResult(Context context, String monsterId) {
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL +
"/peko/modules/monster/index.html?monsterId=" + monsterId);
"/repo/modules/monster/index.html?monsterId=" + monsterId);
}
public static void showLabelInfoAct(Activity mActivity, int requestCode) {
@@ -132,11 +132,11 @@ public class UIHelper {
*/
public static void showRecommendPosH5(Context context) {
String cardUrl = UriProvider.JAVA_WEB_URL +
"/peko/modules/recommend-card/index.html";
"/repo/modules/recommend-card/index.html";
CommonWebViewActivity.start(context, cardUrl);
}
public static void openContactUs(Context context) {
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/peko/modules/contact/contact.html");
CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/repo/modules/contact/contact.html");
}
}

View File

@@ -17,7 +17,7 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.pay.event.NewUserChargeEvent;
import com.yizhuan.xchat_android_core.recall.bean.CheckLostUserInfo;
import com.yizhuan.xchat_android_core.recall.event.CheckLostUserEvent;
import com.yizhuan.xchat_android_core.relation.cp.CpInviteInfo;
import com.yizhuan.xchat_android_core.relation.cp.bean.CpInviteInfo;
import com.yizhuan.xchat_android_core.upgrade.event.ImPushUpdateAppEvent;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;

View File

@@ -13,7 +13,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.yizhuan.erban.R;
import com.yizhuan.erban.audio.widget.VoiceLine;
import com.yizhuan.xchat_android_core.audio.bean.UserVoiceInfo;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.yizhuan.xchat_android_core.utils.StringFormatUtils;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import java.util.List;
@@ -105,7 +105,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter<UserVoiceInfo, BaseView
});
// 点击播放声音/停止声音
helper.voiceBarLayout.setOnClickListener(view -> {
if (StringUtils.isEmpty(item.getVoiceUrl())) {
if (StringFormatUtils.isEmpty(item.getVoiceUrl())) {
return;
}
boolean isChange = helper.getAdapterPosition() != voiceClickPos;
@@ -140,7 +140,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter<UserVoiceInfo, BaseView
});
// 点击播放声音/停止声音
helper.voiceBarLayout.setOnClickListener(view -> {
if (StringUtils.isEmpty(item.getVoiceUrl())) {
if (StringFormatUtils.isEmpty(item.getVoiceUrl())) {
return;
}
boolean isChange = helper.getAdapterPosition() != voiceClickPos;
@@ -177,7 +177,7 @@ public class MyVoiceListAdapter extends BaseQuickAdapter<UserVoiceInfo, BaseView
});
// 点击播放声音/停止声音
helper.voiceBarLayout.setOnClickListener(view -> {
if (StringUtils.isEmpty(item.getVoiceUrl())) {
if (StringFormatUtils.isEmpty(item.getVoiceUrl())) {
return;
}
boolean isChange = helper.getAdapterPosition() != voiceClickPos;

View File

@@ -17,7 +17,7 @@ import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.manager.AudioEngineManager
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.sound.model.SoundModel
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.common.application.BaseApp
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.SingleToastUtil

View File

@@ -71,7 +71,8 @@ import com.yizhuan.erban.avroom.redpackage.RedPackageHandler;
import com.yizhuan.erban.avroom.view.IAvRoomView;
import com.yizhuan.erban.avroom.widget.VerticalViewPagerAdapter;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_core.noble.bean.AllServiceGiftProtocolDataBean;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.common.widget.CustomImageSpan;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
@@ -115,19 +116,18 @@ import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.module_hall.hall.HallModel;
import com.yizhuan.xchat_android_core.module_hall.hall.bean.SuperAdminInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterDataBean;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol;
import com.yizhuan.xchat_android_core.monsterhunting.manager.MonsterDataManager;
import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.bean.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleResourceType;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.patriarch.event.CloseMinRoomEvent;
import com.yizhuan.xchat_android_core.patriarch.event.ImPushMsgPmLimitTimeEvent;
import com.yizhuan.xchat_android_core.patriarch.event.PmDismissAllLimitDialogEvent;
import com.yizhuan.xchat_android_core.patriarch.exception.PmRoomLimitException;
import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageNotifyInfo;
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
@@ -140,12 +140,12 @@ import com.yizhuan.xchat_android_core.super_admin.util.SAdminOptUtil;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.support.room.RoomContext;
import com.yizhuan.xchat_android_core.support.room.RoomView;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.treasurefairy.bean.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.FirstChargeInfo;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.LogUtils;
import com.yizhuan.xchat_android_core.utils.StringUtils;
import com.yizhuan.xchat_android_core.utils.StringFormatUtils;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.ResUtil;
@@ -220,7 +220,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
private GiftBroadcastObserver giftObserver;
private Dialog giftDialog;
private LinkedList<AllServiceGiftProtocol.DataBean> giftList;
private LinkedList<AllServiceGiftProtocolDataBean> giftList;
@Nullable
private SingleRoomTipDialog singleRoomTipDialog;
// 通过红包进来时,有该参数
@@ -300,7 +300,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
public static void setBackBg(Context context, RoomInfo roomInfo, SVGAImageView svgaRoomBg, String[] bgPicture) {
if (roomInfo != null && svgaRoomBg != null) {
if (!StringUtils.isBlank(roomInfo.getBackPic())) {
if (!StringFormatUtils.isBlank(roomInfo.getBackPic())) {
int resourceType = NobleUtil.getResourceType(roomInfo.getBackPic());
if (resourceType == NobleResourceType.URLS) {
if (!roomInfo.getBackPic().equals(bgPicture[0])) {
@@ -561,7 +561,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
}
break;
case RoomEvent.MONSTER_STATUS_CHANGED:
MonsterProtocol.DataBean dataBean = roomEvent.getMonsterStatusAttachment().getDataBean();
MonsterDataBean dataBean = roomEvent.getMonsterStatusAttachment().getDataBean();
Log.e(TAG, "onRoomEventReceive: monster status changed: " + dataBean);
RoomInfo myRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
// 当前为房间页面并且当前房间为怪兽出现房间时才出现通知
@@ -609,7 +609,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
// 当前为房间页面并且当前房间为怪兽出现房间时才出现通知
if (UIUtils.isTopActivity(AVRoomActivity.this) && currentRoomInfo != null &&
currentRoomInfo.getUid() == monsterHuntingResult.getMonster().getAppearRoomUid()) {
MonsterProtocol.DataBean monsterInfo = monsterHuntingResult.getMonster();
MonsterDataBean monsterInfo = monsterHuntingResult.getMonster();
if (monsterDialog != null && monsterDialog.isShowing()) {
monsterDialog.dismiss();
}
@@ -1203,7 +1203,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
giftList = new LinkedList<>();
}
int second2 = baseProtocol.getSecond();
AllServiceGiftProtocol.DataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocol.DataBean.class);
AllServiceGiftProtocolDataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocolDataBean.class);
if (data == null || (data.getGiftUrl()) == null)
return;
giftList.add(data);
@@ -1320,7 +1320,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
if (!isValid()) return;
if (giftList == null) return;
if (giftList.size() == 0) return;
AllServiceGiftProtocol.DataBean data = giftList.peekFirst();
AllServiceGiftProtocolDataBean data = giftList.peekFirst();
if (data == null) return;
if (giftDialog != null && giftDialog.isShowing()) {
return;
@@ -1328,7 +1328,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
giftDialog = generateAllServiceGiftDialog(this, data);
giftDialog.setOnDismissListener(dialog -> {
giftList.pollFirst();
AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
AllServiceGiftProtocolDataBean dataBean = giftList.peekFirst();
if (dataBean != null) {
if (isValid()) {
showGiftDialog();
@@ -1340,7 +1340,7 @@ public class AVRoomActivity extends BaseMvpActivity<IAvRoomView, AvRoomPresenter
giftDialog.show();
}
private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocol.DataBean dataBean) {
private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocolDataBean dataBean) {
return new AllServiceGiftLevelDialog(context, dataBean);
}

View File

@@ -16,7 +16,7 @@ import com.yizhuan.erban.avroom.adapter.RecordForPKAdapter;
import com.yizhuan.erban.avroom.presenter.RecordForPKPresenter;
import com.yizhuan.erban.avroom.view.IRecordForPKView;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.room.pk.bean.PKRecordInfo;
import com.yizhuan.xchat_android_library.base.factory.CreatePresenter;

View File

@@ -39,7 +39,7 @@ import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;
import com.yizhuan.xchat_android_core.room.queue.bean.MicMemberInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.ActivityUtil;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
import com.yizhuan.xchat_android_core.utils.extension.StringExtensionKt;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
@@ -527,7 +527,7 @@ public abstract class BaseMicroViewAdapter extends RecyclerView.Adapter<Recycler
/**
* 主席位特有
*/
FrameLayout frTitle;
View frTitle;
TextView tvRoomDesc;
ImageView ivTag;
TextView tvLabelLeaveMode;

View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.bean.GameInfo
class CreateRoomGameAdapter :
BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_create_game) {

View File

@@ -4,8 +4,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_library.common.glide.GlideUtils
import com.yizhuan.erban.ui.utils.ImageLoadUtilsV2
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.bean.GameInfo
class CreateRoomGameGuideAdapter :
BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_create_game_guide) {

View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.home.bean.HomeRoomInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
class ExitRoomAdapter :
BaseQuickAdapter<HomeRoomInfo, BaseViewHolder>(R.layout.item_exit_room) {

View File

@@ -17,7 +17,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.NobleAvatarView;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.utils.RegexUtil;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.bean.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.room.bean.RoomContributeUserInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomRankMultiItem;

View File

@@ -3,7 +3,7 @@ package com.yizhuan.erban.avroom.adapter
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.bean.GameInfo
class SelectGameAdapter :
BaseQuickAdapter<GameInfo, BaseViewHolder>(R.layout.item_room_select_game) {

View File

@@ -16,7 +16,7 @@ import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.praise.PraiseModel
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.config.BasicConfig

View File

@@ -26,7 +26,7 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowGiftDialogEvent
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_library.rxbus.RxBus
import com.yizhuan.xchat_android_library.utils.CommonUtils
import io.reactivex.Observable

View File

@@ -16,10 +16,10 @@ import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toIntOrDef
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toIntOrDef
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class RoomPKCreateActivity : BaseViewBindingActivity<ActivityRoomPkCreateBinding>() {

View File

@@ -16,7 +16,7 @@ import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class RoomPKSearchActivity : BaseViewBindingActivity<ActivityRoomPkSearchBinding>() {

View File

@@ -5,14 +5,14 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
class RoomPKSearchAdapter :
BaseQuickAdapter<SimpleRoomInfo, BaseViewHolder>(R.layout.item_room_pk_search) {
override fun convert(helper: BaseViewHolder, item: SimpleRoomInfo) {
helper.setText(R.id.tv_room_title,item.title.subAndReplaceDot(7))
.setText(R.id.tv_room_id,"Piko号:${item.erbanNo}")
.setText(R.id.tv_room_id,"Repo号:${item.erbanNo}")
.setChecked(R.id.check_box,item.checked)
ImageLoadUtils.loadImage(mContext,item.avatar,helper.getView(R.id.iv_avatar))
helper.addOnClickListener(R.id.iv_avatar,R.id.check_box)

View File

@@ -9,7 +9,7 @@ import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogRoomPkFinishBinding
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
class RoomPkFinishDialog : BaseDialog<DialogRoomPkFinishBinding>() {

View File

@@ -8,7 +8,7 @@ import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogRoomPkForceFinishBinding
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
class RoomPkForceFinishDialog : BaseDialog<DialogRoomPkForceFinishBinding>() {

View File

@@ -8,9 +8,9 @@ import com.yizhuan.erban.databinding.DialogRoomPkReceivedBinding
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.RoomPKModel
import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toast
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable

View File

@@ -3,24 +3,16 @@ package com.yizhuan.erban.avroom.dialog
import android.annotation.SuppressLint
import android.view.Gravity
import android.view.WindowManager
import androidx.core.view.isInvisible
import androidx.core.view.isVisible
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.yizhuan.erban.R
import com.yizhuan.erban.avroom.adapter.CreateRoomGameAdapter
import com.yizhuan.erban.avroom.adapter.CreateRoomGameGuideAdapter
import com.yizhuan.erban.base.BaseActivity
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogCreateGameRoomBinding
import com.yizhuan.erban.databinding.DialogCreateRoomBinding
import com.yizhuan.erban.home.helper.OpenRoomHelper
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.bean.GameInfo
import com.yizhuan.xchat_android_core.room.game.GameModel
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class CreateGameRoomDialog : BaseDialog<DialogCreateGameRoomBinding>() {

View File

@@ -14,9 +14,9 @@ import com.yizhuan.erban.databinding.DialogCreateRoomBinding
import com.yizhuan.erban.home.helper.OpenRoomHelper
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.game.GameInfo
import com.yizhuan.xchat_android_core.room.game.bean.GameInfo
import com.yizhuan.xchat_android_core.room.game.GameModel
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class CreateRoomDialog : BaseDialog<DialogCreateRoomBinding>() {

View File

@@ -23,7 +23,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import com.netease.nimlib.sdk.chatroom.model.ChatRoomMember;
import com.yizhuan.erban.R;
import com.yizhuan.erban.avroom.adapter.MicQueueAdapter;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.home.helper.LoadPageDataHelper;
import com.yizhuan.erban.ui.widget.dialog.BaseDialog;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;

View File

@@ -25,7 +25,7 @@ import com.yizhuan.erban.avroom.adapter.PKMicQueueAdapter;
import com.yizhuan.erban.home.helper.LoadPageDataHelper;
import com.yizhuan.erban.ui.widget.dialog.BaseDialog;
import com.yizhuan.erban.ui.widget.dialog.CommonLoadingDialog;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.Constants;
import com.yizhuan.xchat_android_core.auth.AuthModel;

View File

@@ -21,7 +21,7 @@ import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.widget.dialog.BaseDialog;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.room.pk.bean.PKTeamInfo;

View File

@@ -18,7 +18,7 @@ import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.ui.widget.dialog.BaseDialog;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.xchat_android_core.bean.RoomQueueInfo;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.pk.bean.PKMemberInfo;

View File

@@ -19,7 +19,7 @@ import com.yizhuan.erban.avroom.activity.CpRoomInviteActivity;
import com.yizhuan.erban.avroom.widget.EditRoomTitleDialog;
import com.yizhuan.erban.databinding.DialogRoomImposeBinding;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;

View File

@@ -26,7 +26,7 @@ import com.yizhuan.erban.avroom.anotherroompk.RoomPKCreateActivity;
import com.yizhuan.erban.avroom.giftvalue.GiftValueDialogUiHelper;
import com.yizhuan.erban.avroom.room_album.RoomAlbumActivity;
import com.yizhuan.erban.avroom.singleroompk.SingleRoomPKCreateActivity;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.erban.ui.widget.ButtonItem;
import com.yizhuan.erban.ui.widget.recyclerview.decoration.ColorDecoration;

View File

@@ -16,7 +16,7 @@ import com.yizhuan.erban.utils.SpannableBuilder
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.bean.BroadcastInfo
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.CommonUtils
import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper
import io.reactivex.Observable

View File

@@ -41,7 +41,7 @@ import com.yizhuan.xchat_android_core.pay.bean.PayRecordId
import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.net.IgnoreException
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.common.util.DeviceUtil
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil
import com.yizhuan.xchat_android_library.utils.ResUtil

View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
import com.yizhuan.xchat_android_core.utils.TextUtils
import com.yizhuan.xchat_android_core.utils.CoreTextUtils
class Reward2Adapter : BaseMultiItemQuickAdapter<FirstChargeReward, BaseViewHolder>(null) {
@@ -33,7 +33,7 @@ class Reward2Adapter : BaseMultiItemQuickAdapter<FirstChargeReward, BaseViewHold
)
helper.setText(R.id.tv_name, item.showText)
.setText(R.id.tv_time, item.showTime)
.setGone(R.id.tv_time, !TextUtils.isEmptyText(item.showTime))
.setGone(R.id.tv_time, !CoreTextUtils.isEmptyText(item.showTime))
}
}

View File

@@ -4,11 +4,10 @@ import androidx.core.view.updateLayoutParams
import androidx.recyclerview.widget.RecyclerView
import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.netease.nim.uikit.common.util.sys.ScreenUtil
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
import com.yizhuan.xchat_android_core.utils.TextUtils
import com.yizhuan.xchat_android_core.utils.CoreTextUtils
class RewardAdapter(private val itemWidth: Int) :
BaseQuickAdapter<FirstChargeReward, BaseViewHolder>(R.layout.item_first_charge_reward) {
@@ -24,6 +23,6 @@ class RewardAdapter(private val itemWidth: Int) :
)
helper.setText(R.id.tv_name, item.showText)
.setText(R.id.tv_time, item.showTime)
.setGone(R.id.tv_time, !TextUtils.isEmptyText(item.showTime))
.setGone(R.id.tv_time, !CoreTextUtils.isEmptyText(item.showTime))
}
}

View File

@@ -9,7 +9,7 @@ import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.event.SwitchRoomEvent
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.StringUtils
import com.yizhuan.xchat_android_core.utils.StringFormatUtils
import com.yizhuan.xchat_android_library.utils.ResUtil
import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers
@@ -66,7 +66,7 @@ class FakeSingleRoomBackFragment : BaseViewBindingFragment<FragmentFakeSingleRoo
jumpRoom(it)
} else {
preRoomInfo = it
if (!StringUtils.isBlank(it.backPic)) {
if (!StringFormatUtils.isBlank(it.backPic)) {
AVRoomActivity.setBackBg(mContext, it, binding.svgaImageViewBg, bgPicture)
}
}

View File

@@ -14,7 +14,7 @@ import com.yizhuan.xchat_android_core.room.bean.RoomInfo
import com.yizhuan.xchat_android_core.room.event.SwitchRoomEvent
import com.yizhuan.xchat_android_core.room.model.AvRoomModel
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.StringUtils
import com.yizhuan.xchat_android_core.utils.StringFormatUtils
import io.reactivex.Single
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable
@@ -56,7 +56,7 @@ class FakeSingleRoomFragment : BaseViewBindingFragment<FragmentFakeSingleRoomBin
jumpRoom(it)
} else {
preRoomInfo = it
if (!StringUtils.isBlank(it.backPic)) {
if (!StringFormatUtils.isBlank(it.backPic)) {
AVRoomActivity.setBackBg(mContext, it, binding.svgaImageViewBg, bgPicture)
}
}

View File

@@ -58,14 +58,14 @@ import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.praise.PraiseModel;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
import com.yizhuan.xchat_android_core.room.game.GameInfo;
import com.yizhuan.xchat_android_core.room.game.bean.GameInfo;
import com.yizhuan.xchat_android_core.room.game.GameModel;
import com.yizhuan.xchat_android_core.room.queuing_mic.event.HasAnimationEffect;
import com.yizhuan.xchat_android_core.share.ShareModel;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.Logger;
import com.yizhuan.xchat_android_core.utils.CoreLogger;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
@@ -155,7 +155,7 @@ public class HomePartyFragment extends BaseFragment implements View.OnClickListe
toast(getString(R.string.have_copy));
}
} catch (Exception e) {
Logger.info("copyText", e.toString());
CoreLogger.info("copyText", e.toString());
toast(e.toString());
}
return true;

View File

@@ -33,7 +33,7 @@ import com.yizhuan.erban.ui.webview.DialogWebViewActivity
import com.yizhuan.tutu.music.widget.MusicPlayerView
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.fansteam.FansTeamInitInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamInitInfo
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
import com.yizhuan.xchat_android_core.im.custom.bean.FansTeamMsgAttachment
import com.yizhuan.xchat_android_core.im.custom.bean.RequestUpmicAttachment

View File

@@ -14,7 +14,7 @@ import com.google.gson.Gson
import com.yizhuan.erban.R
import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.game.GameCfg
import com.yizhuan.xchat_android_core.room.game.bean.GameCfg
import com.yizhuan.xchat_android_core.room.game.GameModel
import com.yizhuan.xchat_android_core.room.game.GameStatus
import com.yizhuan.xchat_android_core.room.model.HomePartyModel

View File

@@ -6,7 +6,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.pay.bean.FirstChargeReward
import com.yizhuan.xchat_android_core.utils.TextUtils
import com.yizhuan.xchat_android_core.utils.CoreTextUtils
class RewardAdapter :
BaseQuickAdapter<FirstChargeReward, BaseViewHolder>(R.layout.item_new_user_charge_reward) {
@@ -16,6 +16,6 @@ class RewardAdapter :
helper.setText(R.id.tv_name, item.showText)
.setText(R.id.tv_time, "(${item.showTime})")
.setGone(R.id.tv_time, !TextUtils.isEmptyText(item.showTime))
.setGone(R.id.tv_time, !CoreTextUtils.isEmptyText(item.showTime))
}
}

View File

@@ -60,7 +60,7 @@ public class MyRecommendCardActivity extends BaseViewBindingActivity<ActivityMyR
@Override
public void performAction(View view) {
CommonWebViewActivity.start(context, UriProvider.JAVA_WEB_URL +
"/peko/modules/recommend-card/help.html");
"/repo/modules/recommend-card/help.html");
}
});
}

View File

@@ -10,8 +10,8 @@ import com.yizhuan.erban.common.widget.dialog.DialogManager
import com.yizhuan.erban.databinding.DialogRedPackageGoRoomBinding
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageNotifyInfo
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_library.utils.ResUtil
import org.greenrobot.eventbus.EventBus

View File

@@ -10,7 +10,7 @@ import com.yizhuan.xchat_android_core.im.custom.bean.RedPackageAttachment
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager
import com.yizhuan.xchat_android_core.manager.RoomEvent
import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageNotifyInfo
import com.yizhuan.xchat_android_core.support.room.RoomContext
import com.yizhuan.xchat_android_core.support.room.RoomHandler

View File

@@ -13,7 +13,7 @@ import com.yizhuan.erban.avroom.redpackage.open.RedPackageOpenDialog
import com.yizhuan.erban.common.widget.dialog.DialogManager
import com.yizhuan.erban.databinding.RedPackageWidgetBinding
import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageNotifyInfo
import com.yizhuan.xchat_android_core.support.room.FrameLayoutRoomWidget
import com.yizhuan.xchat_android_core.support.room.RoomContext
import com.yizhuan.xchat_android_core.support.room.RoomView
@@ -21,7 +21,6 @@ import com.yizhuan.xchat_android_core.support.room.RoomWidget
import com.yizhuan.xchat_android_library.utils.SingleToastUtil
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.CompositeDisposable
import io.reactivex.disposables.Disposable
import okhttp3.internal.toLongOrDefault
import java.text.SimpleDateFormat

View File

@@ -32,6 +32,10 @@ import com.yizhuan.xchat_android_core.home.model.CollectionRoomModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.redpackage.*
import com.yizhuan.xchat_android_core.redpackage.bean.RedEnvelopeState
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageData
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageInfo
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageNotifyInfo
import com.yizhuan.xchat_android_core.support.config.Constants
import com.yizhuan.xchat_android_core.support.room.RoomContext
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes

View File

@@ -1,7 +1,6 @@
package com.yizhuan.erban.avroom.redpackage.open
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import androidx.core.view.isVisible
import com.chad.library.adapter.base.BaseQuickAdapter
@@ -9,8 +8,8 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.loadAvatar
import com.yizhuan.erban.utils.UserUtils
import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeItemVO
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.redpackage.bean.RedEnvelopeItemVO
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_library.utils.ResUtil
import java.text.SimpleDateFormat
import java.util.Locale

View File

@@ -21,7 +21,7 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.utils.toIntOrDef
import com.yizhuan.xchat_android_core.utils.extension.toIntOrDef
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.SingleToastUtil

View File

@@ -17,7 +17,7 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.pay.PayModel
import com.yizhuan.xchat_android_core.redpackage.RedPackageModel
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.utils.toIntOrDef
import com.yizhuan.xchat_android_core.utils.extension.toIntOrDef
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
import com.yizhuan.xchat_android_library.utils.SingleToastUtil
import com.yizhuan.xchat_android_library.utils.codec.DESUtils

View File

@@ -10,7 +10,7 @@ import androidx.appcompat.widget.AppCompatTextView;
import com.chuhai.utils.UiUtils;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;

View File

@@ -7,7 +7,7 @@ import com.yizhuan.erban.avroom.bean.RoomAlbumPhotoInfo
import com.yizhuan.erban.base.BaseViewModel
import com.yizhuan.xchat_android_core.Constants
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
class RoomAlbumFragmentViewModel : BaseViewModel() {

View File

@@ -8,7 +8,7 @@ import com.yizhuan.erban.base.Event
import com.yizhuan.xchat_android_core.file.FileModel
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers

View File

@@ -19,8 +19,8 @@ import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel
import com.yizhuan.xchat_android_core.utils.CurrentTimeUtils
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers

View File

@@ -16,11 +16,10 @@ import com.yizhuan.xchat_android_core.auth.AuthModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel
import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toIntOrDef
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_library.common.application.Env
import com.yizhuan.xchat_android_core.utils.extension.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toIntOrDef
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class SingleRoomPKCreateActivity : BaseViewBindingActivity<ActivitySingleRoomPkCreateBinding>() {

View File

@@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.room.anotherroompk.SimpleRoomInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
class SingleRoomPKSearchAdapter :
BaseQuickAdapter<SimpleRoomInfo, BaseViewHolder>(R.layout.item_single_room_pk_search) {

View File

@@ -9,7 +9,7 @@ import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogSingleRoomPkFinishBinding
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import java.util.concurrent.TimeUnit

View File

@@ -8,7 +8,7 @@ import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogSingleRoomPkForceFinishBinding
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
class SingleRoomPkForceFinishDialog : BaseDialog<DialogSingleRoomPkForceFinishBinding>() {

View File

@@ -8,9 +8,9 @@ import com.yizhuan.erban.databinding.DialogSingleRoomPkReceivedBinding
import com.yizhuan.xchat_android_core.im.custom.bean.RoomPkBean
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel
import com.yizhuan.xchat_android_core.utils.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.ifNotNullOrEmpty
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toast
import io.reactivex.Observable
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.disposables.Disposable

View File

@@ -4,7 +4,7 @@ import android.text.method.ScrollingMovementMethod
import com.yizhuan.erban.base.BaseDialog
import com.yizhuan.erban.databinding.DialogSingleRoomPkRuleBinding
import com.yizhuan.xchat_android_core.room.anotherroompk.SingleRoomPKModel
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
class SingleRoomPkRuleDialog : BaseDialog<DialogSingleRoomPkRuleBinding>() {

View File

@@ -39,7 +39,7 @@ import com.yizhuan.xchat_android_core.room.bean.RoomModeType;
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.SharedPreferenceUtils;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
import com.yizhuan.xchat_android_core.utils.extension.StringExtensionKt;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_library.utils.ListUtils;

View File

@@ -34,7 +34,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.common.svga.SimpleSvgaParseCompletion;
import com.yizhuan.erban.ui.utils.ImageLoadUtils;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo;
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamMsgInfo;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftEffectInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;

View File

@@ -73,7 +73,7 @@ import com.yizhuan.erban.UIHelper;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.avroom.dialog.PKResultDialog;
import com.yizhuan.erban.avroom.room_album.UnlockRoomAlbumPhotoDialog;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.common.widget.CustomAutoWidthImageSpan;
import com.yizhuan.erban.common.widget.CustomImageSpan;
import com.yizhuan.erban.common.widget.OriginalDrawStatusClickSpan;
@@ -95,7 +95,7 @@ import com.yizhuan.xchat_android_core.DemoCache;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.attachmsg.RoomQueueMsgAttachment;
import com.yizhuan.xchat_android_core.decoration.car.bean.CarInfo;
import com.yizhuan.xchat_android_core.fansteam.FansTeamMsgInfo;
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamMsgInfo;
import com.yizhuan.xchat_android_core.gift.GiftModel;
import com.yizhuan.xchat_android_core.gift.bean.GiftInfo;
import com.yizhuan.xchat_android_core.gift.bean.GiftList;
@@ -157,11 +157,11 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.miniworld.bean.MiniWorldInWorldInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterHuntingResult;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterProtocol;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.monsterhunting.bean.MonsterDataBean;
import com.yizhuan.xchat_android_core.noble.bean.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleUtil;
import com.yizhuan.xchat_android_core.praise.PraiseModel;
import com.yizhuan.xchat_android_core.redpackage.RedEnvelopeRoomMsg;
import com.yizhuan.xchat_android_core.redpackage.bean.RedEnvelopeRoomMsg;
import com.yizhuan.xchat_android_core.room.anotherroompk.ShowUserInfoDialogEvent;
import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
@@ -177,14 +177,14 @@ import com.yizhuan.xchat_android_core.room.pk.bean.RoomPKInvitedUpMicMember;
import com.yizhuan.xchat_android_core.room.pk.bean.RoomPkData;
import com.yizhuan.xchat_android_core.room.queuing_mic.attachment.QueuingMicAttachment;
import com.yizhuan.xchat_android_core.room.queuing_mic.bean.QueuingMicInfo;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.treasurefairy.bean.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.ExtensionUtil;
import com.yizhuan.xchat_android_core.utils.StringExtensionKt;
import com.yizhuan.xchat_android_core.utils.extension.StringExtensionKt;
import com.yizhuan.xchat_android_core.utils.net.DontWarnObserver;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
import com.yizhuan.xchat_android_core.vip.bean.VipMessageInfo;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.FormatUtils;
import com.yizhuan.xchat_android_library.utils.JavaUtil;
@@ -898,7 +898,7 @@ public class MessageView extends FrameLayout {
} else if (first == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING) {
switch (second) {
case CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING:
MonsterProtocol.DataBean dataBean = ((MonsterStatusAttachment) attachment).getDataBean();
MonsterDataBean dataBean = ((MonsterStatusAttachment) attachment).getDataBean();
setMonsterNotifyMessage(tvContent, dataBean.getNotifyMessage());
break;
case CustomAttachment.CUSTOM_NOTI_SUB_GAME_RESULT:
@@ -3034,7 +3034,7 @@ public class MessageView extends FrameLayout {
} else if (attachment.getFirst() == CustomAttachment.CUSTOM_MSG_HEADER_TYPE_MONSTER_HUNTING) {
switch (attachment.getSecond()) {
case CustomAttachment.CUSTOM_MSG_SUB_TYPE_MONSTER_HUNTING:
MonsterProtocol.DataBean dataBean = ((MonsterStatusAttachment) attachment).getDataBean();
MonsterDataBean dataBean = ((MonsterStatusAttachment) attachment).getDataBean();
RoomInfo mCurrentRoomInfo = AvRoomDataManager.get().mCurrentRoomInfo;
if (!Objects.equals(mCurrentRoomInfo.getUid(), dataBean.getAppearRoomUid())) {
AVRoomActivity.start(getContext(), dataBean.getAppearRoomUid());

View File

@@ -51,7 +51,7 @@ import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_library.utils.ListUtils
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.StringUtils

View File

@@ -62,7 +62,7 @@ import com.yizhuan.xchat_android_core.room.bean.DatingNotifyInfo
import com.yizhuan.xchat_android_core.super_admin.util.SuperAdminUtil
import com.yizhuan.xchat_android_core.user.UserModel
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_library.utils.ListUtils
import com.yizhuan.xchat_android_library.utils.ResUtil
import com.yizhuan.xchat_android_library.utils.StringUtils

View File

@@ -110,21 +110,21 @@ import com.yizhuan.xchat_android_core.manager.AvRoomDataManager;
import com.yizhuan.xchat_android_core.manager.IMNetEaseManager;
import com.yizhuan.xchat_android_core.manager.RoomEvent;
import com.yizhuan.xchat_android_core.mentoring_relationship.event.GrabApprenticesEvent;
import com.yizhuan.xchat_android_core.newbie.NewbieHelloInfo;
import com.yizhuan.xchat_android_core.newbie.bean.NewbieHelloInfo;
import com.yizhuan.xchat_android_core.newbie.event.NewbieHelloDialogEvent;
import com.yizhuan.xchat_android_core.noble.AllServiceGiftProtocol;
import com.yizhuan.xchat_android_core.noble.NobleInfo;
import com.yizhuan.xchat_android_core.noble.NobleProtocol;
import com.yizhuan.xchat_android_core.noble.bean.AllServiceGiftProtocolDataBean;
import com.yizhuan.xchat_android_core.noble.bean.NobleInfo;
import com.yizhuan.xchat_android_core.noble.bean.NobleProtocol;
import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.pay.bean.WalletInfo;
import com.yizhuan.xchat_android_core.redpackage.RedPackageNotifyInfo;
import com.yizhuan.xchat_android_core.redpackage.bean.RedPackageNotifyInfo;
import com.yizhuan.xchat_android_core.room.bean.RoomInfo;
import com.yizhuan.xchat_android_core.room.model.AvRoomModel;
import com.yizhuan.xchat_android_core.support.room.RoomContext;
import com.yizhuan.xchat_android_core.treasurefairy.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.treasurefairy.bean.FairyMsgInfoBean;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;
import com.yizhuan.xchat_android_core.vip.VipMessageInfo;
import com.yizhuan.xchat_android_core.vip.bean.VipMessageInfo;
import com.yizhuan.xchat_android_library.common.util.DeviceUtil;
import com.yizhuan.xchat_android_library.rxbus.RxBus;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
@@ -177,7 +177,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
private boolean isShowingChargeDialog;
private Dialog giftDialog;
private LinkedList<AllServiceGiftProtocol.DataBean> giftList;
private LinkedList<AllServiceGiftProtocolDataBean> giftList;
private Dialog playEffectDialog;
private LinkedList<PlayEffectInfo> playEffectList;
@@ -988,7 +988,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
giftList = new LinkedList<>();
}
int second2 = baseProtocol.getSecond();
AllServiceGiftProtocol.DataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocol.DataBean.class);
AllServiceGiftProtocolDataBean data = JSON.parseObject(String.valueOf(baseProtocol.getData()), AllServiceGiftProtocolDataBean.class);
if (data == null || data.getGiftUrl() == null) return;
giftList.add(data);
if (second2 == CUSTOM_MSG_ALL_SERVICE_GIFT) {
@@ -1209,7 +1209,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
private void showGiftDialog() {
if (giftList == null) return;
if (giftList.size() == 0) return;
AllServiceGiftProtocol.DataBean data = giftList.peekFirst();
AllServiceGiftProtocolDataBean data = giftList.peekFirst();
if (data == null) {
return;
}
@@ -1222,7 +1222,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
giftDialog = generateAllServiceGiftDialog(this, data);
giftDialog.setOnDismissListener(dialog -> {
giftList.pollFirst();
AllServiceGiftProtocol.DataBean dataBean = giftList.peekFirst();
AllServiceGiftProtocolDataBean dataBean = giftList.peekFirst();
if (dataBean != null) {
if (isValid()) {
showGiftDialog();
@@ -1252,7 +1252,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
return false;
}
private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocol.DataBean dataBean) {
private AllServiceGiftLevelDialog generateAllServiceGiftDialog(@NonNull Context context, @NonNull AllServiceGiftProtocolDataBean dataBean) {
return new AllServiceGiftLevelDialog(context, dataBean);
}

View File

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.net.rxnet.exception.ExceptionHandle
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch

View File

@@ -19,7 +19,7 @@ public abstract class CommonAdapter<T, K extends BaseViewHolder> extends Recycle
private List<T> mData;
private OnItemClickListener<T, K> mOnItemClickListener;
private OnItemParentClickListener<T, K> mOnItemClickListener;
private OnItemChildClickListener<T, K> mOnItemChildClickListener;
@@ -37,7 +37,7 @@ public abstract class CommonAdapter<T, K extends BaseViewHolder> extends Recycle
return this;
}
public CommonAdapter<T, K> setOnItemClickListener(OnItemClickListener<T, K> onItemClickListener) {
public CommonAdapter<T, K> setOnItemClickListener(OnItemParentClickListener<T, K> onItemClickListener) {
this.mOnItemClickListener = onItemClickListener;
return this;
}

View File

@@ -4,6 +4,6 @@ package com.yizhuan.erban.base.list;
* Created by lvzebiao on 2018/12/18.
*/
public interface OnItemClickListener<T, K extends BaseViewHolder> {
public interface OnItemParentClickListener<T, K extends BaseViewHolder> {
void onItemClick(K holder, T item, int position);
}

View File

@@ -10,7 +10,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import java.util.List;

View File

@@ -6,7 +6,7 @@ import android.content.Context;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.erban.avroom.activity.AVRoomActivity;
import com.yizhuan.erban.utils.ActWhiteListMrg;
import com.yizhuan.xchat_android_core.utils.Logger;
import com.yizhuan.xchat_android_core.utils.CoreLogger;
import java.lang.ref.WeakReference;
import java.util.concurrent.CopyOnWriteArrayList;
@@ -84,7 +84,7 @@ public class ActivityStack {
}
Activity existActivity = getActivity(activity.getClass());
if (existActivity != null) {
Logger.error(TAG, "已存在多个相同的实例:" + existActivity.getClass());
CoreLogger.error(TAG, "已存在多个相同的实例:" + existActivity.getClass());
existActivity.finish();//如果onActivityCreated回调时返回栈里面已存在当前Activity的实例则先关掉之前的Activity避免创建过多实例消耗太多内存
}
for (WeakReference<Activity> ac : mActivity) {

View File

@@ -11,9 +11,8 @@ import com.yizhuan.xchat_android_library.common.application.BaseApp
import com.yizhuan.xchat_android_library.common.delegate.SpDelegate
import com.yizhuan.xchat_android_library.common.file.FileHelper
import com.yizhuan.xchat_android_library.common.glide.GlideEngine
import com.yizhuan.xchat_android_library.common.util.Logger
import com.yizhuan.xchat_android_library.common.util.LibLogger
import com.yizhuan.xchat_android_library.easyphoto.EasyPhotos
import com.yizhuan.xchat_android_library.easyphoto.constant.Type.*
import com.yizhuan.xchat_android_library.easyphoto.models.album.entity.Photo
import com.yizhuan.xchat_android_library.utils.TimeUtils
import com.yizhuan.xchat_android_library.utils.TimeUtils.TIME_FORMAT
@@ -160,7 +159,7 @@ object PhotoProvider {
val path = "$foldPath${it.name}"
if (FileHelper.copyFileFromUri(it.uri, path, true)) {
newPaths.add(path)
Logger.debug(TAG, "path: ${it.path} , displayName: ${it.name} , newPath: $path ")
LibLogger.debug(TAG, "path: ${it.path} , displayName: ${it.name} , newPath: $path ")
}
}
}
@@ -174,7 +173,7 @@ object PhotoProvider {
* 清除复制缓存
*/
fun clearCache() {
Logger.debug(
LibLogger.debug(
TAG, "clearCache => mLastSelectTime: ${TimeUtils.getDateTimeString(
mLastSelectTime, TIME_FORMAT)}")
FileHelper.removeAllFile(getInternalPath() + File.separator)

View File

@@ -14,7 +14,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import com.yizhuan.xchat_android_library.common.util.Logger;
import com.yizhuan.xchat_android_library.common.util.LibLogger;
/**
* Created by wushaocheng
@@ -41,7 +41,7 @@ public class BitmapUtil {
final int height = options.outHeight;
final int width = options.outWidth;
Logger.info(TAG, "origin, w= " + width + " h=" + height);
LibLogger.info(TAG, "origin, w= " + width + " h=" + height);
int inSampleSize = 1;
if (height > reqHeight || width > reqWidth) {
@@ -54,13 +54,13 @@ public class BitmapUtil {
}
}
Logger.info(TAG, "sampleSize:" + inSampleSize);
LibLogger.info(TAG, "sampleSize:" + inSampleSize);
return inSampleSize;
}
public static Bitmap setImgSize(Bitmap bm, float newWidth, float newHeight) {
if (bm == null) {
Logger.error(TAG, "bitmap is null.");
LibLogger.error(TAG, "bitmap is null.");
return null;
}
// 获得图片的宽高.

View File

@@ -1,227 +0,0 @@
package com.yizhuan.erban.common.util;
import android.app.Activity;
import android.os.Bundle;
import android.text.TextUtils;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.xchat_android_core.utils.Logger;
import java.util.List;
import com.yizhuan.xchat_android_library.common.base.BaseDialogFragment;
import com.yizhuan.xchat_android_library.common.util.ActivityHelper;
import com.yizhuan.xchat_android_library.common.util.ReflectionUtils;
/**
* User: wukai
* Date: 2017/04/06
* Description:
*/
public class DialogFragmentUtils {
private static final String TAG = "DialogFragmentUtils";
public static final String KEY_DIALOG_TAG = "dialog_tag";
private static int mFragmentIndex = 0;
public static String getFragmentTag(String tag, boolean appendIndexTag) {
if (appendIndexTag) {
return String.format("%s_%d", tag, mFragmentIndex++);
}
return tag;
}
public static String getTag(Bundle bundle) {
return bundle.getString(KEY_DIALOG_TAG);
}
public static boolean isShowing(String fragmentTag, Activity activity) {
if (activity == null) {
Logger.debug(TAG, "check isShowing activity is null return");
return false;
}
if (activity.isFinishing()) {
Logger.debug(TAG, "check isShowing activity isFinishing return");
return false;
}
if (activity.isDestroyed()) {
Logger.debug(TAG, "check isShowing activity is isDestroyed");
return false;
}
if (!(activity instanceof BaseActivity)) {
Logger.error(TAG, "check isShowing activity fail, activity is not BaseActivity");
return false;
}
FragmentManager fragmentManager = ((BaseActivity) activity).getSupportFragmentManager();
Fragment fragmentByTag = fragmentManager.findFragmentByTag(fragmentTag);
if (fragmentByTag == null) {
return false;
}
if (fragmentByTag instanceof DialogFragment) {
DialogFragment dialogFragment = (DialogFragment) fragmentByTag;
return dialogFragment.getDialog() != null && dialogFragment.getDialog().isShowing();
} else return fragmentByTag.isVisible();
}
public static BaseDialogFragment show(String fragmentTag, Activity activity, Class<? extends BaseDialogFragment> clazz, Bundle bundle, boolean appendIndexTag) {
try {
BaseDialogFragment baseDialogFragment = clazz.newInstance();
return show(fragmentTag, activity, baseDialogFragment, bundle, appendIndexTag);
} catch (Exception e1) {
Logger.error(TAG, String.valueOf(e1));
}
return null;
}
public static BaseDialogFragment show(String fragmentTag, Activity activity, BaseDialogFragment baseDialogFragment, Bundle bundle, boolean appendIndexTag) {
if (TextUtils.isEmpty(fragmentTag)) {
Logger.error(TAG, "show dialog failure, fragmentTag = null");
return null;
}
if (!ActivityHelper.isCanUse(activity)) {
Logger.error(TAG, "show dialog failure, activity is not can use");
return null;
}
if (!(activity instanceof BaseActivity)) {
Logger.error(TAG, "show dialog activity fail, activity is not BaseActivity");
return null;
}
FragmentManager fragmentManager = ((BaseActivity) activity).getSupportFragmentManager();
if (bundle == null) {
bundle = new Bundle();
}
String newFragmentTag = DialogFragmentUtils.getFragmentTag(fragmentTag, appendIndexTag);
Logger.debug(TAG, "showDialog: " + newFragmentTag);
Fragment fragment = fragmentManager.findFragmentByTag(newFragmentTag);
if (fragment == null) {
bundle.putString(KEY_DIALOG_TAG, newFragmentTag);
baseDialogFragment.setArguments(bundle);
} else {
if (ActivityHelper.isCanUse(activity)) {
baseDialogFragment = ((BaseDialogFragment) fragment);
baseDialogFragment.dismissAllowingStateLoss();
}
}
if (ActivityHelper.isCanUse(activity) && baseDialogFragment != null) {
try {
doShow(fragmentManager, baseDialogFragment, newFragmentTag);
} catch (Exception e) {
Logger.error(TAG, String.valueOf(e));
}
} else {
return null;
}
return baseDialogFragment;
}
public static void doShow(final FragmentManager fragmentManager, final BaseDialogFragment dialogFragment, final String tag) {
PauseWorkerHandler.instance().post(new Runnable() {
@Override
public void run() {
if (!fragmentManager.isStateSaved()) { // 保证只有在activity存在的时候弹出dialog防止崩溃
// Fix 快速显示同一个弹窗报 Fragment already added: 异常
if (isInvokeShow(dialogFragment)) {
Logger.error(TAG, "Already has fragment=" + dialogFragment.getTag());
return;
}
dialogFragment.show(fragmentManager, tag);
}
}
});
}
public static BaseDialogFragment show(String fragmentTag, Activity activity, Class<? extends BaseDialogFragment> clazz, Bundle bundle) {
return show(fragmentTag, activity, clazz, bundle, true);
}
public static BaseDialogFragment show(String fragmentTag, Activity activity, Class<? extends BaseDialogFragment> clazz) {
return show(fragmentTag, activity, clazz, null, true);
}
public static void dismiss(String fragmentTag, Activity activity) {
if (TextUtils.isEmpty(fragmentTag)) {
Logger.error(TAG, "dismiss dialog failure, fragmentTag = null");
return;
}
if (activity == null) {
Logger.error(TAG, "dismiss %s dialog failure, Activity = null, tag=" + fragmentTag);
return;
}
if (activity.isFinishing()) {
Logger.error(TAG, "dismiss %s dialog failure, Activity is finish, tag=" + fragmentTag);
return;
}
if (activity.isDestroyed()) {
Logger.error(TAG, "dismiss %s dialog failure, Activity is null, tag=" + fragmentTag);
return;
}
if (!(activity instanceof BaseActivity)) {
Logger.error(TAG, "dismiss %s dialog failure, Activity is not BaseActivity, tag=" + fragmentTag);
return;
}
FragmentManager manager = ((BaseActivity) activity).getSupportFragmentManager();
Utils.executePendingTransactionsSafely(fragmentTag, manager);
Fragment fragment = manager.findFragmentByTag(fragmentTag);
if (fragment == null) {
Logger.error(TAG, "dismiss %s dialog failure, Fragment = null, tag="+fragmentTag);
tryCleanDialogFragment(fragmentTag, manager);
} else {
Logger.debug(TAG, "closeDialog=" + fragmentTag);
((DialogFragment) fragment).dismissAllowingStateLoss();
}
}
public static void tryCleanDialogFragment(String fragmentTag, FragmentManager fragmentManager) {
List<Fragment> fragmentList = fragmentManager.getFragments();
int sizeChildFrgList = fragmentList.size();
for (int i = sizeChildFrgList - 1; i >= 0; i--) {
Fragment brotherFragment = fragmentList.get(i);
if (brotherFragment == null) {
continue;
}
Bundle arguments = brotherFragment.getArguments();
if (arguments == null) {
continue;
}
String findTag = getTag(arguments);
if (!TextUtils.isEmpty(findTag) &&
brotherFragment instanceof DialogFragment && findTag.equals(fragmentTag)) {
Logger.debug(TAG, "closeDialog " + fragmentTag + "by tryCleanDialogFragment");
((DialogFragment) brotherFragment).dismissAllowingStateLoss();
break;
}
}
}
private static boolean isInvokeShow(DialogFragment dialogFragment) {
Object value = ReflectionUtils.getFieldValue(dialogFragment, "mShownByMe");
if (value == null) {
Logger.error(TAG, "isInvokeShow value is null");
return false;
}
boolean isShown = (boolean) value;
Logger.debug(TAG, "isInvokeShow isShown=" + isShown);
return isShown;
}
}

View File

@@ -2,7 +2,7 @@ package com.yizhuan.erban.common.util;
import android.os.Handler;
import android.os.Looper;
import com.yizhuan.xchat_android_core.utils.Logger;
import com.yizhuan.xchat_android_core.utils.CoreLogger;
import org.greenrobot.eventbus.Subscribe;
import org.greenrobot.eventbus.ThreadMode;
@@ -47,7 +47,7 @@ public class PauseWorkerHandler {
@Override
public void run() {
boolean isBackground = AppLifeCycleHelper.isBackground();
Logger.info(TAG, "onAppVisibleChangeEvent isBackground="+isBackground);
CoreLogger.info(TAG, "onAppVisibleChangeEvent isBackground="+isBackground);
if (isBackground) {
pause();
} else {

View File

@@ -1,106 +0,0 @@
package com.yizhuan.erban.common.util;
import com.yizhuan.xchat_android_library.utils.FP;
public class StringUtils {
public static boolean isNullOrEmpty(String str) {
return FP.empty(str);
}
public static boolean isNotNullOrEmpty(String str) {
return !StringUtils.isNullOrEmpty(str);
}
public static boolean equal(String s1, String s2) {
return StringUtils.equal(s1, s2, false);
}
public static boolean equal(String s1, String s2, boolean ignoreCase) {
if (s1 != null && s2 != null) {
if (ignoreCase) {
return s1.equalsIgnoreCase(s2);
}
return s1.equals(s2);
}
return s1 == null && s2 == null;
}
public static int find(String pattern, String s) {
return StringUtils.find(pattern, s, false);
}
public static int find(String pattern, String s, boolean ignoreCase) {
return StringUtils.find(pattern, s, ignoreCase, false);
}
public static int find(String pattern, String s, boolean ignoreCase, boolean ignoreWidth) {
if (FP.empty(s)) {
return -1;
} else {
pattern = FP.ref(pattern);
if (ignoreCase) {
pattern = pattern.toLowerCase();
s = s.toLowerCase();
}
if (ignoreWidth) {
pattern = narrow(pattern);
s = narrow(s);
}
return s.indexOf(pattern);
}
}
public static String narrow(String s) {
if (FP.empty(s)) {
return "";
} else {
char[] cs = s.toCharArray();
for (int i = 0; i < cs.length; ++i) {
cs[i] = narrow(cs[i]);
}
return new String(cs);
}
}
public static char narrow(char c) {
if (c >= '' && c <= '') {
return (char) (c - 'ﻠ');
} else if (c == 12288) {
return (char) (c - 12288 + 32);
} else if (c == '。') {
return '。';
} else if (c == 12539) {
return '·';
} else {
return c == 8226 ? '·' : c;
}
}
public static int ord(char c) {
if ('a' <= c && c <= 'z') {
return c;
} else {
return 'A' <= c && c <= 'Z' ? c - 65 + 97 : 0;
}
}
public static int compare(String x, String y) {
return FP.ref(x).compareTo(FP.ref(y));
}
public static long parseLong(String s) {
long l = 0L;
try {
l = Long.parseLong(s.trim());
} catch (Exception e) {
return l;
}
return l;
}
}

View File

@@ -1,180 +0,0 @@
package com.yizhuan.erban.common.util;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.util.DisplayMetrics;
import android.view.Display;
import android.view.WindowManager;
import androidx.fragment.app.FragmentManager;
import com.yizhuan.xchat_android_core.utils.Logger;
import java.lang.reflect.Field;
import java.util.List;
/**
* author: wushaocheng
* time: 2022/11/15
* desc: 转换帮助类
*/
public class Utils {
public static <T> boolean notEmpty(List<T> list) {
return !isEmpty(list);
}
public static <T> boolean isEmpty(List<T> list) {
if (list == null || list.size() == 0) {
return true;
}
return false;
}
public static int getNavigationBarHeight(Context context) {
int statusBarHeight = 0;
int resourceId = context.getResources().getIdentifier("config_showNavigationBar", "bool", "android");
if (resourceId != 0) {
resourceId = context.getResources().getIdentifier("navigation_bar_height", "dimen", "android");
//根据资源ID获取响应的尺寸值
statusBarHeight = context.getResources().getDimensionPixelSize(resourceId);
}
return statusBarHeight;
}
/**
* 判断底部navigator是否已经显示
*/
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public static boolean hasSoftKeys(Context context) {
WindowManager windowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
Display d = windowManager.getDefaultDisplay();
DisplayMetrics realDisplayMetrics = new DisplayMetrics();
d.getRealMetrics(realDisplayMetrics);
int realHeight = realDisplayMetrics.heightPixels;
int realWidth = realDisplayMetrics.widthPixels;
DisplayMetrics displayMetrics = new DisplayMetrics();
d.getMetrics(displayMetrics);
int displayHeight = displayMetrics.heightPixels;
int displayWidth = displayMetrics.widthPixels;
return (realWidth - displayWidth) > 0 || (realHeight - displayHeight) > 0;
}
// 将px值转换为dip或dp值
public static int px2dip(Context context, float pxValue) {
final float scale = context.getResources().getDisplayMetrics().density;
return (int) (pxValue / scale + 0.5f);
}
// 将dip或dp值转换为px值
public static int dip2px(Context context, float dipValue) {
final float scale = context.getResources().getDisplayMetrics().density;
return (int) (dipValue * scale + 0.5f);
}
// 将px值转换为sp值
public static int px2sp(Context context, float pxValue) {
final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
return (int) (pxValue / fontScale + 0.5f);
}
// 将sp值转换为px值
public static int sp2px(Context context, float spValue) {
final float fontScale = context.getResources().getDisplayMetrics().scaledDensity;
return (int) (spValue * fontScale + 0.5f);
}
// 屏幕宽度(像素)
public static int getWindowWidth(Context context) {
DisplayMetrics dm = context.getApplicationContext().getResources().getDisplayMetrics();
return dm.widthPixels;
}
// 屏幕高度(像素)
public static int getWindowHeight(Context context) {
DisplayMetrics dm = context.getApplicationContext().getResources().getDisplayMetrics();
return dm.heightPixels;
}
// 根据Unicode编码判断中文汉字和符号
private static boolean isChinese(char c) {
Character.UnicodeBlock ub = Character.UnicodeBlock.of(c);
if (ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS || ub == Character.UnicodeBlock.CJK_COMPATIBILITY_IDEOGRAPHS
|| ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_A || ub == Character.UnicodeBlock.CJK_UNIFIED_IDEOGRAPHS_EXTENSION_B
|| ub == Character.UnicodeBlock.CJK_SYMBOLS_AND_PUNCTUATION || ub == Character.UnicodeBlock.HALFWIDTH_AND_FULLWIDTH_FORMS
|| ub == Character.UnicodeBlock.GENERAL_PUNCTUATION) {
return true;
}
return false;
}
// 判断中文汉字和符号
public static boolean isChinese(String strName) {
char[] ch = strName.toCharArray();
for (int i = 0; i < ch.length; i++) {
char c = ch[i];
if (isChinese(c)) {
return true;
}
}
return false;
}
public static int getScreenPxWidth(Context context) {
WindowManager wm = (WindowManager) context
.getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics outMetrics = new DisplayMetrics();
wm.getDefaultDisplay().getMetrics(outMetrics);
return outMetrics.widthPixels;
}
public static int getScreenDpWidth(Context context) {
int pxWidth = getScreenPxWidth(context);
return (int) px2dip(context, pxWidth);
}
public static int getScreenPxHeight(Context context) {
WindowManager wm = (WindowManager) context
.getSystemService(Context.WINDOW_SERVICE);
DisplayMetrics outMetrics = new DisplayMetrics();
wm.getDefaultDisplay().getMetrics(outMetrics);
return outMetrics.heightPixels;
}
public static int getScreenDpHeight(Context context) {
int pxHeight = getScreenPxHeight(context);
return (int) px2dip(context, pxHeight);
}
public static void executePendingTransactionsSafely(String TAG, FragmentManager fragmentManager) {
if (fragmentManager == null) {
Logger.error(TAG, "executePendingTransactionsSafely fragmentManager == null");
return;
}
try {
fragmentManager.executePendingTransactions();
} catch (Exception e) {
Logger.error(TAG, String.valueOf(e));
try {
Field mExecutingActions = fragmentManager.getClass().getDeclaredField("mExecutingActions");
mExecutingActions.setAccessible(true);
mExecutingActions.set(fragmentManager, false);
} catch (Exception e1) {
Logger.error(TAG, "set field value fail", e1);
}
}
}
}

View File

@@ -15,7 +15,7 @@ import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.ui.gift.widget.GlideCircleTransform;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;

View File

@@ -16,7 +16,7 @@ import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;
import java.lang.ref.WeakReference;

View File

@@ -19,7 +19,7 @@ import com.bumptech.glide.load.engine.GlideException;
import com.bumptech.glide.request.RequestListener;
import com.bumptech.glide.request.target.Target;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil;
import com.yizhuan.xchat_android_library.utils.SizeUtils;
import com.yizhuan.xchat_android_library.utils.config.BasicConfig;

View File

@@ -16,7 +16,7 @@ import android.widget.TextView;
import com.chuhai.core.component.SuperBottomSheetDialog;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.ui.widget.ButtonItem;
import java.util.List;

View File

@@ -554,7 +554,7 @@ public class DialogManager {
}
/**
* 1、Peko通用的dialog設置以後盡量所有的dialog都引到這個方法方便以後改版
* 1、Repo通用的dialog設置以後盡量所有的dialog都引到這個方法方便以後改版
* 2、如果UI要求彈框是完全自定義的再重新寫過
*
* @param title 標題,空則隱藏 (ui說有些彈框帶標題有些不帶兩種情況共存)

View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.decoration.DecorationInfo
import com.yizhuan.xchat_android_core.decoration.bean.DecorationInfo
open class DecorationCommonAdapter(layoutResId: Int = R.layout.item_decoration_common) :

View File

@@ -6,7 +6,7 @@ import android.text.TextUtils;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.dialog.DialogManager;
import com.yizhuan.xchat_android_core.decoration.DecorationInfo;
import com.yizhuan.xchat_android_core.decoration.bean.DecorationInfo;
import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent;
import com.yizhuan.xchat_android_core.decoration.DecorationModel;
import com.yizhuan.xchat_android_core.utils.net.RxHelper;

View File

@@ -12,7 +12,7 @@ import com.yizhuan.erban.decoration.adapter.DecorationCommonAdapter
import com.yizhuan.erban.decoration.viewmodel.DecorationViewModel
import com.yizhuan.erban.ui.relation.FansListActivity
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.decoration.DecorationInfo
import com.yizhuan.xchat_android_core.decoration.bean.DecorationInfo
import com.yizhuan.xchat_android_core.decoration.DecorationInfoEvent
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
import com.yizhuan.xchat_android_library.utils.ResUtil

View File

@@ -5,11 +5,11 @@ import androidx.lifecycle.MutableLiveData
import com.yizhuan.erban.R
import com.yizhuan.erban.base.BaseViewModel
import com.yizhuan.xchat_android_core.bean.response.ListResult
import com.yizhuan.xchat_android_core.decoration.DecorationInfo
import com.yizhuan.xchat_android_core.decoration.bean.DecorationInfo
import com.yizhuan.xchat_android_core.decoration.DecorationModel
import com.yizhuan.xchat_android_core.home.bean.BannerInfo
import com.yizhuan.xchat_android_core.home.model.HomeModel
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class DecorationViewModel : BaseViewModel() {

View File

@@ -24,7 +24,7 @@ import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseMvpActivity;
import com.yizhuan.erban.base.TitleBar;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.constants.BundleKeys;
import com.yizhuan.erban.family.presenter.FamilyHomePresenter;

View File

@@ -14,7 +14,7 @@ import com.chad.library.adapter.base.BaseViewHolder;
import com.netease.nim.uikit.support.glide.GlideApp;
import com.yizhuan.erban.R;
import com.yizhuan.erban.common.widget.CircleImageView;
import com.yizhuan.erban.common.util.Utils;
import com.yizhuan.xchat_android_library.common.util.Utils;
import com.yizhuan.xchat_android_core.family.bean.FamilyMemberInfo;
import java.util.List;

View File

@@ -15,8 +15,8 @@ import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.gift.GiftModel
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.utils.net.handleBeanData
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class FansTeamJoinActivity : BaseViewBindingActivity<ActivityFansTeamJoinBinding>() {

View File

@@ -21,10 +21,10 @@ import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.erban.ui.webview.DialogWebViewActivity
import com.yizhuan.xchat_android_core.UriProvider
import com.yizhuan.xchat_android_core.fansteam.FansTeamTaskInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamTaskInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.utils.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.subAndReplaceDot
import com.yizhuan.xchat_android_core.utils.extension.toast
import com.yizhuan.xchat_android_library.utils.ResUtil
class FansTeamJoinedActivity : BaseViewBindingActivity<ActivityFansTeamJoinedBinding>() {

View File

@@ -11,7 +11,7 @@ import com.yizhuan.erban.base.BaseViewBindingActivity
import com.yizhuan.erban.common.EmptyViewHelper
import com.yizhuan.erban.databinding.ActivityFansTeamListBinding
import com.yizhuan.erban.ui.utils.RVDelegate
import com.yizhuan.xchat_android_core.fansteam.FansTeamInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamInfo
import com.yizhuan.xchat_android_library.annatation.ActLayoutRes
import com.yizhuan.xchat_android_library.utils.ResUtil

View File

@@ -5,7 +5,7 @@ import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.user.activity.UserInfoActivity
import com.yizhuan.erban.ui.utils.ImageLoadUtils
import com.yizhuan.xchat_android_core.fansteam.FansTeamInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamInfo
class FansTeamListAdapter :

View File

@@ -8,7 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter
import com.chad.library.adapter.base.BaseViewHolder
import com.yizhuan.erban.R
import com.yizhuan.erban.ui.utils.load
import com.yizhuan.xchat_android_core.fansteam.FansTeamTaskInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamTaskInfo
import com.yizhuan.xchat_android_library.utils.ResUtil
class FansTeamTaskAdapter :

View File

@@ -5,8 +5,12 @@ import androidx.lifecycle.MutableLiveData
import com.yizhuan.erban.base.BaseViewModel
import com.yizhuan.xchat_android_core.bean.response.ListResult
import com.yizhuan.xchat_android_core.fansteam.*
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamInitInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamJoinInfo
import com.yizhuan.xchat_android_core.fansteam.bean.FansTeamJoinedInfo
import com.yizhuan.xchat_android_core.manager.AvRoomDataManager
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
class FansTeamViewModel : BaseViewModel() {

View File

@@ -8,7 +8,7 @@ import com.yizhuan.xchat_android_core.home.bean.*
import com.yizhuan.xchat_android_core.home.model.HomeModel
import com.yizhuan.xchat_android_core.room.bean.AnchorInfo
import com.yizhuan.xchat_android_core.user.bean.UserInfo
import com.yizhuan.xchat_android_core.utils.toast
import com.yizhuan.xchat_android_core.utils.extension.toast
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async

Some files were not shown because too many files have changed in this diff Show More