Compare commits
13 Commits
peki
...
habu_relea
Author | SHA1 | Date | |
---|---|---|---|
![]() |
71dab1bb8f | ||
![]() |
1fd9f386d8 | ||
![]() |
c334100bae | ||
![]() |
99844fc6eb | ||
![]() |
cedc402455 | ||
![]() |
1d4f1492f9 | ||
![]() |
5b76455f20 | ||
![]() |
b57eb8b9f4 | ||
![]() |
cb6ca8049f | ||
![]() |
8157edc05c | ||
![]() |
c474cd5824 | ||
![]() |
7560110af2 | ||
![]() |
9d63a90942 |
BIN
ananplay.jks
Normal file
Before Width: | Height: | Size: 1.3 KiB |
BIN
android_crop_lib/src/main/res/drawable-hdpi/crop__ic_cancel.webp
Normal file
After Width: | Height: | Size: 204 B |
Before Width: | Height: | Size: 1.3 KiB |
BIN
android_crop_lib/src/main/res/drawable-hdpi/crop__ic_done.webp
Normal file
After Width: | Height: | Size: 194 B |
Before Width: | Height: | Size: 1.2 KiB |
BIN
android_crop_lib/src/main/res/drawable-mdpi/crop__ic_cancel.webp
Normal file
After Width: | Height: | Size: 160 B |
Before Width: | Height: | Size: 1.2 KiB |
BIN
android_crop_lib/src/main/res/drawable-mdpi/crop__ic_done.webp
Normal file
After Width: | Height: | Size: 168 B |
Before Width: | Height: | Size: 1.5 KiB |
After Width: | Height: | Size: 234 B |
Before Width: | Height: | Size: 1.5 KiB |
BIN
android_crop_lib/src/main/res/drawable-xhdpi/crop__ic_done.webp
Normal file
After Width: | Height: | Size: 268 B |
Before Width: | Height: | Size: 142 B |
BIN
android_crop_lib/src/main/res/drawable-xhdpi/crop__tile.webp
Normal file
After Width: | Height: | Size: 52 B |
@@ -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
|
||||
|
@@ -1,39 +0,0 @@
|
||||
{
|
||||
"project_info": {
|
||||
"project_number": "656602722869",
|
||||
"project_id": "pekolive-30f9e",
|
||||
"storage_bucket": "pekolive-30f9e.appspot.com"
|
||||
},
|
||||
"client": [
|
||||
{
|
||||
"client_info": {
|
||||
"mobilesdk_app_id": "1:656602722869:android:dac206f8aae0ba9021f77c",
|
||||
"android_client_info": {
|
||||
"package_name": "com.vele.pekolive"
|
||||
}
|
||||
},
|
||||
"oauth_client": [
|
||||
{
|
||||
"client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
],
|
||||
"api_key": [
|
||||
{
|
||||
"current_key": "AIzaSyDDoTSpY3wxOefVDVKRmE9cDiT1iv8Ra-4"
|
||||
}
|
||||
],
|
||||
"services": {
|
||||
"appinvite_service": {
|
||||
"other_platform_oauth_client": [
|
||||
{
|
||||
"client_id": "656602722869-sss2inirem512et0015kdqjp39mqgn96.apps.googleusercontent.com",
|
||||
"client_type": 3
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"configuration_version": "1"
|
||||
}
|
32
app/proguard-rules.pro
vendored
@@ -117,19 +117,19 @@
|
||||
-keep class com.netease.** {*;}
|
||||
|
||||
# Presenter 相关
|
||||
-keep class com.yizhuan.erban.base.** { *; }
|
||||
-keep public class * extends com.yizhuan.erban.base.BaseMvpPresenter
|
||||
-keep class com.yizhuan.habu.base.** { *; }
|
||||
-keep public class * extends com.yizhuan.habu.base.BaseMvpPresenter
|
||||
-keep public class * extends com.yizhuan.xchat_android_library.base.factory.AbstractMvpPresenter
|
||||
|
||||
# 云信自定义 ViewHolder 配置
|
||||
-dontwarn com.yizhuan.erban.ui.im.recent.holder.**
|
||||
-keep class com.yizhuan.erban.ui.im.recent.holder.** {*;}
|
||||
-keep class com.yizhuan.erban.ui.im.chat.** {*;}
|
||||
-keep class com.yizhuan.erban.luckymoney.viewholder.** {*;}
|
||||
-keep class com.yizhuan.erban.share.viewholder.** {*;}
|
||||
-keep class com.yizhuan.erban.public_chat_hall.msg.viewholder.** {*;}
|
||||
-keep class com.yizhuan.erban.module_hall.im.msgholder.** {*;}
|
||||
-keep class com.yizhuan.tutu.mentoring_relationship.viewholder.** {*;}
|
||||
-dontwarn com.yizhuan.habu.ui.im.recent.holder.**
|
||||
-keep class com.yizhuan.habu.ui.im.recent.holder.** {*;}
|
||||
-keep class com.yizhuan.habu.ui.im.chat.** {*;}
|
||||
-keep class com.yizhuan.habu.luckymoney.viewholder.** {*;}
|
||||
-keep class com.yizhuan.habu.share.viewholder.** {*;}
|
||||
-keep class com.yizhuan.habu.public_chat_hall.msg.viewholder.** {*;}
|
||||
-keep class com.yizhuan.habu.module_hall.im.msgholder.** {*;}
|
||||
-keep class com.yizhuan.habu.mentoring_relationship.viewholder.** {*;}
|
||||
-keep public class * extends com.netease.nim.uikit.common.ui.recyclerview.holder.RecyclerViewHolder {*;}
|
||||
-keep public class * extends com.netease.nim.uikit.business.session.viewholder.MsgViewHolderBase {*;}
|
||||
|
||||
@@ -201,8 +201,8 @@
|
||||
<init>(...);
|
||||
}
|
||||
|
||||
-dontwarn com.yizhuan.erban.bindadapter.**
|
||||
-keep class com.yizhuan.erban.bindadapter.** {*;}
|
||||
-dontwarn com.yizhuan.habu.bindadapter.**
|
||||
-keep class com.yizhuan.habu.bindadapter.** {*;}
|
||||
|
||||
# Ping++ 混淆过滤
|
||||
-dontwarn com.pingplusplus.**
|
||||
@@ -236,7 +236,7 @@
|
||||
-dontwarn com.yizhuan.xchat_android_core.**
|
||||
-keep class com.yizhuan.xchat_android_core.** {*;}
|
||||
-keep class com.yizhuan.treasure_box.bean.** {*;}
|
||||
-keep class com.yizhuan.erban.avroom.bean.** {*;}
|
||||
-keep class com.yizhuan.habu.avroom.bean.** {*;}
|
||||
|
||||
|
||||
#百度统计
|
||||
@@ -310,8 +310,8 @@
|
||||
-keep class com.autonavi.aps.amapapi.model.**{*;}
|
||||
|
||||
#暂时keep这个View排查华为oom问题
|
||||
-keep class com.yizhuan.erban.avroom.widget.MicroView{*;}
|
||||
-keep class com.yizhuan.erban.ui.widget.rollviewpager.RollPagerView{*;}
|
||||
-keep class com.yizhuan.habu.avroom.widget.MicroView{*;}
|
||||
-keep class com.yizhuan.habu.ui.widget.rollviewpager.RollPagerView{*;}
|
||||
|
||||
#linkedMe
|
||||
-keep class com.microquation.linkedme.android.** { *; }
|
||||
@@ -369,7 +369,7 @@
|
||||
-dontwarn com.meizu.cloud.**
|
||||
-keep class com.meizu.cloud.** {*;}
|
||||
|
||||
-keep class com.yizhuan.erban.ui.widget.AppBarLayoutBehavior {*;}
|
||||
-keep class com.yizhuan.habu.ui.widget.AppBarLayoutBehavior {*;}
|
||||
|
||||
#ViewBinding使用的反射生成的对应Binding
|
||||
-keepclassmembers class * implements androidx.viewbinding.ViewBinding {
|
||||
|
@@ -1,4 +1,4 @@
|
||||
package com.yizhuan.erban;
|
||||
package com.yizhuan.habu;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
@@ -22,7 +22,7 @@ public class ExampleInstrumentedTest {
|
||||
// Context of the app under test.
|
||||
Context appContext = InstrumentationRegistry.getTargetContext();
|
||||
|
||||
assertEquals("com.yizhuan.erban_android_client", appContext.getPackageName());
|
||||
assertEquals("com.yizhuan.habu_android_client", appContext.getPackageName());
|
||||
}
|
||||
|
||||
}
|
||||
|
Before Width: | Height: | Size: 196 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_back.webp
Normal file
After Width: | Height: | Size: 156 B |
Before Width: | Height: | Size: 196 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_back_white.webp
Normal file
After Width: | Height: | Size: 132 B |
Before Width: | Height: | Size: 683 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_charge.webp
Normal file
After Width: | Height: | Size: 254 B |
Before Width: | Height: | Size: 1.1 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_checked.webp
Normal file
After Width: | Height: | Size: 492 B |
Before Width: | Height: | Size: 310 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_close_red.webp
Normal file
After Width: | Height: | Size: 168 B |
Before Width: | Height: | Size: 1.3 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_help_white.webp
Normal file
After Width: | Height: | Size: 562 B |
Before Width: | Height: | Size: 278 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_more.webp
Normal file
After Width: | Height: | Size: 152 B |
Before Width: | Height: | Size: 528 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_more_arrow.webp
Normal file
After Width: | Height: | Size: 228 B |
Before Width: | Height: | Size: 1.5 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_narrow.webp
Normal file
After Width: | Height: | Size: 666 B |
Before Width: | Height: | Size: 1.2 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_narrow_white.webp
Normal file
After Width: | Height: | Size: 526 B |
Before Width: | Height: | Size: 1.5 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_search_black.webp
Normal file
After Width: | Height: | Size: 550 B |
Before Width: | Height: | Size: 1.3 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_setting_grey.webp
Normal file
After Width: | Height: | Size: 472 B |
Before Width: | Height: | Size: 1.3 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_setting_white.webp
Normal file
After Width: | Height: | Size: 552 B |
Before Width: | Height: | Size: 1.2 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_share.webp
Normal file
After Width: | Height: | Size: 518 B |
Before Width: | Height: | Size: 1.0 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_share_white.webp
Normal file
After Width: | Height: | Size: 412 B |
Before Width: | Height: | Size: 1.4 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_switch_close.webp
Normal file
After Width: | Height: | Size: 600 B |
Before Width: | Height: | Size: 1.7 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_switch_open.webp
Normal file
After Width: | Height: | Size: 732 B |
Before Width: | Height: | Size: 1.1 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_team.webp
Normal file
After Width: | Height: | Size: 466 B |
Before Width: | Height: | Size: 916 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_team_white.webp
Normal file
After Width: | Height: | Size: 372 B |
Before Width: | Height: | Size: 2.5 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_tutu_friends.webp
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 2.3 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_tutu_friends_grey.webp
Normal file
After Width: | Height: | Size: 974 B |
Before Width: | Height: | Size: 690 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_unchecked.webp
Normal file
After Width: | Height: | Size: 280 B |
Before Width: | Height: | Size: 642 B |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_unselected.webp
Normal file
After Width: | Height: | Size: 520 B |
Before Width: | Height: | Size: 3.2 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_wechat.webp
Normal file
After Width: | Height: | Size: 1.7 KiB |
Before Width: | Height: | Size: 2.5 KiB |
BIN
app/src/common/res/mipmap-xhdpi/common_ic_wechat_grey.webp
Normal file
After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 569 B |
BIN
app/src/common/res/mipmap-xhdpi/drawable_checkbox_selected.webp
Normal file
After Width: | Height: | Size: 456 B |
Before Width: | Height: | Size: 1.2 KiB |
After Width: | Height: | Size: 534 B |
Before Width: | Height: | Size: 3.3 KiB |
BIN
app/src/common/res/mipmap-xhdpi/ic_private_chat.webp
Normal file
After Width: | Height: | Size: 2.0 KiB |
Before Width: | Height: | Size: 369 B |
BIN
app/src/common/res/mipmap-xhdpi/ic_speedymsg_close.webp
Normal file
After Width: | Height: | Size: 272 B |
Before Width: | Height: | Size: 28 KiB |
BIN
app/src/common/res/mipmap-xhdpi/ic_user_gift_empty.webp
Normal file
After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 767 B |
BIN
app/src/common/res/mipmap-xhdpi/ic_user_new_10dp.webp
Normal file
After Width: | Height: | Size: 596 B |
Before Width: | Height: | Size: 1.4 KiB |
BIN
app/src/common/res/mipmap-xhdpi/ic_user_new_13dp.webp
Normal file
After Width: | Height: | Size: 1006 B |
Before Width: | Height: | Size: 692 B |
BIN
app/src/common/res/mipmap-xhdpi/ic_user_official_10dp.webp
Normal file
After Width: | Height: | Size: 608 B |
Before Width: | Height: | Size: 1.2 KiB |
BIN
app/src/common/res/mipmap-xhdpi/ic_user_official_13dp.webp
Normal file
After Width: | Height: | Size: 898 B |
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="com.yizhuan.erban">
|
||||
package="com.yizhuan.habu">
|
||||
|
||||
<uses-sdk tools:overrideLibrary="com.huawei.android.hms.base,com.huawei.android.hms.push" />
|
||||
|
||||
@@ -92,6 +92,7 @@
|
||||
android:networkSecurityConfig="@xml/network_security_config"
|
||||
android:resizeableActivity="true"
|
||||
android:supportsRtl="true"
|
||||
android:testOnly="false"
|
||||
android:theme="@style/MyMaterialTheme"
|
||||
tools:replace="android:name,android:allowBackup"
|
||||
tools:targetApi="n">
|
||||
@@ -112,23 +113,23 @@
|
||||
则需要考虑发起的intent会出现相同应用图标的选择对话框的情况
|
||||
参考集成文档:https://www.linkedme.cc/docs/page4.html#link1
|
||||
-->
|
||||
<intent-filter>
|
||||
<!-- <intent-filter>-->
|
||||
|
||||
<!-- 此处scheme值需要替换为后台设置中的scheme值 -->
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
<!-- <!– 此处scheme值需要替换为后台设置中的scheme值 –>-->
|
||||
<!-- <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}" /> <!– 刘海屏适配 begin –>-->
|
||||
<!-- 小米 -->
|
||||
<activity
|
||||
android:name="com.soundcloud.android.crop.CropImageActivity"
|
||||
@@ -161,7 +162,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 +223,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 -->
|
||||
@@ -259,12 +260,12 @@
|
||||
android:label="房间流水"
|
||||
android:screenOrientation="portrait" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.music.activity.AddLocalMusicListActivity"
|
||||
android:name="com.yizhuan.habu.music.activity.AddLocalMusicListActivity"
|
||||
android:label="@string/main_androidmanifest_010"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AVRoomTheme" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.music.activity.MusicListActivity"
|
||||
android:name="com.yizhuan.habu.music.activity.MusicListActivity"
|
||||
android:label="@string/main_androidmanifest_011"
|
||||
android:launchMode="singleTop"
|
||||
android:screenOrientation="portrait"
|
||||
@@ -649,7 +650,7 @@
|
||||
android:name=".module_hall.team.activity.HTeamMemberListActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.mentoring_relationship.activity.MentoringRelationshipActivity"
|
||||
android:name="com.yizhuan.habu.mentoring_relationship.activity.MentoringRelationshipActivity"
|
||||
android:label="@string/main_androidmanifest_030"
|
||||
android:screenOrientation="portrait"
|
||||
android:windowSoftInputMode="stateHidden|adjustResize" />
|
||||
@@ -658,26 +659,26 @@
|
||||
android:launchMode="singleTask"
|
||||
android:screenOrientation="portrait" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.room_chat.activity.NimRoomP2PMessageActivity"
|
||||
android:name="com.yizhuan.habu.room_chat.activity.NimRoomP2PMessageActivity"
|
||||
android:theme="@style/room_message_activity" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.room_chat.activity.RoomMsgActivity"
|
||||
android:name="com.yizhuan.habu.room_chat.activity.RoomMsgActivity"
|
||||
android:theme="@style/room_message_activity" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieActivity"
|
||||
android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieActivity"
|
||||
android:theme="@style/room_message_activity" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.room_chat.activity.RoomNewbieMessageActivity"
|
||||
android:name="com.yizhuan.habu.room_chat.activity.RoomNewbieMessageActivity"
|
||||
android:theme="@style/room_message_activity" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.room_chat.activity.RoomInviteFansActivity"
|
||||
android:name="com.yizhuan.habu.room_chat.activity.RoomInviteFansActivity"
|
||||
android:theme="@style/room_message_activity" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.room_chat.activity.NimTeamRoomMessageActivity"
|
||||
android:name="com.yizhuan.habu.room_chat.activity.NimTeamRoomMessageActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/room_message_activity" />
|
||||
<activity
|
||||
android:name="com.yizhuan.tutu.room_chat.activity.NimHallTeamRoomMessageActivity"
|
||||
android:name="com.yizhuan.habu.room_chat.activity.NimHallTeamRoomMessageActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/room_message_activity" />
|
||||
<activity
|
||||
@@ -762,7 +763,7 @@
|
||||
android:name=".bank_card.activity.AddBankCardAgreementActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
<activity
|
||||
android:name="com.tongdaxing.erban.sadmin.RoomSAdminManagerActivity"
|
||||
android:name="com.yizhuan.habu.sadmin.RoomSAdminManagerActivity"
|
||||
android:screenOrientation="portrait" />
|
||||
<activity
|
||||
android:name=".home.activity.CommunityNoticeAct"
|
||||
@@ -1062,30 +1063,6 @@
|
||||
android:name=".service.DaemonService"
|
||||
android:enabled="true" />
|
||||
|
||||
<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" />
|
||||
|
||||
<activity
|
||||
android:name="com.facebook.FacebookActivity"
|
||||
android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
|
||||
android:label="@string/app_name" />
|
||||
<activity
|
||||
android:name="com.facebook.CustomTabActivity"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.VIEW" />
|
||||
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
<category android:name="android.intent.category.BROWSABLE" />
|
||||
|
||||
<data android:scheme="@string/fb_login_protocol_scheme" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
<activity android:name=".avroom.room_album.RoomAlbumActivity" />
|
||||
|
||||
</application>
|
||||
|
@@ -13,8 +13,8 @@ import com.jph.takephoto.permission.InvokeListener;
|
||||
import com.jph.takephoto.permission.PermissionManager;
|
||||
import com.jph.takephoto.permission.PermissionManager.TPermissionType;
|
||||
import com.jph.takephoto.permission.TakePhotoInvocationHandler;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.erban.base.BaseActivity;
|
||||
import com.yizhuan.habu.R;
|
||||
import com.yizhuan.habu.base.BaseActivity;
|
||||
|
||||
/**
|
||||
* 继承这个类来让Activity获取拍照的能力<br>
|
||||
|
@@ -12,7 +12,7 @@ import com.jph.takephoto.model.TResult;
|
||||
import com.jph.takephoto.permission.InvokeListener;
|
||||
import com.jph.takephoto.permission.PermissionManager;
|
||||
import com.jph.takephoto.permission.TakePhotoInvocationHandler;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
|
||||
/**
|
||||
* 继承这个类来让Fragment获取拍照的能力<br>
|
||||
|
@@ -12,7 +12,7 @@ import com.jph.takephoto.model.TResult;
|
||||
import com.jph.takephoto.permission.InvokeListener;
|
||||
import com.jph.takephoto.permission.PermissionManager;
|
||||
import com.jph.takephoto.permission.TakePhotoInvocationHandler;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
|
||||
/**
|
||||
* 继承这个类来让Activity获取拍照的能力<br>
|
||||
|
@@ -35,7 +35,7 @@ import com.jph.takephoto.uitl.TUriParse;
|
||||
import com.jph.takephoto.uitl.TUtils;
|
||||
import com.orhanobut.logger.Logger;
|
||||
import com.soundcloud.android.crop.Crop;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
|
||||
|
||||
import java.io.File;
|
||||
|
@@ -7,7 +7,7 @@ import android.graphics.BitmapFactory;
|
||||
import android.os.Handler;
|
||||
|
||||
import com.jph.takephoto.uitl.TFileUtils;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
import com.yizhuan.xchat_android_library.utils.ResUtil;
|
||||
|
||||
import java.io.ByteArrayOutputStream;
|
||||
|
@@ -1,5 +1,5 @@
|
||||
package com.jph.takephoto.model;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
import com.yizhuan.xchat_android_library.utils.ResUtil;
|
||||
|
||||
/**
|
||||
|
@@ -13,7 +13,7 @@ import com.jph.takephoto.app.TakePhoto;
|
||||
import com.jph.takephoto.model.InvokeParam;
|
||||
import com.jph.takephoto.model.TContextWrap;
|
||||
import com.jph.takephoto.uitl.TConstant;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
import com.yizhuan.xchat_android_library.utils.ResUtil;
|
||||
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
|
||||
|
||||
|
@@ -12,7 +12,7 @@ import android.webkit.MimeTypeMap;
|
||||
|
||||
import com.jph.takephoto.model.TException;
|
||||
import com.jph.takephoto.model.TExceptionType;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
import com.yizhuan.xchat_android_library.utils.ResUtil;
|
||||
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
|
||||
|
||||
|
@@ -20,7 +20,7 @@ import com.jph.takephoto.model.TExceptionType;
|
||||
import com.jph.takephoto.model.TImage;
|
||||
import com.jph.takephoto.model.TIntentWap;
|
||||
import com.soundcloud.android.crop.Crop;
|
||||
import com.yizhuan.erban.R;
|
||||
import com.yizhuan.habu.R;
|
||||
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
|
||||
|
||||
import java.io.File;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
package com.vele.pekolive.lineapi;
|
||||
package com.vele.habuplay.lineapi;
|
||||
|
||||
import cn.sharesdk.line.LineHandlerActivity;
|
||||
|
@@ -1,120 +0,0 @@
|
||||
package com.yizhuan.erban;
|
||||
|
||||
import android.app.ActivityManager;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Intent;
|
||||
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;
|
||||
import com.yizhuan.xchat_android_core.linked.bean.LinkedInfo;
|
||||
import com.yizhuan.xchat_android_core.user.UserModel;
|
||||
import com.yizhuan.xchat_android_core.utils.TextUtils;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
||||
public class AgentActivity extends AppCompatActivity implements SceneRestorable {
|
||||
|
||||
|
||||
protected void onNewIntent(Intent intent) {
|
||||
super.onNewIntent(intent);
|
||||
setIntent(intent);
|
||||
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();
|
||||
}
|
||||
|
||||
public boolean isExistMainActivity(Class<?> activity) {
|
||||
try {
|
||||
Intent intent = new Intent(this, activity);
|
||||
ComponentName cmpName = intent.resolveActivity(getPackageManager());
|
||||
boolean flag = false;
|
||||
if (cmpName != null) {
|
||||
ActivityManager am = (ActivityManager) getSystemService(ACTIVITY_SERVICE);
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
|
||||
List<ActivityManager.AppTask> taskInfoList = am.getAppTasks();
|
||||
for (ActivityManager.AppTask taskInfo : taskInfoList) {
|
||||
if (taskInfo.getTaskInfo().baseActivity.equals(cmpName)) {
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
List<ActivityManager.RunningTaskInfo> taskInfoList = am.getRunningTasks(10);
|
||||
for (ActivityManager.RunningTaskInfo taskInfo : taskInfoList) {
|
||||
if (taskInfo.baseActivity.equals(cmpName)) {
|
||||
flag = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return flag;
|
||||
} catch (Throwable e) {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@@ -1,130 +0,0 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* 统一埋点事件
|
||||
* create by lvzebiao @2019/8/14
|
||||
*/
|
||||
public class ReportManager implements IReportService {
|
||||
|
||||
private static final String TAG = "ReportManager";
|
||||
|
||||
private ReportManager() {
|
||||
}
|
||||
|
||||
private static final class Helper {
|
||||
private static final ReportManager INSTANCE = new ReportManager();
|
||||
}
|
||||
|
||||
public static ReportManager get() {
|
||||
return Helper.INSTANCE;
|
||||
}
|
||||
|
||||
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公共属性
|
||||
*
|
||||
* @param bundle 公共属性
|
||||
*/
|
||||
@Override
|
||||
public void setFirebaseAnalyticsDefaultEventParameters(Bundle bundle) {
|
||||
if (bundle != null) {
|
||||
FirebaseAnalytics.getInstance(XChatApplication.instance()).setDefaultEventParameters(bundle);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 埋点,不需要上报网络质量和事件耗时
|
||||
*
|
||||
* @param eventId 事件名称
|
||||
*/
|
||||
@Override
|
||||
public void reportEvent(String eventId) {
|
||||
reportEvent(eventId, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* 埋点
|
||||
*
|
||||
* @param eventId 事件名称
|
||||
* @param map 事件参数和值
|
||||
*/
|
||||
@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);
|
||||
}
|
||||
|
||||
|
||||
}
|