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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
18401019693 2022-08-11 18:06:12 +08:00
commit ac3f1cf846
12 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
common/libs/alipaySdk-20180601.jar
View File

Binary file not shown.

29
common/src/main/java/com/yunbao/common/pay/ali/AliPayBuilder.java
View File

@ -8,7 +8,6 @@ import android.text.TextUtils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alipay.sdk.app.PayTask;
import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.CommonHttpUtil;
import com.yunbao.common.http.HttpCallback; import com.yunbao.common.http.HttpCallback;
import com.yunbao.common.pay.PayCallback; import com.yunbao.common.pay.PayCallback;
@ -192,20 +191,20 @@ public class AliPayBuilder {
* 调用支付宝sdk * 调用支付宝sdk
*/ */
private void invokeAliPay() { private void invokeAliPay() {
new Thread(new Runnable() { // new Thread(new Runnable() {
@Override // @Override
public void run() { // public void run() {
PayTask alipay = new PayTask(mActivity); //// PayTask alipay = new PayTask(mActivity);
//执行支付，这是一个耗时操作，最后返回支付的结果，用handler发送到主线程 // //执行支付，这是一个耗时操作，最后返回支付的结果，用handler发送到主线程
Map<String, String> result = alipay.payV2(mPayInfo, true); //// Map<String, String> result = alipay.payV2(mPayInfo, true);
L.e("支付宝返回结果----->" + result); //// L.e("支付宝返回结果----->" + result);
if (mPayHandler != null) { //// if (mPayHandler != null) {
Message msg = Message.obtain(); //// Message msg = Message.obtain();
msg.obj = result; //// msg.obj = result;
mPayHandler.sendMessage(msg); //// mPayHandler.sendMessage(msg);
} //// }
} //// }
}).start(); // }).start();
} }

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

@ -761,7 +761,7 @@
<string name="send_buy">開通了</string> <string name="send_buy">開通了</string>
<string name="send_buy_renewed">續費了</string> <string name="send_buy_renewed">續費了</string>
<string name="enter_room"> 進入直播間</string> <string name="enter_room"> 進入直播間</string>
<string name="exp">经验</string> <string name="exp">經驗</string>
<string name="receive_awards">領取獎勵</string> <string name="receive_awards">領取獎勵</string>
<string name="new_rewards">完成新人任務領取更多獎勵</string> <string name="new_rewards">完成新人任務領取更多獎勵</string>
<string name="golden_bean">金豆</string> <string name="golden_bean">金豆</string>

8
config.gradle
View File

@ -4,14 +4,14 @@ ext {
buildToolsVersion: "28.0.3", buildToolsVersion: "28.0.3",
minSdkVersion : 21, minSdkVersion : 21,
targetSdkVersion : 30, targetSdkVersion : 30,
versionCode : 203, versionCode : 206,
versionName : "6.3.8" versionName : "6.3.9"
] ]
manifestPlaceholders = [ manifestPlaceholders = [
//正式 //正式
serverHost : "https://napi.yaoulive.com", // serverHost : "https://napi.yaoulive.com",
//測試 //測試
// serverHost : "https://ceshi.yaoulive.com", serverHost : "https://ceshi.yaoulive.com",
//腾讯地图 //腾讯地图
txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB", txMapAppKey : "EOZBZ-ASLCU-4XPV3-BDCHZ-4E3Q7-H4BWB",

12
dependencies.gradle
View File

@ -15,13 +15,13 @@ ext {
"glide-transformations": 'jp.wasabeef:glide-transformations:3.1.1',//一个基于Glide的transformation库,拥有裁剪,着色,模糊,滤镜等多种转换效果 "glide-transformations": 'jp.wasabeef:glide-transformations:3.1.1',//一个基于Glide的transformation库,拥有裁剪,着色,模糊,滤镜等多种转换效果
"roundedimageview" : 'com.makeramen:roundedimageview:2.3.0', //带圆角，边框的的ImageView "roundedimageview" : 'com.makeramen:roundedimageview:2.3.0', //带圆角，边框的的ImageView
"gif-drawable" : 'pl.droidsonroids.gif:android-gif-drawable:1.2.23',//gif库，播放礼物gif用 "gif-drawable" : 'pl.droidsonroids.gif:android-gif-drawable:1.2.23',//gif库，播放礼物gif用
"SVGAPlayer" : 'com.github.yyued:SVGAPlayer-Android:2.5.14', //svga播放器 "SVGAPlayer" : 'com.github.yyued:SVGAPlayer-Android:2.6.0', //svga播放器
"qiniu-sdk" : 'com.qiniu:qiniu-android-sdk:7.2.1',//七牛云存储 "qiniu-sdk" : 'com.qiniu:qiniu-android-sdk:7.2.1',//七牛云存储
"tencent-cosxml" : 'com.tencent.qcloud:cosxml:5.4.13',//腾讯云存储 // "tencent-cosxml" : 'com.tencent.qcloud:cosxml:5.4.13',//腾讯云存储
"tencent-wechat-sdk" : 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+',//微信sdk,支付登录分享 // "tencent-wechat-sdk" : 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+',//微信sdk,支付登录分享
"tencent-bugly" : 'com.tencent.bugly:crashreport:2.6.6',//腾讯bugly // "tencent-bugly" : 'com.tencent.bugly:crashreport:2.6.6',//腾讯bugly
"umeng-common" : 'com.umeng.sdk:common:1.5.3',//友盟统计 // "umeng-common" : 'com.umeng.sdk:common:1.5.3',//友盟统计
"umeng-analytics" : 'com.umeng.sdk:analytics:7.5.3',//友盟统计 // "umeng-analytics" : 'com.umeng.sdk:analytics:7.5.3',//友盟统计
"ucrop" : 'com.github.yalantis:ucrop:2.2.3',//图片裁剪 "ucrop" : 'com.github.yalantis:ucrop:2.2.3',//图片裁剪
"smartRefreshLayout" : 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-20',//下拉刷新上拉加载 "smartRefreshLayout" : 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-20',//下拉刷新上拉加载
"magicIndicator" : 'com.github.hackware1993:MagicIndicator:1.6.0',//ViewPager指示器 "magicIndicator" : 'com.github.hackware1993:MagicIndicator:1.6.0',//ViewPager指示器

2
live/build.gradle
View File

@ -1 +1 @@
apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common implementation project(path: ':common') annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation files('libs/beautysdk-202202241203.aar') implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" } apply plugin: 'com.android.library' apply plugin: 'img-optimizer' apply plugin: 'kotlin-android' android { compileSdkVersion rootProject.ext.android.compileSdkVersion buildToolsVersion rootProject.ext.android.buildToolsVersion aaptOptions.cruncherEnabled = false aaptOptions.useNewCruncher = false packagingOptions { pickFirst "lib/armeabi/libyuvutils.so" pickFirst "lib/arm64-v8a/libyuvutils.so" pickFirst "lib/armeabi-v7a/libyuvutils.so" pickFirst "lib/armeabi/libyuvtools.so" pickFirst "lib/arm64-v8a/libyuvtools.so" pickFirst "lib/armeabi-v7a/libyuvtools.so" exclude "lib/arm64-v8a/libmmcv_api_handgesture.so" exclude "lib/arm64-v8a/libmmcv_api_express.so" exclude "lib/arm64-v8a/libMediaEncoder.so" exclude "lib/arm64-v8a/libarcore_sdk_c.so" exclude "lib/arm64-v8a/libmediadecoder.so" exclude "lib/arm64-v8a/libMediaMuxer.so" exclude "lib/arm64-v8a/libarcore_sdk_jni.so" exclude "lib/arm64-v8a/libMediaUtils.so" exclude "lib/arm64-v8a/libcosmosffmpeg.so" } defaultConfig { minSdkVersion rootProject.ext.android.minSdkVersion targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode rootProject.ext.android.versionCode versionName rootProject.ext.android.versionName manifestPlaceholders = rootProject.ext.manifestPlaceholders ndk { abiFilters "armeabi-v7a", "arm64-v8a" } javaCompileOptions { annotationProcessorOptions { arguments = [AROUTER_MODULE_NAME: project.getName()] } } } aaptOptions { cruncherEnabled = false useNewCruncher = false } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } kotlinOptions { allWarningsAsErrors = true } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } } repositories { flatDir { dirs 'libs', '../libs' } mavenCentral() } dependencies { implementation 'androidx.constraintlayout:constraintlayout:2.0.0' implementation fileTree(dir: 'libs', include: ['*.jar', '*.aar']) //socket.io implementation('io.socket:socket.io-client:1.0.0') { exclude group: 'org.json', module: 'json' } //common implementation project(path: ':common') annotationProcessor rootProject.ext.dependencies["arouter-compiler"] //工具 api rootProject.ext.dependencies["blank-utilcode"] implementation 'com.eightbitlab:blurview:1.6.6' implementation 'com.google.code.gson:gson:2.8.6' implementation "com.getkeepsafe.relinker:relinker:1.4.4" }

2
live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java
View File

@ -278,7 +278,7 @@ public class LiveEnterRoomAnimPresenter {
} }
try { try {
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
mSVGAParser.decodeFromInputStream(bis, file.getAbsolutePath(), mParseCompletionCallback, true); mSVGAParser.decodeFromInputStream(bis, file.getAbsolutePath(), mParseCompletionCallback, true,null,null);
} catch (Exception e) { } catch (Exception e) {
Log.i("fff", e.getMessage()); Log.i("fff", e.getMessage());
e.printStackTrace(); e.printStackTrace();

4
live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java
View File

@ -1264,7 +1264,7 @@ public class LiveGiftAnimPresenter {
} }
try { try {
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
mSVGAParser.decodeFromInputStream(bis, file.getAbsolutePath(), mParseCompletionCallback, true); mSVGAParser.decodeFromInputStream(bis, file.getAbsolutePath(), mParseCompletionCallback, true,null,null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
mShowGif = false; mShowGif = false;
@ -1300,7 +1300,7 @@ public class LiveGiftAnimPresenter {
} }
try { try {
BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file)); BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));
mIconSVGAParser.decodeFromInputStream(bis, file.getAbsolutePath(), mParseIconCompletionCallback, true); mIconSVGAParser.decodeFromInputStream(bis, file.getAbsolutePath(), mParseIconCompletionCallback, true,null,null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
mShowAllServer = false; mShowAllServer = false;

44
live/src/main/java/com/yunbao/live/utils/UnzipFromAssets.java
View File

@ -41,30 +41,32 @@ public class UnzipFromAssets {
int count = 0; int count = 0;
// 如果进入点为空说明已经遍历完所有压缩包中文件和目录 // 如果进入点为空说明已经遍历完所有压缩包中文件和目录
while (zipEntry != null) { while (zipEntry != null) {
// 如果是一个目录 file = new File(outputDirectory + File.separator + zipEntry.getName());
if (zipEntry.isDirectory()) { String canonicalPath = file.getCanonicalPath();
file = new File(outputDirectory + File.separator + zipEntry.getName()); if (!canonicalPath.startsWith(outputDirectory + File.separator + zipEntry.getName())) {
// 文件需要覆盖或者是文件不存在 // 如果是一个目录
if (isReWrite || !file.exists()) { if (zipEntry.isDirectory()) {
file.mkdir(); // 文件需要覆盖或者是文件不存在
} if (isReWrite || !file.exists()) {
} else { file.mkdir();
// 如果是文件 }
file = new File(outputDirectory + File.separator + zipEntry.getName()); } else {
// 文件需要覆盖或者文件不存在，则解压文件 // 如果是文件
if (isReWrite || !file.exists()) { // 文件需要覆盖或者文件不存在，则解压文件
file.createNewFile(); if (isReWrite || !file.exists()) {
file.createNewFile();
FileOutputStream fileOutputStream = new FileOutputStream(file);
FileOutputStream fileOutputStream = new FileOutputStream(file);
while ((count = zipInputStream.read(buffer)) > 0) {
fileOutputStream.write(buffer, 0, count); while ((count = zipInputStream.read(buffer)) > 0) {
fileOutputStream.write(buffer, 0, count);
}
fileOutputStream.close();
} }
fileOutputStream.close();
} }
// 定位到下一个文件入口
zipEntry = zipInputStream.getNextEntry();
} }
// 定位到下一个文件入口
zipEntry = zipInputStream.getNextEntry();
} }
zipInputStream.close(); zipInputStream.close();
} }

8
live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java
View File

@ -125,7 +125,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void onError() { public void onError() {
Log.e("errqs", "errl"); Log.e("errqs", "errl");
} }
}); },null);
} }
private void svga_new_user_double() { private void svga_new_user_double() {
@ -142,7 +142,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void onError() { public void onError() {
Log.e("errqs", "errl"); Log.e("errqs", "errl");
} }
}); },null);
} }
private void svga_new_user_follow() { private void svga_new_user_follow() {
@ -158,7 +158,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void onError() { public void onError() {
Log.e("errqs", "errl"); Log.e("errqs", "errl");
} }
}); },null);
} }
@ -651,7 +651,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder {
public void onError() { public void onError() {
Log.e("errqs", "errl"); Log.e("errqs", "errl");
} }
}); },null);
} }
} }

2
main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java
View File

@ -372,7 +372,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter<LiveBean> {
@Override @Override
public void onError() { public void onError() {
} }
}); },null);
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }

2
main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java
View File

@ -68,7 +68,7 @@ public class MainHomeLiveWeekItemViewHolder<T> extends RecyclerView.ViewHolder {
public void onError() { public void onError() {
Log.e("errqs", "errl"); Log.e("errqs", "errl");
} }
}); },null);
} }