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

feat：【Habu Live】替换logo、包名、第三方KEY

Browse Source
This commit is contained in:
Max
2023-11-15 18:14:27 +08:00
parent bdcfb21e6e
commit 9d63a90942
58 changed files with 425 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ananplay.jks Normal file
View File

Binary file not shown.

56
app/build.gradle
View File

@@ -1,6 +1,6 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
//apply plugin: 'com.google.gms.google-services'
//apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android'
apply plugin: 'com.tencent.vasdolly'
apply from: '../mob.gradle'
@@ -11,7 +11,7 @@ android {
compileSdkVersion COMPILE_SDK_VERSION.toInteger()
defaultConfig {
applicationId "com.vele.pekolive"
applicationId "com.vele.habuplay"
minSdkVersion MIN_SDK_VERSION.toInteger()
targetSdkVersion TARGET_SDK_VERSION.toInteger()
versionCode Integer.valueOf(version_code)
@@ -22,7 +22,7 @@ android {
flavorDimensions 'default'
manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
// manifestPlaceholders = [CRASHLYTICS_COLLECTION_ENABLED: CRASHLYTICS_COLLECTION_ENABLED.toBoolean()]
}
splits {
@@ -60,7 +60,7 @@ android {
if (abi == null) {
abi = "universal"
}
outputFileName = "piko_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
outputFileName = "habu_${buildType.name}_v${defaultConfig.versionName}_${abi}_${date}.apk"
}
}
@@ -81,19 +81,19 @@ android {
signingConfigs {
v2 {
storeFile file('../pekolive.jks')
storePassword "peko2023"
keyAlias "pekolive"
keyPassword "peko2023"
storeFile file('../ananplay.jks')
storePassword "vele2021"
keyAlias "ananplay"
keyPassword "vele2021"
v2SigningEnabled true
v1SigningEnabled true
}
v1 {
storeFile file('../pekolive.jks')
storePassword "peko2023"
keyAlias "pekolive"
keyPassword "peko2023"
storeFile file('../ananplay.jks')
storePassword "vele2021"
keyAlias "ananplay"
keyPassword "vele2021"
v2SigningEnabled false
v1SigningEnabled true
}
@@ -147,14 +147,14 @@ android {
}
buildTypes {
def server_url_debug = '"http://beta.api.pekolive.com/"'
def server_url_release = '"https://api.pekolive.com/"'
def server_url_debug = '"http://beta.api.anan.chat/"'
def server_url_release = '"https://api.anan.chat"'
debug {
println("minifyEnabled = " + minify_enabled)
ext.enableCrashlytics = false
ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
// ext.enableCrashlytics = false
// ext.alwaysUpdateBuildId = false // Firebase Crashlytics禁用更新构建ID
buildConfigField "String", "BASE_URL", server_url_debug
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
@@ -176,10 +176,10 @@ android {
release {
ext.enableCrashlytics = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
ext.alwaysUpdateBuildId = CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
firebaseCrashlytics {
//Firebase Crashlytics控制上传混淆文件开关
mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
}
// firebaseCrashlytics {
// //Firebase Crashlytics控制上传混淆文件开关
// mappingFileUploadEnabled CRASHLYTICS_COLLECTION_ENABLED.toBoolean()
// }
buildConfigField "String", "BASE_URL", server_url_release
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
@@ -285,15 +285,15 @@ dependencies {
implementation 'com.github.zhpanvip:BannerViewPager:3.5.6'
//fireBase
implementation platform('com.google.firebase:firebase-bom:31.1.1')
implementation 'com.google.firebase:firebase-crashlytics-ktx'
implementation 'com.google.firebase:firebase-analytics-ktx'
// implementation platform('com.google.firebase:firebase-bom:31.1.1')
// implementation 'com.google.firebase:firebase-crashlytics-ktx'
// implementation 'com.google.firebase:firebase-analytics-ktx'
//Adjust接入
implementation 'com.adjust.sdk:adjust-android:4.33.0'
implementation 'com.android.installreferrer:installreferrer:2.2'
// implementation 'com.adjust.sdk:adjust-android:4.33.0'
// implementation 'com.android.installreferrer:installreferrer:2.2'
// Add the following if you are using the Adjust SDK inside web views on your app
implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
// implementation 'com.adjust.sdk:adjust-android-webbridge:4.33.0'
implementation 'com.github.yalantis:ucrop:2.2.7'
@@ -310,7 +310,7 @@ channel {
outputDir = new File(project.buildDir, "channelapk")
//多渠道包的命名规则，默认为：${appName}-${versionName}-${versionCode}-${flavorName}-${buildType}-${buildTime}
def only64 = onlyArm64 ? "-only64" : ""
apkNameFormat = 'piko-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
apkNameFormat = 'habu-${buildType}only64-${flavorName}-v${versionName}-${buildTime}'.replace("only64", only64)
//快速模式：生成渠道包时不进行校验（速度可以提升10倍以上，默认为false）
fastMode = false
//buildTime的时间格式，默认格式：yyyyMMdd-HHmmss

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

@@ -112,23 +112,23 @@
则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
-->
<intent-filter>
<!-- <intent-filter>-->
<!-- 此处scheme值需要替换为后台设置中的scheme值 -->
<action android:name="android.intent.action.VIEW" />
<!-- &lt;!&ndash; 此处scheme值需要替换为后台设置中的scheme值 &ndash;&gt;-->
<!-- <action android:name="android.intent.action.VIEW" />-->
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<!-- <category android:name="android.intent.category.DEFAULT" />-->
<!-- <category android:name="android.intent.category.BROWSABLE" />-->
<data
android:host="main"
android:scheme="pikoapp" />
</intent-filter>
<!-- <data-->
<!-- android:host="main"-->
<!-- android:scheme="pikoapp" />-->
<!-- </intent-filter>-->
</activity>
<meta-data
android:name="firebase_crashlytics_collection_enabled"
android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> <!-- 刘海屏适配 begin -->
<!-- <meta-data-->
<!-- android:name="firebase_crashlytics_collection_enabled"-->
<!-- android:value="${CRASHLYTICS_COLLECTION_ENABLED}" /> &lt;!&ndash; 刘海屏适配 begin &ndash;&gt;-->
<!-- 小米 -->
<activity
android:name="com.soundcloud.android.crop.CropImageActivity"
@@ -161,7 +161,7 @@
如果 SDKOptions 中提供了，取 SDKOptions 中的值。
-->
<activity
android:name="com.vele.pekolive.lineapi.LineAuthenticationCallbackActivity"
android:name="com.vele.habuplay.lineapi.LineAuthenticationCallbackActivity"
android:exported="true"
android:launchMode="singleTask"
android:noHistory="true">
@@ -222,7 +222,7 @@
<activity
android:name=".MainActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="Piko"
android:label="Habu Live"
android:launchMode="singleTask"
android:screenOrientation="portrait"
android:windowSoftInputMode="adjustPan|stateAlwaysHidden" /> <!-- 配置的service和receiver -->
@@ -1065,9 +1065,9 @@
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/facebook_app_id" />
<meta-data
android:name="com.facebook.sdk.ClientToken"
android:value="@string/facebook_client_token" />
<!-- <meta-data-->
<!-- android:name="com.facebook.sdk.ClientToken"-->
<!-- android:value="@string/facebook_client_token" />-->
<activity
android:name="com.facebook.FacebookActivity"

2
app/src/main/java/com/vele/pekolive/lineapi/LineAuthenticationCallbackActivity.java → app/src/main/java/com/vele/habuplay/lineapi/LineAuthenticationCallbackActivity.java
View File

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

118
app/src/main/java/com/yizhuan/erban/AgentActivity.java
View File

@@ -7,9 +7,6 @@ import android.os.Build;
import androidx.appcompat.app.AppCompatActivity;
import com.mob.moblink.MobLink;
import com.mob.moblink.Scene;
import com.mob.moblink.SceneRestorable;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.yizhuan.erban.other.activity.SplashActivity;
import com.yizhuan.xchat_android_core.linked.LinkedModel;
@@ -20,70 +17,71 @@ import com.yizhuan.xchat_android_core.utils.TextUtils;
import java.util.HashMap;
import java.util.List;
public class AgentActivity extends AppCompatActivity implements SceneRestorable {
public class AgentActivity extends AppCompatActivity {
// implements SceneRestorable {
protected void onNewIntent(Intent intent) {
super.onNewIntent(intent);
setIntent(intent);
MobLink.updateNewIntent(getIntent(), this);
// MobLink.updateNewIntent(getIntent(), this);
}
@Override
public void onReturnSceneData(Scene scene) {
try {
HashMap<String, Object> hashMap = scene.getParams();
LogUtil.print("linkedme", hashMap);
//根据key获取传入的参数的值,该key关键字View可为任意值,由集成方规定,请与web端商议,一致即可
LinkedInfo linkedInfo = new LinkedInfo();
String roomuid = (String) hashMap.get("roomuid");
String uid = (String) hashMap.get("uid");
String type = String.valueOf(hashMap.get("type"));
String familyId = (String) hashMap.get("familyId");
String url = (String) hashMap.get("url");
String worldId = (String) hashMap.get("worldId");
String dynamicId = (String) hashMap.get("dynamicId");
String inviteCode = (String) hashMap.get("inviteCode");
if (roomuid != null) {
linkedInfo.setRoomUid(roomuid);
}
if (TextUtils.isEmptyText(roomuid) && uid != null) {
linkedInfo.setRoomUid(uid);
}
if (uid != null) {
linkedInfo.setUid(uid);
}
linkedInfo.setType(type);
if (familyId != null) {
linkedInfo.setFamilyId(familyId);
}
if (url != null) {
linkedInfo.setUrl(url);
}
if (worldId != null) {
linkedInfo.setWorldId(worldId);
}
if (dynamicId != null) {
linkedInfo.setDynamicId(dynamicId);
}
linkedInfo.setInviteCode(inviteCode);
LinkedModel.get().setLinkedInfo(linkedInfo);
} catch (Exception e) {
}
if (isExistMainActivity(MainActivity.class) && UserModel.get().getCacheLoginUserInfo() != null) {//应用已开启&用户信息以获取
MainActivity.handleLinkedJump(this);
} else {//应用未开启
SplashActivity.start(this);
}
finish();
}
// @Override
// public void onReturnSceneData(Scene scene) {
//
// try {
// HashMap<String, Object> hashMap = scene.getParams();
//
// LogUtil.print("linkedme", hashMap);
// //根据key获取传入的参数的值,该key关键字View可为任意值,由集成方规定,请与web端商议,一致即可
// LinkedInfo linkedInfo = new LinkedInfo();
// String roomuid = (String) hashMap.get("roomuid");
// String uid = (String) hashMap.get("uid");
// String type = String.valueOf(hashMap.get("type"));
// String familyId = (String) hashMap.get("familyId");
// String url = (String) hashMap.get("url");
// String worldId = (String) hashMap.get("worldId");
// String dynamicId = (String) hashMap.get("dynamicId");
// String inviteCode = (String) hashMap.get("inviteCode");
// if (roomuid != null) {
// linkedInfo.setRoomUid(roomuid);
// }
// if (TextUtils.isEmptyText(roomuid) && uid != null) {
// linkedInfo.setRoomUid(uid);
// }
// if (uid != null) {
// linkedInfo.setUid(uid);
// }
// linkedInfo.setType(type);
// if (familyId != null) {
// linkedInfo.setFamilyId(familyId);
// }
// if (url != null) {
// linkedInfo.setUrl(url);
// }
// if (worldId != null) {
// linkedInfo.setWorldId(worldId);
// }
// if (dynamicId != null) {
// linkedInfo.setDynamicId(dynamicId);
// }
//
// linkedInfo.setInviteCode(inviteCode);
//
// LinkedModel.get().setLinkedInfo(linkedInfo);
//
// } catch (Exception e) {
// }
//
//
// if (isExistMainActivity(MainActivity.class) && UserModel.get().getCacheLoginUserInfo() != null) {//应用已开启&用户信息以获取
// MainActivity.handleLinkedJump(this);
// } else {//应用未开启
// SplashActivity.start(this);
// }
// finish();
// }
public boolean isExistMainActivity(Class<?> activity) {
try {

110
app/src/main/java/com/yizhuan/erban/application/ReportManager.java
View File

@@ -1,20 +1,6 @@
package com.yizhuan.erban.application;
import android.os.Bundle;
import android.text.TextUtils;
import com.adjust.sdk.Adjust;
import com.adjust.sdk.AdjustConfig;
import com.adjust.sdk.AdjustEvent;
import com.adjust.sdk.LogLevel;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.google.firebase.crashlytics.FirebaseCrashlytics;
import com.google.gson.Gson;
import com.orhanobut.logger.Logger;
import com.yizhuan.xchat_android_constants.XChatConstants;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil;
import java.util.Map;
/**
@@ -37,38 +23,38 @@ public class ReportManager implements IReportService {
}
public void init() {
initFirebase();
initAdjust();
// initFirebase();
// initAdjust();
}
/**
* 初始化Firebase相关库
*/
private void initFirebase() {
// FirebaseCrashlytics注册公共属性
FirebaseCrashlytics.getInstance().setCustomKey(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID());
// FirebaseAnalytics注册公共属性
Bundle params = new Bundle();
if (AuthModel.get().getCurrentUid() != 0) {
params.putLong(IReportConstants.UID, AuthModel.get().getCurrentUid());
}
params.putString(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID());
setFirebaseAnalyticsDefaultEventParameters(params);
}
// private void initFirebase() {
// // FirebaseCrashlytics注册公共属性
// FirebaseCrashlytics.getInstance().setCustomKey(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID());
// // FirebaseAnalytics注册公共属性
// Bundle params = new Bundle();
// if (AuthModel.get().getCurrentUid() != 0) {
// params.putLong(IReportConstants.UID, AuthModel.get().getCurrentUid());
// }
// params.putString(IReportConstants.CHANNEL, AppMetaDataUtil.getChannelID());
// setFirebaseAnalyticsDefaultEventParameters(params);
// }
//Adjust初始化
private void initAdjust() {
String appToken = XChatConstants.ADJUST_APP_TOKEN;
String environment;
if (XChatApplication.isDebug()) {
environment = AdjustConfig.ENVIRONMENT_SANDBOX;
} else {
environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
}
AdjustConfig config = new AdjustConfig(XChatApplication.instance(), appToken, environment);
config.setLogLevel(LogLevel.WARN);
Adjust.onCreate(config);
}
// private void initAdjust() {
// String appToken = XChatConstants.ADJUST_APP_TOKEN;
// String environment;
// if (XChatApplication.isDebug()) {
// environment = AdjustConfig.ENVIRONMENT_SANDBOX;
// } else {
// environment = AdjustConfig.ENVIRONMENT_PRODUCTION;
// }
// AdjustConfig config = new AdjustConfig(XChatApplication.instance(), appToken, environment);
// config.setLogLevel(LogLevel.WARN);
// Adjust.onCreate(config);
// }
/**
* 设置FirebaseAnalytics公共属性
@@ -77,9 +63,9 @@ public class ReportManager implements IReportService {
*/
@Override
public void setFirebaseAnalyticsDefaultEventParameters(Bundle bundle) {
if (bundle != null) {
FirebaseAnalytics.getInstance(XChatApplication.instance()).setDefaultEventParameters(bundle);
}
// if (bundle != null) {
// FirebaseAnalytics.getInstance(XChatApplication.instance()).setDefaultEventParameters(bundle);
// }
}
/**
@@ -100,30 +86,30 @@ public class ReportManager implements IReportService {
*/
@Override
public void reportEvent(String eventId, Map<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);
}
// 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);
// AdjustEvent adjustEvent = new AdjustEvent(eventId);
// Adjust.trackEvent(adjustEvent);
}

33
app/src/main/java/com/yizhuan/erban/application/XChatApplication.java
View File

@@ -20,9 +20,6 @@ import com.coorchice.library.utils.LogUtils;
import com.facebook.stetho.Stetho;
import com.hjq.toast.ToastUtils;
import com.mob.MobSDK;
import com.mob.moblink.MobLink;
import com.mob.moblink.RestoreSceneListener;
import com.mob.moblink.Scene;
import com.netease.nim.uikit.api.NimUIKit;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.netease.nimlib.sdk.NIMClient;
@@ -279,21 +276,21 @@ public class XChatApplication extends BaseApp {
* 初始化linkedMe
*/
private static void initLinkedMe() {
MobSDK.init(instance, "36b91eeac7469", "63ec0702513aca17e20615dd5dfdc03f");
MobLink.setRestoreSceneListener(new RestoreSceneListener() {
@Override
public Class<? extends Activity> willRestoreScene(Scene scene) {
return AgentActivity.class;
}
@Override
public void completeRestore(Scene scene) {
}
@Override
public void notFoundScene(Scene scene) {
}
});
MobSDK.init(instance, "32fd2f8457880", "ef796ca85e8cd95a76929663de133214");
// MobLink.setRestoreSceneListener(new RestoreSceneListener() {
// @Override
// public Class<? extends Activity> willRestoreScene(Scene scene) {
// return AgentActivity.class;
// }
//
// @Override
// public void completeRestore(Scene scene) {
// }
//
// @Override
// public void notFoundScene(Scene scene) {
// }
// });
}

2
app/src/main/java/com/yizhuan/erban/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,"Piko号:${item.erbanNo}")
.setText(R.id.tv_room_id,"Habu Live号:${item.erbanNo}")
.setChecked(R.id.check_box,item.checked)
ImageLoadUtils.loadImage(mContext,item.avatar,helper.getView(R.id.iv_avatar))
helper.addOnClickListener(R.id.iv_avatar,R.id.check_box)

56
app/src/main/java/com/yizhuan/erban/avroom/fragment/HomePartyRoomFragment.java
View File

@@ -804,34 +804,34 @@ public class HomePartyRoomFragment extends BaseRoomFragment<IHomePartyView, Home
gameBinding.tvHourRank.setVisibility(View.GONE);
}
if (!GoldBoxHelper.needIntegrateBoxEntrance()) {
GoldBoxHelper.isHideBox().subscribe(
hide -> {
if (hide != null && !hide) {
if (AvRoomDataManager.get().isCpRoom()) {
gameBinding.ivTreasureBoxCp.setVisibility(View.VISIBLE);
gameBinding.ivTreasureBox.setVisibility(View.GONE);
} else {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.VISIBLE);
GlideApp.with(BasicConfig.INSTANCE.getAppContext())
.load(GoldBoxHelper.getBoxIcon())
.error(R.drawable.icon_room_treasure_box)
.into(gameBinding.ivTreasureBox);
}
} else {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.GONE);
}
},
throwable -> {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.GONE);
});
} else {
gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
gameBinding.ivTreasureBox.setVisibility(View.GONE);
}
// if (!GoldBoxHelper.needIntegrateBoxEntrance()) {
// GoldBoxHelper.isHideBox().subscribe(
// hide -> {
// if (hide != null && !hide) {
// if (AvRoomDataManager.get().isCpRoom()) {
// gameBinding.ivTreasureBoxCp.setVisibility(View.VISIBLE);
// gameBinding.ivTreasureBox.setVisibility(View.GONE);
// } else {
// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
// gameBinding.ivTreasureBox.setVisibility(View.VISIBLE);
// GlideApp.with(BasicConfig.INSTANCE.getAppContext())
// .load(GoldBoxHelper.getBoxIcon())
// .error(R.drawable.icon_room_treasure_box)
// .into(gameBinding.ivTreasureBox);
// }
// } else {
// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
// gameBinding.ivTreasureBox.setVisibility(View.GONE);
// }
// },
// throwable -> {
// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
// gameBinding.ivTreasureBox.setVisibility(View.GONE);
// });
// } else {
// gameBinding.ivTreasureBoxCp.setVisibility(View.GONE);
// gameBinding.ivTreasureBox.setVisibility(View.GONE);
// }
setDragonView();
}

30
app/src/main/java/com/yizhuan/erban/avroom/fragment/SingleRoomFragment.kt
View File

@@ -85,21 +85,21 @@ class SingleRoomFragment : BaseRoomFragment<ISingleRoomView?, SingleRoomPresente
super.initiate()
mvpPresenter?.getBannerList()
initSpeedyMessage(gameBinding.flSpeedyMessage)
GoldBoxHelper.isHideBox().subscribe(
{
if (it == false) {
gameBinding.ivTreasureBox.visibility = View.VISIBLE
gameBinding.ivTreasureBox.load(
GoldBoxHelper.getBoxIcon(),
defaultRes = R.drawable.icon_room_treasure_box
)
} else {
gameBinding.ivTreasureBox.visibility = View.GONE
}
}
) {
gameBinding.ivTreasureBox.visibility = View.GONE
}
// GoldBoxHelper.isHideBox().subscribe(
// {
// if (it == false) {
// gameBinding.ivTreasureBox.visibility = View.VISIBLE
// gameBinding.ivTreasureBox.load(
// GoldBoxHelper.getBoxIcon(),
// defaultRes = R.drawable.icon_room_treasure_box
// )
// } else {
// gameBinding.ivTreasureBox.visibility = View.GONE
// }
// }
// ) {
// gameBinding.ivTreasureBox.visibility = View.GONE
// }
fansTeamViewModel.loadFansTeamInitInfo()

5
app/src/main/java/com/yizhuan/erban/common/util/AppLifeCycleHelper.java
View File

@@ -6,7 +6,6 @@ import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.adjust.sdk.Adjust;
import com.yizhuan.erban.application.XChatApplication;
import com.yizhuan.xchat_android_core.auth.AuthModel;
@@ -41,12 +40,12 @@ public class AppLifeCycleHelper implements Application.ActivityLifecycleCallback
@Override
public void onActivityResumed(@NonNull Activity activity) {
XChatApplication.gStack.onActivityResumed(activity);
Adjust.onResume();
// Adjust.onResume();
}
@Override
public void onActivityPaused(@NonNull Activity activity) {
Adjust.onPause();
// Adjust.onPause();
}
@Override

25
app/src/main/java/com/yizhuan/erban/ui/login/LoginActivity.java
View File

@@ -23,7 +23,6 @@ import com.facebook.FacebookException;
import com.facebook.GraphRequest;
import com.facebook.login.LoginManager;
import com.facebook.login.LoginResult;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nim.uikit.common.util.log.LogUtil;
import com.tongdaxing.erban.upgrade.AppUpgradeHelper;
@@ -127,10 +126,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
public void onSuccess(String result) {
getDialogManager().dismissDialog();
reportLoginResult(IReportConstants.ONE, IReportConstants.ONE, "");
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_facebook));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_facebook));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.FACEBOOK);
}
@@ -277,10 +276,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override
public void onSuccess(String result) {
reportLoginResult(IReportConstants.TWO, IReportConstants.ONE, "");
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_line));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_line));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
getDialogManager().dismissDialog();
SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.LINE);
}
@@ -308,10 +307,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override
public void onSuccess(String result) {
reportLoginResult(IReportConstants.THREE, IReportConstants.ONE, "");
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_google));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_google));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
getDialogManager().dismissDialog();
SPUtils.putString(SpConstants.LOGIN_TYPE, SpConstants.GOOGLE);
}

