yutou/test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6.7.0谷歌送审版本

Browse Source
This commit is contained in:
zlzw
2024-06-07 10:39:47 +08:00
parent 4628079ac7
commit c263e3543c
12 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/build.gradle
View File

@@ -188,7 +188,7 @@ android {
if (rootProject.ext.manifestPlaceholders.serverHost == "https://napi.yaoulive.com") {
isTest = "正式服"
}
outputFileName = "[${new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("GMT+8"))}]PDLive-${defaultConfig.versionName}-${isGoogle}-${isPlugin}-${variant.buildType.name}-${isTest}.apk"
outputFileName = "[${new Date().format("yyyy-MM-dd", TimeZone.getTimeZone("GMT+8"))}]潘多拉-${defaultConfig.versionName}-${isGoogle}-${isPlugin}-${variant.buildType.name}-${isTest}.apk"
}
}
@@ -231,8 +231,15 @@ android {
multiDexEnabled true
ndk {
// TODO: 谷歌商城需要兼容两个平台
//abiFilters "armeabi-v7a", "arm64-v8a"
abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
println("打包版本:${rootProject.ext.manifestPlaceholders.isGooglePlay}")
if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
println("链接包")
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
println("谷歌包")
}
}
javaCompileOptions {
annotationProcessorOptions {

3
baidu/build.gradle
View File

@@ -31,7 +31,8 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
buildTypes {

3
beauty/build.gradle
View File

@@ -31,7 +31,8 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
aaptOptions {

7
common/build.gradle
View File

@@ -14,7 +14,12 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
javaCompileOptions {

17
common/src/main/java/com/yunbao/common/manager/InstructorRemarkManager.java
View File

@@ -47,13 +47,11 @@ public class InstructorRemarkManager extends BaseCacheManager {
if (null == instructorRemarkMap) {
String string = getString(KEY_INSTRUCTOR_REMARK);
if (!StringUtil.isEmpty(string)) {
instructorRemarkMap = JSON.parseObject(string, new TypeReference<Map<String, String>>() {
});
instructorRemarkMap = JSON.parseObject(string, Map.class);
}
}
}catch (Exception e){
Log.i("remark", "getInstructorRemark: "+getString(KEY_INSTRUCTOR_REMARK));
} catch (Exception e) {
Log.i("remark", "getInstructorRemark: " + getString(KEY_INSTRUCTOR_REMARK));
e.printStackTrace();
}
if (instructorRemarkMap == null) {
@@ -66,12 +64,11 @@ public class InstructorRemarkManager extends BaseCacheManager {
* 设置指导员备注信息
*/
public void setInstructorRemark(String map) {
this.instructorRemarkMap = JSON.parseObject(map, new TypeReference<Map<String, String>>() {
});
this.instructorRemarkMap = JSON.parseObject(map, Map.class);
put(KEY_INSTRUCTOR_REMARK, map);
for (String key : instructorRemarkMap.keySet()) {
UserInfo userInfo = RongUserInfoManager.getInstance().getUserInfo(key);
if(userInfo!=null){
if (userInfo != null && !StringUtil.isEmpty(instructorRemarkMap.get(key))) {
userInfo.setName(instructorRemarkMap.get(key));
RongUserInfoManager.getInstance().refreshUserInfoCache(userInfo);
}
@@ -133,9 +130,7 @@ public class InstructorRemarkManager extends BaseCacheManager {
@Override
public void onSuccess(int code, String msg, String[] info) {
if (code == 0 && info.length > 0) {
instructorRemarkMap = JSON.parseObject(info[0], new TypeReference<Map<String, String>>() {
});
instructorRemarkMap = JSON.parseObject(info[0], Map.class);
setInstructorRemark(info[0]);
}

22
common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
View File

@@ -54,10 +54,18 @@ public class OpenAdManager {
}
public void clear() {
runnableMap.clear();
showMap.clear();
list.clear();
waitRunnableMap.clear();
if (runnableMap != null) {
runnableMap.clear();
}
if (showMap != null) {
showMap.clear();
}
if (list != null) {
list.clear();
}
if (waitRunnableMap != null) {
waitRunnableMap.clear();
}
list = null;
runNowRunnable = null;
}
@@ -114,7 +122,7 @@ public class OpenAdManager {
}
private static long showTime = 0;
private OnItemClickListener<String> onItemClickListener=new OnItemClickListener<String>() {
private OnItemClickListener<String> onItemClickListener = new OnItemClickListener<String>() {
@Override
public void onItemClick(String bean, int position) {
@@ -123,7 +131,7 @@ public class OpenAdManager {
public synchronized void show(int type, boolean isGuard) {
showType = type;
if(true){
if (false) {
//潘多拉不需要彈窗
return;
}
@@ -327,7 +335,7 @@ public class OpenAdManager {
if (model.getShowModel() == OpenAdModel.SHOW_DIY) {
String nextTime = String.valueOf(System.currentTimeMillis() + (Long.parseLong(model.getSection()) * 60 * 1000));
SpUtil.setStringValue("open_ad_popup_time_" + model.getId(), nextTime);
Log.i(TAG, "run: 下一次展示时间:"+nextTime+" | "+model.getSection());
Log.i(TAG, "run: 下一次展示时间:" + nextTime + " | " + model.getSection());
showMap.remove(model.getId());
}
if (model.getModel() == OpenAdModel.MODEL_BOTTOM) {

11
common/src/main/java/com/yunbao/common/utils/DeviceUtils.java
View File

@@ -90,6 +90,17 @@ public class DeviceUtils {
}
return "0";
}
public static String getVersionName2(Context context) {
try {
PackageManager manager = context.getPackageManager();
PackageInfo info = manager.getPackageInfo(context.getPackageName(), 0);
return info.versionCode+"";
} catch (Exception e) {
e.printStackTrace();
}
return "0";
}
/**

12
config.gradle
View File

@@ -4,20 +4,20 @@ ext {
buildToolsVersion: "29.0.2",
minSdkVersion : 23,
targetSdkVersion : 33,
versionCode : 676,
versionName : "6.6.9",
versionCode : 529,
versionName : "6.7.0",
namespace : "com.pandoralive.shayu"
]
manifestPlaceholders = [
//正式、
// serverHost : "https://napi.yaoulive.com",
serverHost : "https://napi.yaoulive.com",
// 测试
serverHost : " https://ceshi.yaoulive.com",
// serverHost : " https://ceshi.yaoulive.com",
buildTime : new Date().format("MM-dd HH:mm", TimeZone.getTimeZone("GMT+8")),
//百度语音识别
swReleaseModel : false, //true 声网正式服 false 测试服
swReleaseModel : true, //true 声网正式服 false 测试服
baiduAppId : "23774720",
baiduAppKey : "zgCgFhUKEOV7I3ZXDFpTfnRB",
@@ -26,7 +26,7 @@ ext {
// true表示谷歌支付 false
// isGooglePlay : false,
// true表示谷歌支付 false 0 链接包(isPluginModel-> true) 1 谷歌包 2华为包 3 samsung包
isGooglePlay : 0,
isGooglePlay : 1,
//是否上报异常日志
isUploadLog : true,

2
live/build.gradle
View File

@@ -1 +1 @@
apply plugin: 'com.android.library'
apply plugin: 'com.android.library'

7
main/build.gradle
View File

@@ -30,7 +30,12 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
javaCompileOptions {

7
pluginsForAnchor/build.gradle
View File

@@ -119,7 +119,12 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a", "arm64-v8a","x86","x86_64"
if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
}
aaptOptions {

7
video/build.gradle
View File

@@ -31,7 +31,12 @@ android {
versionName rootProject.ext.android.versionName
manifestPlaceholders = rootProject.ext.manifestPlaceholders
ndk {
abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
// abiFilters "armeabi-v7a","arm64-v8a","x86","x86_64"
if (rootProject.ext.manifestPlaceholders.isGooglePlay == 0) {
abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
} else {
abiFilters "armeabi-v7a", "arm64-v8a"
}
}
javaCompileOptions {
annotationProcessorOptions {