Merge remote-tracking branch 'origin/master'

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() {
+//        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();
     }
 
 

common/src/main/res/values/strings.xml

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

config.gradle

@@ -4,14 +4,14 @@ ext {
             buildToolsVersion: "28.0.3",
             minSdkVersion    : 21,
             targetSdkVersion : 30,
-            versionCode      : 203,
+            versionCode      : 206,
-            versionName      : "6.3.8"
+            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",

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-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',//图片裁剪
             "smartRefreshLayout"   : 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-alpha-20',//下拉刷新上拉加载
             "magicIndicator"       : 'com.github.hackware1993:MagicIndicator:1.6.0',//ViewPager指示器

live/build.gradle

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

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();

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;

live/src/main/java/com/yunbao/live/utils/UnzipFromAssets.java

@@ -41,30 +41,32 @@ public class UnzipFromAssets {
         int count = 0;
         // 如果进入点为空说明已经遍历完所有压缩包中文件和目录
         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();
     }

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);
         }
 
     }

main/src/main/java/com/yunbao/main/adapter/MainHomeLiveAdapter.java

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

main/src/main/java/com/yunbao/main/views/MainHomeLiveWeekItemViewHolder.java

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