6.5.4礼物冠名

common/src/main/java/com/yunbao/common/activity/WebViewActivity.java

@@ -169,7 +169,7 @@ public class WebViewActivity extends AbsActivity {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
         mWebView.getSettings().setUseWideViewPort(true); // 关键点
         mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件

common/src/main/java/com/yunbao/common/utils/FileUtil.java

@@ -7,6 +7,7 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
+import java.io.IOException;
 import java.io.PrintWriter;
 
 /**
@@ -88,7 +89,11 @@ public class FileUtil {
             duration= Long.parseLong(time);
         } catch (Exception ex) {
         } finally {
+            try {
                 mmr.release();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
         return duration;
     }

common/src/main/java/com/yunbao/common/views/weight/NobleNoticeView.java

@@ -250,7 +250,8 @@ public class NobleNoticeView extends FrameLayout {
         @Override
         public void onStep(int frame, double v) {
             System.out.println("frame = " + frame);
-            if (frame == 20) {
+            System.out.println("scrollLayout.getMeasuredWidth() = " + scrollLayout.getMeasuredWidth());
+            if (frame == 21) {
                 setButtonPosition(roleType);
                 observable.observeOn(AndroidSchedulers.mainThread())
                         .subscribe(bitmap -> {

config.gradle

@@ -1,10 +1,10 @@
 ext {
     android = [
-            compileSdkVersion: 31,
+            compileSdkVersion: 33,
             buildToolsVersion: "29.0.2",
             minSdkVersion    : 21,
-            targetSdkVersion : 31,
+            targetSdkVersion : 33,
-            versionCode      : 444,
+            versionCode      : 445,
             versionName      : "6.5.4"
     ]
     manifestPlaceholders = [
@@ -21,10 +21,10 @@ ext {
             baiduAppKey      : "zgCgFhUKEOV7I3ZXDFpTfnRB",
             baiduAppSecretKey: "nEVSgmuGpU0pjPr6VleEGGAl0hzGW52S",
 //            true表示谷歌支付 false
-            isGooglePlay     :  false,
+            isGooglePlay     :  true,
             //是否上报异常日志
             isUploadLog      :  true,
             //是否打包成插件包模式
-            isPluginModel    :  true,
+            isPluginModel    :  false,
     ]
 }

live/src/main/java/com/yunbao/live/dialog/LiveGameDialogFragment.java

@@ -160,9 +160,9 @@ public class LiveGameDialogFragment extends AbsDialogFragment {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setAppCacheEnabled(true);
+//        mWebView.getSettings().setAppCacheEnabled(true);
 
         mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
         mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

live/src/main/java/com/yunbao/live/dialog/LiveHDDialogFragment.java

@@ -157,9 +157,9 @@ public class LiveHDDialogFragment extends AbsDialogFragment {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setAppCacheEnabled(true);
+//        mWebView.getSettings().setAppCacheEnabled(true);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

live/src/main/java/com/yunbao/live/dialog/LiveUserAnchorMailBoxWebInfoPopDialog.java

@@ -69,9 +69,9 @@ public class LiveUserAnchorMailBoxWebInfoPopDialog extends AbsDialogPopupWindow
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = getContext().getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
-        mWebView.getSettings().setAppCacheEnabled(true);
+//        mWebView.getSettings().setAppCacheEnabled(true);
         mWebView.getSettings().setJavaScriptCanOpenWindowsAutomatically(true); // 是否允许JS打开新窗口
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mWebView.getSettings().setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

main/src/main/java/com/yunbao/main/activity/CustomerServiceWebViewActivity.java

@@ -168,7 +168,7 @@ public class CustomerServiceWebViewActivity extends AbsActivity {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
         mWebView.getSettings().setUseWideViewPort(true); // 关键点
         mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件

main/src/main/java/com/yunbao/main/activity/MyWebViewActivity.java

@@ -203,7 +203,7 @@ public class MyWebViewActivity extends AbsActivity {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
         mWebView.getSettings().setUseWideViewPort(true); // 关键点
         mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件

main/src/main/java/com/yunbao/main/activity/MyWebViewActivity2.java

@@ -178,7 +178,7 @@ public class MyWebViewActivity2 extends AbsActivity {
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
         mWebView.getSettings().setUseWideViewPort(true); // 关键点
         mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件

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

@@ -106,7 +106,7 @@ public class MainHomeCommunityViewHolder extends AbsMainHomeChildViewHolder impl
         mWebView.getSettings().setJavaScriptEnabled(true);
         mWebView.getSettings().setDomStorageEnabled(true);
         String appCachePath = mContext.getCacheDir().getAbsolutePath();
-        mWebView.getSettings().setAppCachePath(appCachePath);
+//        mWebView.getSettings().setAppCachePath(appCachePath);
         mWebView.getSettings().setAllowFileAccess(true);
         mWebView.getSettings().setUseWideViewPort(true); // 关键点
         mWebView.getSettings().setAllowFileAccess(true); // 允许访问文件

video/src/main/java/com/yunbao/video/activity/VideoEditActivity.java

@@ -35,6 +35,7 @@ import com.yunbao.video.views.VideoMusicViewHolder;
 import com.yunbao.video.views.VideoProcessViewHolder;
 
 import java.io.File;
+import java.io.IOException;
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -659,7 +660,11 @@ public class VideoEditActivity extends AbsActivity implements
             mHandler.release();
         }
         if (mMetadataRetriever != null) {
+            try {
                 mMetadataRetriever.release();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
         if (mFilterViewHolder != null) {
             mFilterViewHolder.release();

video/src/main/java/com/yunbao/video/activity/VideoPublishActivity.java

@@ -334,7 +334,11 @@ public class VideoPublishActivity extends AbsActivity implements ITXLivePlayList
             e.printStackTrace();
         } finally {
             if (mmr != null) {
+                try {
                     mmr.release();
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
             }
         }
         if (bitmap == null) {