moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改域名、应用名、签名等配置

Browse Source
This commit is contained in:
max
2024-03-04 11:25:20 +08:00
parent eae1539375
commit 1873359e36
67 changed files with 200 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
app/build.gradle
View File

@@ -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

4
app/src/main/AndroidManifest.xml
View File

@@ -162,7 +162,7 @@
如果 SDKOptions 中提供了，取 SDKOptions 中的值。
-->
<!-- <activity-->
<!-- android:name="app.hiyoo.fun.lineapi.LineAuthenticationCallbackActivity"-->
<!-- android:name="app.molistar.fun.lineapi.LineAuthenticationCallbackActivity"-->
<!-- android:exported="true"-->
<!-- android:launchMode="singleTask"-->
<!-- android:noHistory="true">-->
@@ -223,7 +223,7 @@
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="Hiyoo"
android:label="Molistar"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->

2
app/src/main/java/com/chwl/app/MainActivity.java
View File

@@ -640,7 +640,7 @@ public class MainActivity extends BaseMvpActivity<IMainView, MainPresenter>
//登录页展示时
HashMap<String, Object> 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);
}

6
app/src/main/java/com/chwl/app/UIHelper.java
View File

@@ -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");
}
}

2
app/src/main/java/com/chwl/app/application/App.java
View File

@@ -526,7 +526,7 @@ public class App extends BaseApp {
initContext(this);
//首次启动事件
HashMap<String, Object> 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);
}

8
app/src/main/java/com/chwl/app/application/IReportConstants.java
View File

@@ -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";
}

53
app/src/main/java/com/chwl/app/application/ReportManager.java
View File

@@ -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<String, Object> 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<String, Object> 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);
}

2
app/src/main/java/com/chwl/app/avroom/anotherroompk/RoomPKSearchAdapter.kt
View File

@@ -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)

52
app/src/main/java/com/chwl/app/avroom/presenter/RoomNewbieHellowWordPresenter.java
View File

@@ -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<IRoomNewbieMessageView> {
private int start = 0;
private int pageSize = 5;//发现萌新-打招呼列表
public void loadData(int start) {
RoomNewbieModel.get().getMessageList(start, pageSize)
.compose(bindToLifecycle()).subscribe(new SingleObserver<RoomNewbieMessageInfo>() {
@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;
}
}

2
app/src/main/java/com/chwl/app/avroom/recommendcard/MyRecommendCardActivity.java
View File

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

2
app/src/main/java/com/chwl/app/base/BaseActivity.java
View File

@@ -1266,7 +1266,7 @@ public abstract class BaseActivity extends RxAppCompatActivity
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)) {
ChargeActivity.start(context);

2
app/src/main/java/com/chwl/app/common/widget/dialog/DialogManager.java
View File

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

2
app/src/main/java/com/chwl/app/common/widget/dialog/DialogUiHelper.java
View File

@@ -62,7 +62,7 @@ public class DialogUiHelper {
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)) {
ChargeActivity.start(context);

6
app/src/main/java/com/chwl/app/home/fragment/AccompanyFragment.kt
View File

@@ -53,7 +53,7 @@ class AccompanyFragment : BaseViewBindingFragment<FragmentAccompanyBinding>() {
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<FragmentAccompanyBinding>() {
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<FragmentAccompanyBinding>() {
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?)

4
app/src/main/java/com/chwl/app/home/fragment/HomeFragment.kt
View File

@@ -34,7 +34,7 @@ class HomeFragment : BaseViewBindingFragment<FragmentHomeBinding>(), 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<FragmentHomeBinding>(), 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())

2
app/src/main/java/com/chwl/app/home/fragment/HomeTabHomeFragment.java
View File

@@ -132,7 +132,7 @@ public class HomeTabHomeFragment extends BaseFragment {
//首页_热门房间
HashMap<String, Object> 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);
})

4
app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt
View File

@@ -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)
}

2
app/src/main/java/com/chwl/app/home/fragment/RecommendFragment.kt
View File

@@ -62,7 +62,7 @@ class RecommendFragment : BaseViewBindingFragment<FragmentRecommendBinding>() {
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)

4
app/src/main/java/com/chwl/app/other/dialog/PrivacyAgreementDialog.java
View File

@@ -98,7 +98,7 @@ public class PrivacyAgreementDialog extends Dialog implements View.OnClickListen
//协议弹框展示
HashMap<String, Object> 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<String, Object> 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();

2
app/src/main/java/com/chwl/app/radish/activity/RadishRecordActivity.java
View File

@@ -119,7 +119,7 @@ public class RadishRecordActivity extends BaseMvpActivity<IRadishRecordView, Rad
mTitleBar.addAction(new TitleBar.ImageAction(R.mipmap.common_ic_help_white) {
@Override
public void performAction(View view) {
CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.JAVA_WEB_URL + "/hiyoo/modules/rule/radish.html");
CommonWebViewActivity.start(RadishRecordActivity.this, UriProvider.JAVA_WEB_URL + "/molistar/modules/rule/radish.html");
}
});
}

3
app/src/main/java/com/chwl/app/team/viewmodel/TeamVM.java
View File

@@ -81,10 +81,9 @@ public class TeamVM extends BaseVM {
}
/**
* 通过Peko号搜索群聊成员
* 通过号搜索群聊成员
*
* @param chatId 群组 ID
* @param erbanNo Peko号
* @param page 页码
* @return
*/

1
app/src/main/java/com/chwl/app/ui/im/chat/MsgViewHolderText.java
View File

@@ -141,7 +141,6 @@ public class MsgViewHolderText extends MsgViewHolderBase {
CommonWebViewActivity.start(mTvMsg.getContext(), IM_SERVER_URL + "modules/nobles/numApply.html");
break;
case CustomAttachment.CUSTOM_MSG_HEADER_TYPE_NOBLE_END:
//http://beta.tutuyuyin.com/modules/nobles/order.html?nobleIndex=1
CommonWebViewActivity.start(mTvMsg.getContext(), IM_SERVER_URL + "modules/nobles/order.html");
break;
case CustomAttachment.CUSTOM_MESS_SUB_HADEXPIRE:

2
app/src/main/java/com/chwl/app/ui/im/fragment/MessageFragment.java
View File

@@ -400,7 +400,7 @@ public class MessageFragment extends TFragment implements ModuleProxy, MessageLi
private JSONObject hwField(IMMessage message) {
Intent hwIntent = new Intent(Intent.ACTION_VIEW);
String intentStr = String.format(
"hiyoopushscheme://com.huawei.codelabpush/deeplink?sessionID=%s&sessionType=%s",
"molistarpushscheme://com.huawei.codelabpush/deeplink?sessionID=%s&sessionType=%s",
sessionId, sessionType
);
hwIntent.putExtra("skiptype", PushMessageHandler.PAYLOAD_SKIPTYPE_PRIVATE_MSG);

4
app/src/main/java/com/chwl/app/ui/login/LoginCodeActivity.kt
View File

@@ -177,7 +177,7 @@ class LoginCodeActivity : BaseViewBindingActivity<ActivityLoginCodeBinding>() {
//发起登录
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<ActivityLoginCodeBinding>() {
private fun reportLoginResult(result: Int, failDetail: String) {
val map = HashMap<String, Any>(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

12
app/src/main/java/com/chwl/app/ui/login/LoginPasswordActivity.java
View File

@@ -222,7 +222,7 @@ public class LoginPasswordActivity extends BaseActivity {
//发起登录
HashMap<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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<String, Object> 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);

2
app/src/main/java/com/chwl/app/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -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 = "";

2
app/src/main/java/com/chwl/app/ui/patriarch/PatriarchModeActivity.java
View File

@@ -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); //下划线

2
app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java
View File

@@ -355,7 +355,7 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
//点击充值
HashMap<String, Object> 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));

3
app/src/main/java/com/chwl/app/ui/setting/ModifyPwdActivity.java
View File

@@ -184,9 +184,6 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
} else {
ResetPasswordActivity.start(context, ResetPasswordActivity.FROM_LOGIN);
}
// getDialogManager().showOkCancelWithTitleDialog(getString(R.string.login_contact_service), "LINE：pekoyuyin", getString(R.string.button_ok), "", true, () -> {
//
// });
break;
}
}