9
app/src/main/java/com/yizhuan/erban/ui/login/LoginCodeActivity.kt
View File

@@ -11,7 +11,6 @@ import android.view.MotionEvent
import android.widget.EditText
import androidx.core.content.ContextCompat
import com.coorchice.library.utils.LogUtils
import com.google.firebase.analytics.FirebaseAnalytics
import com.netease.nim.uikit.StatusBarUtil
import com.trello.rxlifecycle3.android.ActivityEvent
import com.yizhuan.erban.MainActivity
@@ -204,10 +203,10 @@ class LoginCodeActivity : BaseViewBindingActivity<ActivityLoginCodeBinding>() {
reportLoginResult(IReportConstants.ONE, "")
DemoCache.saveBoundAuthCode(true)
dialogManager.dismissDialog()
val map = HashMap<String, Any>(2)
map[FirebaseAnalytics.Param.METHOD] = getString(R.string.login_phone_code)
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map)
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN)
// val map = HashMap<String, Any>(2)
// map[FirebaseAnalytics.Param.METHOD] = getString(R.string.login_phone_code)
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map)
// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN)
stopCounter()
}

17
app/src/main/java/com/yizhuan/erban/ui/login/LoginPasswordActivity.java
View File

@@ -17,7 +17,6 @@ import androidx.appcompat.widget.AppCompatTextView;
import androidx.core.content.ContextCompat;
import com.coorchice.library.SuperTextView;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.netease.nim.uikit.StatusBarUtil;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.MainActivity;
@@ -217,10 +216,10 @@ public class LoginPasswordActivity extends BaseActivity {
reportLoginResult(IReportConstants.ONE, "");
DemoCache.saveBoundAuthCode(true);
getDialogManager().dismissDialog();
HashMap<String, Object> map = new HashMap<>(3);
map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_phone_code));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
// HashMap<String, Object> map = new HashMap<>(3);
// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_phone_code));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
stopCounter();
SPUtils.putString(SpConstants.LOGIN_TYPE, "");
}
@@ -323,10 +322,10 @@ public class LoginPasswordActivity extends BaseActivity {
@Override
public void onSuccess(String result) {
reportLoginResult(IReportConstants.ONE, result);
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_account));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.METHOD, getString(R.string.login_account));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.LOGIN, map);
// ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_LOGIN);
getDialogManager().dismissDialog();
SPUtils.putString(SpConstants.LOGIN_TYPE, "");
}

