diff --git a/ananplay.jks b/ananplay.jks new file mode 100644 index 000000000..8eb891c43 Binary files /dev/null and b/ananplay.jks differ diff --git a/app/build.gradle b/app/build.gradle index 9b63ecbef..b601a0b9a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'com.android.application' -apply plugin: 'com.google.gms.google-services' -apply plugin: 'com.google.firebase.crashlytics' +//apply plugin: 'com.google.gms.google-services' +//apply plugin: 'com.google.firebase.crashlytics' apply plugin: 'kotlin-android' apply plugin: 'com.tencent.vasdolly' apply from: '../mob.gradle' @@ -11,7 +11,7 @@ android { compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { - applicationId "com.vele.pekolive" + applicationId "com.vele.habuplay" minSdkVersion MIN_SDK_VERSION.toInteger() targetSdkVersion TARGET_SDK_VERSION.toInteger() versionCode Integer.valueOf(version_code) @@ -22,7 +22,7 @@ android { flavorDimensions 'default' - manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()] +// manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()] } splits { @@ -60,7 +60,7 @@ android { if (abi == null) { abi = "universal" } - outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk" + outputFileName = "habu_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk" } } @@ -81,19 +81,19 @@ android { signingConfigs { v2 { - storeFile file('../pekolive.jks') - storePassword "peko2023" - keyAlias "pekolive" - keyPassword "peko2023" + storeFile file('../ananplay.jks') + storePassword "vele2021" + keyAlias "ananplay" + keyPassword "vele2021" v2SigningEnabled true v1SigningEnabled true } v1 { - storeFile file('../pekolive.jks') - storePassword "peko2023" - keyAlias "pekolive" - keyPassword "peko2023" + storeFile file('../ananplay.jks') + storePassword "vele2021" + keyAlias "ananplay" + keyPassword "vele2021" v2SigningEnabled false v1SigningEnabled true } @@ -147,14 +147,14 @@ android { } buildTypes { - def server_url_debug = '"http://beta.api.pekolive.com/"' - def server_url_release = '"https://api.pekolive.com/"' + def server_url_debug = '"http://beta.api.anan.chat/"' + def server_url_release = '"https://api.anan.chat"' debug { println("minifyEnabled = " + minify_enabled) - ext.enableCrashlytics = false - ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID +// ext.enableCrashlytics = false +// ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID buildConfigField "String", "BASE_URL", server_url_debug buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" @@ -176,10 +176,10 @@ android { release { ext.enableCrashlytics = CRASHLYTICS_COLLECTION_ENABLED.toBoolean() ext.alwaysUpdateBuildId = CRASHLYTICS_COLLECTION_ENABLED.toBoolean() - firebaseCrashlytics { - //Firebase Crashlytics控制上传混淆文件开关 - mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean() - } +// firebaseCrashlytics { +// //Firebase Crashlytics控制上传混淆文件开关 +// mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean() +// } buildConfigField "String", "BASE_URL", server_url_release buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" @@ -285,15 +285,15 @@ dependencies { implementation 'com.github.zhpanvip:BannerViewPager:3.5.6' //fireBase - implementation platform('com.google.firebase:firebase-bom:31.1.1') - implementation 'com.google.firebase:firebase-crashlytics-ktx' - implementation 'com.google.firebase:firebase-analytics-ktx' +// implementation platform('com.google.firebase:firebase-bom:31.1.1') +// implementation 'com.google.firebase:firebase-crashlytics-ktx' +// implementation 'com.google.firebase:firebase-analytics-ktx' //Adjust接入 - implementation 'com.adjust.sdk:adjust-android:4.33.0' - implementation 'com.android.installreferrer:installreferrer:2.2' +// implementation 'com.adjust.sdk:adjust-android:4.33.0' +// implementation 'com.android.installreferrer:installreferrer:2.2' // Add the following if you are using the Adjust SDK inside web views on your app - implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0' +// implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0' implementation 'com.github.yalantis:ucrop:2.2.7' @@ -310,7 +310,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 = 'habu-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64) //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false） fastMode = false //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 38f00dc6e..0236412bf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -112,23 +112,23 @@ 则需要考虑发起的intent会出现相同应用图标的选择对话框的情况 参考集成文档:https://www.linkedme.cc/docs/page4.html#link1 --> - + - - + + - - + + - - + + + + - + + + @@ -222,7 +222,7 @@ @@ -1065,9 +1065,9 @@ - + + + hashMap = scene.getParams(); - - LogUtil.print("linkedme", hashMap); - //根据key获取传入的参数的值,该key关键字View可为任意值,由集成方规定,请与web端商议,一致即可 - LinkedInfo linkedInfo = new LinkedInfo(); - String roomuid = (String) hashMap.get("roomuid"); - String uid = (String) hashMap.get("uid"); - String type = String.valueOf(hashMap.get("type")); - String familyId = (String) hashMap.get("familyId"); - String url = (String) hashMap.get("url"); - String worldId = (String) hashMap.get("worldId"); - String dynamicId = (String) hashMap.get("dynamicId"); - String inviteCode = (String) hashMap.get("inviteCode"); - if (roomuid != null) { - linkedInfo.setRoomUid(roomuid); - } - if (TextUtils.isEmptyText(roomuid) && uid != null) { - linkedInfo.setRoomUid(uid); - } - if (uid != null) { - linkedInfo.setUid(uid); - } - linkedInfo.setType(type); - if (familyId != null) { - linkedInfo.setFamilyId(familyId); - } - if (url != null) { - linkedInfo.setUrl(url); - } - if (worldId != null) { - linkedInfo.setWorldId(worldId); - } - if (dynamicId != null) { - linkedInfo.setDynamicId(dynamicId); - } - - linkedInfo.setInviteCode(inviteCode); - - LinkedModel.get().setLinkedInfo(linkedInfo); - - } catch (Exception e) { - } - - - if (isExistMainActivity(MainActivity.class) && UserModel.get().getCacheLoginUserInfo() != null) {//应用已开启&用户信息以获取 - MainActivity.handleLinkedJump(this); - } else {//应用未开启 - SplashActivity.start(this); - } - finish(); - } +// @Override +// public void onReturnSceneData(Scene scene) { +// +// try { +// HashMap hashMap = scene.getParams(); +// +// LogUtil.print("linkedme", hashMap); +// //根据key获取传入的参数的值,该key关键字View可为任意值,由集成方规定,请与web端商议,一致即可 +// LinkedInfo linkedInfo = new LinkedInfo(); +// String roomuid = (String) hashMap.get("roomuid"); +// String uid = (String) hashMap.get("uid"); +// String type = String.valueOf(hashMap.get("type")); +// String familyId = (String) hashMap.get("familyId"); +// String url = (String) hashMap.get("url"); +// String worldId = (String) hashMap.get("worldId"); +// String dynamicId = (String) hashMap.get("dynamicId"); +// String inviteCode = (String) hashMap.get("inviteCode"); +// if (roomuid != null) { +// linkedInfo.setRoomUid(roomuid); +// } +// if (TextUtils.isEmptyText(roomuid) && uid != null) { +// linkedInfo.setRoomUid(uid); +// } +// if (uid != null) { +// linkedInfo.setUid(uid); +// } +// linkedInfo.setType(type); +// if (familyId != null) { +// linkedInfo.setFamilyId(familyId); +// } +// if (url != null) { +// linkedInfo.setUrl(url); +// } +// if (worldId != null) { +// linkedInfo.setWorldId(worldId); +// } +// if (dynamicId != null) { +// linkedInfo.setDynamicId(dynamicId); +// } +// +// linkedInfo.setInviteCode(inviteCode); +// +// LinkedModel.get().setLinkedInfo(linkedInfo); +// +// } catch (Exception e) { +// } +// +// +// if (isExistMainActivity(MainActivity.class) && UserModel.get().getCacheLoginUserInfo() != null) {//应用已开启&用户信息以获取 +// MainActivity.handleLinkedJump(this); +// } else {//应用未开启 +// SplashActivity.start(this); +// } +// finish(); +// } public boolean isExistMainActivity(Class activity) { try { diff --git a/app/src/main/java/com/yizhuan/erban/application/ReportManager.java b/app/src/main/java/com/yizhuan/erban/application/ReportManager.java index a3a6d342f..a09621777 100644 --- a/app/src/main/java/com/yizhuan/erban/application/ReportManager.java +++ b/app/src/main/java/com/yizhuan/erban/application/ReportManager.java @@ -1,20 +1,6 @@ package com.yizhuan.erban.application; import android.os.Bundle; -import android.text.TextUtils; - -import com.adjust.sdk.Adjust; -import com.adjust.sdk.AdjustConfig; -import com.adjust.sdk.AdjustEvent; -import com.adjust.sdk.LogLevel; -import com.google.firebase.analytics.FirebaseAnalytics; -import com.google.firebase.crashlytics.FirebaseCrashlytics; -import com.google.gson.Gson; -import com.orhanobut.logger.Logger; -import com.yizhuan.xchat_android_constants.XChatConstants; -import com.yizhuan.xchat_android_core.auth.AuthModel; -import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil; - import java.util.Map; /** @@ -37,38 +23,38 @@ public class ReportManager implements IReportService { } public void init() { - initFirebase(); - initAdjust(); +// initFirebase(); +// initAdjust(); } /** * 初始化Firebase相关库 */ - private void initFirebase() { - // FirebaseCrashlytics注册公共属性 - FirebaseCrashlytics.getInstance().setCustomKey(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID()); - // FirebaseAnalytics注册公共属性 - Bundle params = new Bundle(); - if (AuthModel.get().getCurrentUid() != 0) { - params.putLong(IReportConstants.UID, AuthModel.get().getCurrentUid()); - } - params.putString(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID()); - setFirebaseAnalyticsDefaultEventParameters(params); - } +// private void initFirebase() { +// // FirebaseCrashlytics注册公共属性 +// FirebaseCrashlytics.getInstance().setCustomKey(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID()); +// // FirebaseAnalytics注册公共属性 +// Bundle params = new Bundle(); +// if (AuthModel.get().getCurrentUid() != 0) { +// params.putLong(IReportConstants.UID, AuthModel.get().getCurrentUid()); +// } +// params.putString(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID()); +// setFirebaseAnalyticsDefaultEventParameters(params); +// } //Adjust初始化 - private void initAdjust() { - String appToken = XChatConstants.ADJUST_APP_TOKEN; - String environment; - if (XChatApplication.isDebug()) { - environment = AdjustConfig.ENVIRONMENT_SANDBOX; - } else { - environment = AdjustConfig.ENVIRONMENT_PRODUCTION; - } - AdjustConfig config = new AdjustConfig(XChatApplication.instance(), appToken, environment); - config.setLogLevel(LogLevel.WARN); - Adjust.onCreate(config); - } +// private void initAdjust() { +// String appToken = XChatConstants.ADJUST_APP_TOKEN; +// String environment; +// if (XChatApplication.isDebug()) { +// environment = AdjustConfig.ENVIRONMENT_SANDBOX; +// } else { +// environment = AdjustConfig.ENVIRONMENT_PRODUCTION; +// } +// AdjustConfig config = new AdjustConfig(XChatApplication.instance(), appToken, environment); +// config.setLogLevel(LogLevel.WARN); +// Adjust.onCreate(config); +// } /** * 设置FirebaseAnalytics公共属性 @@ -77,9 +63,9 @@ public class ReportManager implements IReportService { */ @Override public void setFirebaseAnalyticsDefaultEventParameters(Bundle bundle) { - if (bundle != null) { - FirebaseAnalytics.getInstance(XChatApplication.instance()).setDefaultEventParameters(bundle); - } +// if (bundle != null) { +// FirebaseAnalytics.getInstance(XChatApplication.instance()).setDefaultEventParameters(bundle); +// } } /** @@ -100,30 +86,30 @@ public class ReportManager implements IReportService { */ @Override public void reportEvent(String eventId, Map map) { - try { - Logger.i(TAG, "reportEvent: eventId=%s, map=%s", eventId, new Gson().toJson(map)); - Bundle bundle = null; - if (map != null) { - bundle = new Bundle(); - for (Map.Entry item : map.entrySet()) { - String key = item.getKey(); - Object value = item.getValue(); - if (!TextUtils.isEmpty(key) && value != null) { - bundle.putString(key, String.valueOf(value)); - } - } - } - //所有事件都上报到Google Analytics - FirebaseAnalytics.getInstance(XChatApplication.instance()).logEvent(eventId, bundle); - } catch (Exception e) { - Logger.e(TAG, "reportEvent", e); - } +// try { +// Logger.i(TAG, "reportEvent: eventId=%s, map=%s", eventId, new Gson().toJson(map)); +// Bundle bundle = null; +// if (map != null) { +// bundle = new Bundle(); +// for (Map.Entry item : map.entrySet()) { +// String key = item.getKey(); +// Object value = item.getValue(); +// if (!TextUtils.isEmpty(key) && value != null) { +// bundle.putString(key, String.valueOf(value)); +// } +// } +// } +// //所有事件都上报到Google Analytics +// FirebaseAnalytics.getInstance(XChatApplication.instance()).logEvent(eventId, bundle); +// } catch (Exception e) { +// Logger.e(TAG, "reportEvent", e); +// } } @Override public void reportAdjustEvent(String eventId) { - AdjustEvent adjustEvent = new AdjustEvent(eventId); - Adjust.trackEvent(adjustEvent); +// AdjustEvent adjustEvent = new AdjustEvent(eventId); +// Adjust.trackEvent(adjustEvent); } diff --git a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java index 255ab7505..c91eb852a 100644 --- a/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java +++ b/app/src/main/java/com/yizhuan/erban/application/XChatApplication.java @@ -20,9 +20,6 @@ import com.coorchice.library.utils.LogUtils; import com.facebook.stetho.Stetho; import com.hjq.toast.ToastUtils; import com.mob.MobSDK; -import com.mob.moblink.MobLink; -import com.mob.moblink.RestoreSceneListener; -import com.mob.moblink.Scene; import com.netease.nim.uikit.api.NimUIKit; import com.netease.nim.uikit.common.util.log.LogUtil; import com.netease.nimlib.sdk.NIMClient; @@ -279,21 +276,21 @@ public class XChatApplication extends BaseApp { * 初始化linkedMe */ private static void initLinkedMe() { - MobSDK.init(instance, "36b91eeac7469", "63ec0702513aca17e20615dd5dfdc03f"); - MobLink.setRestoreSceneListener(new RestoreSceneListener() { - @Override - public Class willRestoreScene(Scene scene) { - return AgentActivity.class; - } - - @Override - public void completeRestore(Scene scene) { - } - - @Override - public void notFoundScene(Scene scene) { - } - }); + MobSDK.init(instance, "32fd2f8457880", "ef796ca85e8cd95a76929663de133214"); +// MobLink.setRestoreSceneListener(new RestoreSceneListener() { +// @Override +// public Class willRestoreScene(Scene scene) { +// return AgentActivity.class; +// } +// +// @Override +// public void completeRestore(Scene scene) { +// } +// +// @Override +// public void notFoundScene(Scene scene) { +// } +// }); } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt index bbe203910..112973357 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/anotherroompk/RoomPKSearchAdapter.kt @@ -12,7 +12,7 @@ class RoomPKSearchAdapter : 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,"Habu Live号:${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) diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java index 142412ea5..468f30ce9 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java @@ -804,34 +804,34 @@ public class HomePartyRoomFragment extends BaseRoomFragment { - if (hide != null && !hide) { - if (AvRoomDataManager.get().isCpRoom()) { - gameBinding.ivTreasureBoxCp.setVisibility(View.VISIBLE); - gameBinding.ivTreasureBox.setVisibility(View.GONE); - } else { - gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); - gameBinding.ivTreasureBox.setVisibility(View.VISIBLE); - GlideApp.with(BasicConfig.INSTANCE.getAppContext()) - .load(GoldBoxHelper.getBoxIcon()) - .error(R.drawable.icon_room_treasure_box) - .into(gameBinding.ivTreasureBox); - } - } else { - gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); - gameBinding.ivTreasureBox.setVisibility(View.GONE); - } - }, - throwable -> { - gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); - gameBinding.ivTreasureBox.setVisibility(View.GONE); - }); - } else { - gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); - gameBinding.ivTreasureBox.setVisibility(View.GONE); - } +// if (!GoldBoxHelper.needIntegrateBoxEntrance()) { +// GoldBoxHelper.isHideBox().subscribe( +// hide -> { +// if (hide != null && !hide) { +// if (AvRoomDataManager.get().isCpRoom()) { +// gameBinding.ivTreasureBoxCp.setVisibility(View.VISIBLE); +// gameBinding.ivTreasureBox.setVisibility(View.GONE); +// } else { +// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); +// gameBinding.ivTreasureBox.setVisibility(View.VISIBLE); +// GlideApp.with(BasicConfig.INSTANCE.getAppContext()) +// .load(GoldBoxHelper.getBoxIcon()) +// .error(R.drawable.icon_room_treasure_box) +// .into(gameBinding.ivTreasureBox); +// } +// } else { +// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); +// gameBinding.ivTreasureBox.setVisibility(View.GONE); +// } +// }, +// throwable -> { +// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); +// gameBinding.ivTreasureBox.setVisibility(View.GONE); +// }); +// } else { +// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE); +// gameBinding.ivTreasureBox.setVisibility(View.GONE); +// } setDragonView(); } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt b/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt index 5ac9e4c68..13807f03e 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt @@ -85,21 +85,21 @@ class SingleRoomFragment : BaseRoomFragment map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_facebook)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); - ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_facebook)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); +// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.FACEBOOK); } @@ -277,10 +276,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @Override public void onSuccess(String result) { reportLoginResult(IReportConstants.TWO, IReportConstants.ONE, ""); - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_line)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); - ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_line)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); +// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); getDialogManager().dismissDialog(); SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.LINE); } @@ -308,10 +307,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener @Override public void onSuccess(String result) { reportLoginResult(IReportConstants.THREE, IReportConstants.ONE, ""); - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_google)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); - ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_google)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); +// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); getDialogManager().dismissDialog(); SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.GOOGLE); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt index 601387c46..de9e4b2ca 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt @@ -11,7 +11,6 @@ import android.view.MotionEvent import android.widget.EditText import androidx.core.content.ContextCompat import com.coorchice.library.utils.LogUtils -import com.google.firebase.analytics.FirebaseAnalytics import com.netease.nim.uikit.StatusBarUtil import com.trello.rxlifecycle3.android.ActivityEvent import com.yizhuan.erban.MainActivity @@ -204,10 +203,10 @@ class LoginCodeActivity : BaseViewBindingActivity() { reportLoginResult(IReportConstants.ONE, "") DemoCache.saveBoundAuthCode(true) dialogManager.dismissDialog() - val map = HashMap(2) - map[FirebaseAnalytics.Param.METHOD] = getString(R.string.login_phone_code) - ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map) - ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN) +// val map = HashMap(2) +// map[FirebaseAnalytics.Param.METHOD] = getString(R.string.login_phone_code) +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map) +// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN) stopCounter() } diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java b/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java index 258448abc..8e8e983ab 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java @@ -17,7 +17,6 @@ import androidx.appcompat.widget.AppCompatTextView; import androidx.core.content.ContextCompat; import com.coorchice.library.SuperTextView; -import com.google.firebase.analytics.FirebaseAnalytics; import com.netease.nim.uikit.StatusBarUtil; import com.trello.rxlifecycle3.android.ActivityEvent; import com.yizhuan.erban.MainActivity; @@ -217,10 +216,10 @@ public class LoginPasswordActivity extends BaseActivity { reportLoginResult(IReportConstants.ONE, ""); DemoCache.saveBoundAuthCode(true); getDialogManager().dismissDialog(); - HashMap map = new HashMap<>(3); - map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_phone_code)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); - ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); +// HashMap map = new HashMap<>(3); +// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_phone_code)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); +// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); stopCounter(); SPUtils.putString(SpConstants.LOGIN_TYPE, ""); } @@ -323,10 +322,10 @@ public class LoginPasswordActivity extends BaseActivity { @Override public void onSuccess(String result) { reportLoginResult(IReportConstants.ONE, result); - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_account)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); - ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_account)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map); +// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN); getDialogManager().dismissDialog(); SPUtils.putString(SpConstants.LOGIN_TYPE, ""); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java index 5bd9804d5..9eb5ae92f 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java @@ -10,12 +10,9 @@ import android.widget.ImageView; import android.widget.RadioButton; import androidx.annotation.Nullable; -import androidx.appcompat.widget.AppCompatImageView; import androidx.appcompat.widget.AppCompatTextView; -import com.adjust.sdk.Adjust; import com.google.android.material.textfield.TextInputEditText; -import com.google.firebase.analytics.FirebaseAnalytics; import com.sleepbot.datetimepicker.time.RadialPickerLayout; import com.sleepbot.datetimepicker.time.TimePickerDialog; import com.trello.rxlifecycle3.android.FragmentEvent; @@ -203,7 +200,8 @@ public class AddUserInfoFragment extends BaseFragment } INVITE_USER_CODE = shareCode; String finalChannel = channel; - String adid = Adjust.getAdid(); +// String adid = Adjust.getAdid(); + String adid = ""; UserModel.get().requestCompleteUserInfo(userInfo, channel, uid, roomUid, shareCode, adid) .compose(bindUntilEvent(FragmentEvent.DESTROY)) .subscribe(new SingleObserver() { @@ -216,9 +214,9 @@ public class AddUserInfoFragment extends BaseFragment public void onSuccess(UserInfo userInfo) { getDialogManager().dismissDialog(); ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_REGISTER); - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.METHOD, finalChannel); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.SIGN_UP, map); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.METHOD, finalChannel); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SIGN_UP, map); AuthModel.get().setThirdUserInfo(null); getActivity().finish(); } diff --git a/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java b/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java index 0e1db913a..96b5649aa 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java +++ b/app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java @@ -28,7 +28,7 @@ public class BillingManager implements PurchasesUpdatedListener { private static final String TAG = "BillingManager"; /*购买key*/ - private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAotfZw5IAGCV4V/L/AblIO5DL/hrLTwC9MDlVoEEcL8rgrF4GIZrzhInQhqwjoY8FelThezK68ccMz4i+hi3Mup9kHNhYjlZo+A14gXV+omEzAFiWtqOsISvifSxrMi849LQuXfImqlKNRLzp+YSkr4oJq7OE7QmxlLwpAzFj623c6Z9NSj+NdoE3bRrS2F1SSGYYyHEMyV005TdzKnqtjwtkga2RPNZCnyepU6OuF/HrIUoBTIVpgd4aZC2lKSBY9GNBMxZLd0yCsXNLXRXnR0itaNh0clYkxUSa3PemqjBsr79hLFn2yQKDsBwSCBAfBsgbpAA84PF5Jl4dw6rl0wIDAQAB"; + private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNboVqeCAvW1s2mNCaNipu0bd15HC6FP86E1+dTEdMTD9XLWkYiXCzEbt+ciTda/XdAOYYe4YNnyfW7T/a9E7O0ZyjPj08q2LQaMqgTBecpzQhE7ZhYYmh3DdWrGKCEMLImX4yNuEEX9yC/dVP49nHNqfLWxmnzhDrJ5JDSlpvguOI4lMRe0/1gx7kfEeB8DOg8HfvdibiVZI4vhjk9Oz6sWJQZd1/bOuUe4huAj9Ys/4zcgniE8Da45lGdefjn12y7ELhcUZpFLLKvXmj0qnfqBX94CB+wfbEOYvALKaFb+bBZe/a8YEn/9zA4UsA0j+eRweXBb6e1AqaZJ4wp/JQIDAQAB"; /*客户端*/ private BillingClient billingClient; diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt index 883f170ea..436f7aada 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt @@ -218,7 +218,7 @@ class SettingActivity : BaseViewBindingActivity(), View. private fun debug() { // RedPackageOpenDialog2().show(this) - val json = "{\"first\":3,\"second\":32,\"data\":{\"recvUserUid\":2735,\"recvUserAvatar\":\"https://img.pekolive.com/default_avatar.png\",\"recvUserNick\":\"66丢丢丢丢丢多多多的hhhh\",\"sendUserNick\":\"11的ass\",\"sendUserAvatar\":\"http://beta.img.pekolive.com/Fk7aur-1RBqKXC-qqBwMTjivZ3lV?imageslim\",\"sendUserUid\":2737,\"giftUrl\":\"http://beta.img.pekolive.com/Fn6h_gPFD5MwA-Ql_kcWqNpKp0JM?imageslim\",\"giftName\":\"幽靈糖果\",\"giftId\":2075,\"giftNum\":${Random.nextInt(1,1000)},\"giftGolds\":33440,\"notifyStaySecond\":5,\"isHomeShow\":true,\"isSkipRoom\":true,\"isFullScreen\":false,\"isSendMsg\":false,\"roomUid\":2737,\"roomErbanNo\":11,\"roomTitle\":\"11的工会\",\"levelNum\":${Random.nextInt(1,4)}}}" - onReceivedNimBroadcastMessage(json) +// val json = "{\"first\":3,\"second\":32,\"data\":{\"recvUserUid\":2735,\"recvUserAvatar\":\"https://img.pekolive.com/default_avatar.png\",\"recvUserNick\":\"66丢丢丢丢丢多多多的hhhh\",\"sendUserNick\":\"11的ass\",\"sendUserAvatar\":\"http://beta.img.pekolive.com/Fk7aur-1RBqKXC-qqBwMTjivZ3lV?imageslim\",\"sendUserUid\":2737,\"giftUrl\":\"http://beta.img.pekolive.com/Fn6h_gPFD5MwA-Ql_kcWqNpKp0JM?imageslim\",\"giftName\":\"幽靈糖果\",\"giftId\":2075,\"giftNum\":${Random.nextInt(1,1000)},\"giftGolds\":33440,\"notifyStaySecond\":5,\"isHomeShow\":true,\"isSkipRoom\":true,\"isFullScreen\":false,\"isSendMsg\":false,\"roomUid\":2737,\"roomErbanNo\":11,\"roomTitle\":\"11的工会\",\"levelNum\":${Random.nextInt(1,4)}}}" +// onReceivedNimBroadcastMessage(json) } } \ No newline at end of file diff --git a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java index 5327c5906..d70bf9e82 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java +++ b/app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java @@ -11,10 +11,8 @@ import android.view.WindowManager; import android.widget.TextView; import com.google.android.material.bottomsheet.BottomSheetDialog; -import com.google.firebase.analytics.FirebaseAnalytics; import com.yizhuan.erban.R; import com.yizhuan.erban.application.ReportManager; -import com.yizhuan.xchat_android_library.utils.ResUtil; import com.yizhuan.xchat_android_library.utils.SingleToastUtil; import java.util.HashMap; @@ -97,9 +95,9 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen case R.id.tv_erban: if (onShareDialogItemClick != null) { if (type != TYPE_SHARE_H5) { - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.text_share_erban_friends)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.text_share_erban_friends)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); onShareDialogItemClick.onInAppSharingItemClick(); } else { SingleToastUtil.showToastShort(getString(R.string.ui_widget_sharedialog_02)); @@ -109,27 +107,27 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen break; case R.id.tv_line: if (onShareDialogItemClick != null) { - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_line)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_line)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Line.NAME)); } dismiss(); break; case R.id.tv_facebook: if (onShareDialogItemClick != null) { - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_facebook)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_facebook)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Facebook.NAME)); } dismiss(); break; case R.id.tv_share_link: if (onShareDialogItemClick != null) { - HashMap map = new HashMap<>(2); - map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_link)); - ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); +// HashMap map = new HashMap<>(2); +// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_link)); +// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map); onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(GooglePlus.NAME)); } dismiss(); diff --git a/app/src/main/res/drawable-xhdpi/about_logo.png b/app/src/main/res/drawable-xhdpi/about_logo.png deleted file mode 100644 index 23cc98ad0..000000000 Binary files a/app/src/main/res/drawable-xhdpi/about_logo.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/default_avatar.webp b/app/src/main/res/drawable-xhdpi/default_avatar.webp index 6b9c7d4aa..ccbe6f9d2 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_avatar.webp and b/app/src/main/res/drawable-xhdpi/default_avatar.webp differ diff --git a/app/src/main/res/drawable-xhdpi/default_banner.webp b/app/src/main/res/drawable-xhdpi/default_banner.webp index da35a698b..f4e65ce08 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_banner.webp and b/app/src/main/res/drawable-xhdpi/default_banner.webp differ diff --git a/app/src/main/res/drawable-xhdpi/default_cover.webp b/app/src/main/res/drawable-xhdpi/default_cover.webp index 00b8c11e3..343e3b231 100644 Binary files a/app/src/main/res/drawable-xhdpi/default_cover.webp and b/app/src/main/res/drawable-xhdpi/default_cover.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_logo.png b/app/src/main/res/drawable-xhdpi/ic_logo.png index c2235614b..4382cc849 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_logo.png and b/app/src/main/res/drawable-xhdpi/ic_logo.png differ diff --git a/app/src/main/res/drawable-xhdpi/icon_common_failure.png b/app/src/main/res/drawable-xhdpi/icon_common_failure.png deleted file mode 100644 index 7c520b466..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_common_failure.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_common_failure_green.webp b/app/src/main/res/drawable-xhdpi/icon_common_failure_green.webp deleted file mode 100644 index cc30ebee5..000000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_common_failure_green.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/splash_bg.webp b/app/src/main/res/drawable-xhdpi/splash_bg.webp deleted file mode 100644 index 0a80d639f..000000000 Binary files a/app/src/main/res/drawable-xhdpi/splash_bg.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/splash_bottom.png b/app/src/main/res/drawable-xhdpi/splash_bottom.png index 1c4dd953c..886f80778 100644 Binary files a/app/src/main/res/drawable-xhdpi/splash_bottom.png and b/app/src/main/res/drawable-xhdpi/splash_bottom.png differ diff --git a/app/src/main/res/drawable-xhdpi/splash_logo.png b/app/src/main/res/drawable-xhdpi/splash_logo.png index 23b092ade..104c03b95 100644 Binary files a/app/src/main/res/drawable-xhdpi/splash_logo.png and b/app/src/main/res/drawable-xhdpi/splash_logo.png differ diff --git a/app/src/main/res/drawable/bg_splash.xml b/app/src/main/res/drawable/bg_splash.xml index 65e65ec3c..7ed577a83 100644 --- a/app/src/main/res/drawable/bg_splash.xml +++ b/app/src/main/res/drawable/bg_splash.xml @@ -1,14 +1,26 @@ + - + + + - + + + + + + diff --git a/app/src/main/res/drawable/icon_common_failure.xml b/app/src/main/res/drawable/icon_common_failure.xml new file mode 100644 index 000000000..02b1b4cc6 --- /dev/null +++ b/app/src/main/res/drawable/icon_common_failure.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_common_failure_green.xml b/app/src/main/res/drawable/icon_common_failure_green.xml new file mode 100644 index 000000000..6487c69a4 --- /dev/null +++ b/app/src/main/res/drawable/icon_common_failure_green.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login_password.xml b/app/src/main/res/layout/activity_login_password.xml index 8510a49a8..ab364326a 100644 --- a/app/src/main/res/layout/activity_login_password.xml +++ b/app/src/main/res/layout/activity_login_password.xml @@ -33,7 +33,7 @@ android:layout_marginStart="@dimen/dp_24" android:layout_marginTop="48dp" android:fontFamily="sans-serif-medium" - android:text="@string/Welcome_to_piko" + android:text="@string/welcome_to_app" android:textColor="@color/text_title_color" android:textSize="28sp" android:textStyle="bold" @@ -112,7 +112,7 @@ android:background="@null" android:focusable="true" android:gravity="center_vertical" - android:hint="@string/please_input_piko_account" + android:hint="@string/please_input_app_account" android:inputType="number" android:maxLength="11" android:textColor="@color/text_title_color" diff --git a/app/src/main/res/layout/item_exchange_debris.xml b/app/src/main/res/layout/item_exchange_debris.xml index db9384683..f75604769 100644 --- a/app/src/main/res/layout/item_exchange_debris.xml +++ b/app/src/main/res/layout/item_exchange_debris.xml @@ -12,7 +12,7 @@ android:id="@+id/iv_icon" android:layout_width="@dimen/dp_24" android:layout_height="@dimen/dp_24" - android:src="@drawable/about_logo" /> + android:src="@mipmap/app_logo" /> + tools:text="Habu LiveHabu Live" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_my_fairy.xml b/app/src/main/res/layout/item_my_fairy.xml index 25f3824b0..c367ab91a 100644 --- a/app/src/main/res/layout/item_my_fairy.xml +++ b/app/src/main/res/layout/item_my_fairy.xml @@ -11,7 +11,7 @@ android:id="@+id/iv_fairy" android:layout_width="@dimen/dp_25" android:layout_height="@dimen/dp_25" - android:src="@drawable/about_logo" /> + android:src="@mipmap/app_logo" /> ]> +]> &app_name; 暫無消息 @@ -119,7 +119,7 @@ 僅%s或%s的用戶可發起聊天 房主已下線 - 更多好玩的房間在Piko等您喲！去看看！ + 更多好玩的房間在Habu Live等您喲！去看看！ 主頁 返回 粉絲 @@ -131,7 +131,7 @@ 好友 關註 你還沒有添加任何好友哦! \n快去添加好友吧! - 你還沒有任何Piko粉絲哦! + 你還沒有任何Habu Live粉絲哦! 我的鉆石余額 鉆石可以用於提現，兌換比率1元=10鉆 首頁 @@ -167,7 +167,7 @@ 我的關註 我的粉絲 - 你還沒有關註任何Piko好友哦! \n快去添加關註吧! + 你還沒有關註任何Habu Live好友哦! \n快去添加關註吧! 搜索昵稱或ID 搜索用戶ID 搜索房間名稱或ID @@ -261,7 +261,7 @@ 查看對方戰績> 查看我的戰績> - 別氣餒，Piko永遠支持你哦！ + 別氣餒，Habu Live永遠支持你哦！ @@ -343,7 +343,7 @@ %1$d    有效期%2$d天 該車輛已下架，無法購買 開著你的車，駕著你的馬 - 來Piko盡情馳騁吧! + 來Habu Live盡情馳騁吧! 座駕商城 %1$s 剩餘 @@ -363,7 +363,7 @@ 5 打爆怪獸的獎勵將會隨著怪獸的實力（血值）增加而增加，例如：打爆一只血值1000的怪獸將獲得總價不少於1000鉆石的鉆石或者座駕獎勵\n - 6 若有疑問，請咨詢Piko客服：1213490\n + 6 若有疑問，請咨詢Habu Live客服：\n ·玩法介紹· 確定 @@ -427,7 +427,7 @@ 退出家族 退出家族後您的家族幣將無法使用\n重新加入即可還原,你真的要退出嗎? 邀請好友 - 【Piko】 用聲音表達心情，用家族傳承微笑。 + 【Habu Live】 用聲音表達心情，用家族傳承微笑。 加入 搜索成員ID/昵稱 家族管理 @@ -447,7 +447,7 @@ 加入家族身份驗證 解散家族 提示 - 需要聯系客服才能解散家族哦~\nPiko家族客服:%1$s + 需要聯系客服才能解散家族哦~\nHabu Live家族客服:%1$s 聯系客服 確認加入"%1$s"嗎? 我希望加入貴家族 @@ -539,7 +539,7 @@ 好友 關註 粉絲 - 每天第一次分享免費領紅包（不包含分享至Piko好友） + 每天第一次分享免費領紅包（不包含分享至Habu Live好友） 好友 Google 群 @@ -565,7 +565,7 @@ 驗證碼將發送至您綁定的手機\"{0}\",請註意查收 更多 我是兔兔老用戶 - 我是Piko新用戶 + 我是Habu Live新用戶 登錄 授權碼 驗證碼 @@ -579,7 +579,7 @@ 親愛的小孩: 好久不見，翻起曾經一起度過的時光，期待你再次出現在身旁，謝謝你回來！ 請輸入邀請碼(選填) - 輸入邀請碼，邀請你加入的好友和你都可以獲得Piko回歸計劃的超級大禮哦！ + 輸入邀請碼，邀請你加入的好友和你都可以獲得Habu Live回歸計劃的超級大禮哦！ 收下回歸禮 頭像: @@ -665,7 +665,7 @@ KTV中… 加載中… - Piko小新 + Habu Live小新 請輸入邀請碼(選填) 排麥模式 @@ -836,7 +836,7 @@ 我的賬戶 - Piko + Habu Live 如何登錄？ %s也可登錄%s哦 %s 收個徒弟贏鉆石 @@ -1491,7 +1491,7 @@ 房間更新事件 進入房間事件 語音房_推廣入口 - 發送失敗，Piko提醒您文明用語~ + 發送失敗，Habu Live提醒您文明用語~ 語音房_公屏發言 房間榜 網絡異常，請重試！ @@ -2182,7 +2182,7 @@ 本輪已用完補簽機會 分享好友 即可獲得補簽機會\n - 分享後返回Piko才有效哦~ + 分享後返回Habu Live才有效哦~ 分享好友 本次補簽需要消耗 蘿蔔 @@ -2779,8 +2779,8 @@ 我的tab [liao] 內容字體長度= 親愛的 - 該內容不能分享給Piko好友 - 該內容不能分享給Piko好友 + 該內容不能分享給Habu Live好友 + 該內容不能分享給Habu Live好友 我 該用戶已不在麥位上,請重新選擇 已關註Ta @@ -2942,7 +2942,7 @@ 金豆 人名長度要限製在十個字以內 領取12/14個，剩餘12.600金豆 - Piko小新 + Habu Live小新 請輸入當前登錄密碼 原密碼 請輸入新的登錄密碼 @@ -3072,7 +3072,7 @@ 驗證碼: 請輸入驗證碼 下一步 - 如果您的手機號已丟失\n請咨詢客服，ID：88001 + 如果您的手機號已丟失\n請咨詢客服，ID： 請綁定你的支付寶賬號 羅生 鉆石余額 @@ -3237,8 +3237,8 @@ 裝扮已放至【我的裝扮】 獲得新人禮物 已放入背包，盡快使用吧~ - Piko可可鴨Piko可... - 歡迎來到Piko，Ta已經等待你很\n久啦，快來一起玩吧~ + Habu Live可可鴨Habu Live可... + 歡迎來到Habu Live，Ta已經等待你很\n久啦，快來一起玩吧~ 開啟浪漫之旅 青少年保護 拉拉 @@ -3832,7 +3832,7 @@ 用戶昵稱用戶昵稱稱稱 一二三四五六七八 我的我的我的我的我我我我我的我的我我我我我我我我 - Piko送你一個現金紅包 + Habu Live送你一個現金紅包 元 恭喜您獲得 獎勵紅包 @@ -4068,7 +4068,7 @@ 房間名不能為空 房間名不能超過15個字 保存成功 - 搜索昵稱/PikoID + 搜索昵稱/Habu LiveID 收入統計入口 收入統計 每日統計 @@ -4165,7 +4165,7 @@ 版本過舊，請下載最新版本哦 立即加入 通過暗號加入廳 - 添加成員-PikoID + 添加成員-Habu LiveID 有效，過期後重新獲取 公開群全站用戶可加入，只能創建 個;\n內部群僅廳成員可加入，最多創建 @@ -4268,7 +4268,7 @@ 設置禁言 即將上線敬請期待 尚未開通貴族 - ¥6立刻成為Piko貴族 + ¥6立刻成為Habu Live貴族 當前等級 騎士 還差: @@ -4286,8 +4286,8 @@ 我是emoji\n我是emoji 7天內(2月18日前)有效，過期後需重新獲取 添加成員 - PikoID添加 - Piko女神廳 + Habu LiveID添加 + Habu Live女神廳 公開群名稱 添加成員 添加成員權限 @@ -4299,7 +4299,7 @@ 開廳時長 送禮人數 新用戶送禮人數 - Piko女神 + Habu Live女神 忘憂閣忘憂閣忘憂閣忘憂閣 吉林吉林 吉林吉林 @@ -4327,7 +4327,7 @@ 去收徒 名師排行榜 師徒推送-點擊跳轉 - Piko：您收到一條收徒消息哦！ + Habu Live：您收到一條收徒消息哦！ 解除成功！ 啊哈哈哈哈哈哈 啦啦啦啦啦啦啦啦啦啦啊啊啊 @@ -4339,11 +4339,11 @@ 小明同學啦啦啦啦 ·給他發送拜師函吧· 關註並打招呼 - 小哥哥你就從了我吧,做我徒弟,以後我們一起浪跡Piko,你是風兒我是沙！ + 小哥哥你就從了我吧,做我徒弟,以後我們一起浪跡Habu Live,你是風兒我是沙！ 哇哦 終於搶到你~\n這就是緣分吧！ 小明同學啦啦啦啦 就讓我們從這裏開啟師徒之旅吧！\n你認我做師傅，我教你梳中分~ - Piko所有問題都可以問Ta哦~ + Habu Live所有問題都可以問Ta哦~ 拜師禮物 花花由官方提供，不扣任何鉆石哦！ 新人小花 @@ -4673,13 +4673,13 @@ 我的消息 我的頭條 進入交友大廳 - 發送失敗，Piko提醒您文明用語~ + 發送失敗，Habu Live提醒您文明用語~ 發送失敗，Pieko提醒您文明用語~ 送該禮物 公聊大廳 資料卡片-主頁 你已被禁言，剩餘 - 分鐘。Piko提醒您文明用語 + 分鐘。Habu Live提醒您文明用語 我在交友大廳發現好玩的東西！@你了 快點過來看看~ /@我的 我發出的 @@ -4936,12 +4936,12 @@ 所屬廳 送礼物 去設置 - 請您再次考慮授予PIKO存儲空間權限，否則PIKO將無法正常加載您本地的文件內容。 - 請您再次考慮授予PIKO攝像頭權限，否則PIKO將無法取得您拍攝的內容。 + 請您再次考慮授予Habu Live存儲空間權限，否則Habu Live將無法正常加載您本地的文件內容。 + 請您再次考慮授予Habu Live攝像頭權限，否則Habu Live將無法取得您拍攝的內容。 為了能正常加載您本地的文件內容，請前往應用權限設置界面打開存儲空間權限。 為了能取得您拍攝的內容，請前往應用權限設置界面打開攝像頭權限。 - 您已拒絕提供存儲空間權限，PIKO將無法正常加載您本地的文件內容。 - 您已拒絕提供攝像頭權限，PIKO將無法取得您拍攝的內容。 + 您已拒絕提供存儲空間權限，Habu Live將無法正常加載您本地的文件內容。 + 您已拒絕提供攝像頭權限，Habu Live將無法取得您拍攝的內容。 明細 兌換鉆石 金幣 @@ -5103,14 +5103,14 @@ 成員收入 高管設置 簽約流水 - Welcome to Piko！ + Welcome to Habu Live！ - 1266232494209868 - fb1266232494209868 - 189d1a90712cc61cedded4cf1372cb21 + 2899088310346434 + fb2899088310346434 + 賬號登錄 短信登錄 - 請輸入Piko賬號 + 請輸入Habu Live賬號 請獲取驗證碼 請輸入授權碼 請選擇您的性別 @@ -5128,7 +5128,7 @@ 購買%d個愛心 請選擇或輸入購買的愛心數量 如何儲值： - 1.在Piko語音App內前往【我的】—【儲值鑽石】進行儲值\n2.聯繁客服獲取儲值鏈接\n客服WeChat: %s 複製\n客服Line: %s 複製\n3.如遇提示"儲值失敗，請聯系客服處理~"，請添加客服進行處理 + 1.在Habu Live語音App內前往【我的】—【儲值鑽石】進行儲值\n2.聯繁客服獲取儲值鏈接\n客服WeChat: %s 複製\n客服Line: %s 複製\n3.如遇提示"儲值失敗，請聯系客服處理~"，請添加客服進行處理 可用碎片不足，請購買 0 輸入數量 diff --git a/app/src/module_bank_card/res/values/strings.xml b/app/src/module_bank_card/res/values/strings.xml index f2fe34a77..9cbd53b24 100644 --- a/app/src/module_bank_card/res/values/strings.xml +++ b/app/src/module_bank_card/res/values/strings.xml @@ -11,7 +11,7 @@ 解除綁定銀行卡成功 用戶服務協議及隱私政策 - 尊敬的Piko用戶：\n\u3000\u3000為了更好地保障你的合法權益， + 尊敬的Habu Live用戶：\n\u3000\u3000為了更好地保障你的合法權益， 讓你正常使用%s服務，%s公司依照國家法律法規，對支付賬戶進行實名製管理、 履行反洗錢職責並采取風險防控措施。你需要向%s公司以及合作公司（匯聚支付）提交身份信息、 聯系方式、交易信息。\n\u3000\u3000%s公司將嚴格依據國家法律法規收集、存儲、使用你的個人信息，確保信息安全。 diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt index b221c6f23..f333cc0bb 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/activity/SuperAdminAddActivity.kt @@ -45,7 +45,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity= fairyOpenInfo.getLevelLimit(); + return false; +// UserInfo userInfo = UserModel.get().getCacheLoginUserInfo(); +// FairyOpenInfo fairyOpenInfo = InitialModel.get().getFairyOpenInfo(); +// if (fairyOpenInfo == null || userInfo == null) return false; +// +// return fairyOpenInfo.isOpen() && userInfo.getUserLevelVo().getExperLevelSeq() >= fairyOpenInfo.getLevelLimit(); } } diff --git a/build.gradle b/build.gradle index f05660f69..0aa2a82b9 100644 --- a/build.gradle +++ b/build.gradle @@ -25,8 +25,8 @@ buildscript { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.tencent.vasdolly:plugin:3.0.3' classpath "com.mob.sdk:MobSDK:2018.0319.1724" - classpath 'com.google.gms:google-services:4.3.13' - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' +// classpath 'com.google.gms:google-services:4.3.13' +// classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2' } } diff --git a/core/build.gradle b/core/build.gradle index 9a2963a63..43633b4a6 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -89,10 +89,10 @@ dependencies { api 'androidx.room:room-rxjava2:2.3.0' //firebase推送、统计 - implementation 'com.google.firebase:firebase-messaging:23.1.1' - implementation 'com.google.android.gms:play-services-base:18.1.0' - implementation 'com.google.firebase:firebase-core:19.0.0' - implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' +// implementation 'com.google.firebase:firebase-messaging:23.1.1' +// implementation 'com.google.android.gms:play-services-base:18.1.0' +// implementation 'com.google.firebase:firebase-core:19.0.0' +// implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1' //googleplay内购 api 'com.google.android.gms:play-services-wallet:19.2.1' diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java index 29e4adaed..2ae9a4fd3 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java @@ -3,6 +3,7 @@ package com.yizhuan.xchat_android_constants; import com.yizhuan.xchat_android_core.BuildConfig; import com.yizhuan.xchat_android_core.R; import com.yizhuan.xchat_android_library.utils.ResUtil; +import com.yizhuan.xchat_android_library.utils.codec.DESUtils; /** * Created by MadisonRong on 09/08/2018. @@ -13,7 +14,7 @@ public class XChatConstants { /** * 包名(各種緩存目錄的根目錄) */ - public static final String XCHAT_DIR_NAME = "com.mango.piko"; + public static final String XCHAT_DIR_NAME = "com.vele.habuplay"; /** * sp名字 @@ -38,59 +39,24 @@ public class XChatConstants { /** * 雲信 key (DEBUG) */ - public static final String NIM_KEY_DEBUG = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更換 +// public static final String NIM_KEY_DEBUG = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更換 /** * 雲信 key (RELEASE) */ - public static final String NIM_KEY_RELEASE = "d4d74e9ba6ac3364ccc7526ea4791215";//已更換 - - /** - * 網易易盾 productNumber - */ - public static final String YI_DUN_PRODUCT_NUMBER = "YD00313347064620";//已更換 - /** - * 網易易盾 業務 ID 註冊 - */ - public static final String QUICK_PASS_BUSINESS_ID = "ef7de5582f194c549125a64b710e7f31"; - - /** - * 網易易盾 業務 ID 註冊 - */ - public static final String YI_DUN_BUSINESS_ID = "af43d0f8752147c48f8281800da6049e"; - /** - * 網易易盾 業務 ID 註冊 - */ - public static final String YI_DUN_LOGIN_BUSINESS_ID = "67881c7a69764c058435ba93a51b1285"; - - /** - * 數美-天網 的 organization - */ - public static final String SHU_MEI_TIAN_WANG_ORGANIZATION = "2qjgWI5tyNipa08YPjOt"; +// public static final String NIM_KEY_RELEASE = "d4d74e9ba6ac3364ccc7526ea4791215";//已更換 /** * 聲網 key */ - public static final String AGORA_KEY = "f8713b6ec98c4c01adaf34cb4fa091b1"; //已更換 +// public static final String AGORA_KEY = "f8713b6ec98c4c01adaf34cb4fa091b1"; //已更換 - /** - * 阿裏雲日誌空間名字 - */ - public static final String ALIYUN_LOG_NAME = "66accompanylog"; - /** - * 阿裏雲日誌空間名字 - */ - public static final String ALIYUN_LOG_STORE = "66accompanylog"; /** * 百度統計 key */ - public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改 +// public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改 - /** - * linkedMe key - */ - public static final String LINKED_ME_KEY = "6ba9e9d9760b8acc50b2b499cfd557da"; /** * 公屏第一條提示消息 @@ -224,13 +190,13 @@ public class XChatConstants { /** * Referer (DEBUG) */ - public static final String KEY_REFERER_DEBUG = "https://beta.api.pekolive.com/"; + public static final String KEY_REFERER_DEBUG = "https://beta.api.anan.chat/"; /** * Referer (RELEASE) */ - public static final String KEY_REFERER_RELEASE = "https://api.pekolive.com/"; - public static final String APP_MARK = "peko"; + public static final String KEY_REFERER_RELEASE = "https://api.anan.chat/"; + public static final String APP_MARK = "habu"; /** * 聊天室文本消息易盾反垃圾業務id */ @@ -243,11 +209,34 @@ public class XChatConstants { /** * Adjust配置 */ - public static final String ADJUST_APP_TOKEN = "ujzc7mbv3g8w"; +// public static final String ADJUST_APP_TOKEN = "ujzc7mbv3g8w"; /** * peko谷歌下载地址 */ - public static String appDownloadUrl = "https://play.google.com/store/apps/details?id=com.vele.pekolive"; + public static String appDownloadUrl = "https://play.google.com/store/apps/details?id=com.vele.habuplay"; + public static String getAgoraKey() { + try { + return DESUtils.DESAndBase64Decrypt("8QLrysqBwGmCodayBzvis+9wWYUwQlBPkUqdprUrlcNAwgt7a5hAGQ=="); + } catch (Exception e) { + return ""; + } + } + + public static String getNimKeyDebug() { + try { + return DESUtils.DESAndBase64Decrypt("zkUPMmvAAUxWJTdS34whaFNEWuJaKpfllz5BgjG8r2JAwgt7a5hAGQ=="); + } catch (Exception e) { + return ""; + } + } + + public static String getNimKeyRelease() { + try { + return DESUtils.DESAndBase64Decrypt("ivctC5n5Xoo+FOTazYk7bTOI3V+Rmi8gAjTkAaKBJolAwgt7a5hAGQ=="); + } catch (Exception e) { + return ""; + } + } } diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java index 34e2906b5..79d1bb8cd 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java @@ -13,8 +13,8 @@ public class UriProvider { /** * 默认以下生产环境地址 */ - public static String JAVA_WEB_URL = "https://api.pekolive.com/"; - public static String IM_SERVER_URL = "https://api.pekolive.com/"; + public static String JAVA_WEB_URL = "https://api.anan.chat/"; + public static String IM_SERVER_URL = "https://api.anan.chat/"; /** * 初始化URL diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java index f47d1b886..a03abc6eb 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java @@ -55,7 +55,7 @@ public class RtcEngineManager extends BaseEngine { Logger.t(TAG).d("enterChannel channelId:%d", channelId); if (mRtcEngine == null) { try { - mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XChatConstants.AGORA_KEY, mEngineEventHandler); + mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XChatConstants.getAgoraKey(), mEngineEventHandler); } catch (Exception e) { throw new RuntimeException( "NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e)); diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java index c0bf56da2..c74a90250 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java @@ -1,5 +1,7 @@ package com.yizhuan.xchat_android_core.manager.trtc; +import com.yizhuan.xchat_android_library.utils.codec.DESUtils; + public class SDKConfig { /** * 声网appid，需要替换为尽自己账号下的声网appid @@ -11,7 +13,7 @@ public class SDKConfig { * 进入腾讯云云通信[控制台](https://console.cloud.tencent.com/avc) 创建应用，即可看到 SDKAppId， * 它是腾讯云用于区分客户的唯一标识。 */ - public static int TX_SDKAPPID = 1400823228;// +// public static int TX_SDKAPPID = 1400823228;// /** * 腾讯云 bizid和appid @@ -30,4 +32,13 @@ public class SDKConfig { * 1：表示房间号为整型房间号，如："111"，"123" */ public static int TX_CHANNELNAME_INT = 1; + + + public static String getTXAppId() { + try { + return DESUtils.DESAndBase64Decrypt("SvVKinDlp2xq9wtVeUYw1w=="); + } catch (Exception e) { + return ""; + } + } } diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java index 4470ee515..742d8f44c 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java @@ -51,7 +51,7 @@ public class TRtcEngineManager extends BaseEngine { if (initInfo != null && initInfo.getTrtcAppId() != null) { mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), initInfo.getTrtcAppId(), mEngineEventHandler); } else { - mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), String.valueOf(SDKConfig.TX_SDKAPPID), mEngineEventHandler); + mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), SDKConfig.getTXAppId(), mEngineEventHandler); } } catch (Exception e) { throw new RuntimeException( diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java b/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java index f508fad2a..5cac893dc 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/Constants.java @@ -16,12 +16,11 @@ import java.util.List; public class Constants { public static final String ERBAN_DIR_NAME = XChatConstants.XCHAT_DIR_NAME; public static final String nimAppKey = Env.isDebug() ? - XChatConstants.NIM_KEY_DEBUG : XChatConstants.NIM_KEY_RELEASE; + XChatConstants.getNimKeyDebug() : XChatConstants.getNimKeyRelease(); public static final String nimAppSecret = "da03b83af84a"; /** * 百度统计 */ - public static final String BAIDU_APPKEY = XChatConstants.BAIDU_APP_KEY; public static final String LOG_DIR = ERBAN_DIR_NAME + File.separator + "logs"; public static final String CONFIG_DIR = ERBAN_DIR_NAME + File.separator + "config"; @@ -104,7 +103,7 @@ public class Constants { //相亲模式男神坑位下标 public static final List maleIndex = Arrays.asList(0, 1, 4, 5); - public static final String GOOGLE = "google"; + public static final String GOOGLE = com.yizhuan.xchat_android_library.common.Constants.GOOGLE; public static final String ANDROID = "android"; diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index c49744503..9afb49c70 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,12 +1,12 @@ XChat_Android_Core 平臺嚴禁未成年人直播或打賞，倡導綠色互動，禁止宣傳及發布政治、低俗、暴力、色情等違規違法內容，嚴禁違規交易和誘導欺詐用戶，如有違規將對賬號進行封禁，發現請及時舉報。 - 來piko，邂逅你的專屬聲音 - 來Piko，開黑交友玩遊戲 + 來Habu Live，邂逅你的專屬聲音 + 來Habu Live，開黑交友玩遊戲 加入家族,和你興趣相投的小夥伴一起玩耍吧~ - hi,我想邀請您加入我的Piko家族: + hi,我想邀請您加入我的Habu Live家族: 加入家族,和你興趣相投的小夥伴一起玩耍吧~ - hi,我想邀請您加入我的Piko群聊: + hi,我想邀請您加入我的Habu Live群聊: 可點擊房間話題查看本房間公告 相親玩法已開啟,請點擊主持人麥位選擇主持人 新一輪的相親已開啟 @@ -531,7 +531,7 @@ 成功 網絡異常，請稍後再試! 網絡錯誤 - Piko開小差中~請稍後再試 + Habu Live開小差中~請稍後再試 網絡異常,請檢查您的網絡再試! 猴 雞 diff --git a/gradle.properties b/gradle.properties index 647870b55..4846dabc8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,11 +13,10 @@ org.gradle.daemon=true # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -android.injected.testOnly=false android.useAndroidX=true android.enableJetifier=true android.enableResourceOptimizations=false - +android.injected.testOnly=false # mob MobSDK.spEdition=FP @@ -31,8 +30,8 @@ COMPILE_SDK_VERSION=33 MIN_SDK_VERSION=21 TARGET_SDK_VERSION=33 -version_name=2.2.0 -version_code=2200 +version_name=3.3.0 +version_code=3300 #systemProp.https.proxyHost=127.0.0.1 -#systemProp.https.proxyPort=7890 \ No newline at end of file +#systemProp.https.proxyPort=7890 diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index 3caa7ca5c..725f8b5db 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ -]> +]> &app_name; diff --git a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/Constants.java b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/Constants.java index 9012795b0..d8ed3afc7 100644 --- a/library/src/module_common/java/com/yizhuan/xchat_android_library/common/Constants.java +++ b/library/src/module_common/java/com/yizhuan/xchat_android_library/common/Constants.java @@ -8,5 +8,5 @@ public class Constants { public static final int UPLOAD_IMAGE_MAX_SIZE = 2340; //上传的gif 默认大小不能超过 1MB public static final int UPLOAD_GIF_MAX_SIZE = 1 << 20; - + public static final String GOOGLE = "google_habu"; } diff --git a/mob.gradle b/mob.gradle index 85dead794..fbe03700e 100644 --- a/mob.gradle +++ b/mob.gradle @@ -1,36 +1,36 @@ apply plugin: 'com.mob.sdk' MobSDK { - appKey "36b91eeac7469" - appSecret "63ec0702513aca17e20615dd5dfdc03f" + appKey "32fd2f8457880" + appSecret "ef796ca85e8cd95a76929663de133214" appBundleMode true - MobLink { - uriScheme "pekoapp://sharesdk" - appLinkHost "cebg.t4m.cn" - } +// MobLink { +// uriScheme "ananplay://sharesdk" +// appLinkHost "bvgw.t4m.cn" +// } ShareSDK { version '3.10.9' //平台配置信息 gui false devInfo { Facebook { - appKey "1266232494209868" - appSecret "c9b170b383f8be9cdf118823b8632821" + appKey "2899088310346434" + appSecret "329a52326acbbf043f8a18a28a0c9570" callbackUri "https://mob.com" shareByAppClient true enable true } GooglePlus { - appId "797840604753-7odpvo802kh6u57261vpd0gv7jrv5h5l.apps.googleusercontent.com" + appId "280420698373-najdbkk7ju8lg8f6gg4bnll8nf7l0i2c.apps.googleusercontent.com" callbackUri "http://localhost" officialVersion "default" enable true } Line { - appId "1657475529" - appSecret "903d014c269d65b827cd32997836e60b" + appId "1655904857" + appSecret "392a9cada6f63a88a0f34a8e479364e1" enable true } } diff --git a/nim_uikit/res/values/strings.xml b/nim_uikit/res/values/strings.xml index 8a5201642..85218d8bb 100644 --- a/nim_uikit/res/values/strings.xml +++ b/nim_uikit/res/values/strings.xml @@ -313,8 +313,8 @@ ,時長: 秒 yyyy年MM月 - 發送失敗，Piko提醒您文明用語~ - 發送失敗，Piko提醒您文明用語~ + 發送失敗，Habu Live提醒您文明用語~ + 發送失敗，Habu Live提醒您文明用語~ 邀請 加入群 加入討論組 diff --git a/tmpmob/ShareSDK/assets/ShareSDK.xml b/tmpmob/ShareSDK/assets/ShareSDK.xml index d8588c7d1..8a9846055 100644 --- a/tmpmob/ShareSDK/assets/ShareSDK.xml +++ b/tmpmob/ShareSDK/assets/ShareSDK.xml @@ -6,11 +6,11 @@ - + - + @@ -30,7 +30,7 @@ - +