diff --git a/common/libs/alipaySdk-20180601.jar b/common/libs/alipaySdk-20180601.jar deleted file mode 100644 index 8af9c905e..000000000 Binary files a/common/libs/alipaySdk-20180601.jar and /dev/null differ diff --git a/common/src/main/java/com/yunbao/common/pay/ali/AliPayBuilder.java b/common/src/main/java/com/yunbao/common/pay/ali/AliPayBuilder.java index 877d74ba4..a2fa25e89 100644 --- a/common/src/main/java/com/yunbao/common/pay/ali/AliPayBuilder.java +++ b/common/src/main/java/com/yunbao/common/pay/ali/AliPayBuilder.java @@ -8,7 +8,6 @@ import android.text.TextUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.alipay.sdk.app.PayTask; import com.yunbao.common.http.CommonHttpUtil; import com.yunbao.common.http.HttpCallback; import com.yunbao.common.pay.PayCallback; @@ -192,20 +191,20 @@ public class AliPayBuilder { * 调用支付宝sdk */ private void invokeAliPay() { - new Thread(new Runnable() { - @Override - public void run() { - PayTask alipay = new PayTask(mActivity); - //执行支付，这是一个耗时操作，最后返回支付的结果，用handler发送到主线程 - Map result = alipay.payV2(mPayInfo, true); - L.e("支付宝返回结果----->" + result); - if (mPayHandler != null) { - Message msg = Message.obtain(); - msg.obj = result; - mPayHandler.sendMessage(msg); - } - } - }).start(); +// new Thread(new Runnable() { +// @Override +// public void run() { +//// PayTask alipay = new PayTask(mActivity); +// //执行支付，这是一个耗时操作，最后返回支付的结果，用handler发送到主线程 +//// Map result = alipay.payV2(mPayInfo, true); +//// L.e("支付宝返回结果----->" + result); +//// if (mPayHandler != null) { +//// Message msg = Message.obtain(); +//// msg.obj = result; +//// mPayHandler.sendMessage(msg); +//// } +//// } +// }).start(); } diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml index 2d19ac9ff..7d280ed29 100644 --- a/common/src/main/res/values/strings.xml +++ b/common/src/main/res/values/strings.xml @@ -761,7 +761,7 @@ 開通了 續費了 進入直播間 - 经验 + 經驗 領取獎勵 完成新人任務領取更多獎勵 金豆 diff --git a/config.gradle b/config.gradle index 5462f3fe9..3f66756b1 100644 --- a/config.gradle +++ b/config.gradle @@ -4,14 +4,14 @@ ext { buildToolsVersion: "28.0.3", minSdkVersion : 21, targetSdkVersion : 30, - versionCode : 203, - versionName : "6.3.8" + versionCode : 206, + versionName : "6.3.9" ] 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", diff --git a/dependencies.gradle b/dependencies.gradle index 591bdefa4..48d15d066 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -15,13 +15,13 @@ ext { "glide-transformations": 'jp.wasabeef:glide-transformations:3.1.1',//一个基于Glide的transformation库,拥有裁剪,着色,模糊,滤镜等多种转换效果 "roundedimageview" : 'com.makeramen:roundedimageview:2.3.0', //带圆角，边框的的ImageView "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',//七牛云存储 - "tencent-cosxml" : 'com.tencent.qcloud:cosxml:5.4.13',//腾讯云存储 - "tencent-wechat-sdk" : 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+',//微信sdk,支付登录分享 - "tencent-bugly" : 'com.tencent.bugly:crashreport:2.6.6',//腾讯bugly - "umeng-common" : 'com.umeng.sdk:common:1.5.3',//友盟统计 - "umeng-analytics" : 'com.umeng.sdk:analytics:7.5.3',//友盟统计 +// "tencent-cosxml" : 'com.tencent.qcloud:cosxml:5.4.13',//腾讯云存储 +// "tencent-wechat-sdk" : 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:+',//微信sdk,支付登录分享 +// "tencent-bugly" : 'com.tencent.bugly:crashreport:2.6.6',//腾讯bugly +// "umeng-common" : 'com.umeng.sdk:common:1.5.3',//友盟统计 +// "umeng-analytics" : 'com.umeng.sdk:analytics:7.5.3',//友盟统计 "ucrop" : 'com.github.yalantis:ucrop:2.2.3',//图片裁剪 "smartRefreshLayout" : 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-20',//下拉刷新上拉加载 "magicIndicator" : 'com.github.hackware1993:MagicIndicator:1.6.0',//ViewPager指示器 diff --git a/live/build.gradle b/live/build.gradle index 989609960..ad671fbb0 100644 --- a/live/build.gradle +++ b/live/build.gradle @@ -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" } \ No newline at end of file +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" } \ No newline at end of file diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java index ad3779404..fe7ae0d8f 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveEnterRoomAnimPresenter.java @@ -278,7 +278,7 @@ public class LiveEnterRoomAnimPresenter { } try { 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) { Log.i("fff", e.getMessage()); e.printStackTrace(); diff --git a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java index b76a782f7..fd60e2c3e 100644 --- a/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java +++ b/live/src/main/java/com/yunbao/live/presenter/LiveGiftAnimPresenter.java @@ -1264,7 +1264,7 @@ public class LiveGiftAnimPresenter { } try { 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) { e.printStackTrace(); mShowGif = false; @@ -1300,7 +1300,7 @@ public class LiveGiftAnimPresenter { } try { 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) { e.printStackTrace(); mShowAllServer = false; diff --git a/live/src/main/java/com/yunbao/live/utils/UnzipFromAssets.java b/live/src/main/java/com/yunbao/live/utils/UnzipFromAssets.java index b11e383fd..59e97714f 100644 --- a/live/src/main/java/com/yunbao/live/utils/UnzipFromAssets.java +++ b/live/src/main/java/com/yunbao/live/utils/UnzipFromAssets.java @@ -41,30 +41,32 @@ public class UnzipFromAssets { int count = 0; // 如果进入点为空说明已经遍历完所有压缩包中文件和目录 while (zipEntry != null) { - // 如果是一个目录 - if (zipEntry.isDirectory()) { - file = new File(outputDirectory + File.separator + zipEntry.getName()); - // 文件需要覆盖或者是文件不存在 - if (isReWrite || !file.exists()) { - file.mkdir(); - } - } else { - // 如果是文件 - file = new File(outputDirectory + File.separator + zipEntry.getName()); - // 文件需要覆盖或者文件不存在，则解压文件 - if (isReWrite || !file.exists()) { - file.createNewFile(); - - FileOutputStream fileOutputStream = new FileOutputStream(file); - - while ((count = zipInputStream.read(buffer)) > 0) { - fileOutputStream.write(buffer, 0, count); + file = new File(outputDirectory + File.separator + zipEntry.getName()); + String canonicalPath = file.getCanonicalPath(); + if (!canonicalPath.startsWith(outputDirectory + File.separator + zipEntry.getName())) { + // 如果是一个目录 + if (zipEntry.isDirectory()) { + // 文件需要覆盖或者是文件不存在 + if (isReWrite || !file.exists()) { + file.mkdir(); + } + } else { + // 如果是文件 + // 文件需要覆盖或者文件不存在，则解压文件 + if (isReWrite || !file.exists()) { + file.createNewFile(); + + FileOutputStream fileOutputStream = new FileOutputStream(file); + + while ((count = zipInputStream.read(buffer)) > 0) { + fileOutputStream.write(buffer, 0, count); + } + fileOutputStream.close(); } - fileOutputStream.close(); } + // 定位到下一个文件入口 + zipEntry = zipInputStream.getNextEntry(); } - // 定位到下一个文件入口 - zipEntry = zipInputStream.getNextEntry(); } zipInputStream.close(); } diff --git a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java index e5e1f48e3..718057136 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveAudienceViewHolder.java @@ -125,7 +125,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { public void onError() { Log.e("errqs", "errl"); } - }); + },null); } private void svga_new_user_double() { @@ -142,7 +142,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { public void onError() { Log.e("errqs", "errl"); } - }); + },null); } private void svga_new_user_follow() { @@ -158,7 +158,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { public void onError() { Log.e("errqs", "errl"); } - }); + },null); } @@ -651,7 +651,7 @@ public class LiveAudienceViewHolder extends AbsLiveViewHolder { public void onError() { Log.e("errqs", "errl"); } - }); + },null); } } diff --git a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java index a7001f77d..169c66070 100644 --- a/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java +++ b/main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java @@ -372,7 +372,7 @@ public class MainHomeLiveAdapter extends RefreshAdapter { @Override public void onError() { } - }); + },null); } catch (Exception e) { e.printStackTrace(); } diff --git a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java index 775ed214e..c47ee8f54 100644 --- a/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java +++ b/main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java @@ -68,7 +68,7 @@ public class MainHomeLiveWeekItemViewHolder extends RecyclerView.ViewHolder { public void onError() { Log.e("errqs", "errl"); } - }); + },null); }