diff --git a/app/build.gradle b/app/build.gradle index 55528a503..ece1a89b2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { - applicationId isolationMode ? 'com.e.oos' : 'com.a.f' + applicationId isolationMode ? 'com.e.oos' : 'com.hhchu.molistar' minSdkVersion MIN_SDK_VERSION.toInteger() targetSdkVersion TARGET_SDK_VERSION.toInteger() versionCode Integer.valueOf(version_code) @@ -24,7 +24,7 @@ android { if (isolationMode) { resValue "string", "app_name", "Mo-debug" } else { - resValue "string", "app_name", "Mo" + resValue "string", "app_name", "Molistar" } } @@ -63,7 +63,7 @@ android { if (abi == null) { abi = "universal" } - outputFileName = "hiyoo_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk" + outputFileName = "Molistar_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk" } } @@ -81,26 +81,26 @@ android { enabled = true } -// signingConfigs { -// -// debug { -// storeFile file('../app_debug.jks') -// storePassword "debug2024" -// keyAlias "debug" -// keyPassword "debug2024" -// v2SigningEnabled true -// v1SigningEnabled true -// } -// -// release { -// storeFile file('../app_release.jks') -// storePassword "xxxx" -// keyAlias "xxx" -// keyPassword "xxxx" -// v2SigningEnabled true -// v1SigningEnabled true -// } -// } + signingConfigs { + + debug { + storeFile file('../molistar_debug.jks') + storePassword "molistar" + keyAlias "molistar" + keyPassword "molistar" + v2SigningEnabled true + v1SigningEnabled true + } + + release { + storeFile file('../molistar.jks') + storePassword "molistar" + keyAlias "molistar" + keyPassword "molistar" + v2SigningEnabled true + v1SigningEnabled true + } + } sourceSets { @@ -135,15 +135,12 @@ android { } buildTypes { - def server_url_debug = '"http://beta.api.pekolive.com/"' - def server_url_release = '"https://api.pekolive.com/"' + def server_url_debug = '"http://api.molistar.xyz/"' + def server_url_release = '"https://api.molistar.xyz/"' debug { println("minifyEnabled = " + minify_enabled) -// ext.enableCrashlytics = false -// ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID - buildConfigField "String", "BASE_URL", server_url_debug buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "BASE_URL" @@ -151,7 +148,7 @@ android { minifyEnabled minify_enabled.toBoolean() // 是否混淆 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' crunchPngs false // 停用 PNG 压缩 -// signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release + signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release gradle.taskGraph.whenReady { tasks.each { task -> if (task.name.contains("Test") || task.name.contains("Lint")) { @@ -164,10 +161,6 @@ android { release { ext.enableCrashlytics = CRASHLYTICS_COLLECTION_ENABLED.toBoolean() ext.alwaysUpdateBuildId = 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" @@ -177,7 +170,7 @@ android { shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件 zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列 crunchPngs true // 启用 PNG 压缩 -// signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release + signingConfig isolationMode ? signingConfigs.debug : signingConfigs.release proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -261,21 +254,8 @@ dependencies { implementation 'com.github.mmin18:realtimeblurview:1.2.1' -// implementation 'com.appsflyer:af-android-sdk:6.8.2' - 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' - - //Adjust接入 -// 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.github.yalantis:ucrop:2.2.7' implementation 'com.github.lihangleo2:ShadowLayout:3.3.2' @@ -283,7 +263,6 @@ dependencies { //wheelView implementation 'com.contrarywind:wheelview:4.1.0' -// implementation 'tech.sud.mgp:SudMGP-static:1.3.3.1158' implementation project(':modules:module_base') if (!isolationMode && file("../modules/module_google/build.gradle").exists()) { @@ -295,7 +274,7 @@ channel { //多渠道包的输出目录，默认为new File(project.buildDir,"channel") outputDir = new File(project.buildDir, "channelapk") //多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime} - apkNameFormat = 'hiyoo-${buildType}-${flavorName}-v${versionName}-${buildTime}' + apkNameFormat = 'Molistar-${buildType}-${flavorName}-v${versionName}-${buildTime}' //快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false） fastMode = false //buildTime的时间格式，默认格式：yyyyMMdd-HHmmss diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f8e41f472..cea4600c0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -162,7 +162,7 @@ 如果 SDKOptions 中提供了，取 SDKOptions 中的值。 --> - + @@ -223,7 +223,7 @@ diff --git a/app/src/main/java/com/chwl/app/MainActivity.java b/app/src/main/java/com/chwl/app/MainActivity.java index ea08613d1..6fd26d73a 100644 --- a/app/src/main/java/com/chwl/app/MainActivity.java +++ b/app/src/main/java/com/chwl/app/MainActivity.java @@ -640,7 +640,7 @@ public class MainActivity extends BaseMvpActivity //登录页展示时 HashMap map = new HashMap<>(3); map.put(IReportConstants.HOMEPAGE_TYPE, type); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE); ReportManager.get().reportEvent(IReportConstants.MODULE_HOMEPAGE_CLICK, map); } diff --git a/app/src/main/java/com/chwl/app/UIHelper.java b/app/src/main/java/com/chwl/app/UIHelper.java index 05870e663..d054b88a6 100644 --- a/app/src/main/java/com/chwl/app/UIHelper.java +++ b/app/src/main/java/com/chwl/app/UIHelper.java @@ -107,7 +107,7 @@ public class UIHelper { public static void showMonsterResult(Context context, String monsterId) { CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + - "/hiyoo/modules/monster/index.html?monsterId=" + monsterId); + "/molistar/modules/monster/index.html?monsterId=" + monsterId); } /** @@ -126,11 +126,11 @@ public class UIHelper { */ public static void showRecommendPosH5(Context context) { String cardUrl = UriProvider.JAVA_WEB_URL + - "/hiyoo/modules/recommend-card/index.html"; + "/molistar/modules/recommend-card/index.html"; CommonWebViewActivity.start(context, cardUrl); } public static void openContactUs(Context context) { - CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/hiyoo/modules/contact/contact.html"); + CommonWebViewActivity.start(context, UriProvider.IM_SERVER_URL + "/molistar/modules/contact/contact.html"); } } diff --git a/app/src/main/java/com/chwl/app/application/App.java b/app/src/main/java/com/chwl/app/application/App.java index 7522aa224..dbc927c26 100644 --- a/app/src/main/java/com/chwl/app/application/App.java +++ b/app/src/main/java/com/chwl/app/application/App.java @@ -526,7 +526,7 @@ public class App extends BaseApp { initContext(this); //首次启动事件 HashMap map = new HashMap<>(2); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_ACTIVATE); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_ACTIVATE); ReportManager.get().reportEvent(IReportConstants.ACTIVATE_FIRST, map); } diff --git a/app/src/main/java/com/chwl/app/application/IReportConstants.java b/app/src/main/java/com/chwl/app/application/IReportConstants.java index f2e5b31fd..5b97f7c9e 100644 --- a/app/src/main/java/com/chwl/app/application/IReportConstants.java +++ b/app/src/main/java/com/chwl/app/application/IReportConstants.java @@ -32,9 +32,9 @@ public interface IReportConstants { int FIFTEEN = 15; String ACTIVATE_FIRST = "activate_first"; - String PEKO_ACTIVATE = "peko_activate"; + String MOLISTAR_ACTIVATE = "molistar_activate"; String AGREEMENT_SHOW = "agreement_show"; - String PEKO_LOGIN = "peko_login"; + String MOLISTAR_LOGIN = "molistar_login"; String AGREEMENT_CLICK = "agreement_click"; String CLICK_TYPE = "click_type"; String PAGE = "page"; @@ -47,7 +47,7 @@ public interface IReportConstants { String FAIL_DETAIL = "fail_detail"; String MODULE_HOMEPAGE_CLICK = "module_homepage_click"; String HOMEPAGE_TYPE = "homepage_type"; - String PEKO_HOMEPAGE = "peko_homepage"; + String MOLISTAR_HOMEPAGE = "molistar_homepage"; String TAB_HOMEPAGE_CLICK = "tab_homepage_click"; String HOMEPAGE_TAB = "homepage_tab"; String PAYPAGE_SHOW = "paypage_show"; @@ -55,6 +55,6 @@ public interface IReportConstants { String ACCOUNT_BALANCE = "account_balance"; String PAY_CLICK = "pay_click"; String MONEY = "money"; - String PEKO_PAY = "peko_pay"; + String MOLISTAR_PAY = "molistar_pay"; } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/application/ReportManager.java b/app/src/main/java/com/chwl/app/application/ReportManager.java index 423ef7f8d..eb7e7b4d9 100644 --- a/app/src/main/java/com/chwl/app/application/ReportManager.java +++ b/app/src/main/java/com/chwl/app/application/ReportManager.java @@ -23,38 +23,8 @@ public class ReportManager implements IReportService { } public void init() { -// 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); -// } - - //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); -// } /** * 设置FirebaseAnalytics公共属性 @@ -63,9 +33,6 @@ public class ReportManager implements IReportService { */ @Override public void setFirebaseAnalyticsDefaultEventParameters(Bundle bundle) { -// if (bundle != null) { -// FirebaseAnalytics.getInstance(XChatApplication.instance()).setDefaultEventParameters(bundle); -// } } /** @@ -86,30 +53,10 @@ 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); -// } } @Override public void reportAdjustEvent(String eventId) { -// AdjustEvent adjustEvent = new AdjustEvent(eventId); -// Adjust.trackEvent(adjustEvent); } diff --git a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt b/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt index f09357451..a77d8c672 100644 --- a/app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt +++ b/app/src/main/java/com/chwl/app/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,"Hiyoo号:${item.erbanNo}") + .setText(R.id.tv_room_id,"Molistar号:${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/chwl/app/avroom/presenter/RoomNewbieHellowWordPresenter.java b/app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbieHellowWordPresenter.java deleted file mode 100644 index 4b15429bf..000000000 --- a/app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbieHellowWordPresenter.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.chwl.app.avroom.presenter; - -import com.chwl.app.R; -import com.chwl.app.base.BaseMvpPresenter; -import com.chwl.app.module.IRoomNewbieMessageView; -import com.chwl.app.module.RoomNewbieModel; -import com.chwl.core.bean.RoomNewbieMessageInfo; -import com.chwl.library.utils.ResUtil; - -import io.reactivex.SingleObserver; -import io.reactivex.disposables.Disposable; - -public class RoomNewbieHellowWordPresenter extends BaseMvpPresenter { - private int start = 0; - private int pageSize = 5;//发现萌新-打招呼列表 - public void loadData(int start) { - RoomNewbieModel.get().getMessageList(start, pageSize) - .compose(bindToLifecycle()).subscribe(new SingleObserver() { - @Override - public void onSubscribe(Disposable d) { - - } - - @Override - public void onSuccess(RoomNewbieMessageInfo messageInfos) { - if (messageInfos != null) { - if (mMvpView != null) { - mMvpView.getRoomNewbieMessageSuccess(messageInfos); - } - } else { - if (mMvpView != null) { - mMvpView.getRoomNewbieMessageFails(ResUtil.getString(R.string.avroom_presenter_roomnewbiehellowwordpresenter_01)); - } - } - } - - @Override - public void onError(Throwable e) { - if (mMvpView != null) { - mMvpView.getRoomNewbieMessageFails(e.getMessage()); - } - - } - }); - } - - - - public int getStart() { - return start; - } -} diff --git a/app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java b/app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java index a060c5037..0edd30f03 100644 --- a/app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java +++ b/app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java @@ -60,7 +60,7 @@ public class MyRecommendCardActivity extends BaseViewBindingActivity() { ReportManager.get().reportEvent( IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.NINE), - Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) + Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE) ) ) CreateRoomDialog().apply { setGameVisible() }.show(context) @@ -79,7 +79,7 @@ class AccompanyFragment : BaseViewBindingFragment() { ReportManager.get().reportEvent( IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.SEVEN), - Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) + Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE) ) ) AVRoomActivity.startForFromType( @@ -95,7 +95,7 @@ class AccompanyFragment : BaseViewBindingFragment() { ReportManager.get().reportEvent( IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.EIGHT), - Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) + Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE) ) ) OpenRoomHelper.openRoom(context as BaseActivity?) diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt index 05345d29f..2ad2cb416 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt @@ -34,7 +34,7 @@ class HomeFragment : BaseViewBindingFragment(), View.OnClic ReportManager.get().reportEvent( IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.ONE), - Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) + Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE) ) ) SearchActivity.start(activity) @@ -48,7 +48,7 @@ class HomeFragment : BaseViewBindingFragment(), View.OnClic ReportManager.get().reportEvent( IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.THREE), - Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) + Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE) ) ) CommonWebViewActivity.start(mContext, UriProvider.getRanking()) diff --git a/app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java b/app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java index 1566116fd..c9ffd9e26 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java +++ b/app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java @@ -132,7 +132,7 @@ public class HomeTabHomeFragment extends BaseFragment { //首页_热门房间 HashMap map = new HashMap<>(3); map.put(IReportConstants.HOMEPAGE_TYPE, IReportConstants.FIVE); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE); ReportManager.get().reportEvent(IReportConstants.MODULE_HOMEPAGE_CLICK, map); AVRoomActivity.startForFromType(mContext, list.get(position).getRoomUid(), AVRoomActivity.FROM_TYPE_RECOMMEND); }) diff --git a/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt index ecbc72685..0aac4fc34 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt @@ -306,7 +306,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { if (goldWalletInfo != null) { map[IReportConstants.ACCOUNT_BALANCE] = goldWalletInfo.diamondNum } - map[IReportConstants.MODULE] = IReportConstants.PEKO_PAY + map[IReportConstants.MODULE] = IReportConstants.MOLISTAR_PAY ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map) jumpChargePage() @@ -321,7 +321,7 @@ class MeFragment : BaseFragment(), View.OnClickListener { if (goldWalletInfo != null) { map[IReportConstants.ACCOUNT_BALANCE] = goldWalletInfo.diamondNum } - map[IReportConstants.MODULE] = IReportConstants.PEKO_PAY + map[IReportConstants.MODULE] = IReportConstants.MOLISTAR_PAY ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map) } diff --git a/app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt b/app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt index 8ab400741..777ef758c 100644 --- a/app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt +++ b/app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt @@ -62,7 +62,7 @@ class RecommendFragment : BaseViewBindingFragment() { ReportManager.get().reportEvent( IReportConstants.MODULE_HOMEPAGE_CLICK, mapOf( Pair(IReportConstants.HOMEPAGE_TYPE, IReportConstants.TEN), - Pair(IReportConstants.MODULE, IReportConstants.PEKO_HOMEPAGE) + Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_HOMEPAGE) ) ) AVRoomActivity.start(mContext, homePlayInfo.uid) diff --git a/app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java b/app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java index b9932e651..80c680d69 100644 --- a/app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java +++ b/app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java @@ -98,7 +98,7 @@ public class PrivacyAgreementDialog extends Dialog implements View.OnClickListen //协议弹框展示 HashMap map = new HashMap<>(2); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); ReportManager.get().reportEvent(IReportConstants.AGREEMENT_SHOW, map); } @@ -107,7 +107,7 @@ public class PrivacyAgreementDialog extends Dialog implements View.OnClickListen //协议弹框展示 HashMap map = new HashMap<>(5); map.put(IReportConstants.CLICK_TYPE, IReportConstants.THREE); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); map.put(IReportConstants.PAGE, IReportConstants.ONE); ReportManager.get().reportEvent(IReportConstants.AGREEMENT_CLICK, map); cancel(); diff --git a/app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java b/app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java index 541ee9f22..84c142f7f 100644 --- a/app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java +++ b/app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java @@ -119,7 +119,7 @@ public class RadishRecordActivity extends BaseMvpActivity() { //发起登录 ReportManager.get().reportEvent( IReportConstants.LOGIN_REQUEST, mapOf( - Pair(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN), + Pair(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN), Pair(IReportConstants.LOGIN_TYPE, IReportConstants.FOUR) ) ) @@ -229,7 +229,7 @@ class LoginCodeActivity : BaseViewBindingActivity() { private fun reportLoginResult(result: Int, failDetail: String) { val map = HashMap(6) map[IReportConstants.LOGIN_TYPE] = IReportConstants.FOUR - map[IReportConstants.MODULE] = IReportConstants.PEKO_LOGIN + map[IReportConstants.MODULE] = IReportConstants.MOLISTAR_LOGIN map[IReportConstants.RESULT] = result if (result == IReportConstants.ZERO) { map[IReportConstants.FAIL_DETAIL] = failDetail diff --git a/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java b/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java index 40f15e45b..7c5a16efd 100644 --- a/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java +++ b/app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java @@ -222,7 +222,7 @@ public class LoginPasswordActivity extends BaseActivity { //发起登录 HashMap map = new HashMap<>(3); map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FOUR); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map); String smsCode = etCode.getText().toString(); getDialogManager().showProgressDialog( @@ -381,7 +381,7 @@ public class LoginPasswordActivity extends BaseActivity { //发起登录 HashMap map = new HashMap<>(3); map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); ReportManager.get().reportEvent(IReportConstants.LOGIN_REQUEST, map); } @@ -395,7 +395,7 @@ public class LoginPasswordActivity extends BaseActivity { private void reportLoginResult(int result, String failDetail) { HashMap map = new HashMap<>(6); map.put(IReportConstants.LOGIN_TYPE, IReportConstants.FIVE); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); map.put(IReportConstants.RESULT, result); if (result == IReportConstants.ZERO) { map.put(IReportConstants.FAIL_DETAIL, failDetail); @@ -433,7 +433,7 @@ public class LoginPasswordActivity extends BaseActivity { //隐私政策点击 HashMap map = new HashMap<>(5); map.put(IReportConstants.CLICK_TYPE, IReportConstants.TWO); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); map.put(IReportConstants.PAGE, IReportConstants.TWO); ReportManager.get().reportEvent(IReportConstants.AGREEMENT_CLICK, map); @@ -450,7 +450,7 @@ public class LoginPasswordActivity extends BaseActivity { //用户协议点击 HashMap map = new HashMap<>(5); map.put(IReportConstants.CLICK_TYPE, IReportConstants.ONE); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); map.put(IReportConstants.PAGE, IReportConstants.TWO); ReportManager.get().reportEvent(IReportConstants.AGREEMENT_CLICK, map); @@ -473,7 +473,7 @@ public class LoginPasswordActivity extends BaseActivity { //协议点击同意 HashMap map = new HashMap<>(5); map.put(IReportConstants.CLICK_TYPE, IReportConstants.THREE); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_LOGIN); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_LOGIN); map.put(IReportConstants.PAGE, IReportConstants.TWO); ReportManager.get().reportEvent(IReportConstants.AGREEMENT_CLICK, map); diff --git a/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java b/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java index e3c97ee7f..f9207600b 100644 --- a/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java +++ b/app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java @@ -53,7 +53,7 @@ public class AddUserInfoFragment extends BaseFragment private int gender = -1; private XRadioGroup rgGender; private RadioButton rbMale; - private String avatarUrl = "https://img.hiyoo.fun/default_avatar.png"; + private String avatarUrl = "https://img.molistar.xyz/default_avatar_molistar.png"; public static String INVITE_USER_CODE = ""; diff --git a/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java index b0936d763..fbfa9e96d 100644 --- a/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java +++ b/app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java @@ -26,7 +26,7 @@ public static void start(Context context) { @Override protected void init() { initWhiteTitleBar(ResUtil.getString(R.string.ui_patriarch_patriarchmodeactivity_01)); - mBinding.tvPlan.setOnClickListener(v -> CommonWebViewActivity.start(PatriarchModeActivity.this, UriProvider.IM_SERVER_URL + "/peko/activity/cleanNet/index.html")); + mBinding.tvPlan.setOnClickListener(v -> CommonWebViewActivity.start(PatriarchModeActivity.this, UriProvider.IM_SERVER_URL + "/molistar/activity/cleanNet/index.html")); mBinding.tvOpen.setOnClickListener(v -> start(PatriarchPwdActivity.class)); mBinding.tvPlan.getPaint().setFlags(Paint.UNDERLINE_TEXT_FLAG); //下划线 diff --git a/app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java b/app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java index 1cf424ec1..f32543323 100644 --- a/app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java +++ b/app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java @@ -355,7 +355,7 @@ public class ChargeActivity extends BaseMvpActivity map = new HashMap<>(3); map.put(IReportConstants.MONEY, bean.money); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_PAY); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_PAY); ReportManager.get().reportEvent(IReportConstants.PAY_CLICK, map); } else { toast(getString(R.string.Recharge_failure)); diff --git a/app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java b/app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java index 5735dbf15..5f818b716 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java +++ b/app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java @@ -184,9 +184,6 @@ public class ModifyPwdActivity extends BaseBindingActivity { -// -// }); break; } } diff --git a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt index 58cfc6ada..5dc4bd0b8 100644 --- a/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt +++ b/app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt @@ -204,12 +204,5 @@ 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) -// CommonWebViewActivity.start(this,"http://192.168.0.19:5500/#/Rank") -// val json = -// "{\"first\":85,\"second\":855,\"data\":{\"nick\":\"66丢丢丢丢丢多多多的hhhh\",\"preVipName\":\"子爵\",\"floatPic\":\"https://image.hfighting.com/Fq3JtbK2acO3FN-3vWZo8ldtHfse\",\"uid\":2735,\"currVipName\":\"侯爵\",\"erbanNo\":66,\"roomUid\":2734,\"avatar\":\"https://img.pekolive.com/default_avatar.png\",\"currVipLevel\":5}}" -// onReceivedNimBroadcastMessage(json) } } \ No newline at end of file diff --git a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java index 249dd18f6..be902be58 100644 --- a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java @@ -308,7 +308,7 @@ public class CommonWebViewActivity extends BaseActivity { // 设置setWebChromeClient对象 webView.setWebChromeClient(wvcc); // 设置Webview的user-agent - webView.getSettings().setUserAgentString(webView.getSettings().getUserAgentString() + " hiyooAppAndroid"); + webView.getSettings().setUserAgentString(webView.getSettings().getUserAgentString() + " molistarAppAndroid"); } private void onGotoAppFinish(WebView view) { diff --git a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java index 06ed4aa31..193145e14 100644 --- a/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java +++ b/app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java @@ -91,7 +91,7 @@ public class CommonWebViewFragment extends BaseBindingFragment map = new HashMap<>(3); map.put(IReportConstants.MONEY, money); - map.put(IReportConstants.MODULE, IReportConstants.PEKO_PAY); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_PAY); ReportManager.get().reportEvent(IReportConstants.PAY_CLICK, map); } } diff --git a/app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java b/app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java index 18a50be07..5cfd2c31d 100644 --- a/app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java +++ b/app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java @@ -181,7 +181,7 @@ public class SimpleWebViewActivity extends AppCompatActivity { // 设置setWebChromeClient对象 webView.setWebChromeClient(wvcc); // 设置Webview的user-agent - webView.getSettings().setUserAgentString(webView.getSettings().getUserAgentString() + " hiyooAppAndroid"); + webView.getSettings().setUserAgentString(webView.getSettings().getUserAgentString() + " molistarAppAndroid"); } private void initView() { diff --git a/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java b/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java index 38e9e16bb..31e27cb96 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java @@ -997,7 +997,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene if (goldWalletInfo != null) { map.put(IReportConstants.ACCOUNT_BALANCE, goldWalletInfo.getDiamondNum()); } - map.put(IReportConstants.MODULE, IReportConstants.PEKO_PAY); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_PAY); ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map); } else if (GIFT_DIALOG_FROM.equals(ResUtil.getString(R.string.im_actions_giftaction_01))) { HashMap map = new HashMap<>(5); @@ -1005,7 +1005,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene if (goldWalletInfo != null) { map.put(IReportConstants.ACCOUNT_BALANCE, goldWalletInfo.getDiamondNum()); } - map.put(IReportConstants.MODULE, IReportConstants.PEKO_PAY); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_PAY); ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map); } // if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) { @@ -1198,7 +1198,7 @@ public class GiftDialog extends BottomSheetDialog implements View.OnClickListene if (goldWalletInfo != null) { map.put(IReportConstants.ACCOUNT_BALANCE, goldWalletInfo.getDiamondNum()); } - map.put(IReportConstants.MODULE, IReportConstants.PEKO_PAY); + map.put(IReportConstants.MODULE, IReportConstants.MOLISTAR_PAY); ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map); break; case R.id.tv_reload: diff --git a/app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java b/app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java index e88cb59fc..d725fe00d 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java +++ b/app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java @@ -158,15 +158,15 @@ public class MonsterDialog extends BaseDialog implements View.OnClickListener { case R.id.tv_msg: long beforeAppearSeconds = dataBean.getBeforeAppearSeconds(); if (beforeAppearSeconds >= 30) { - CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/hiyoo/modules/monster/intro.html"); + CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/molistar/modules/monster/intro.html"); } else if (beforeAppearSeconds < 30 && beforeAppearSeconds > 15) { - CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/hiyoo/modules/monster/intro.html"); + CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + "/molistar/modules/monster/intro.html"); } else if (beforeAppearSeconds <= 15) { AVRoomActivity.start(getContext(), dataBean.getAppearRoomUid()); } if (dataBean.getMonsterStatus() == MonsterInfo.MONSTER_STATUS_DID_DEAD) { CommonWebViewActivity.start(getContext(), UriProvider.IM_SERVER_URL + - "/hiyoo/modules/monster/index.html?monsterId=" + dataBean.getMonsterId()); + "/molistar/modules/monster/index.html?monsterId=" + dataBean.getMonsterId()); } break; } diff --git a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt index dc81e81e8..e360bc767 100644 --- a/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt +++ b/app/src/main/java/com/chwl/app/vip/VipMainActivity.kt @@ -265,7 +265,7 @@ class VipMainActivity : BaseViewBindingActivity(), chargeInfo = it.list.getOrNull(0) chargeInfo?.let { chargeBean -> binding.tvOpenVip.text = - "${chargeBean.getMoney()}${getString(R.string.me_immediately_become_a_Peko_nobleman)}" + "${chargeBean.getMoney()}${getString(R.string.me_immediately_become_a_nobleman)}" } }, { it.printStackTrace() @@ -383,7 +383,7 @@ class VipMainActivity : BaseViewBindingActivity(), googleChargeBean = showChargeList[0] binding.tvOpenVip.text = "${ googleChargeBean?.getMoney() - }${getString(R.string.me_immediately_become_a_Peko_nobleman)}" + }${getString(R.string.me_immediately_become_a_nobleman)}" } } } diff --git a/app/src/main/res/layout/item_home_concerns.xml b/app/src/main/res/layout/item_home_concerns.xml index 967190e0f..fc63546c1 100644 --- a/app/src/main/res/layout/item_home_concerns.xml +++ b/app/src/main/res/layout/item_home_concerns.xml @@ -65,6 +65,6 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/fl_room_history_avatar_container" - tools:text="HiyooHiyoo" /> + tools:text="MolistarMolistar" /> \ No newline at end of file diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 734336d43..418269463 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1,4 +1,4 @@ -]> +]> 聯繫客服 加载数据中,请稍后... @@ -1057,7 +1057,7 @@ Line Facebook 開通貴族點擊事件 - 立即開通貴族特權 + 立即開通貴族特權 恭喜開通貴族成功! 獲取貴族數據失敗,請重試 尚未開通貴族 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index 734336d43..418269463 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,4 +1,4 @@ -]> +]> 聯繫客服 加载数据中,请稍后... @@ -1057,7 +1057,7 @@ Line Facebook 開通貴族點擊事件 - 立即開通貴族特權 + 立即開通貴族特權 恭喜開通貴族成功! 獲取貴族數據失敗,請重試 尚未開通貴族 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5f36499b5..f1b6b0a22 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -495,7 +495,7 @@ @color/color_FE4C62 #9af5ef - + #FFA936 #39EBDF @@ -556,7 +556,7 @@ #2D93FF - + #FFFFBC52 @@ -599,7 +599,7 @@ #B3B3C3 - + #99FFFFFF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d30af59f0..7f72b92d6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,4 +1,4 @@ -]> +]> Contact customer service Loading data, please wait... @@ -127,7 +127,7 @@ Chat initiation is only available for %s or %s users Host is offline - More fun rooms are waiting for you on Hiyoo! Go and check it out! + More fun rooms are waiting for you on Molistar! Go and check it out! Home Back Fans @@ -139,7 +139,7 @@ Friends Following You haven\'t added any friends yet! \nGo and add friends now! - You don\'t have any Hiyoo fans yet! + You don\'t have any Molistar fans yet! My Diamond Balance Diamonds can be withdrawn and exchanged at a rate of 1 yuan = 10 diamonds Home @@ -175,7 +175,7 @@ My Following My Fans - You haven\'t followed any Hiyoo friends yet! \nGo and start following now! + You haven\'t followed any Molistar friends yet! \nGo and start following now! Search by nickname or ID Search user ID Search nickname or ID @@ -269,7 +269,7 @@ View Opponent\'s Record> View My Record> - Don\'t give up, Hiyoo is always here to support you! + Don\'t give up, Molistar is always here to support you! @@ -351,7 +351,7 @@ %1$d    Validity %2$d days This vehicle has been removed from sale and cannot be purchased Drive your car, ride your horse, - and let\'s gallop on Hiyoo! + and let\'s gallop on Molistar! Vehicle Shop %1$s Remaining @@ -366,7 +366,7 @@ 3. If a monster is successfully defeated within the specified time, a lucky winner will be generated to receive all the rewards for defeating the monsters. 4. The higher the damage contribution, the greater the chance of receiving rewards. For example, if a monster with 1000 HP is defeated, and player A contributes 500 damage points, there is a 50% chance of receiving rewards. 5. The rewards for defeating monsters will increase as the strength (HP) of the monsters increases. For example, defeating a monster with 1000 HP will yield rewards worth no less than 1000 diamonds or a vehicle. - 6. If you have any questions, please contact Hiyoo Customer Service. + 6. If you have any questions, please contact Molistar Customer Service. · Gameplay Introduction · OK @@ -429,7 +429,7 @@ Exit Family After exiting the family, your family currency will not be usable.\nYou can restore it by rejoining. Are you sure you want to exit? Invite Friends - [Hiyoo] Express emotions with voices, inherit smiles with families. + [Molistar] Express emotions with voices, inherit smiles with families. Join Search Member ID/Nickname Family Management @@ -449,7 +449,7 @@ Join Family Identity Verification Disband Family Tip - You need to contact customer service to disband the family~\nHiyoo Family Customer Service: %1$s + You need to contact customer service to disband the family~\nMolistar Family Customer Service: %1$s Contact Customer Service Confirm to join "%1$s"? I want to join your prestigious family @@ -541,7 +541,7 @@ Friends Following Fans - Share to get free red envelopes for the first time each day (excluding sharing to Hiyoo friends) + Share to get free red envelopes for the first time each day (excluding sharing to Molistar friends) Friends Google Group @@ -566,22 +566,22 @@ Verification code will be sent to your bound phone \"%1$s\", please check it carefully More - I\'m a former Hiyoo user - I\'m a new Hiyoo user + I\'m a former Molistar user + I\'m a new Molistar user Log In Authorization Code Verification Code Authorization Code Regain Please enter your password - Users who have not set a password, please set one in Hiyoo before logging in + Users who have not set a password, please set one in Molistar before logging in How to set a password? Log In Now Dear Child: Long time no see, recalling the time we spent together. Looking forward to your return by my side. Thank you for coming back! Please enter invitation code (optional) - Enter invitation code, both you and the friend who invited you can get super gifts from Hiyoo Return Plan! + Enter invitation code, both you and the friend who invited you can get super gifts from Molistar Return Plan! Accept Return Gift Avatar: @@ -666,7 +666,7 @@ In KTV... Loading... - Hiyoo Little New + Molistar Little New Please Enter Invitation Code (Optional) Queue Mic Mode @@ -836,7 +836,7 @@ My Account - Hiyoo + Molistar How to log in? %s can also log in to %s %s Recruit a Disciple and Win Diamonds @@ -1048,7 +1048,7 @@ Line Facebook Open Nobleman Click Event - Immediately Become a Peko Nobleman + Immediately Become a Molistar Nobleman Congratulations on opening the nobility successfully! Failed to get aristocrat data, please try again Not yet a nobleman @@ -1512,7 +1512,7 @@ Room update event Enter room event Voice Room_Promotion Entry - Failed to send, Hiyoo reminds you to use civilized language~ + Failed to send, Molistar reminds you to use civilized language~ Voice Room_Public Screen Speaking Room Rankings Network abnormality, please retry! @@ -2202,7 +2202,7 @@ No more make-up opportunities left in this round Share with friends to receive a make-up chance\n - Sharing is only effective when you return to Hiyoo~ + Sharing is only effective when you return to Molistar~ Share with friends This make-up requires consuming Radish @@ -2800,8 +2800,8 @@ My tab [liao] Content font length= Dear - This content cannot be shared with Hiyoo friends - This content cannot be shared with Hiyoo friends + This content cannot be shared with Molistar friends + This content cannot be shared with Molistar friends Me The user is no longer on the mic, please select again Followed @@ -2963,7 +2963,7 @@ Gold Beans The length of the name should be limited to ten characters Received 12/14, remaining 12,600 gold beans - Hiyoo Little New + Molistar Little New Please enter current login password Original Password Please enter a new login password @@ -3258,8 +3258,8 @@ Dress up has been placed in [My Dress Up] Receive new user gifts Already placed in the backpack, please use it as soon as possible~ - Hiyoo Kekeduck Hiyoo可... - Welcome to Hiyoo, Ta has been waiting for you for a long time, come and play together~ + Molistar Kekeduck Molistar可... + Welcome to Molistar, Ta has been waiting for you for a long time, come and play together~ Start a romantic journey Youth Protection 拉拉 @@ -3853,7 +3853,7 @@ User Nickname User Nickname Nickname One, two, three, four, five, six, seven, eight Mine Mine Mine Mine I I I I My My My My My My My My My My My - Hiyoo gives you a cash red envelope + Molistar gives you a cash red envelope yuan Congratulations on getting Reward Red Envelope @@ -4089,7 +4089,7 @@ Room name cannot be empty Room name cannot exceed 15 characters Saved successfully - Search Nickname/HiyooID + Search Nickname/MolistarID Income Statistics Entrance Income Statistics Daily Statistics @@ -4186,7 +4186,7 @@ Version too old, please download the latest version Join Now Join Hall by Secret Code - Add Member - HiyooID + Add Member - MolistarID Valid, retrieve again after expiration Open group, all users can join, only creator can create ; Internal group, only hall members can join, maximum create @@ -4289,7 +4289,7 @@ Set Mute Coming Soon, Please Stay Tuned VIP Not Activated Yet - Become a Hiyoo VIP for ¥6 Now + Become a Molistar VIP for ¥6 Now Current Level Vip1 Remainder: @@ -4307,8 +4307,8 @@ I am emoji\nI am emoji Valid within 7 days (before February 18), need to obtain again after expiration Add Member - Hiyoo ID Addition - Hiyoo Goddess Hall + Molistar ID Addition + Molistar Goddess Hall Public Group Name Add Member Add Member Permissions @@ -4320,7 +4320,7 @@ Hall Opening Duration Number of Gift Givers Number of New Users Gifting - Hiyoo Goddess + Molistar Goddess Forget Worry Pavilion Forget Worry Pavilion Forget Worry Pavilion Forget Worry Pavilion Jilin Jilin Jilin Jilin @@ -4348,7 +4348,7 @@ Go to Accept Apprentice Master Ranking Mentorship Push - Click to Jump - Hiyoo: You received an apprentice message! + Molistar: You received an apprentice message! Release Successful! Ah hahaha La la la la la la la la la la la la ah ah ah @@ -4360,11 +4360,11 @@ Xiaoming Classmate La La La La · Send him a mentorship letter · Follow and say hello - Little brother, just accept me as your master, be my apprentice, let\'s wander around Hiyoo together, you\'re the wind, I\'m the sand! + Little brother, just accept me as your master, be my apprentice, let\'s wander around Molistar together, you\'re the wind, I\'m the sand! Wow Finally caught you~\nThis must be fate! Xiaoming Classmate La La La La Let\'s start the mentorship journey from here!\nYou acknowledge me as your master, and I\'ll teach you how to part your hair in the middle~ - You can ask him anything on Hiyoo~ + You can ask him anything on Molistar~ Mentorship Gift Flowers provided by the official, no diamonds deducted! Newbie Little Flower @@ -4924,12 +4924,12 @@ Affiliated Hall Give Gifts Go to Setting - Please reconsider granting Hiyoo storage permission, otherwise Hiyoo will not be able to load your local file content properly. - Please reconsider granting Hiyoo camera permission, otherwise Hiyoo will not be able to access the content you shoot. + Please reconsider granting Molistar storage permission, otherwise Molistar will not be able to load your local file content properly. + Please reconsider granting Molistar camera permission, otherwise Molistar will not be able to access the content you shoot. To properly load your local file content, please go to the application permission settings page to enable storage permission. To access the content you shoot, please go to the application permission settings page to enable camera permission. - You have refused to provide storage permission, Hiyoo will not be able to load your local file content properly. - You have refused to provide camera permission, Hiyoo will not be able to access the content you shoot. + You have refused to provide storage permission, Molistar will not be able to load your local file content properly. + You have refused to provide camera permission, Molistar will not be able to access the content you shoot. Detail Convert Diamonds Gold Coins @@ -5091,10 +5091,10 @@ Member Income Senior Management Setup Contract Statement - Welcome to Hiyoo! + Welcome to Molistar! Account Login Code Login - Please enter your Hiyoo account + Please enter your Molistar account Please get verification code Please enter the authorization code Please select your gender @@ -5112,7 +5112,7 @@ Buy %d love Please select or enter the quantity of hearts purchased How to recharge: - 1. Go to "My" - "Recharge Diamonds" in the Hiyoo voice app for recharge\n2. Contact customer service for recharge link\nCustomer service WeChat: %s Copy\nCustomer service Line: %s Copy\n3. If you encounter the prompt "Recharge failed, please contact customer service for processing~", please add customer service for processing + 1. Go to "My" - "Recharge Diamonds" in the Molistar voice app for recharge\n2. Contact customer service for recharge link\nCustomer service WeChat: %s Copy\nCustomer service Line: %s Copy\n3. If you encounter the prompt "Recharge failed, please contact customer service for processing~", please add customer service for processing Insufficient available debris, please purchase 0 Enter quantity diff --git a/app/src/module_bank_card/res/values-zh-rTW/strings.xml b/app/src/module_bank_card/res/values-zh-rTW/strings.xml index 0661d6081..88cc341fe 100644 --- a/app/src/module_bank_card/res/values-zh-rTW/strings.xml +++ b/app/src/module_bank_card/res/values-zh-rTW/strings.xml @@ -11,7 +11,7 @@ 解除綁定銀行卡成功 用戶服務協議及隱私政策 - 尊敬的Hiyoo用戶：\n\u3000\u3000為了更好地保障你的合法權益， + 尊敬的Molistar用戶：\n\u3000\u3000為了更好地保障你的合法權益， 讓你正常使用%s服務，%s公司依照國家法律法規，對支付賬戶進行實名製管理、 履行反洗錢職責並采取風險防控措施。你需要向%s公司以及合作公司（匯聚支付）提交身份信息、 聯系方式、交易信息。\n\u3000\u3000%s公司將嚴格依據國家法律法規收集、存儲、使用你的個人信息，確保信息安全。 diff --git a/app/src/module_bank_card/res/values-zh/strings.xml b/app/src/module_bank_card/res/values-zh/strings.xml index 0661d6081..88cc341fe 100644 --- a/app/src/module_bank_card/res/values-zh/strings.xml +++ b/app/src/module_bank_card/res/values-zh/strings.xml @@ -11,7 +11,7 @@ 解除綁定銀行卡成功 用戶服務協議及隱私政策 - 尊敬的Hiyoo用戶：\n\u3000\u3000為了更好地保障你的合法權益， + 尊敬的Molistar用戶：\n\u3000\u3000為了更好地保障你的合法權益， 讓你正常使用%s服務，%s公司依照國家法律法規，對支付賬戶進行實名製管理、 履行反洗錢職責並采取風險防控措施。你需要向%s公司以及合作公司（匯聚支付）提交身份信息、 聯系方式、交易信息。\n\u3000\u3000%s公司將嚴格依據國家法律法規收集、存儲、使用你的個人信息，確保信息安全。 diff --git a/app/src/module_bank_card/res/values/strings.xml b/app/src/module_bank_card/res/values/strings.xml index 2035753da..4326b4826 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 @@ Successfully unbound bank card User Service Agreement and Privacy Policy - Dear Hiyoo User:\n\u3000\u3000In order to better protect your legitimate rights and interests, + Dear Molistar User:\n\u3000\u3000In order to better protect your legitimate rights and interests, and allow you to use %s services normally, %s company complies with national laws and regulations to implement real-name system management for payment accounts, fulfill anti-money laundering responsibilities, and take risk prevention measures. You need to submit identity information, contact information, and transaction information to %s company and cooperative companies (Converge Pay).\n\u3000\u3000%s company will strictly collect, store, and use your personal information in accordance with national laws and regulations to ensure information security. Please read and fully understand %s and %s carefully.\n\u3000\u3000If you agree to accept the above agreement, please click "Agree" and continue the registration process. Otherwise, diff --git a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt index 8b7ac9130..67c4f411f 100644 --- a/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt +++ b/app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt @@ -45,7 +45,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity uid=91459&pageSize=10&pageNo=1&channel= - * @param url - * @return - */ public static String cutUrlParamStr(String url){ return url.substring(url.indexOf("?") + 1, url.length()); } diff --git a/core/src/main/java/com/chwl/core/web/bean/WebJsBeanInfo.java b/core/src/main/java/com/chwl/core/web/bean/WebJsBeanInfo.java index 4c2cbe3bc..74c8407fc 100644 --- a/core/src/main/java/com/chwl/core/web/bean/WebJsBeanInfo.java +++ b/core/src/main/java/com/chwl/core/web/bean/WebJsBeanInfo.java @@ -14,10 +14,6 @@ public class WebJsBeanInfo { public static final int RESET_UI = 4; public static final int IMAGE = 5;// 分享图片 - /** - * type : 1 - * data : {"msg":"wewawa","title":ResUtil.getString(R.string.web_bean_webjsbeaninfo_01),"link":"http://beta.erbanyy.com/modules/noble/faq.html"} - */ private int type; private DataBean data; @@ -39,11 +35,6 @@ public class WebJsBeanInfo { } public static class DataBean { - /** - * msg : wewawa - * title : 常见问题 - * link : http://beta.erbanyy.com/modules/noble/faq.html - */ private String msg; private String title; diff --git a/core/src/main/res/values-zh-rTW/strings.xml b/core/src/main/res/values-zh-rTW/strings.xml index 913bf73eb..30408e42b 100644 --- a/core/src/main/res/values-zh-rTW/strings.xml +++ b/core/src/main/res/values-zh-rTW/strings.xml @@ -1,12 +1,12 @@ XChat_Android_Core 安全提醒：請勿傳播任何違法、違規、低俗、暴力等不良信息，否則將麵臨賬號封禁處罰。 - 來Hiyoo，邂逅你的專屬聲音 - 來Hiyoo，開黑交友玩遊戲 + 來Molistar，邂逅你的專屬聲音 + 來Molistar，開黑交友玩遊戲 加入家族,和你興趣相投的小夥伴一起玩耍吧~ - hi,我想邀請您加入我的Hiyoo家族: + hi,我想邀請您加入我的Molistar家族: 加入家族,和你興趣相投的小夥伴一起玩耍吧~ - hi,我想邀請您加入我的Hiyoo群聊: + hi,我想邀請您加入我的Molistar群聊: 可點擊房間話題查看本房間公告 相親玩法已開啟,請點擊主持人麥位選擇主持人 新一輪的相親已開啟 @@ -531,7 +531,7 @@ 成功 網絡異常，請稍後再試! 網絡錯誤 - Hiyoo開小差中~請稍後再試 + Molistar開小差中~請稍後再試 網絡異常,請檢查您的網絡再試! 猴 雞 diff --git a/core/src/main/res/values-zh/strings.xml b/core/src/main/res/values-zh/strings.xml index 913bf73eb..30408e42b 100644 --- a/core/src/main/res/values-zh/strings.xml +++ b/core/src/main/res/values-zh/strings.xml @@ -1,12 +1,12 @@ XChat_Android_Core 安全提醒：請勿傳播任何違法、違規、低俗、暴力等不良信息，否則將麵臨賬號封禁處罰。 - 來Hiyoo，邂逅你的專屬聲音 - 來Hiyoo，開黑交友玩遊戲 + 來Molistar，邂逅你的專屬聲音 + 來Molistar，開黑交友玩遊戲 加入家族,和你興趣相投的小夥伴一起玩耍吧~ - hi,我想邀請您加入我的Hiyoo家族: + hi,我想邀請您加入我的Molistar家族: 加入家族,和你興趣相投的小夥伴一起玩耍吧~ - hi,我想邀請您加入我的Hiyoo群聊: + hi,我想邀請您加入我的Molistar群聊: 可點擊房間話題查看本房間公告 相親玩法已開啟,請點擊主持人麥位選擇主持人 新一輪的相親已開啟 @@ -531,7 +531,7 @@ 成功 網絡異常，請稍後再試! 網絡錯誤 - Hiyoo開小差中~請稍後再試 + Molistar開小差中~請稍後再試 網絡異常,請檢查您的網絡再試! 猴 雞 diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 2b0cb6bea..43d73a868 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -1,12 +1,12 @@ XChat_Android_Core Security Reminder: Do not spread any illegal, improper, vulgar, violent, or other inappropriate information, otherwise your account will face account suspension and penalties. - Come to Hiyoo and meet your exclusive voice. - Come to Hiyoo, make friends, and play games together. + Come to Molistar and meet your exclusive voice. + Come to Molistar, make friends, and play games together. Join a family and play with friends who share your interests. - Hi, I would like to invite you to join my Hiyoo family: + Hi, I would like to invite you to join my Molistar family: Join a family and play with friends who share your interests. - Hi, I would like to invite you to join my Hiyoo group chat: + Hi, I would like to invite you to join my Molistar group chat: Click on the room topic to view the room announcement. Blind date mode is open, please click on the host&s microphone to select the host. A new round of blind dates has begun. @@ -525,7 +525,7 @@ Success Network abnormal, please try again later! Network error - Hiyoo is taking a break~ Please try again later + Molistar is taking a break~ Please try again later Network error, please check your network and try again! Monkey Rooster diff --git a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt index ae382571f..8873753d6 100644 --- a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt +++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt @@ -6,7 +6,7 @@ data class GrabApprenticesInfo( */ val uid: Long = 0L, /** - * Hiyoo号 + * Molistar号 */ val erbanNo: Long = 0L, /** diff --git a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt index 3e16d7966..51152bc9a 100644 --- a/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt +++ b/core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt @@ -12,7 +12,7 @@ data class SimpleUserVo( val uid: Long = 0L, /** - * Hiyoo号 + * Molistar号 */ val erbanNo: Long = 0L, diff --git a/library/src/main/res/values-zh-rTW/strings.xml b/library/src/main/res/values-zh-rTW/strings.xml index abc847997..f84b1a3e8 100644 --- a/library/src/main/res/values-zh-rTW/strings.xml +++ b/library/src/main/res/values-zh-rTW/strings.xml @@ -1,4 +1,4 @@ -]> +]> &app_name; diff --git a/library/src/main/res/values-zh/strings.xml b/library/src/main/res/values-zh/strings.xml index abc847997..f84b1a3e8 100644 --- a/library/src/main/res/values-zh/strings.xml +++ b/library/src/main/res/values-zh/strings.xml @@ -1,4 +1,4 @@ -]> +]> &app_name; diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index 59bf89dc2..4b2a0bb48 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/chwl/library/common/Constants.java b/library/src/module_common/java/com/chwl/library/common/Constants.java index 2d17ffdcf..233ff0a6c 100644 --- a/library/src/module_common/java/com/chwl/library/common/Constants.java +++ b/library/src/module_common/java/com/chwl/library/common/Constants.java @@ -6,5 +6,5 @@ public class Constants { public static final int UPLOAD_IMAGE_MAX_FILE_LENGTH = 640; //上传的图片 默认宽高最大值 2340 public static final int UPLOAD_IMAGE_MAX_SIZE = 2340; - public static final String GOOGLE = "google_hiyoo"; + public static final String GOOGLE = "google_molistar"; } diff --git a/nim_uikit/res/values-zh-rTW/strings.xml b/nim_uikit/res/values-zh-rTW/strings.xml index 63ec7e863..377ed0925 100644 --- a/nim_uikit/res/values-zh-rTW/strings.xml +++ b/nim_uikit/res/values-zh-rTW/strings.xml @@ -313,8 +313,8 @@ ,時長: 秒 yyyy年MM月 - 發送失敗，Hiyoo提醒您文明用語~ - 發送失敗，Hiyoo提醒您文明用語~ + 發送失敗，Molistar提醒您文明用語~ + 發送失敗，Molistar提醒您文明用語~ 邀請 加入群 加入討論組 diff --git a/nim_uikit/res/values-zh/strings.xml b/nim_uikit/res/values-zh/strings.xml index 63ec7e863..377ed0925 100644 --- a/nim_uikit/res/values-zh/strings.xml +++ b/nim_uikit/res/values-zh/strings.xml @@ -313,8 +313,8 @@ ,時長: 秒 yyyy年MM月 - 發送失敗，Hiyoo提醒您文明用語~ - 發送失敗，Hiyoo提醒您文明用語~ + 發送失敗，Molistar提醒您文明用語~ + 發送失敗，Molistar提醒您文明用語~ 邀請 加入群 加入討論組 diff --git a/nim_uikit/res/values/strings.xml b/nim_uikit/res/values/strings.xml index f1411c8e6..36f565b1f 100644 --- a/nim_uikit/res/values/strings.xml +++ b/nim_uikit/res/values/strings.xml @@ -314,8 +314,8 @@ , Duration: seconds yyyy-MM -Failed to send, Hiyoo reminds you to use civilized language~ -Failed to send, Hiyoo reminds you to use civilized language~ +Failed to send, Molistar reminds you to use civilized language~ +Failed to send, Molistar reminds you to use civilized language~ Invited to join the group to join the discussion group