7
app/src/main/java/com/chwl/app/ui/setting/SettingActivity.kt
View File

@@ -204,12 +204,5 @@ class SettingActivity : BaseViewBindingActivity<ActivitySettingBinding>(), 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)
}
}

2
app/src/main/java/com/chwl/app/ui/webview/CommonWebViewActivity.java
View File

@@ -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) {

2
app/src/main/java/com/chwl/app/ui/webview/CommonWebViewFragment.java
View File

@@ -91,7 +91,7 @@ public class CommonWebViewFragment extends BaseBindingFragment<FragmentCommonWeb
}
});
// 设置Webview的user-agent
webView.getSettings().setUserAgentString(webView.getSettings().getUserAgentString() + " hiyooAppAndroid");
webView.getSettings().setUserAgentString(webView.getSettings().getUserAgentString() + " molistarAppAndroid");
}
@Override

4
app/src/main/java/com/chwl/app/ui/webview/JSInterface.java
View File

@@ -113,7 +113,7 @@ public class JSInterface {
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)) {
ChargeActivity.start(context);
@@ -140,7 +140,7 @@ public class JSInterface {
//点击充值
HashMap<String, Object> 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);
}
}

2
app/src/main/java/com/chwl/app/ui/webview/SimpleWebViewActivity.java
View File

@@ -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() {

6
app/src/main/java/com/chwl/app/ui/widget/GiftDialog.java
View File

@@ -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<String, Object> 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:

6
app/src/main/java/com/chwl/app/ui/widget/dialog/MonsterDialog.java
View File

@@ -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;
}

4
app/src/main/java/com/chwl/app/vip/VipMainActivity.kt
View File

@@ -265,7 +265,7 @@ class VipMainActivity : BaseViewBindingActivity<ActivityVipMainBinding>(),
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<ActivityVipMainBinding>(),
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)}"
}
}
}

2
app/src/main/res/layout/item_home_concerns.xml
View File

@@ -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" />
</androidx.constraintlayout.widget.ConstraintLayout>

4
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "Hiyoo" >]>
<!DOCTYPE resources [<!ENTITY app_name "Molistar" >]>
<resources>
<string name="contact_customer_service">聯繫客服</string>
<string name="loading_data_please_wait">加载数据中,请稍后...</string>
@@ -1057,7 +1057,7 @@
<string name="share_line">Line</string>
<string name="share_facebook">Facebook</string>
<string name="me_open_nobleman_click_event">開通貴族點擊事件</string>
<string name="me_immediately_become_a_Peko_nobleman">立即開通貴族特權</string>
<string name="me_immediately_become_a_nobleman">立即開通貴族特權</string>
<string name="me_opening_of_the_aristocracy_successful">恭喜開通貴族成功!</string>
<string name="me_failed_to_get_aristocrat_data">獲取貴族數據失敗,請重試</string>
<string name="me_no_aristocracy_yet">尚未開通貴族</string>

4
app/src/main/res/values-zh/strings.xml
View File

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "Hiyoo" >]>
<!DOCTYPE resources [<!ENTITY app_name "Molistar" >]>
<resources>
<string name="contact_customer_service">聯繫客服</string>
<string name="loading_data_please_wait">加载数据中,请稍后...</string>
@@ -1057,7 +1057,7 @@
<string name="share_line">Line</string>
<string name="share_facebook">Facebook</string>
<string name="me_open_nobleman_click_event">開通貴族點擊事件</string>
<string name="me_immediately_become_a_Peko_nobleman">立即開通貴族特權</string>
<string name="me_immediately_become_a_nobleman">立即開通貴族特權</string>
<string name="me_opening_of_the_aristocracy_successful">恭喜開通貴族成功!</string>
<string name="me_failed_to_get_aristocrat_data">獲取貴族數據失敗,請重試</string>
<string name="me_no_aristocracy_yet">尚未開通貴族</string>

6
app/src/main/res/values/colors.xml
View File

@@ -495,7 +495,7 @@
<color name="design_color">@color/color_FE4C62</color>
<color name="color_9af5ef">#9af5ef</color>
<!-- Peko主题色 -->
<!-- 主题色 -->
<color name="color_7154EE">#FFA936</color>
<color name="color_39EBDF">#39EBDF</color>
@@ -556,7 +556,7 @@
<color name="color_2D93FF">#2D93FF</color>
<!-- PekoUI规范 start-->
<!-- UI规范 start-->
<!-- 主题色 -->
<color name="app_248cfe">#FFFFBC52</color>
@@ -599,7 +599,7 @@
<!-- 按钮文字颜色置灰 -->
<color name="text_button_color_gray">#B3B3C3</color>
<!-- PekoUI规范 end-->
<!-- UI规范 end-->
<!--60透明度-->
<color name="color_60_FFFFFF">#99FFFFFF</color>