12
app/src/main/java/com/yizhuan/erban/ui/login/fragment/AddUserInfoFragment.java
View File

@@ -10,12 +10,9 @@ import android.widget.ImageView;
import android.widget.RadioButton;
import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatImageView;
import androidx.appcompat.widget.AppCompatTextView;
import com.adjust.sdk.Adjust;
import com.google.android.material.textfield.TextInputEditText;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.sleepbot.datetimepicker.time.RadialPickerLayout;
import com.sleepbot.datetimepicker.time.TimePickerDialog;
import com.trello.rxlifecycle3.android.FragmentEvent;
@@ -203,7 +200,8 @@ public class AddUserInfoFragment extends BaseFragment
}
INVITE_USER_CODE = shareCode;
String finalChannel = channel;
String adid = Adjust.getAdid();
// String adid = Adjust.getAdid();
String adid = "";
UserModel.get().requestCompleteUserInfo(userInfo, channel, uid, roomUid, shareCode, adid)
.compose(bindUntilEvent(FragmentEvent.DESTROY))
.subscribe(new SingleObserver<UserInfo>() {
@@ -216,9 +214,9 @@ public class AddUserInfoFragment extends BaseFragment
public void onSuccess(UserInfo userInfo) {
getDialogManager().dismissDialog();
ReportManager.get().reportAdjustEvent(IReportConstants.ADJUST_REGISTER);
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.METHOD, finalChannel);
ReportManager.get().reportEvent(FirebaseAnalytics.Event.SIGN_UP, map);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.METHOD, finalChannel);
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SIGN_UP, map);
AuthModel.get().setThirdUserInfo(null);
getActivity().finish();
}

2
app/src/main/java/com/yizhuan/erban/ui/pay/BillingManager.java
View File