82
app/src/main/res/values/strings.xml
View File

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "Hiyoo" >]>
<!DOCTYPE resources [<!ENTITY app_name "Molistar" >]>
<resources>
<string name="contact_customer_service">Contact customer service</string>
<string name="loading_data_please_wait">Loading data, please wait...</string>
@@ -127,7 +127,7 @@
<string name="text_chat_limit">Chat initiation is only available for %s or %s users</string>
<string name="room_offline">Host is offline</string>
<string name="root_offline_notice">More fun rooms are waiting for you on Hiyoo! Go and check it out!</string>
<string name="root_offline_notice">More fun rooms are waiting for you on Molistar! Go and check it out!</string>
<string name="home">Home</string>
<string name="back">Back</string>
<string name="fan">Fans</string>
@@ -139,7 +139,7 @@
<string name="friend">Friends</string>
<string name="attention">Following</string>
<string name="no_frenids_text">You haven\'t added any friends yet! \nGo and add friends now!</string>
<string name="no_fan_text">You don\'t have any Hiyoo fans yet!</string>
<string name="no_fan_text">You don\'t have any Molistar fans yet!</string>
<string name="my_jewel">My Diamond Balance</string>
<string name="jewel_withdraw">Diamonds can be withdrawn and exchanged at a rate of 1 yuan = 10 diamonds</string>
<string name="main_home">Home</string>
@@ -175,7 +175,7 @@
<string name="my_attention">My Following</string>
<string name="my_fan">My Fans</string>
<string name="no_attention_text">You haven\'t followed any Hiyoo friends yet! \nGo and start following now!</string>
<string name="no_attention_text">You haven\'t followed any Molistar friends yet! \nGo and start following now!</string>
<string name="search_hint">Search by nickname or ID</string>
<string name="search_user_id">Search user ID</string>
<string name="search_room_or_id">Search nickname or ID</string>
@@ -269,7 +269,7 @@
<string name="pk_opponent_result"> View Opponent\'s Record></string>
<string name="pk_mine_result"> View My Record></string>
<string name="pk_tip_do_not_give_up">Don\'t give up, Hiyoo is always here to support you!</string>
<string name="pk_tip_do_not_give_up">Don\'t give up, Molistar is always here to support you!</string>
<!--Private Chat-->
@@ -351,7 +351,7 @@
<string name="car_detail_price_days2">%1$d&#160;&#160;&#160;&#160;Validity %2$d days</string>
<string name="car_user_info_off_shelf">This vehicle has been removed from sale and cannot be purchased</string>
<string name="car_dialog_content_before">Drive your car, ride your horse,</string>
<string name="car_dialog_content_after">and let\'s gallop on Hiyoo!</string>
<string name="car_dialog_content_after">and let\'s gallop on Molistar!</string>
<string name="car_shop_name">Vehicle Shop</string>
<string name="decoration_status_wrapper">%1$s</string>
<string name="decoration_remainder">Remaining</string>
@@ -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.
</string>
<string name="text_monster_hunting_introduction">· Gameplay Introduction ·</string>
<string name="text_ok">OK</string>
@@ -429,7 +429,7 @@
<string name="family_exit_family">Exit Family</string>
<string name="family_exit_family_tip">After exiting the family, your family currency will not be usable.\nYou can restore it by rejoining. Are you sure you want to exit?</string>
<string name="family_invite_friends">Invite Friends</string>
<string name="family_invite_friends_slogan">[Hiyoo] Express emotions with voices, inherit smiles with families.</string>
<string name="family_invite_friends_slogan">[Molistar] Express emotions with voices, inherit smiles with families.</string>
<string name="family_join">Join</string>
<string name="family_search_member_hint">Search Member ID/Nickname </string>
<string name="family_manage_title">Family Management</string>
@@ -449,7 +449,7 @@
<string name="family_join_valid_hint">Join Family Identity Verification</string>
<string name="family_disband">Disband Family</string>
<string name="common_tip">Tip</string>
<string name="family_disband_tip1">You need to contact customer service to disband the family~\nHiyoo Family Customer Service: %1$s</string>
<string name="family_disband_tip1">You need to contact customer service to disband the family~\nMolistar Family Customer Service: %1$s</string>
<string name="family_contact_service">Contact Customer Service</string>
<string name="family_join_tip">Confirm to join "%1$s"?</string>
<string name="family_join_hint">I want to join your prestigious family</string>
@@ -541,7 +541,7 @@
<string name="tab_title_friends">Friends</string>
<string name="tab_title_attentions">Following</string>
<string name="tab_title_fans">Fans</string>
<string name="title_share_dialog">Share to get free red envelopes for the first time each day (excluding sharing to Hiyoo friends)</string>
<string name="title_share_dialog">Share to get free red envelopes for the first time each day (excluding sharing to Molistar friends)</string>
<string name="text_share_erban_friends">Friends</string>
<string name="text_share_Google">Google</string>
<string name="tab_title_team">Group</string>
@@ -566,22 +566,22 @@
<string name="tips_bind_alipay_sms_code">Verification code will be sent to your bound phone \"%1$s\", please check it carefully</string>
<string name="home_more">More</string>
<string name="text_qq_login_erban_member">I\'m a former Hiyoo user</string>
<string name="text_qq_login_tutu_member">I\'m a new Hiyoo user</string>
<string name="text_qq_login_erban_member">I\'m a former Molistar user</string>
<string name="text_qq_login_tutu_member">I\'m a new Molistar user</string>
<string name="text_login">Log In</string>
<string name="text_login_auth_code">Authorization Code</string>
<string name="text_login_code">Verification Code</string>
<string name="text_authorization_code">Authorization Code</string>
<string name="text_login_code_regain">Regain</string>
<string name="input_text_hint_password">Please enter your password</string>
<string name="text_tips_set_password">Users who have not set a password, please set one in Hiyoo before logging in</string>
<string name="text_tips_set_password">Users who have not set a password, please set one in Molistar before logging in</string>
<string name="hint_how_to_set_password">How to set a password?</string>
<string name="btn_text_login_now">Log In Now</string>
<string name="label_recall_title">Dear Child:</string>
<string name="label_recall_content">Long time no see, recalling the time we spent together. Looking forward to your return by my side. Thank you for coming back!</string>
<string name="hint_recall_input">Please enter invitation code (optional)</string>
<string name="tips_recall">Enter invitation code, both you and the friend who invited you can get super gifts from Hiyoo Return Plan!</string>
<string name="tips_recall">Enter invitation code, both you and the friend who invited you can get super gifts from Molistar Return Plan!</string>
<string name="label_recall_accept">Accept Return Gift</string>
<string name="label_user_info_avatar">Avatar:</string>
@@ -666,7 +666,7 @@
<string name="KTV_ing">In KTV...</string>
<string name="common_loading_tips">Loading...</string>
<string name="text_default_nick">Hiyoo Little New</string>
<string name="text_default_nick">Molistar Little New</string>
<string name="text_default_code">Please Enter Invitation Code (Optional)</string>
<string name="text_room_queuing_micro_mode">Queue Mic Mode</string>
@@ -836,7 +836,7 @@
<string name="label_charge_gold">My Account</string>
<string name="old_app_name">Hiyoo</string>
<string name="old_app_name">Molistar</string>
<string name="tip_login_how_login">How to log in?</string>
<string name="tip_login_old_account">%s can also log in to %s %s</string>
<string name="me_mentoring_relationship_title">Recruit a Disciple and Win Diamonds</string>
@@ -1048,7 +1048,7 @@
<string name="share_line">Line</string>
<string name="share_facebook">Facebook</string>
<string name="me_open_nobleman_click_event">Open Nobleman Click Event</string>
<string name="me_immediately_become_a_Peko_nobleman">Immediately Become a Peko Nobleman</string>
<string name="me_immediately_become_a_nobleman">Immediately Become a Molistar Nobleman</string>
<string name="me_opening_of_the_aristocracy_successful">Congratulations on opening the nobility successfully!</string>
<string name="me_failed_to_get_aristocrat_data">Failed to get aristocrat data, please try again</string>
<string name="me_no_aristocracy_yet">Not yet a nobleman</string>
@@ -1512,7 +1512,7 @@
<string name="avroom_fragment_baseroomfragment_01">Room update event</string>
<string name="avroom_fragment_baseroomfragment_02">Enter room event</string>
<string name="avroom_fragment_baseroomfragment_03">Voice Room_Promotion Entry</string>
<string name="avroom_fragment_baseroomfragment_04">Failed to send, Hiyoo reminds you to use civilized language~</string>
<string name="avroom_fragment_baseroomfragment_04">Failed to send, Molistar reminds you to use civilized language~</string>
<string name="avroom_fragment_baseroomfragment_05">Voice Room_Public Screen Speaking</string>
<string name="avroom_fragment_baseroomfragment_06">Room Rankings</string>
<string name="avroom_fragment_baseroomfragment_07">Network abnormality, please retry!</string>
@@ -2202,7 +2202,7 @@
<string name="radish_signin_signinactivity_02">No more make-up opportunities left in this round</string>
<string name="radish_signin_signinactivity_03">Share with friends</string>
<string name="radish_signin_signinactivity_04"> to receive a make-up chance\n</string>
<string name="radish_signin_signinactivity_05">Sharing is only effective when you return to Hiyoo~</string>
<string name="radish_signin_signinactivity_05">Sharing is only effective when you return to Molistar~</string>
<string name="radish_signin_signinactivity_06">Share with friends</string>
<string name="radish_signin_signinactivity_07">This make-up requires consuming </string>
<string name="radish_signin_signinactivity_08">Radish</string>
@@ -2800,8 +2800,8 @@
<string name="ui_widget_maintablayout_04">My tab</string>
<string name="ui_widget_marqueelayout_01">[liao] Content font length=</string>
<string name="ui_widget_recalldialog_01">Dear</string>
<string name="ui_widget_sharedialog_01">This content cannot be shared with Hiyoo friends</string>
<string name="ui_widget_sharedialog_02">This content cannot be shared with Hiyoo friends</string>
<string name="ui_widget_sharedialog_01">This content cannot be shared with Molistar friends</string>
<string name="ui_widget_sharedialog_02">This content cannot be shared with Molistar friends</string>
<string name="ui_widget_userinfodialog_01">Me</string>
<string name="ui_widget_userinfodialog_02">The user is no longer on the mic, please select again</string>
<string name="ui_widget_userinfodialog_03">Followed</string>
@@ -2963,7 +2963,7 @@
<string name="layout_activity_lucky_money_detail_02">Gold Beans</string>
<string name="layout_activity_lucky_money_detail_03">The length of the name should be limited to ten characters</string>
<string name="layout_activity_lucky_money_detail_04">Received 12/14, remaining 12,600 gold beans</string>
<string name="layout_activity_main_01">Hiyoo Little New</string>
<string name="layout_activity_main_01">Molistar Little New</string>
<string name="layout_activity_modify_pwd_01">Please enter current login password</string>
<string name="layout_activity_modify_pwd_02">Original Password</string>
<string name="layout_activity_modify_pwd_03">Please enter a new login password</string>
@@ -3258,8 +3258,8 @@
<string name="layout_dialog_new_user_charge_prize_01">Dress up has been placed in [My Dress Up]</string>
<string name="layout_dialog_new_user_gift_01">Receive new user gifts</string>
<string name="layout_dialog_new_user_gift_02">Already placed in the backpack, please use it as soon as possible~</string>
<string name="layout_dialog_new_user_hello_01">Hiyoo Kekeduck Hiyoo可...</string>
<string name="layout_dialog_new_user_hello_02">Welcome to Hiyoo, Ta has been waiting for you for a long time, come and play together~</string>
<string name="layout_dialog_new_user_hello_01">Molistar Kekeduck Molistar可...</string>
<string name="layout_dialog_new_user_hello_02">Welcome to Molistar, Ta has been waiting for you for a long time, come and play together~</string>
<string name="layout_dialog_new_user_hello_03">Start a romantic journey</string>
<string name="layout_dialog_patriarch_mode_01">Youth Protection</string>
<string name="layout_dialog_pk_result_01">拉拉</string>
@@ -3853,7 +3853,7 @@
<string name="layout_popup_message_tip_01">User Nickname User Nickname Nickname</string>
<string name="layout_popup_message_tip_02">One, two, three, four, five, six, seven, eight</string>
<string name="layout_pull_radish_ranking_list_item_01">Mine Mine Mine Mine I I I I My My My My My My My My My My My</string>
<string name="layout_red_packet_dialog_01">Hiyoo gives you a cash red envelope</string>
<string name="layout_red_packet_dialog_01">Molistar gives you a cash red envelope</string>
<string name="layout_red_packet_dialog_02">yuan</string>
<string name="layout_red_packet_dialog_03">Congratulations on getting</string>
<string name="layout_red_packet_dialog_04">Reward Red Envelope</string>
@@ -4089,7 +4089,7 @@
<string name="hall_activity_hallnamesettingactivity_03">Room name cannot be empty</string>
<string name="hall_activity_hallnamesettingactivity_04">Room name cannot exceed 15 characters</string>
<string name="hall_activity_hallnamesettingactivity_05">Saved successfully</string>
<string name="hall_activity_hallsearchactivity_01">Search Nickname/HiyooID</string>
<string name="hall_activity_hallsearchactivity_01">Search Nickname/MolistarID</string>
<string name="hall_activity_incomestatisticsactivity_01">Income Statistics Entrance</string>
<string name="hall_activity_incomestatisticsactivity_02">Income Statistics</string>
<string name="hall_activity_incomestatisticsactivity_03">Daily Statistics</string>
@@ -4186,7 +4186,7 @@
<string name="module_hall_secretcode_pwdcodemgr_06">Version too old, please download the latest version</string>
<string name="module_hall_secretcode_pwdcodemgr_07">Join Now</string>
<string name="module_hall_secretcode_pwdcodemgr_08">Join Hall by Secret Code</string>
<string name="module_hall_secretcode_pwdcodemgr_09">Add Member - HiyooID</string>
<string name="module_hall_secretcode_pwdcodemgr_09">Add Member - MolistarID</string>
<string name="module_hall_secretcode_secretcodedialog_03">Valid, retrieve again after expiration</string>
<string name="team_activity_createhallteamactivity_01">Open group, all users can join, only creator can create</string>
<string name="team_activity_createhallteamactivity_02">; Internal group, only hall members can join, maximum create</string>
@@ -4289,7 +4289,7 @@
<string name="layout_activity_team_info_edit_012">Set Mute</string>
<string name="layout_activity_vip_main_01">Coming Soon, Please Stay Tuned</string>
<string name="layout_activity_vip_main_02">VIP Not Activated Yet</string>
<string name="layout_activity_vip_main_03">Become a Hiyoo VIP for ¥6 Now</string>
<string name="layout_activity_vip_main_03">Become a Molistar VIP for ¥6 Now</string>
<string name="layout_activity_vip_main_04">Current Level</string>
<string name="layout_activity_vip_main_05">Vip1</string>
<string name="layout_activity_vip_main_06">Remainder:</string>
@@ -4307,8 +4307,8 @@
<string name="layout_dialog_secret_code_02">I am emoji\nI am emoji</string>
<string name="layout_dialog_secret_code_03">Valid within 7 days (before February 18), need to obtain again after expiration</string>
<string name="layout_dialog_share_secret_code_01">Add Member</string>
<string name="layout_dialog_share_secret_code_02">Hiyoo ID Addition</string>
<string name="layout_include_user_module_hall_01">Hiyoo Goddess Hall</string>
<string name="layout_dialog_share_secret_code_02">Molistar ID Addition</string>
<string name="layout_include_user_module_hall_01">Molistar Goddess Hall</string>
<string name="layout_include_user_module_hall_02">Public Group Name</string>
<string name="layout_item_auth_menu_01">Add Member</string>
<string name="layout_item_auth_setting_01">Add Member Permissions</string>
@@ -4320,7 +4320,7 @@
<string name="layout_item_clan_income_05">Hall Opening Duration</string>
<string name="layout_item_clan_income_06">Number of Gift Givers</string>
<string name="layout_item_clan_income_07">Number of New Users Gifting</string>
<string name="layout_item_group_list_01">Hiyoo Goddess</string>
<string name="layout_item_group_list_01">Molistar Goddess</string>
<string name="layout_item_hall_01">Forget Worry Pavilion Forget Worry Pavilion Forget Worry Pavilion Forget Worry Pavilion</string>
<string name="layout_item_income_01">Jilin Jilin</string>
<string name="layout_item_income_02">Jilin Jilin</string>
@@ -4348,7 +4348,7 @@
<string name="mentoring_relationship_activity_mentoringrelationshipactivity_02">Go to Accept Apprentice</string>
<string name="mentoring_relationship_activity_mentoringrelationshipactivity_03">Master Ranking</string>
<string name="mentoring_relationship_dialog_grabapprenticesnoticedialog_01">Mentorship Push - Click to Jump</string>
<string name="layout_dialog_grab_apprentices_notify_01">Hiyoo: You received an apprentice message!</string>
<string name="layout_dialog_grab_apprentices_notify_01">Molistar: You received an apprentice message!</string>
<string name="layout_dialog_release_mentoring_relationship_success_01">Release Successful!</string>
<string name="layout_item_grab_apprentice_01">Ah hahaha</string>
<string name="layout_item_mentoring_relationship_results_display_01">La la la la la la la la la la la la ah ah ah</string>
@@ -4360,11 +4360,11 @@
<string name="layout_view_holder_apprentice_mission_four_02">Xiaoming Classmate La La La La</string>
<string name="layout_view_holder_apprentice_mission_four_03">· Send him a mentorship letter ·</string>
<string name="layout_view_holder_apprentice_mission_four_04">Follow and say hello</string>
<string name="layout_view_holder_apprentice_mission_four_05">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!</string>
<string name="layout_view_holder_apprentice_mission_four_05">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!</string>
<string name="layout_view_holder_apprentice_mission_one_01">Wow Finally caught you~\nThis must be fate!</string>
<string name="layout_view_holder_apprentice_mission_one_02">Xiaoming Classmate La La La La</string>
<string name="layout_view_holder_apprentice_mission_one_03">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~</string>
<string name="layout_view_holder_apprentice_mission_one_04">You can ask him anything on Hiyoo~</string>
<string name="layout_view_holder_apprentice_mission_one_04">You can ask him anything on Molistar~</string>
<string name="layout_view_holder_apprentice_mission_three_01">Mentorship Gift</string>
<string name="layout_view_holder_apprentice_mission_three_02">Flowers provided by the official, no diamonds deducted!</string>
<string name="layout_view_holder_apprentice_mission_three_03">Newbie Little Flower</string>
@@ -4924,12 +4924,12 @@
<string name="department_of_management">Affiliated Hall</string>
<string name="give_gift">Give Gifts</string>
<string name="room_perform_go_update">Go to Setting</string>
<string name="permission_storage_rationale">Please reconsider granting Hiyoo storage permission, otherwise Hiyoo will not be able to load your local file content properly.</string>
<string name="permission_camera_rationale">Please reconsider granting Hiyoo camera permission, otherwise Hiyoo will not be able to access the content you shoot.</string>
<string name="permission_storage_rationale">Please reconsider granting Molistar storage permission, otherwise Molistar will not be able to load your local file content properly.</string>
<string name="permission_camera_rationale">Please reconsider granting Molistar camera permission, otherwise Molistar will not be able to access the content you shoot.</string>
<string name="permission_storage_denied">To properly load your local file content, please go to the application permission settings page to enable storage permission.</string>
<string name="permission_camera_denied">To access the content you shoot, please go to the application permission settings page to enable camera permission.</string>
<string name="permission_storage_refused">You have refused to provide storage permission, Hiyoo will not be able to load your local file content properly.</string>
<string name="permission_camera_refused">You have refused to provide camera permission, Hiyoo will not be able to access the content you shoot.</string>
<string name="permission_storage_refused">You have refused to provide storage permission, Molistar will not be able to load your local file content properly.</string>
<string name="permission_camera_refused">You have refused to provide camera permission, Molistar will not be able to access the content you shoot.</string>
<string name="detail">Detail</string>
<string name="convert_diamond">Convert Diamonds</string>
<string name="gold">Gold Coins</string>
@@ -5091,10 +5091,10 @@
<string name="Member_income">Member Income</string>
<string name="Senior_management_setup">Senior Management Setup</string>
<string name="contract_statement">Contract Statement</string>
<string name="welcome_to_app">Welcome to Hiyoo!</string>
<string name="welcome_to_app">Welcome to Molistar!</string>
<string name="account_login">Account Login</string>
<string name="code_login">Code Login</string>
<string name="please_input_app_account">Please enter your Hiyoo account</string>
<string name="please_input_app_account">Please enter your Molistar account</string>
<string name="please_get_code">Please get verification code</string>
<string name="Please_enter_the_authorization_code">Please enter the authorization code</string>
<string name="select_your_gender">Please select your gender</string>
@@ -5112,7 +5112,7 @@
<string name="buy_love_num">Buy %d love</string>
<string name="please_select_or_enter_the_quantity_of_hearts_purchased">Please select or enter the quantity of hearts purchased</string>
<string name="how_to_recharge_with_cs">How to recharge:</string>
<string name="tips_cs_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</string>
<string name="tips_cs_recharge">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</string>
<string name="fairy_debris_not_enough_please_buy">Insufficient available debris, please purchase</string>
<string name="zero">0</string>
<string name="please_input_quantity">Enter quantity</string>