@@ -28,7 +28,7 @@ public class BillingManager implements PurchasesUpdatedListener {
private static final String TAG = "BillingManager";
/*购买key*/
private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAotfZw5IAGCV4V/L/AblIO5DL/hrLTwC9MDlVoEEcL8rgrF4GIZrzhInQhqwjoY8FelThezK68ccMz4i+hi3Mup9kHNhYjlZo+A14gXV+omEzAFiWtqOsISvifSxrMi849LQuXfImqlKNRLzp+YSkr4oJq7OE7QmxlLwpAzFj623c6Z9NSj+NdoE3bRrS2F1SSGYYyHEMyV005TdzKnqtjwtkga2RPNZCnyepU6OuF/HrIUoBTIVpgd4aZC2lKSBY9GNBMxZLd0yCsXNLXRXnR0itaNh0clYkxUSa3PemqjBsr79hLFn2yQKDsBwSCBAfBsgbpAA84PF5Jl4dw6rl0wIDAQAB";
private static final String BASE_64_ENCODED_PUBLIC_KEY = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApNboVqeCAvW1s2mNCaNipu0bd15HC6FP86E1+dTEdMTD9XLWkYiXCzEbt+ciTda/XdAOYYe4YNnyfW7T/a9E7O0ZyjPj08q2LQaMqgTBecpzQhE7ZhYYmh3DdWrGKCEMLImX4yNuEEX9yC/dVP49nHNqfLWxmnzhDrJ5JDSlpvguOI4lMRe0/1gx7kfEeB8DOg8HfvdibiVZI4vhjk9Oz6sWJQZd1/bOuUe4huAj9Ys/4zcgniE8Da45lGdefjn12y7ELhcUZpFLLKvXmj0qnfqBX94CB+wfbEOYvALKaFb+bBZe/a8YEn/9zA4UsA0j+eRweXBb6e1AqaZJ4wp/JQIDAQAB";
/*客户端*/
private BillingClient billingClient;

4
app/src/main/java/com/yizhuan/erban/ui/setting/SettingActivity.kt
View File

@@ -218,7 +218,7 @@ 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)
// 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)
}
}

26
app/src/main/java/com/yizhuan/erban/ui/widget/ShareDialog.java
View File

@@ -11,10 +11,8 @@ import android.view.WindowManager;
import android.widget.TextView;
import com.google.android.material.bottomsheet.BottomSheetDialog;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.yizhuan.erban.R;
import com.yizhuan.erban.application.ReportManager;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import java.util.HashMap;
@@ -97,9 +95,9 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
case R.id.tv_erban:
if (onShareDialogItemClick != null) {
if (type != TYPE_SHARE_H5) {
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.text_share_erban_friends));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.text_share_erban_friends));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
onShareDialogItemClick.onInAppSharingItemClick();
} else {
SingleToastUtil.showToastShort(getString(R.string.ui_widget_sharedialog_02));
@@ -109,27 +107,27 @@ public class ShareDialog extends BottomSheetDialog implements View.OnClickListen
break;
case R.id.tv_line:
if (onShareDialogItemClick != null) {
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_line));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_line));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Line.NAME));
}
dismiss();
break;
case R.id.tv_facebook:
if (onShareDialogItemClick != null) {
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_facebook));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_facebook));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(Facebook.NAME));
}
dismiss();
break;
case R.id.tv_share_link:
if (onShareDialogItemClick != null) {
HashMap<String, Object> map = new HashMap<>(2);
map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_link));
ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
// HashMap<String, Object> map = new HashMap<>(2);
// map.put(FirebaseAnalytics.Param.CONTENT_TYPE, getString(R.string.share_link));
// ReportManager.get().reportEvent(FirebaseAnalytics.Event.SHARE, map);
onShareDialogItemClick.onSharePlatformClick(ShareSDK.getPlatform(GooglePlus.NAME));
}
dismiss();

BIN
app/src/main/res/drawable-xhdpi/about_logo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 28 KiB

BIN
app/src/main/res/drawable-xhdpi/default_avatar.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
app/src/main/res/drawable-xhdpi/default_banner.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
app/src/main/res/drawable-xhdpi/default_cover.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_common_failure.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 67 KiB

BIN
app/src/main/res/drawable-xhdpi/icon_common_failure_green.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

BIN
app/src/main/res/drawable-xhdpi/splash_bg.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.2 KiB

BIN
app/src/main/res/drawable-xhdpi/splash_bottom.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 108 KiB

BIN
app/src/main/res/drawable-xhdpi/splash_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 20 KiB

22
app/src/main/res/drawable/bg_splash.xml
View File

@@ -1,14 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<bitmap
android:gravity="fill"
android:src="@drawable/splash_bg" />
<shape android:shape="rectangle">
<solid android:color="@color/white" />
</shape>
</item>
<item android:top="200dp">
<item android:top="180dp">
<bitmap
android:gravity="center_horizontal|top"
android:dither="true"
android:filter="true"
android:gravity="top"
android:src="@drawable/splash_logo" />
</item>
<item>
<bitmap
android:dither="true"
android:filter="true"
android:gravity="bottom"
android:src="@drawable/splash_bottom" />
</item>
</layer-list>

5
app/src/main/res/drawable/icon_common_failure.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="400px" android:height="356px"/>
</shape>

4
app/src/main/res/drawable/icon_common_failure_green.xml Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<size android:width="370px" android:height="290px"/>
</shape>

4
app/src/main/res/layout/activity_login_password.xml
View File

@@ -33,7 +33,7 @@
android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="48dp"
android:fontFamily="sans-serif-medium"
android:text="@string/Welcome_to_piko"
android:text="@string/welcome_to_app"
android:textColor="@color/text_title_color"
android:textSize="28sp"
android:textStyle="bold"
@@ -112,7 +112,7 @@
android:background="@null"
android:focusable="true"
android:gravity="center_vertical"
android:hint="@string/please_input_piko_account"
android:hint="@string/please_input_app_account"
android:inputType="number"
android:maxLength="11"
android:textColor="@color/text_title_color"

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

@@ -12,7 +12,7 @@
android:id="@+id/iv_icon"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:src="@drawable/about_logo" />
android:src="@mipmap/app_logo" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_num"

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="PikoPiko" />
tools:text="Habu LiveHabu Live" />
</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -11,7 +11,7 @@
android:id="@+id/iv_fairy"
android:layout_width="@dimen/dp_25"
android:layout_height="@dimen/dp_25"
android:src="@drawable/about_logo" />
android:src="@mipmap/app_logo" />
<TextView
android:id="@+id/tv_count"

BIN
app/src/main/res/mipmap-hdpi/app_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/mipmap-xhdpi/app_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 41 KiB

BIN
app/src/main/res/mipmap-xxhdpi/app_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 71 KiB

After

Width:  |  Height:  |  Size: 34 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/app_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 53 KiB

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