2
app/src/module_bank_card/res/values-zh-rTW/strings.xml
View File

@@ -11,7 +11,7 @@
<string name="toast_unbind_bank_card_success">解除綁定銀行卡成功</string>
<string name="title_add_bank_card_agreement">用戶服務協議及隱私政策</string>
<string name="text_add_bank_card_agreement">
尊敬的Hiyoo用戶：\n\u3000\u3000為了更好地保障你的合法權益，
尊敬的Molistar用戶：\n\u3000\u3000為了更好地保障你的合法權益，
讓你正常使用%s服務，%s公司依照國家法律法規，對支付賬戶進行實名製管理、
履行反洗錢職責並采取風險防控措施。你需要向%s公司以及合作公司（匯聚支付）提交身份信息、
聯系方式、交易信息。\n\u3000\u3000%s公司將嚴格依據國家法律法規收集、存儲、使用你的個人信息，確保信息安全。

2
app/src/module_bank_card/res/values-zh/strings.xml
View File

@@ -11,7 +11,7 @@
<string name="toast_unbind_bank_card_success">解除綁定銀行卡成功</string>
<string name="title_add_bank_card_agreement">用戶服務協議及隱私政策</string>
<string name="text_add_bank_card_agreement">
尊敬的Hiyoo用戶：\n\u3000\u3000為了更好地保障你的合法權益，
尊敬的Molistar用戶：\n\u3000\u3000為了更好地保障你的合法權益，
讓你正常使用%s服務，%s公司依照國家法律法規，對支付賬戶進行實名製管理、
履行反洗錢職責並采取風險防控措施。你需要向%s公司以及合作公司（匯聚支付）提交身份信息、
聯系方式、交易信息。\n\u3000\u3000%s公司將嚴格依據國家法律法規收集、存儲、使用你的個人信息，確保信息安全。