@@ -1,4 +1,4 @@
<!DOCTYPE resources [<!ENTITY app_name "Piko" >]>
<!DOCTYPE resources [<!ENTITY app_name "Habu Live" >]>
<resources>
<string name="app_name">&app_name;</string>
<string name="no_list_data">暫無消息</string>
@@ -119,7 +119,7 @@
<string name="text_chat_limit">僅%s或%s的用戶可發起聊天</string>
<string name="room_offline">房主已下線</string>
<string name="root_offline_notice">更多好玩的房間在Piko等您喲！去看看！</string>
<string name="root_offline_notice">更多好玩的房間在Habu Live等您喲！去看看！</string>
<string name="home">主頁</string>
<string name="back">返回</string>
<string name="fan">粉絲</string>
@@ -131,7 +131,7 @@
<string name="friend">好友</string>
<string name="attention">關註</string>
<string name="no_frenids_text">你還沒有添加任何好友哦! \n快去添加好友吧!</string>
<string name="no_fan_text">你還沒有任何Piko粉絲哦!</string>
<string name="no_fan_text">你還沒有任何Habu Live粉絲哦!</string>
<string name="my_jewel">我的鉆石余額</string>
<string name="jewel_withdraw">鉆石可以用於提現，兌換比率1元=10鉆</string>
<string name="main_home">首頁</string>
@@ -167,7 +167,7 @@
<string name="my_attention">我的關註</string>
<string name="my_fan">我的粉絲</string>
<string name="no_attention_text">你還沒有關註任何Piko好友哦! \n快去添加關註吧!</string>
<string name="no_attention_text">你還沒有關註任何Habu Live好友哦! \n快去添加關註吧!</string>
<string name="search_hint">搜索昵稱或ID</string>
<string name="search_user_id">搜索用戶ID</string>
<string name="search_room_or_id">搜索房間名稱或ID</string>
@@ -261,7 +261,7 @@
<string name="pk_opponent_result"> 查看對方戰績></string>
<string name="pk_mine_result"> 查看我的戰績></string>
<string name="pk_tip_do_not_give_up">別氣餒，Piko永遠支持你哦！</string>
<string name="pk_tip_do_not_give_up">別氣餒，Habu Live永遠支持你哦！</string>
<!--密聊-->
@@ -343,7 +343,7 @@
<string name="car_detail_price_days2">%1$d&#160;&#160;&#160;&#160;有效期%2$d天</string>
<string name="car_user_info_off_shelf">該車輛已下架，無法購買</string>
<string name="car_dialog_content_before">開著你的車，駕著你的馬</string>
<string name="car_dialog_content_after">來Piko盡情馳騁吧!</string>
<string name="car_dialog_content_after">來Habu Live盡情馳騁吧!</string>
<string name="car_shop_name">座駕商城</string>
<string name="decoration_status_wrapper">%1$s</string>
<string name="decoration_remainder">剩餘</string>
@@ -363,7 +363,7 @@
5 打爆怪獸的獎勵將會隨著怪獸的實力（血值）增加而增加，例如：打爆一只血值1000的怪獸將獲得總價不少於1000鉆石的鉆石或者座駕獎勵\n
6 若有疑問，請咨詢Piko客服：1213490\n
6 若有疑問，請咨詢Habu Live客服：\n
</string>
<string name="text_monster_hunting_introduction">·玩法介紹·</string>
<string name="text_ok">確定</string>
@@ -427,7 +427,7 @@
<string name="family_exit_family">退出家族</string>
<string name="family_exit_family_tip">退出家族後您的家族幣將無法使用\n重新加入即可還原,你真的要退出嗎?</string>
<string name="family_invite_friends">邀請好友</string>
<string name="family_invite_friends_slogan">【Piko】 用聲音表達心情，用家族傳承微笑。</string>
<string name="family_invite_friends_slogan">【Habu Live】 用聲音表達心情，用家族傳承微笑。</string>
<string name="family_join">加入</string>
<string name="family_search_member_hint">搜索成員ID/昵稱 </string>
<string name="family_manage_title">家族管理</string>
@@ -447,7 +447,7 @@
<string name="family_join_valid_hint">加入家族身份驗證</string>
<string name="family_disband">解散家族</string>
<string name="common_tip">提示</string>
<string name="family_disband_tip1">需要聯系客服才能解散家族哦~\nPiko家族客服:%1$s</string>
<string name="family_disband_tip1">需要聯系客服才能解散家族哦~\nHabu Live家族客服:%1$s</string>
<string name="family_contact_service">聯系客服</string>
<string name="family_join_tip">確認加入"%1$s"嗎?</string>
<string name="family_join_hint">我希望加入貴家族</string>
@@ -539,7 +539,7 @@
<string name="tab_title_friends">好友</string>
<string name="tab_title_attentions">關註</string>
<string name="tab_title_fans">粉絲</string>
<string name="title_share_dialog">每天第一次分享免費領紅包（不包含分享至Piko好友）</string>
<string name="title_share_dialog">每天第一次分享免費領紅包（不包含分享至Habu Live好友）</string>
<string name="text_share_erban_friends">好友</string>
<string name="text_share_Google">Google</string>
<string name="tab_title_team">群</string>
@@ -565,7 +565,7 @@
<string name="tips_bind_alipay_sms_code">驗證碼將發送至您綁定的手機\"{0}\",請註意查收</string>
<string name="home_more">更多</string>
<string name="text_qq_login_erban_member">我是兔兔老用戶</string>
<string name="text_qq_login_tutu_member">我是Piko新用戶</string>
<string name="text_qq_login_tutu_member">我是Habu Live新用戶</string>
<string name="text_login">登錄</string>
<string name="text_login_auth_code">授權碼</string>
<string name="text_login_code">驗證碼</string>
@@ -579,7 +579,7 @@
<string name="label_recall_title">親愛的小孩:</string>
<string name="label_recall_content">好久不見，翻起曾經一起度過的時光，期待你再次出現在身旁，謝謝你回來！</string>
<string name="hint_recall_input">請輸入邀請碼(選填)</string>
<string name="tips_recall">輸入邀請碼，邀請你加入的好友和你都可以獲得Piko回歸計劃的超級大禮哦！</string>
<string name="tips_recall">輸入邀請碼，邀請你加入的好友和你都可以獲得Habu Live回歸計劃的超級大禮哦！</string>
<string name="label_recall_accept">收下回歸禮</string>
<string name="label_user_info_avatar">頭像:</string>
@@ -665,7 +665,7 @@
<string name="KTV_ing">KTV中…</string>
<string name="common_loading_tips">加載中…</string>
<string name="text_default_nick">Piko小新</string>
<string name="text_default_nick">Habu Live小新</string>
<string name="text_default_code">請輸入邀請碼(選填)</string>
<string name="text_room_queuing_micro_mode">排麥模式</string>
@@ -836,7 +836,7 @@
<string name="label_charge_gold">我的賬戶</string>
<string name="old_app_name">Piko</string>
<string name="old_app_name">Habu Live</string>
<string name="tip_login_how_login">如何登錄？</string>
<string name="tip_login_old_account">%s也可登錄%s哦 %s</string>
<string name="me_mentoring_relationship_title">收個徒弟贏鉆石</string>
@@ -1491,7 +1491,7 @@
<string name="avroom_fragment_baseroomfragment_01">房間更新事件</string>
<string name="avroom_fragment_baseroomfragment_02">進入房間事件</string>
<string name="avroom_fragment_baseroomfragment_03">語音房_推廣入口</string>
<string name="avroom_fragment_baseroomfragment_04">發送失敗，Piko提醒您文明用語~</string>
<string name="avroom_fragment_baseroomfragment_04">發送失敗，Habu Live提醒您文明用語~</string>
<string name="avroom_fragment_baseroomfragment_05">語音房_公屏發言</string>
<string name="avroom_fragment_baseroomfragment_06">房間榜</string>
<string name="avroom_fragment_baseroomfragment_07">網絡異常，請重試！</string>
@@ -2182,7 +2182,7 @@
<string name="radish_signin_signinactivity_02">本輪已用完補簽機會</string>
<string name="radish_signin_signinactivity_03">分享好友</string>
<string name="radish_signin_signinactivity_04"> 即可獲得補簽機會\n</string>
<string name="radish_signin_signinactivity_05">分享後返回Piko才有效哦~</string>
<string name="radish_signin_signinactivity_05">分享後返回Habu Live才有效哦~</string>
<string name="radish_signin_signinactivity_06">分享好友</string>
<string name="radish_signin_signinactivity_07">本次補簽需要消耗 </string>
<string name="radish_signin_signinactivity_08">蘿蔔</string>
@@ -2779,8 +2779,8 @@
<string name="ui_widget_maintablayout_04">我的tab</string>
<string name="ui_widget_marqueelayout_01">[liao] 內容字體長度=</string>
<string name="ui_widget_recalldialog_01">親愛的</string>
<string name="ui_widget_sharedialog_01">該內容不能分享給Piko好友</string>
<string name="ui_widget_sharedialog_02">該內容不能分享給Piko好友</string>
<string name="ui_widget_sharedialog_01">該內容不能分享給Habu Live好友</string>
<string name="ui_widget_sharedialog_02">該內容不能分享給Habu Live好友</string>
<string name="ui_widget_userinfodialog_01">我</string>
<string name="ui_widget_userinfodialog_02">該用戶已不在麥位上,請重新選擇</string>
<string name="ui_widget_userinfodialog_03">已關註Ta</string>
@@ -2942,7 +2942,7 @@
<string name="layout_activity_lucky_money_detail_02">金豆</string>
<string name="layout_activity_lucky_money_detail_03">人名長度要限製在十個字以內</string>
<string name="layout_activity_lucky_money_detail_04">領取12/14個，剩餘12.600金豆</string>
<string name="layout_activity_main_01">Piko小新</string>
<string name="layout_activity_main_01">Habu Live小新</string>
<string name="layout_activity_modify_pwd_01">請輸入當前登錄密碼</string>
<string name="layout_activity_modify_pwd_02">原密碼</string>
<string name="layout_activity_modify_pwd_03">請輸入新的登錄密碼</string>
@@ -3072,7 +3072,7 @@
<string name="layout_activity_verify_phone_02">驗證碼:</string>
<string name="layout_activity_verify_phone_03">請輸入驗證碼</string>
<string name="layout_activity_verify_phone_04">下一步</string>
<string name="layout_activity_verify_phone_05">如果您的手機號已丟失\n請咨詢客服，ID：88001</string>
<string name="layout_activity_verify_phone_05">如果您的手機號已丟失\n請咨詢客服，ID：</string>
<string name="layout_activity_withdraw_01">請綁定你的支付寶賬號</string>
<string name="layout_activity_withdraw_02">羅生</string>
<string name="layout_activity_withdraw_03">鉆石余額</string>
@@ -3237,8 +3237,8 @@
<string name="layout_dialog_new_user_charge_prize_01">裝扮已放至【我的裝扮】</string>
<string name="layout_dialog_new_user_gift_01">獲得新人禮物 </string>
<string name="layout_dialog_new_user_gift_02">已放入背包，盡快使用吧~</string>
<string name="layout_dialog_new_user_hello_01">Piko可可鴨Piko可...</string>
<string name="layout_dialog_new_user_hello_02">歡迎來到Piko，Ta已經等待你很\n久啦，快來一起玩吧~</string>
<string name="layout_dialog_new_user_hello_01">Habu Live可可鴨Habu Live可...</string>
<string name="layout_dialog_new_user_hello_02">歡迎來到Habu Live，Ta已經等待你很\n久啦，快來一起玩吧~</string>
<string name="layout_dialog_new_user_hello_03">開啟浪漫之旅</string>
<string name="layout_dialog_patriarch_mode_01">青少年保護</string>
<string name="layout_dialog_pk_result_01">拉拉</string>
@@ -3832,7 +3832,7 @@
<string name="layout_popup_message_tip_01">用戶昵稱用戶昵稱稱稱</string>
<string name="layout_popup_message_tip_02">一二三四五六七八</string>
<string name="layout_pull_radish_ranking_list_item_01">我的我的我的我的我我我我我的我的我我我我我我我我</string>
<string name="layout_red_packet_dialog_01">Piko送你一個現金紅包</string>
<string name="layout_red_packet_dialog_01">Habu Live送你一個現金紅包</string>
<string name="layout_red_packet_dialog_02">元</string>
<string name="layout_red_packet_dialog_03">恭喜您獲得</string>
<string name="layout_red_packet_dialog_04">獎勵紅包</string>
@@ -4068,7 +4068,7 @@
<string name="hall_activity_hallnamesettingactivity_03">房間名不能為空</string>
<string name="hall_activity_hallnamesettingactivity_04">房間名不能超過15個字</string>
<string name="hall_activity_hallnamesettingactivity_05">保存成功</string>
<string name="hall_activity_hallsearchactivity_01">搜索昵稱/PikoID</string>
<string name="hall_activity_hallsearchactivity_01">搜索昵稱/Habu LiveID</string>
<string name="hall_activity_incomestatisticsactivity_01">收入統計入口</string>
<string name="hall_activity_incomestatisticsactivity_02">收入統計</string>
<string name="hall_activity_incomestatisticsactivity_03">每日統計</string>
@@ -4165,7 +4165,7 @@
<string name="module_hall_secretcode_pwdcodemgr_06">版本過舊，請下載最新版本哦</string>
<string name="module_hall_secretcode_pwdcodemgr_07">立即加入</string>
<string name="module_hall_secretcode_pwdcodemgr_08">通過暗號加入廳</string>
<string name="module_hall_secretcode_pwdcodemgr_09">添加成員-PikoID</string>
<string name="module_hall_secretcode_pwdcodemgr_09">添加成員-Habu LiveID</string>
<string name="module_hall_secretcode_secretcodedialog_03">有效，過期後重新獲取</string>
<string name="team_activity_createhallteamactivity_01">公開群全站用戶可加入，只能創建</string>
<string name="team_activity_createhallteamactivity_02">個;\n內部群僅廳成員可加入，最多創建</string>
@@ -4268,7 +4268,7 @@
<string name="layout_activity_team_info_edit_012">設置禁言</string>
<string name="layout_activity_vip_main_01">即將上線敬請期待</string>
<string name="layout_activity_vip_main_02">尚未開通貴族</string>
<string name="layout_activity_vip_main_03">¥6立刻成為Piko貴族</string>
<string name="layout_activity_vip_main_03">¥6立刻成為Habu Live貴族</string>
<string name="layout_activity_vip_main_04">當前等級</string>
<string name="layout_activity_vip_main_05">騎士</string>
<string name="layout_activity_vip_main_06">還差:</string>
@@ -4286,8 +4286,8 @@
<string name="layout_dialog_secret_code_02">我是emoji\n我是emoji</string>
<string name="layout_dialog_secret_code_03">7天內(2月18日前)有效，過期後需重新獲取</string>
<string name="layout_dialog_share_secret_code_01">添加成員</string>
<string name="layout_dialog_share_secret_code_02">PikoID添加</string>
<string name="layout_include_user_module_hall_01">Piko女神廳</string>
<string name="layout_dialog_share_secret_code_02">Habu LiveID添加</string>
<string name="layout_include_user_module_hall_01">Habu Live女神廳</string>
<string name="layout_include_user_module_hall_02">公開群名稱</string>
<string name="layout_item_auth_menu_01">添加成員</string>
<string name="layout_item_auth_setting_01">添加成員權限</string>
@@ -4299,7 +4299,7 @@
<string name="layout_item_clan_income_05">開廳時長</string>
<string name="layout_item_clan_income_06">送禮人數</string>
<string name="layout_item_clan_income_07">新用戶送禮人數</string>
<string name="layout_item_group_list_01">Piko女神</string>
<string name="layout_item_group_list_01">Habu Live女神</string>
<string name="layout_item_hall_01">忘憂閣忘憂閣忘憂閣忘憂閣</string>
<string name="layout_item_income_01">吉林吉林</string>
<string name="layout_item_income_02">吉林吉林</string>
@@ -4327,7 +4327,7 @@
<string name="mentoring_relationship_activity_mentoringrelationshipactivity_02">去收徒</string>
<string name="mentoring_relationship_activity_mentoringrelationshipactivity_03">名師排行榜</string>
<string name="mentoring_relationship_dialog_grabapprenticesnoticedialog_01">師徒推送-點擊跳轉</string>
<string name="layout_dialog_grab_apprentices_notify_01">Piko：您收到一條收徒消息哦！</string>
<string name="layout_dialog_grab_apprentices_notify_01">Habu Live：您收到一條收徒消息哦！</string>
<string name="layout_dialog_release_mentoring_relationship_success_01">解除成功！</string>
<string name="layout_item_grab_apprentice_01">啊哈哈哈哈哈哈</string>
<string name="layout_item_mentoring_relationship_results_display_01">啦啦啦啦啦啦啦啦啦啦啊啊啊</string>
@@ -4339,11 +4339,11 @@
<string name="layout_view_holder_apprentice_mission_four_02">小明同學啦啦啦啦</string>
<string name="layout_view_holder_apprentice_mission_four_03">·給他發送拜師函吧·</string>
<string name="layout_view_holder_apprentice_mission_four_04">關註並打招呼</string>
<string name="layout_view_holder_apprentice_mission_four_05">小哥哥你就從了我吧,做我徒弟,以後我們一起浪跡Piko,你是風兒我是沙！</string>
<string name="layout_view_holder_apprentice_mission_four_05">小哥哥你就從了我吧,做我徒弟,以後我們一起浪跡Habu Live,你是風兒我是沙！</string>
<string name="layout_view_holder_apprentice_mission_one_01">哇哦 終於搶到你~\n這就是緣分吧！</string>
<string name="layout_view_holder_apprentice_mission_one_02">小明同學啦啦啦啦</string>
<string name="layout_view_holder_apprentice_mission_one_03">就讓我們從這裏開啟師徒之旅吧！\n你認我做師傅，我教你梳中分~</string>
<string name="layout_view_holder_apprentice_mission_one_04">Piko所有問題都可以問Ta哦~</string>
<string name="layout_view_holder_apprentice_mission_one_04">Habu Live所有問題都可以問Ta哦~</string>
<string name="layout_view_holder_apprentice_mission_three_01">拜師禮物</string>
<string name="layout_view_holder_apprentice_mission_three_02">花花由官方提供，不扣任何鉆石哦！</string>
<string name="layout_view_holder_apprentice_mission_three_03">新人小花</string>
@@ -4673,13 +4673,13 @@
<string name="public_chat_hall_activity_publicchathallrelatedtomeactivity_01">我的消息</string>
<string name="public_chat_hall_activity_publicchathallrelatedtomeactivity_02">我的頭條</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_01">進入交友大廳</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_02">發送失敗，Piko提醒您文明用語~</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_02">發送失敗，Habu Live提醒您文明用語~</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_03">發送失敗，Pieko提醒您文明用語~</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_04">送該禮物</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_05">公聊大廳</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_06">資料卡片-主頁</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_07">你已被禁言，剩餘</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_08">分鐘。Piko提醒您文明用語</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_08">分鐘。Habu Live提醒您文明用語</string>
<string name="public_chat_hall_fragment_publicchathallmessagefragment_09">我在交友大廳發現好玩的東西！@你了 快點過來看看~</string>
<string name="public_chat_hall_fragment_publicchathallmymessagefragment_01">/@我的</string>
<string name="public_chat_hall_fragment_publicchathallmymessagefragment_02">我發出的</string>
@@ -4936,12 +4936,12 @@
<string name="department_of_management">所屬廳</string>
<string name="give_gift">送礼物</string>
<string name="room_perform_go_update">去設置</string>
<string name="permission_storage_rationale">請您再次考慮授予PIKO存儲空間權限，否則PIKO將無法正常加載您本地的文件內容。</string>
<string name="permission_camera_rationale">請您再次考慮授予PIKO攝像頭權限，否則PIKO將無法取得您拍攝的內容。</string>
<string name="permission_storage_rationale">請您再次考慮授予Habu Live存儲空間權限，否則Habu Live將無法正常加載您本地的文件內容。</string>
<string name="permission_camera_rationale">請您再次考慮授予Habu Live攝像頭權限，否則Habu Live將無法取得您拍攝的內容。</string>
<string name="permission_storage_denied">為了能正常加載您本地的文件內容，請前往應用權限設置界面打開存儲空間權限。</string>
<string name="permission_camera_denied">為了能取得您拍攝的內容，請前往應用權限設置界面打開攝像頭權限。</string>
<string name="permission_storage_refused">您已拒絕提供存儲空間權限，PIKO將無法正常加載您本地的文件內容。</string>
<string name="permission_camera_refused">您已拒絕提供攝像頭權限，PIKO將無法取得您拍攝的內容。</string>
<string name="permission_storage_refused">您已拒絕提供存儲空間權限，Habu Live將無法正常加載您本地的文件內容。</string>
<string name="permission_camera_refused">您已拒絕提供攝像頭權限，Habu Live將無法取得您拍攝的內容。</string>
<string name="detail">明細</string>
<string name="convert_diamond">兌換鉆石</string>
<string name="gold">金幣</string>
@@ -5103,14 +5103,14 @@
<string name="Member_income">成員收入</string>
<string name="Senior_management_setup">高管設置</string>
<string name="contract_statement">簽約流水</string>
<string name="Welcome_to_piko">Welcome to Piko！</string>
<string name="welcome_to_app">Welcome to Habu Live！</string>
<string name="facebook_app_id">1266232494209868</string>
<string name="fb_login_protocol_scheme">fb1266232494209868</string>
<string name="facebook_client_token">189d1a90712cc61cedded4cf1372cb21</string>
<string name="facebook_app_id">2899088310346434</string>
<string name="fb_login_protocol_scheme">fb2899088310346434</string>
<string name="facebook_client_token"></string>
<string name="account_login">賬號登錄</string>
<string name="code_login">短信登錄</string>
<string name="please_input_piko_account">請輸入Piko賬號</string>
<string name="please_input_app_account">請輸入Habu Live賬號</string>
<string name="please_get_code">請獲取驗證碼</string>
<string name="Please_enter_the_authorization_code">請輸入授權碼</string>
<string name="select_your_gender">請選擇您的性別</string>
@@ -5128,7 +5128,7 @@
<string name="buy_love_num">購買%d個愛心</string>
<string name="please_select_or_enter_the_quantity_of_hearts_purchased">請選擇或輸入購買的愛心數量</string>
<string name="how_to_recharge_with_cs">如何儲值：</string>
<string name="tips_cs_recharge">1.在Piko語音App內前往【我的】—【儲值鑽石】進行儲值\n2.聯繁客服獲取儲值鏈接\n客服WeChat: %s 複製\n客服Line: %s 複製\n3.如遇提示"儲值失敗，請聯系客服處理~"，請添加客服進行處理</string>
<string name="tips_cs_recharge">1.在Habu Live語音App內前往【我的】—【儲值鑽石】進行儲值\n2.聯繁客服獲取儲值鏈接\n客服WeChat: %s 複製\n客服Line: %s 複製\n3.如遇提示"儲值失敗，請聯系客服處理~"，請添加客服進行處理</string>
<string name="fairy_debris_not_enough_please_buy">可用碎片不足，請購買</string>
<string name="zero">0</string>
<string name="please_input_quantity">輸入數量</string>

2
app/src/module_bank_card/res/values/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">
尊敬的Piko用戶：\n\u3000\u3000為了更好地保障你的合法權益，
尊敬的Habu Live用戶：\n\u3000\u3000為了更好地保障你的合法權益，
讓你正常使用%s服務，%s公司依照國家法律法規，對支付賬戶進行實名製管理、
履行反洗錢職責並采取風險防控措施。你需要向%s公司以及合作公司（匯聚支付）提交身份信息、
聯系方式、交易信息。\n\u3000\u3000%s公司將嚴格依據國家法律法規收集、存儲、使用你的個人信息，確保信息安全。

2
app/src/module_labour_union/java/com/yizhuan/erban/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} (PikoID:${it.erbanNo})為公會超級管理員嗎?",
"確定要添加用戶 ${it.nick} (Habu LiveID:${it.erbanNo})為公會超級管理員嗎?",
true
) {
SuperAdminRoomSetActivity.start(this, clanId, it.uid)

11
app/src/module_treasure_box/java/com/yizhuan/erban/treasure_box/widget/GoldBoxHelper.java
View File

@@ -103,11 +103,12 @@ public class GoldBoxHelper {
}
public static boolean isShowFairy() {
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
FairyOpenInfo fairyOpenInfo = InitialModel.get().getFairyOpenInfo();
if (fairyOpenInfo == null || userInfo == null) return false;
return fairyOpenInfo.isOpen() && userInfo.getUserLevelVo().getExperLevelSeq() >= fairyOpenInfo.getLevelLimit();
return false;
// UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
// FairyOpenInfo fairyOpenInfo = InitialModel.get().getFairyOpenInfo();
// if (fairyOpenInfo == null || userInfo == null) return false;
//
// return fairyOpenInfo.isOpen() && userInfo.getUserLevelVo().getExperLevelSeq() >= fairyOpenInfo.getLevelLimit();
}
}