2
app/src/module_bank_card/res/values/strings.xml
View File

@@ -11,7 +11,7 @@
<string name="toast_unbind_bank_card_success">Successfully unbound bank card</string>
<string name="title_add_bank_card_agreement">User Service Agreement and Privacy Policy</string>
<string name="text_add_bank_card_agreement">
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,

2
app/src/module_labour_union/java/com/chwl/app/module_hall/hall/activity/SuperAdminAddActivity.kt
View File

@@ -45,7 +45,7 @@ class SuperAdminAddActivity : BaseViewBindingActivity<ActivitySuperAdminAddBindi
if (view.id == R.id.tv_set) {
adminAdapter.getItem(position)?.let {
dialogManager.showOkCancelDialog(
"確定要添加用戶 ${it.nick} (HiyooID:${it.erbanNo})為公會超級管理員嗎?",
"確定要添加用戶 ${it.nick} (MolistarID:${it.erbanNo})為公會超級管理員嗎?",
true
) {
SuperAdminRoomSetActivity.start(this, clanId, it.uid)

8
app/src/module_room_chat/java/com/chwl/app/room_chat/fragment/RoomMsgRecentListFragment.java
View File

@@ -3,8 +3,6 @@ package com.chwl.app.room_chat.fragment;
import android.annotation.SuppressLint;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.View;
import android.widget.FrameLayout;
import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentManager;
@@ -22,11 +20,7 @@ import com.chwl.app.room_chat.activity.NimHallTeamRoomMessageActivity;
import com.chwl.app.room_chat.activity.NimRoomP2PMessageActivity;
import com.chwl.app.room_chat.activity.NimTeamRoomMessageActivity;
import com.chwl.core.auth.event.LoginEvent;
import com.chwl.core.initial.InitialModel;
import com.chwl.core.level.UserLevelVo;
import com.chwl.core.user.UserModel;
import com.chwl.core.user.event.LoadLoginUserInfoEvent;
import com.chwl.core.utils.SharedPreferenceUtils;
import com.chwl.core.utils.net.BeanObserver;
import com.chwl.library.utils.ResUtil;
@@ -44,8 +38,6 @@ import io.reactivex.Single;
*/
public class RoomMsgRecentListFragment extends BaseFragment {
private RoomMsgRecentContactsFragment recentContactsFragment;
private final String share_pref_is_newbie_clicked = "share_pref_is_newbie_clicked";
private long lastClickTime;
public static RoomMsgRecentListFragment newInstance() {
return new RoomMsgRecentListFragment();

58
core/src/main/java/com/chwl/core/UriProvider.java
View File

@@ -48,35 +48,35 @@ public class UriProvider {
* @return -
*/
public static String getRoomBg() {
return IM_SERVER_URL.concat("/hiyoo/modules/noble/roomBgList.html");
return IM_SERVER_URL.concat("/molistar/modules/noble/roomBgList.html");
}
/**
* 贵族介绍页
*/
public static String getNobleIntro() {
return IM_SERVER_URL.concat("/hiyoo/modules/nobles/intro.html");
return IM_SERVER_URL.concat("/molistar/modules/nobles/intro.html");
}
/**
* 贵族介绍页
*/
public static String getRanking() {
return IM_SERVER_URL.concat("/hiyoo/modules/rank/index.html#/rank");
return IM_SERVER_URL.concat("/molistar/modules/rank/index.html#/rank");
}
/**
* 帮助页
*/
public static String getHelp() {
return IM_SERVER_URL.concat("/hiyoo/modules/rule/guide.html");
return IM_SERVER_URL.concat("/molistar/modules/rule/guide.html");
}
/**
* 等级界面
*/
public static String getUserLevelUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/level/index.html");
return JAVA_WEB_URL.concat("/molistar/modules/level/index.html");
}
/**
@@ -85,7 +85,7 @@ public class UriProvider {
* @return
*/
public static String getUserProtocolUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/protocol.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/protocol.html");
}
/**
@@ -94,20 +94,20 @@ public class UriProvider {
* @return
*/
public static String getUserReportUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/inform/index.html");
return JAVA_WEB_URL.concat("/molistar/modules/inform/index.html");
}
/**
* Hiyoo专属，实名认证页面
* Molistar专属，实名认证页面
*
* @return
*/
public static String getTutuRealNamePage() {
return JAVA_WEB_URL.concat("/hiyoo/modules/identity/new.html");
return JAVA_WEB_URL.concat("/molistar/modules/identity/new.html");
}
public static String getCommnunityNorms() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/community-norms.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/community-norms.html");
}
/**
@@ -116,7 +116,7 @@ public class UriProvider {
* @return
*/
public static String getPrivacyAgreement() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/privacy-wap.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/privacy-wap.html");
}
public static String getLinkUrl(String linkUrl) {
@@ -130,7 +130,7 @@ public class UriProvider {
* 个人魅力榜
*/
public static String getPersonalCharismaRank() {
return JAVA_WEB_URL.concat("/hiyoo/modules/charm/index.html");
return JAVA_WEB_URL.concat("/molistar/modules/charm/index.html");
}
/**
@@ -139,7 +139,7 @@ public class UriProvider {
* @return
*/
public static String getDatingRule() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/dating.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/dating.html");
}
@@ -147,7 +147,7 @@ public class UriProvider {
* 房间排行榜
*/
public static String getRoomRanking() {
return IM_SERVER_URL.concat("/hiyoo/modules/room_rank/index.html?roomUid=" + AvRoomDataManager.get().getRoomUid());
return IM_SERVER_URL.concat("/molistar/modules/room_rank/index.html?roomUid=" + AvRoomDataManager.get().getRoomUid());
}
/**
@@ -156,91 +156,91 @@ public class UriProvider {
* @return
*/
public static String getSDKPermissionUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/sdk.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/sdk.html");
}
/**
* 隐私指引
*/
public static String getPrivacyUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/privacy-wap.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/privacy-wap.html");
}
/**
* 贵族中心帮助页
*/
public static String getVipHelpUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/introduction-patrician.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/introduction-patrician.html");
}
/**
* 贵族榜
*/
public static String getRankListUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/noble/index.html");
return JAVA_WEB_URL.concat("/molistar/modules/noble/index.html");
}
/**
* 用户充值协议
*/
public static String getChargeAgreementUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/rechargeAgreement.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/rechargeAgreement.html");
}
/**
* 用户注册服务协议
*/
public static String getRegistrationAgreementUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/protocol.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/protocol.html");
}
/**
* 账号注销协议
*/
public static String getCancellationAgreementUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/rule/logout-agreement.html");
return JAVA_WEB_URL.concat("/molistar/modules/rule/logout-agreement.html");
}
/**
* 开通粉丝团
*/
public static String getFansTeamOpenUrl(long roomUid) {
return JAVA_WEB_URL.concat("/hiyoo/modules/fans_club/nameplate.html?roomUid=" + roomUid);
return JAVA_WEB_URL.concat("/molistar/modules/fans_club/nameplate.html?roomUid=" + roomUid);
}
/**
* 粉丝团排行
*/
public static String getFansTeamRankUrl(long roomUid) {
return JAVA_WEB_URL.concat("/hiyoo/modules/fans_club/fans_rank.html?roomUid=" + roomUid);
return JAVA_WEB_URL.concat("/molistar/modules/fans_club/fans_rank.html?roomUid=" + roomUid);
}
/**
* 我的粉丝团
*/
public static String getFansTeamMyFansUrl(long roomUid) {
return JAVA_WEB_URL.concat("/hiyoo/modules/fans_club/myfans.html?roomUid=" + roomUid);
return JAVA_WEB_URL.concat("/molistar/modules/fans_club/myfans.html?roomUid=" + roomUid);
}
/**
* 粉丝团规则
*/
public static String getFansTeamRuleUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/fans_club/rule.html");
return JAVA_WEB_URL.concat("/molistar/modules/fans_club/rule.html");
}
/**
* 个播小时榜
*/
public static String getSingleRoomHourRankUrl(long roomUid) {
return JAVA_WEB_URL.concat("/hiyoo/modules/room_rank/hourRank.html?roomUid=" + roomUid);
return JAVA_WEB_URL.concat("/molistar/modules/room_rank/hourRank.html?roomUid=" + roomUid);
}
/**
* 牌照房小时榜
*/
public static String getRoomHourRankUrl(long roomUid) {
return JAVA_WEB_URL.concat("/hiyoo/modules/room_rank/hourRankLicense.html?roomUid=" + roomUid);
return JAVA_WEB_URL.concat("/molistar/modules/room_rank/hourRankLicense.html?roomUid=" + roomUid);
}
@@ -248,7 +248,7 @@ public class UriProvider {
* 周星榜
*/
public static String getWeekStarUrl() {
return JAVA_WEB_URL.concat("/hiyoo/modules/weekStar/newWeekStar.html");
return JAVA_WEB_URL.concat("/molistar/modules/weekStar/newWeekStar.html");
}
/**
@@ -257,6 +257,6 @@ public class UriProvider {
* @return
*/
public static String getLiveAgreement() {
return JAVA_WEB_URL.concat("/hiyoo/activity/activemodel/index.html?code=ZBGG");
return JAVA_WEB_URL.concat("/molistar/activity/activemodel/index.html?code=ZBGG");
}
}

8
core/src/main/java/com/chwl/core/XConstants.java
View File

@@ -11,7 +11,7 @@ public class XConstants {
/**
* 包名(各種緩存目錄的根目錄)
*/
public static final String XCHAT_DIR_NAME = "app.hiyoo.fun";
public static final String XCHAT_DIR_NAME = "com.hhchu.molistar";
/**
* sp名字
@@ -91,13 +91,13 @@ public class XConstants {
/**
* Referer (DEBUG)
*/
public static final String KEY_REFERER_DEBUG = "http://beta.api.hiyoo.fun/";
public static final String KEY_REFERER_DEBUG = "http://api.molistar.xyz/";
/**
* Referer (RELEASE)
*/
public static final String KEY_REFERER_RELEASE = "https://api.hiyoo.fun/";
public static final String APP_MARK = "hiyoo";
public static final String KEY_REFERER_RELEASE = "https://api.molistar.xyz/";
public static final String APP_MARK = "molistar";
/**
* 聊天室文本消息易盾反垃圾業務id
*/

4
core/src/main/java/com/chwl/core/room/model/RoomSettingModel.java
View File

@@ -312,7 +312,7 @@ public class RoomSettingModel extends BaseMvpModel {
/**
* 更新房间设置信息
* Hiyoo项目-打开关闭房间纯净模式-房主修改
* Molistar项目-打开关闭房间纯净模式-房主修改
*
* @param title
* @param desc
@@ -336,7 +336,7 @@ public class RoomSettingModel extends BaseMvpModel {
/**
* 更新房间设置信息
* Hiyoo项目-打开关闭房间纯净模式
* Molistar项目-打开关闭房间纯净模式
*
* @param title
* @param desc

2
core/src/main/java/com/chwl/core/room/pk/bean/PKTeamMember.java
View File

@@ -10,7 +10,7 @@ import lombok.Data;
@Data
public class PKTeamMember {
private String uid;//用户uid
private String erbanNo;//Peko号
private String erbanNo;//
private String nick;//昵称
private int gender;//性别
private String avatar;//头像

2
core/src/main/java/com/chwl/core/statistic/protocol/StatisticsProtocol.java
View File

@@ -489,7 +489,7 @@ public interface StatisticsProtocol {
/**
* Hiyoo1.4.0版本埋点整理
* Molistar1.4.0版本埋点整理
*/
String EVENT_APP_LAUNCH = "app_launch"; //app启动

2
core/src/main/java/com/chwl/core/user/UserModel.java
View File

@@ -1002,7 +1002,7 @@ public final class UserModel extends BaseModel implements IUserModel {
@Field("passwd") String password);
/**
* @param erbanNo Peko号或手机号码
* @param erbanNo 号或手机号码
* @return -
*/
@GET("user/getSimpleUser")

7
core/src/main/java/com/chwl/core/utils/APIEncryptUtil.java
View File

@@ -116,13 +116,6 @@ public class APIEncryptUtil {
return paramsMap;
}
/**
* 把URl 后面的参数字符串 截取出来
* 例子:
* https://beta.erbanyy.com/fans/following?uid=91459&pageSize=10&pageNo=1&channel= -> uid=91459&pageSize=10&pageNo=1&channel=
* @param url
* @return
*/
public static String cutUrlParamStr(String url){
return url.substring(url.indexOf("?") + 1, url.length());
}

9
core/src/main/java/com/chwl/core/web/bean/WebJsBeanInfo.java
View File

@@ -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;

10
core/src/main/res/values-zh-rTW/strings.xml
View File

@@ -1,12 +1,12 @@
<resources>
<string name="app_name">XChat_Android_Core</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_01">安全提醒：請勿傳播任何違法、違規、低俗、暴力等不良信息，否則將麵臨賬號封禁處罰。</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">來Hiyoo，邂逅你的專屬聲音</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">來Hiyoo，開黑交友玩遊戲</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">來Molistar，邂逅你的專屬聲音</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">來Molistar，開黑交友玩遊戲</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_04">加入家族,和你興趣相投的小夥伴一起玩耍吧~</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">hi,我想邀請您加入我的Hiyoo家族:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">hi,我想邀請您加入我的Molistar家族:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_06">加入家族,和你興趣相投的小夥伴一起玩耍吧~</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">hi,我想邀請您加入我的Hiyoo群聊:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">hi,我想邀請您加入我的Molistar群聊:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_08">可點擊房間話題查看本房間公告</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_09">相親玩法已開啟,請點擊主持人麥位選擇主持人</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_010">新一輪的相親已開啟</string>
@@ -531,7 +531,7 @@
<string name="utils_net_rxhelper_04">成功</string>
<string name="utils_net_rxhelper_05">網絡異常，請稍後再試!</string>
<string name="utils_net_rxhelper_06">網絡錯誤</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_01">Hiyoo開小差中~請稍後再試</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_01">Molistar開小差中~請稍後再試</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_02">網絡異常,請檢查您的網絡再試!</string>
<string name="xchat_android_core_utils_starutils_01">猴</string>
<string name="xchat_android_core_utils_starutils_02">雞</string>

10
core/src/main/res/values-zh/strings.xml
View File

@@ -1,12 +1,12 @@
<resources>
<string name="app_name">XChat_Android_Core</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_01">安全提醒：請勿傳播任何違法、違規、低俗、暴力等不良信息，否則將麵臨賬號封禁處罰。</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">來Hiyoo，邂逅你的專屬聲音</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">來Hiyoo，開黑交友玩遊戲</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">來Molistar，邂逅你的專屬聲音</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">來Molistar，開黑交友玩遊戲</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_04">加入家族,和你興趣相投的小夥伴一起玩耍吧~</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">hi,我想邀請您加入我的Hiyoo家族:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">hi,我想邀請您加入我的Molistar家族:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_06">加入家族,和你興趣相投的小夥伴一起玩耍吧~</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">hi,我想邀請您加入我的Hiyoo群聊:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">hi,我想邀請您加入我的Molistar群聊:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_08">可點擊房間話題查看本房間公告</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_09">相親玩法已開啟,請點擊主持人麥位選擇主持人</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_010">新一輪的相親已開啟</string>
@@ -531,7 +531,7 @@
<string name="utils_net_rxhelper_04">成功</string>
<string name="utils_net_rxhelper_05">網絡異常，請稍後再試!</string>
<string name="utils_net_rxhelper_06">網絡錯誤</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_01">Hiyoo開小差中~請稍後再試</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_01">Molistar開小差中~請稍後再試</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_02">網絡異常,請檢查您的網絡再試!</string>
<string name="xchat_android_core_utils_starutils_01">猴</string>
<string name="xchat_android_core_utils_starutils_02">雞</string>

10
core/src/main/res/values/strings.xml
View File

@@ -1,12 +1,12 @@
<resources>
<string name="app_name">XChat_Android_Core</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_01">Security Reminder: Do not spread any illegal, improper, vulgar, violent, or other inappropriate information, otherwise your account will face account suspension and penalties.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">Come to Hiyoo and meet your exclusive voice.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">Come to Hiyoo, make friends, and play games together.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">Come to Molistar and meet your exclusive voice.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">Come to Molistar, make friends, and play games together.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_04">Join a family and play with friends who share your interests.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">Hi, I would like to invite you to join my Hiyoo family:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">Hi, I would like to invite you to join my Molistar family:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_06">Join a family and play with friends who share your interests.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">Hi, I would like to invite you to join my Hiyoo group chat:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">Hi, I would like to invite you to join my Molistar group chat:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_08">Click on the room topic to view the room announcement.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_09">Blind date mode is open, please click on the host&#038;s microphone to select the host.</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_010">A new round of blind dates has begun.</string>
@@ -525,7 +525,7 @@
<string name="utils_net_rxhelper_04">Success</string>
<string name="utils_net_rxhelper_05">Network abnormal, please try again later!</string>
<string name="utils_net_rxhelper_06">Network error</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_01">Hiyoo is taking a break~ Please try again later</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_01">Molistar is taking a break~ Please try again later</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_02">Network error, please check your network and try again!</string>
<string name="xchat_android_core_utils_starutils_01">Monkey</string>
<string name="xchat_android_core_utils_starutils_02">Rooster</string>

2
core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/GrabApprenticesInfo.kt
View File

@@ -6,7 +6,7 @@ data class GrabApprenticesInfo(
*/
val uid: Long = 0L,
/**
* Hiyoo号
* Molistar号
*/
val erbanNo: Long = 0L,
/**

2
core/src/model_mentoring_relationship/java/com/chwl/core/mentoring_relationship/bean/SimpleUserVo.kt
View File

@@ -12,7 +12,7 @@ data class SimpleUserVo(
val uid: Long = 0L,
/**
* Hiyoo号
* Molistar号
*/
val erbanNo: Long = 0L,

2
library/src/main/res/values-zh-rTW/strings.xml
View File

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "Hiyoo" >]>
<!DOCTYPE resources [<!ENTITY app_name "Molistar" >]>
<resources>
<string name="app_name">&app_name;</string>

2
library/src/main/res/values-zh/strings.xml
View File

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "Hiyoo" >]>
<!DOCTYPE resources [<!ENTITY app_name "Molistar" >]>
<resources>
<string name="app_name">&app_name;</string>

2
library/src/main/res/values/strings.xml
View File

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "Hiyoo">]>
<!DOCTYPE resources [<!ENTITY app_name "Molistar">]>
<resources>
<string name="app_name">&app_name;</string>