4
build.gradle
View File

@@ -25,8 +25,8 @@ buildscript {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.tencent.vasdolly:plugin:3.0.3'
classpath "com.mob.sdk:MobSDK:2018.0319.1724"
classpath 'com.google.gms:google-services:4.3.13'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
// classpath 'com.google.gms:google-services:4.3.13'
// classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
}
}

8
core/build.gradle
View File

@@ -89,10 +89,10 @@ dependencies {
api 'androidx.room:room-rxjava2:2.3.0'
//firebase推送、统计
implementation 'com.google.firebase:firebase-messaging:23.1.1'
implementation 'com.google.android.gms:play-services-base:18.1.0'
implementation 'com.google.firebase:firebase-core:19.0.0'
implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
// implementation 'com.google.firebase:firebase-messaging:23.1.1'
// implementation 'com.google.android.gms:play-services-base:18.1.0'
// implementation 'com.google.firebase:firebase-core:19.0.0'
// implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
//googleplay内购
api 'com.google.android.gms:play-services-wallet:19.2.1'

79
core/src/diff_src_erban/java/com/yizhuan/xchat_android_constants/XChatConstants.java
View File

@@ -3,6 +3,7 @@ package com.yizhuan.xchat_android_constants;
import com.yizhuan.xchat_android_core.BuildConfig;
import com.yizhuan.xchat_android_core.R;
import com.yizhuan.xchat_android_library.utils.ResUtil;
import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
/**
* Created by MadisonRong on 09/08/2018.
@@ -13,7 +14,7 @@ public class XChatConstants {
/**
* 包名(各種緩存目錄的根目錄)
*/
public static final String XCHAT_DIR_NAME = "com.mango.piko";
public static final String XCHAT_DIR_NAME = "com.vele.habuplay";
/**
* sp名字
@@ -38,59 +39,24 @@ public class XChatConstants {
/**
* 雲信 key (DEBUG)
*/
public static final String NIM_KEY_DEBUG = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更換
// public static final String NIM_KEY_DEBUG = "1c3b8c6bf8467d8e4c33a004dbec5c94";//已更換
/**
* 雲信 key (RELEASE)
*/
public static final String NIM_KEY_RELEASE = "d4d74e9ba6ac3364ccc7526ea4791215";//已更換
/**
* 網易易盾 productNumber
*/
public static final String YI_DUN_PRODUCT_NUMBER = "YD00313347064620";//已更換
/**
* 網易易盾 業務 ID 註冊
*/
public static final String QUICK_PASS_BUSINESS_ID = "ef7de5582f194c549125a64b710e7f31";
/**
* 網易易盾 業務 ID 註冊
*/
public static final String YI_DUN_BUSINESS_ID = "af43d0f8752147c48f8281800da6049e";
/**
* 網易易盾 業務 ID 註冊
*/
public static final String YI_DUN_LOGIN_BUSINESS_ID = "67881c7a69764c058435ba93a51b1285";
/**
* 數美-天網 的 organization
*/
public static final String SHU_MEI_TIAN_WANG_ORGANIZATION = "2qjgWI5tyNipa08YPjOt";
// public static final String NIM_KEY_RELEASE = "d4d74e9ba6ac3364ccc7526ea4791215";//已更換
/**
* 聲網 key
*/
public static final String AGORA_KEY = "f8713b6ec98c4c01adaf34cb4fa091b1"; //已更換
// public static final String AGORA_KEY = "f8713b6ec98c4c01adaf34cb4fa091b1"; //已更換
/**
* 阿裏雲日誌空間名字
*/
public static final String ALIYUN_LOG_NAME = "66accompanylog";
/**
* 阿裏雲日誌空間名字
*/
public static final String ALIYUN_LOG_STORE = "66accompanylog";
/**
* 百度統計 key
*/
public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改
// public static final String BAIDU_APP_KEY = "b8a4cb4bd1";//已更改
/**
* linkedMe key
*/
public static final String LINKED_ME_KEY = "6ba9e9d9760b8acc50b2b499cfd557da";
/**
* 公屏第一條提示消息
@@ -224,13 +190,13 @@ public class XChatConstants {
/**
* Referer (DEBUG)
*/
public static final String KEY_REFERER_DEBUG = "https://beta.api.pekolive.com/";
public static final String KEY_REFERER_DEBUG = "https://beta.api.anan.chat/";
/**
* Referer (RELEASE)
*/
public static final String KEY_REFERER_RELEASE = "https://api.pekolive.com/";
public static final String APP_MARK = "peko";
public static final String KEY_REFERER_RELEASE = "https://api.anan.chat/";
public static final String APP_MARK = "habu";
/**
* 聊天室文本消息易盾反垃圾業務id
*/
@@ -243,11 +209,34 @@ public class XChatConstants {
/**
* Adjust配置
*/
public static final String ADJUST_APP_TOKEN = "ujzc7mbv3g8w";
// public static final String ADJUST_APP_TOKEN = "ujzc7mbv3g8w";
/**
* peko谷歌下载地址
*/
public static String appDownloadUrl = "https://play.google.com/store/apps/details?id=com.vele.pekolive";
public static String appDownloadUrl = "https://play.google.com/store/apps/details?id=com.vele.habuplay";
public static String getAgoraKey() {
try {
return DESUtils.DESAndBase64Decrypt("8QLrysqBwGmCodayBzvis+9wWYUwQlBPkUqdprUrlcNAwgt7a5hAGQ==");
} catch (Exception e) {
return "";
}
}
public static String getNimKeyDebug() {
try {
return DESUtils.DESAndBase64Decrypt("zkUPMmvAAUxWJTdS34whaFNEWuJaKpfllz5BgjG8r2JAwgt7a5hAGQ==");
} catch (Exception e) {
return "";
}
}
public static String getNimKeyRelease() {
try {
return DESUtils.DESAndBase64Decrypt("ivctC5n5Xoo+FOTazYk7bTOI3V+Rmi8gAjTkAaKBJolAwgt7a5hAGQ==");
} catch (Exception e) {
return "";
}
}
}

4
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/UriProvider.java
View File

@@ -13,8 +13,8 @@ public class UriProvider {
/**
* 默认以下生产环境地址
*/
public static String JAVA_WEB_URL = "https://api.pekolive.com/";
public static String IM_SERVER_URL = "https://api.pekolive.com/";
public static String JAVA_WEB_URL = "https://api.anan.chat/";
public static String IM_SERVER_URL = "https://api.anan.chat/";
/**
* 初始化URL

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/agora/RtcEngineManager.java
View File

@@ -55,7 +55,7 @@ public class RtcEngineManager extends BaseEngine {
Logger.t(TAG).d("enterChannel channelId:%d", channelId);
if (mRtcEngine == null) {
try {
mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XChatConstants.AGORA_KEY, mEngineEventHandler);
mRtcEngine = RtcEngine.create(BasicConfig.INSTANCE.getAppContext(), XChatConstants.getAgoraKey(), mEngineEventHandler);
} catch (Exception e) {
throw new RuntimeException(
"NEED TO check rtc sdk init fatal error\n" + Log.getStackTraceString(e));

13
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/SDKConfig.java
View File

@@ -1,5 +1,7 @@
package com.yizhuan.xchat_android_core.manager.trtc;
import com.yizhuan.xchat_android_library.utils.codec.DESUtils;
public class SDKConfig {
/**
* 声网appid，需要替换为尽自己账号下的声网appid
@@ -11,7 +13,7 @@ public class SDKConfig {
* 进入腾讯云云通信[控制台](https://console.cloud.tencent.com/avc) 创建应用，即可看到 SDKAppId，
* 它是腾讯云用于区分客户的唯一标识。
*/
public static int TX_SDKAPPID = 1400823228;//
// public static int TX_SDKAPPID = 1400823228;//
/**
* 腾讯云 bizid和appid
@@ -30,4 +32,13 @@ public class SDKConfig {
* 1：表示房间号为整型房间号，如："111"，"123"
*/
public static int TX_CHANNELNAME_INT = 1;
public static String getTXAppId() {
try {
return DESUtils.DESAndBase64Decrypt("SvVKinDlp2xq9wtVeUYw1w==");
} catch (Exception e) {
return "";
}
}
}

2
core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/manager/trtc/TRtcEngineManager.java
View File

@@ -51,7 +51,7 @@ public class TRtcEngineManager extends BaseEngine {
if (initInfo != null && initInfo.getTrtcAppId() != null) {
mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), initInfo.getTrtcAppId(), mEngineEventHandler);
} else {
mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), String.valueOf(SDKConfig.TX_SDKAPPID), mEngineEventHandler);
mRtcEngine = TRTCEngineAdapter.create(BasicConfig.INSTANCE.getAppContext(), SDKConfig.getTXAppId(), mEngineEventHandler);
}
} catch (Exception e) {
throw new RuntimeException(

5
core/src/main/java/com/yizhuan/xchat_android_core/Constants.java
View File

@@ -16,12 +16,11 @@ import java.util.List;
public class Constants {
public static final String ERBAN_DIR_NAME = XChatConstants.XCHAT_DIR_NAME;
public static final String nimAppKey = Env.isDebug() ?
XChatConstants.NIM_KEY_DEBUG : XChatConstants.NIM_KEY_RELEASE;
XChatConstants.getNimKeyDebug() : XChatConstants.getNimKeyRelease();
public static final String nimAppSecret = "da03b83af84a";
/**
* 百度统计
*/
public static final String BAIDU_APPKEY = XChatConstants.BAIDU_APP_KEY;
public static final String LOG_DIR = ERBAN_DIR_NAME + File.separator + "logs";
public static final String CONFIG_DIR = ERBAN_DIR_NAME + File.separator + "config";
@@ -104,7 +103,7 @@ public class Constants {
//相亲模式男神坑位下标
public static final List<Integer> maleIndex = Arrays.asList(0, 1, 4, 5);
public static final String GOOGLE = "google";
public static final String GOOGLE = com.yizhuan.xchat_android_library.common.Constants.GOOGLE;
public static final String ANDROID = "android";

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">平臺嚴禁未成年人直播或打賞，倡導綠色互動，禁止宣傳及發布政治、低俗、暴力、色情等違規違法內容，嚴禁違規交易和誘導欺詐用戶，如有違規將對賬號進行封禁，發現請及時舉報。</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">來piko，邂逅你的專屬聲音</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">來Piko，開黑交友玩遊戲</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_02">來Habu Live，邂逅你的專屬聲音</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_03">來Habu Live，開黑交友玩遊戲</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_04">加入家族,和你興趣相投的小夥伴一起玩耍吧~</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">hi,我想邀請您加入我的Piko家族:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_05">hi,我想邀請您加入我的Habu Live家族:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_06">加入家族,和你興趣相投的小夥伴一起玩耍吧~</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">hi,我想邀請您加入我的Piko群聊:</string>
<string name="yizhuan_xchat_android_constants_xchatconstants_07">hi,我想邀請您加入我的Habu Live群聊:</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">Piko開小差中~請稍後再試</string>
<string name="xchat_android_core_utils_oldhttperrorhandleutil_01">Habu Live開小差中~請稍後再試</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>

7
gradle.properties
View File

@@ -13,11 +13,10 @@ org.gradle.daemon=true
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.injected.testOnly=false
android.useAndroidX=true
android.enableJetifier=true
android.enableResourceOptimizations=false
android.injected.testOnly=false
# mob
MobSDK.spEdition=FP
@@ -31,8 +30,8 @@ COMPILE_SDK_VERSION=33
MIN_SDK_VERSION=21
TARGET_SDK_VERSION=33
version_name=2.2.0
version_code=2200
version_name=3.3.0
version_code=3300
#systemProp.https.proxyHost=127.0.0.1
#systemProp.https.proxyPort=7890

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

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

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

@@ -8,5 +8,5 @@ public class Constants {
public static final int UPLOAD_IMAGE_MAX_SIZE = 2340;
//上传的gif 默认大小不能超过 1MB
public static final int UPLOAD_GIF_MAX_SIZE = 1 << 20;
public static final String GOOGLE = "google_habu";
}

22
mob.gradle
View File

@@ -1,36 +1,36 @@
apply plugin: 'com.mob.sdk'
MobSDK {
appKey "36b91eeac7469"
appSecret "63ec0702513aca17e20615dd5dfdc03f"
appKey "32fd2f8457880"
appSecret "ef796ca85e8cd95a76929663de133214"
appBundleMode true
MobLink {
uriScheme "pekoapp://sharesdk"
appLinkHost "cebg.t4m.cn"
}
// MobLink {
// uriScheme "ananplay://sharesdk"
// appLinkHost "bvgw.t4m.cn"
// }
ShareSDK {
version '3.10.9'
//平台配置信息
gui false
devInfo {
Facebook {
appKey "1266232494209868"
appSecret "c9b170b383f8be9cdf118823b8632821"
appKey "2899088310346434"
appSecret "329a52326acbbf043f8a18a28a0c9570"
callbackUri "https://mob.com"
shareByAppClient true
enable true
}
GooglePlus {
appId "797840604753-7odpvo802kh6u57261vpd0gv7jrv5h5l.apps.googleusercontent.com"
appId "280420698373-najdbkk7ju8lg8f6gg4bnll8nf7l0i2c.apps.googleusercontent.com"
callbackUri "http://localhost"
officialVersion "default"
enable true
}
Line {
appId "1657475529"
appSecret "903d014c269d65b827cd32997836e60b"
appId "1655904857"
appSecret "392a9cada6f63a88a0f34a8e479364e1"
enable true
}
}

4
nim_uikit/res/values/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">發送失敗，Piko提醒您文明用語~</string>
<string name="session_fragment_messagefragment_02">發送失敗，Piko提醒您文明用語~</string>
<string name="session_fragment_messagefragment_01">發送失敗，Habu Live提醒您文明用語~</string>
<string name="session_fragment_messagefragment_02">發送失敗，Habu Live提醒您文明用語~</string>
<string name="session_helper_teamnotificationhelper_01">邀請 </string>
<string name="session_helper_teamnotificationhelper_02"> 加入群</string>
<string name="session_helper_teamnotificationhelper_03"> 加入討論組</string>

6
tmpmob/ShareSDK/assets/ShareSDK.xml
View File

@@ -6,11 +6,11 @@
<QZone Enable="false" />
<Renren Enable="false" />
<KaiXin Enable="false" />
<Facebook ShareByAppClient="true" Enable="true" ConsumerKey="1266232494209868" ConsumerSecret="c9b170b383f8be9cdf118823b8632821" RedirectUrl="https://mob.com" />
<Facebook ShareByAppClient="true" Enable="true" ConsumerKey="2899088310346434" ConsumerSecret="329a52326acbbf043f8a18a28a0c9570" RedirectUrl="https://mob.com" />
<Twitter Enable="false" />
<Evernote Enable="false" />
<FourSquare Enable="false" />
<GooglePlus OfficialVersion="default" Enable="true" ClientID="797840604753-7odpvo802kh6u57261vpd0gv7jrv5h5l.apps.googleusercontent.com" RedirectUrl="http://localhost" />
<GooglePlus OfficialVersion="default" Enable="true" ClientID="280420698373-najdbkk7ju8lg8f6gg4bnll8nf7l0i2c.apps.googleusercontent.com" RedirectUrl="http://localhost" />
<Instagram Enable="false" />
<LinkedIn Enable="false" />
<Tumblr Enable="false" />
@@ -30,7 +30,7 @@
<Yixin Enable="false" />
<YixinMoments Enable="false" />
<Mingdao Enable="false" />
<Line Enable="true" ChannelID="1657475529" ChannelSecret="903d014c269d65b827cd32997836e60b" />
<Line Enable="true" ChannelID="1655904857" ChannelSecret="392a9cada6f63a88a0f34a8e479364e1" />
<WhatsApp Enable="false" />
<KakaoTalk Enable="false" />
<KakaoStory Enable="false" />