2
library/src/module_common/java/com/chwl/library/common/Constants.java
View File

@@ -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";
}

4
nim_uikit/res/values-zh-rTW/strings.xml
View File

@@ -313,8 +313,8 @@
<string name="session_activity_watchvideoactivity_04">,時長: </string>
<string name="session_activity_watchvideoactivity_05"> 秒</string>
<string name="session_adapter_mediaadapter_01">yyyy年MM月</string>
<string name="session_fragment_messagefragment_01">發送失敗，Hiyoo提醒您文明用語~</string>
<string name="session_fragment_messagefragment_02">發送失敗，Hiyoo提醒您文明用語~</string>
<string name="session_fragment_messagefragment_01">發送失敗，Molistar提醒您文明用語~</string>
<string name="session_fragment_messagefragment_02">發送失敗，Molistar提醒您文明用語~</string>
<string name="session_helper_teamnotificationhelper_01">邀請 </string>
<string name="session_helper_teamnotificationhelper_02"> 加入群</string>
<string name="session_helper_teamnotificationhelper_03"> 加入討論組</string>

4
nim_uikit/res/values-zh/strings.xml
View File

@@ -313,8 +313,8 @@
<string name="session_activity_watchvideoactivity_04">,時長: </string>
<string name="session_activity_watchvideoactivity_05"> 秒</string>
<string name="session_adapter_mediaadapter_01">yyyy年MM月</string>
<string name="session_fragment_messagefragment_01">發送失敗，Hiyoo提醒您文明用語~</string>
<string name="session_fragment_messagefragment_02">發送失敗，Hiyoo提醒您文明用語~</string>
<string name="session_fragment_messagefragment_01">發送失敗，Molistar提醒您文明用語~</string>
<string name="session_fragment_messagefragment_02">發送失敗，Molistar提醒您文明用語~</string>
<string name="session_helper_teamnotificationhelper_01">邀請 </string>
<string name="session_helper_teamnotificationhelper_02"> 加入群</string>
<string name="session_helper_teamnotificationhelper_03"> 加入討論組</string>

4
nim_uikit/res/values/strings.xml
View File

@@ -314,8 +314,8 @@
<string name="session_activity_watchvideoactivity_04">, Duration: </string>
<string name="session_activity_watchvideoactivity_05"> seconds</string>
<string name="session_adapter_mediaadapter_01">yyyy-MM</string>
<string name="session_fragment_messagefragment_01">Failed to send, Hiyoo reminds you to use civilized language~</string>
<string name="session_fragment_messagefragment_02">Failed to send, Hiyoo reminds you to use civilized language~</string>
<string name="session_fragment_messagefragment_01">Failed to send, Molistar reminds you to use civilized language~</string>
<string name="session_fragment_messagefragment_02">Failed to send, Molistar reminds you to use civilized language~</string>
<string name="session_helper_teamnotificationhelper_01">Invited </string>
<string name="session_helper_teamnotificationhelper_02"> to join the group</string>
<string name="session_helper_teamnotificationhelper_03"> to join the discussion group</string>