# Conflicts:
#	src/api/src/main/java/com/pi/api/base/App.java
#	src/build.gradle
#	src/config.gradle
#	src/gradle.properties
#	src/pi_app/src/main/assets/bin/2.7.1
#	src/pi_app/src/main/assets/bin/2.7.2
#	src/pi_app/src/main/assets/bin/2.8.3
#	src/pi_app/src/main/java/com/pi/pi_app/AppActivity.java
#	src/plugin/src/main/java/com/pi/plugin/interfaces/constant/SdkPlatform.java
#	src/plugin_facebook/build.gradle
#	src/plugin_facebook/src/main/res/values/strings.xml
#	src/plugin_google/src/main/java/com/pi/plugin_google/PayInstance.java
#	src/plugin_google/src/main/java/com/pi/plugin_google/SdkInstance.java
#	src/plugin_manager/src/main/java/com/pi/plugin_manager/utils/PluginUtils.java
#	src/settings.gradle
#	src/util/build.gradle
#	src/util/src/main/AndroidManifest.xml
#	src/util/src/main/java/com/pi/other/PiLog.java
#	src/util/src/main/java/com/pi/other/UpdateUtils.java
#	src/util/src/main/java/com/pi/util/AppUtil.java
#	src/web_config/config_demo.json
#	src/webview/build.gradle
#	src/webview/src/main/java/com/pi/webview/WebViewProxy.java
#	src/webview/src/main/java/com/pi/webview/X5WebView.java
#	src/webview_app/build.gradle
#	src/webview_app/proguard-rules.pro
#	src/webview_app/src/main/AndroidManifest.xml
#	src/webview_app/src/main/java/com/pi/webview_app/activity/SplashActivity.java
#	src/webview_app/src/main/java/com/pi/webview_app/app/AppApplication.java
#	src/webview_app/src/main/java/com/pi/webview_app/app/TrueApplication.java
#	src/webview_app/src/main/java/com/pi/webview_app/tinker/TinkerApplicationLike.java

commit fa2313f4
Merge: c7fa1722 8abd60c2
Author: zhuy <zhuy>
Date:   Wed Nov 15 17:31:00 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit c7fa1722
Author: zhuy <zhuy>
Date:   Wed Nov 15 17:30:33 2023 +0800

    fix: 异常卡死

commit 8abd60c2
Author: lhp <haipingg@163.com>
Date:   Wed Nov 1 17:24:00 2023 +0800

    fix:软键盘注销监听

commit 82bd379a
Merge: 987f05f5 5ce4c2ff
Author: lhp <haipingg@163.com>
Date:   Mon Oct 30 15:38:14 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 987f05f5
Author: lhp <haipingg@163.com>
Date:   Mon Oct 30 15:38:02 2023 +0800

    fix:异步文件拷贝

commit 5ce4c2ff
Author: zhuy <zhuy>
Date:   Mon Oct 30 15:30:56 2023 +0800

    feat: 跟新找不到路径

commit eb9e1220
Merge: 9762b27d de430875
Author: zhuy <zhuy>
Date:   Mon Oct 30 10:13:46 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

    # Conflicts:
    #	src/pi_app/src/main/assets/bin/2.7.6

commit 9762b27d
Author: zhuy <zhuy>
Date:   Mon Oct 30 10:12:27 2023 +0800

    fix: v8调试

commit de430875
Merge: ed938519 6abe4514
Author: zhuy <zhuy>
Date:   Mon Oct 16 17:28:12 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit ed938519
Author: zhuy <zhuy>
Date:   Mon Oct 16 17:28:06 2023 +0800

    feat: 备注

commit 6abe4514
Author: lhp <haipingg@163.com>
Date:   Mon Oct 16 15:00:39 2023 +0800

    fix:清缓存,指定目录不清除

commit 9b2b45b5
Author: lhp <haipingg@163.com>
Date:   Fri Oct 13 21:05:13 2023 +0800

    fix:暂时关闭清缓存

commit 2641c533
Author: zhuy <zhuy>
Date:   Fri Oct 13 18:02:03 2023 +0800

    feat: svg

commit fe83b334
Author: zhuy <zhuy>
Date:   Thu Oct 12 19:01:24 2023 +0800

    feat: 同上

commit 21e7a8f0
Merge: 1832c139 31261d98
Author: zhuy <zhuy>
Date:   Thu Oct 12 17:28:21 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 1832c139
Author: zhuy <zhuy>
Date:   Thu Oct 12 17:28:13 2023 +0800

    feat: svg

commit 31261d98
Author: lhp <haipingg@163.com>
Date:   Thu Sep 28 17:46:54 2023 +0800

    fix:更新pi_sys闪退

commit 8375fb9a
Author: lhp <haipingg@163.com>
Date:   Wed Sep 27 14:33:26 2023 +0800

    fix:tap退出登录

commit 76e5c218
Author: lhp <haipingg@163.com>
Date:   Wed Sep 27 13:11:48 2023 +0800

    fix:同上

commit 7550d089
Author: lhp <haipingg@163.com>
Date:   Wed Sep 27 11:17:11 2023 +0800

    fix:tap登出

commit 40d92e04
Author: lhp <haipingg@163.com>
Date:   Thu Sep 21 16:08:46 2023 +0800

    fix:打印cfg

commit 8bfc2b77
Author: lhp <haipingg@163.com>
Date:   Thu Sep 21 15:11:37 2023 +0800

    fix:同上

commit 0bcce9f8
Author: lhp <haipingg@163.com>
Date:   Thu Sep 21 15:02:06 2023 +0800

    fix:同上

commit a44137d4
Author: lhp <haipingg@163.com>
Date:   Thu Sep 21 14:21:58 2023 +0800

    fix:本地记录上次删除沙箱版本

commit 267f8e6f
Author: lhp <haipingg@163.com>
Date:   Tue Sep 19 19:01:03 2023 +0800

    fix:Android版本更新且勾选删除沙箱文件时清空所有缓存

commit e100f241
Author: lhp <haipingg@163.com>
Date:   Mon Sep 18 17:15:40 2023 +0800

    fix:报错高层无法拿到id

commit 38294676
Author: lhp <haipingg@163.com>
Date:   Mon Sep 18 16:31:04 2023 +0800

    fix:更新apk清沙箱(老版本)

commit 7ff52a10
Author: zhuy <zhuy>
Date:   Wed Sep 6 19:21:25 2023 +0800

    fix:so下载

commit 7a834cc2
Merge: 30eb18c7 3b1e764b
Author: zhuy <zhuy>
Date:   Wed Sep 6 18:29:12 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 30eb18c7
Author: zhuy <zhuy>
Date:   Wed Sep 6 18:28:23 2023 +0800

    FEAT: 判断下载路径是否存在

commit 3b1e764b
Author: lhp <haipingg@163.com>
Date:   Tue Sep 5 16:32:06 2023 +0800

    fix:日志

commit b52814aa
Author: lhp <haipingg@163.com>
Date:   Tue Sep 5 16:31:45 2023 +0800

    fix:日志

commit 397bcb27
Author: lhp <haipingg@163.com>
Date:   Tue Sep 5 10:41:56 2023 +0800

    fix:清沙箱缓存

commit 18a4d28f
Author: lhp <haipingg@163.com>
Date:   Mon Sep 4 17:33:11 2023 +0800

    fix:阿里云日志上报Grafana

commit c18f111a
Author: lhp <haipingg@163.com>
Date:   Mon Sep 4 10:42:28 2023 +0800

    fix:清沙箱

commit b1cf5aee
Author: lhp <haipingg@163.com>
Date:   Mon Sep 4 10:11:20 2023 +0800

    fix:更新so,清缓存方法

commit 7ef39439
Merge: b3e075b3 6f78499e
Author: lhp <haipingg@163.com>
Date:   Fri Sep 1 10:58:26 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit b3e075b3
Author: lhp <haipingg@163.com>
Date:   Fri Sep 1 10:58:11 2023 +0800

    fix:隐私，初始化

commit 6f78499e
Author: zhuy <zhuy>
Date:   Wed Aug 30 16:58:40 2023 +0800

    feat: 升级so版本号

commit 16329696
Merge: c1f39dc3 e535db5d
Author: zhuy <zhuy>
Date:   Wed Aug 30 16:48:10 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit c1f39dc3
Author: zhuy <zhuy>
Date:   Wed Aug 30 16:47:25 2023 +0800

    fix: b站渠道闪退

commit e535db5d
Merge: 293750e6 16498406
Author: lhp <haipingg@163.com>
Date:   Wed Aug 30 10:03:48 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 293750e6
Author: lhp <haipingg@163.com>
Date:   Wed Aug 30 10:03:36 2023 +0800

    fix:设备唯一id

commit 16498406
Author: zhuy <zhuy>
Date:   Tue Aug 29 18:29:57 2023 +0800

    feat: so 更新

commit c33fd398
Author: lhp <haipingg@163.com>
Date:   Tue Aug 29 15:47:12 2023 +0800

    fix:更新so

commit 97a6b924
Author: lhp <haipingg@163.com>
Date:   Tue Aug 29 10:06:47 2023 +0800

    fix:重启更新so

commit 33652330
Author: lhp <haipingg@163.com>
Date:   Thu Aug 24 19:38:43 2023 +0800

    fix:巨量支付

commit 25a9d93d
Author: lhp <haipingg@163.com>
Date:   Wed Aug 23 18:06:25 2023 +0800

    fix:更改巨量注册id key值

commit 07eaf150
Author: lhp <haipingg@163.com>
Date:   Wed Aug 23 13:45:16 2023 +0800

    fix:webview重启

commit 74855906
Author: lhp <haipingg@163.com>
Date:   Wed Aug 23 10:15:21 2023 +0800

    fix:tap渠道特殊处理

commit 093d1762
Author: lhp <haipingg@163.com>
Date:   Tue Aug 22 18:56:33 2023 +0800

    fix:巨量

commit c0442970
Author: lhp <haipingg@163.com>
Date:   Mon Aug 21 11:11:03 2023 +0800

    fix:隐私协议同意

commit e4f7d225
Author: lhp <haipingg@163.com>
Date:   Fri Aug 18 18:24:22 2023 +0800

    fix:隐私协议同意回传

commit 8f124af7
Author: lhp <haipingg@163.com>
Date:   Fri Aug 18 14:49:42 2023 +0800

    fix:oaid延后

commit 3b0c0027
Author: lhp <haipingg@163.com>
Date:   Thu Aug 17 19:06:19 2023 +0800

    fix:更新重启慢

commit 5652eea8
Author: lhp <haipingg@163.com>
Date:   Wed Aug 16 17:59:09 2023 +0800

    fix:转储文件上传完善，退出时先清空activity栈

commit 6c517dd4
Author: lhp <haipingg@163.com>
Date:   Mon Aug 14 16:37:17 2023 +0800

    fix:解决弹窗(服务端cfg出错)问题

commit fdd81dbe
Author: lhp <haipingg@163.com>
Date:   Sun Aug 13 19:46:32 2023 +0800

    fix：转储文件上传(未完善)

commit 8d524877
Author: lhp <haipingg@163.com>
Date:   Fri Aug 11 10:06:21 2023 +0800

    fix:文件上传

commit 8a311c62
Author: lhp <haipingg@163.com>
Date:   Thu Aug 10 10:12:48 2023 +0800

    fix:日志关键步骤上传

commit 02a7c248
Author: lhp <haipingg@163.com>
Date:   Mon Aug 7 17:03:41 2023 +0800

    fix:blankj库移除

commit 71147eef
Author: lhp <haipingg@163.com>
Date:   Fri Aug 4 13:31:55 2023 +0800

    fix:字体文件更新

commit 47a02462
Author: lhp <haipingg@163.com>
Date:   Thu Aug 3 10:24:03 2023 +0800

    fix:quick初始化失败重新初始化

commit c772ce92
Author: lhp <haipingg@163.com>
Date:   Tue Aug 1 15:51:31 2023 +0800

    fix:同上

commit 5504dc92
Author: lhp <haipingg@163.com>
Date:   Tue Aug 1 14:37:44 2023 +0800

    fix:巨量

commit fc90ef6c
Author: lhp <haipingg@163.com>
Date:   Tue Aug 1 14:35:34 2023 +0800

    fix:巨量

commit abcbd609
Author: lhp <haipingg@163.com>
Date:   Mon Jul 31 14:21:15 2023 +0800

    fix:小米屏蔽OAID

commit 398aa0fe
Author: lhp <haipingg@163.com>
Date:   Mon Jul 31 11:05:14 2023 +0800

    fix:打开OAID

commit 54b63588
Author: lhp <haipingg@163.com>
Date:   Mon Jul 31 10:58:01 2023 +0800

    fix：调横竖屏切换

commit 11e5fda3
Author: lhp <haipingg@163.com>
Date:   Fri Jul 28 15:02:48 2023 +0800

    fix:同上

commit fc31aba0
Merge: 7a8ccc25 cb727d10
Author: lhp <haipingg@163.com>
Date:   Thu Jul 27 17:31:09 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 7a8ccc25
Author: lhp <haipingg@163.com>
Date:   Thu Jul 27 17:31:00 2023 +0800

    fix:日志，暂删oaid

commit cb727d10
Merge: 866d20ba 8b7097b5
Author: zhuy <zhuy>
Date:   Wed Jul 19 16:08:19 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 866d20ba
Author: zhuy <zhuy>
Date:   Wed Jul 19 16:07:49 2023 +0800

    feat: 快照

commit 8b7097b5
Author: lhp <haipingg@163.com>
Date:   Tue Jul 18 14:19:58 2023 +0800

    fix:切换账号监听注销接口

commit 114fafb1
Author: lhp <haipingg@163.com>
Date:   Mon Jul 17 16:03:33 2023 +0800

    fix:切换横竖屏，不使用镜像站

commit 4744a15c
Author: lhp <haipingg@163.com>
Date:   Tue Jul 11 14:51:17 2023 +0800

    fix:新增切换账号监听

commit eb042a89
Author: lhp <haipingg@163.com>
Date:   Tue Jul 11 10:45:16 2023 +0800

    fix:x5内核

commit 08ac9491
Author: lhp <haipingg@163.com>
Date:   Mon Jul 10 15:54:17 2023 +0800

    fix:模拟器x5webview

commit d8cd67be
Author: lhp <haipingg@163.com>
Date:   Mon Jul 10 15:50:17 2023 +0800

    fix:一键登录

commit 7f739057
Author: lhp <haipingg@163.com>
Date:   Mon Jul 10 15:28:08 2023 +0800

    fix:同上

commit 0b4fe3bc
Author: lhp <haipingg@163.com>
Date:   Mon Jul 10 15:26:53 2023 +0800

    fix:aar包Git无法检测(bug)

commit 0e7cffac
Merge: 312d32fc a99956f5
Author: lhp <haipingg@163.com>
Date:   Mon Jul 10 15:04:20 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 312d32fc
Author: lhp <haipingg@163.com>
Date:   Mon Jul 10 15:04:14 2023 +0800

    fix:一键登录

commit a99956f5
Author: lhp <haipingg@163.com>
Date:   Fri Jul 7 19:21:36 2023 +0800

    fix:正常报错

commit 7de93ce2
Author: lhp <haipingg@163.com>
Date:   Fri Jul 7 18:46:07 2023 +0800

    fix:oaid获取不到导致无法进入游戏

commit bdb4fc82
Author: lhp <haipingg@163.com>
Date:   Fri Jul 7 15:24:54 2023 +0800

    fix:oaid获取不到情况返回imei

commit 1ee31c57
Author: lhp <haipingg@163.com>
Date:   Thu Jul 6 16:14:38 2023 +0800

    feat:游戏内屏幕旋转

commit 9c866b18
Author: lhp <haipingg@163.com>
Date:   Wed Jul 5 16:35:25 2023 +0800

    fix:判断是否可调试

commit 7096f7ef
Author: zhuy <zhuy>
Date:   Sun Jun 25 18:10:16 2023 +0800

    feat: touch id

commit 0ed62be1
Merge: 98838c1d e500521b
Author: zhuy <zhuy>
Date:   Sun Jun 25 16:42:33 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 98838c1d
Author: zhuy <zhuy>
Date:   Sun Jun 25 16:40:04 2023 +0800

    feat: touch id

commit e500521b
Author: lhp <haipingg@163.com>
Date:   Sun Jun 25 14:24:35 2023 +0800

    fix:阿里云一键登录

commit 82537087
Merge: d185c10c cbdabc1e
Author: lhp <haipingg@163.com>
Date:   Sun Jun 25 10:17:16 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit d185c10c
Author: lhp <haipingg@163.com>
Date:   Sun Jun 25 10:17:07 2023 +0800

    fix:部分手机崩溃问题(提前存放so路径)

commit cbdabc1e
Author: lhp <haipingg@163.com>
Date:   Thu Jun 15 17:19:25 2023 +0800

    fix:安装apk，使用nativeActivity

commit 9bf4bacc
Author: zhuy <zhuy>
Date:   Thu May 25 16:12:55 2023 +0800

    feat: quic

commit 5d977e07
Author: lhp <haipingg@163.com>
Date:   Thu May 25 15:05:04 2023 +0800

    fix:quick具体渠道接口，gameactivity闪退bug

commit 2717187b
Author: lhp <haipingg@163.com>
Date:   Wed May 24 13:32:08 2023 +0800

    Squashed commit of the following:

    commit ab945700
    Author: zhuy <zhuy>
    Date:   Wed May 24 10:53:56 2023 +0800

        feat: rust

    commit 46d084c5
    Author: lhp <haipingg@163.com>
    Date:   Fri May 19 17:01:19 2023 +0800

        fix:使用gameActivity

    # Conflicts:
    #	src/pi_app/src/main/assets/bin/2.8.0
    #	src/pi_app/src/main/assets/snapshot/2.8.0
    #	src/plugin_snapshot/src/main/jniLibs/arm64-v8a/libgen_snapshot.so

commit 3b199c53
Author: zhuy <zhuy>
Date:   Tue May 23 11:03:12 2023 +0800

    feat: 跟新 rust 1.69

commit 41a5d687
Author: lhp <haipingg@163.com>
Date:   Fri May 19 16:25:51 2023 +0800

    fix:删除tinker配置

commit 0c1080c1
Author: lhp <haipingg@163.com>
Date:   Tue May 16 11:10:29 2023 +0800

    fix：读储存权限

commit 531a0980
Author: lhp <haipingg@163.com>
Date:   Tue May 16 10:47:42 2023 +0800

    fix:监听CPU温度接口

commit bbe4fa9d
Author: lhp <haipingg@163.com>
Date:   Fri Apr 28 18:10:31 2023 +0800

    fix:穿山甲广告用户跳过仍可领奖

commit b3ca86c6
Author: lhp <haipingg@163.com>
Date:   Thu Apr 20 11:00:51 2023 +0800

    fix:崩溃转储so，及解决quick无法安装问题

commit 734c4feb
Merge: d70a3b18 e8224fb6
Author: wangzhiqiang <25707332@qq.com>
Date:   Mon Apr 17 16:31:38 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit d70a3b18
Author: wangzhiqiang <25707332@qq.com>
Date:   Mon Apr 17 16:31:21 2023 +0800

    feat: 增加lz4-hc 解压缩

commit e8224fb6
Author: lhp <haipingg@163.com>
Date:   Thu Apr 13 18:38:29 2023 +0800

    fix:这个分支现在是国内版，正常使用quick

commit 5bce8daf
Author: lhp <haipingg@163.com>
Date:   Thu Apr 13 14:36:47 2023 +0800

    fix:使用android自带的uuid作为唯一标识符

commit e5e050ea
Author: lhp <haipingg@163.com>
Date:   Wed Apr 12 19:01:45 2023 +0800

    fix:quick出了点问题，先让他们打包google

commit f3ce3fd0
Author: lhp <haipingg@163.com>
Date:   Mon Apr 10 18:51:27 2023 +0800

    fix:facebook模块实现选择性加载manifest文件

commit a5e129dd
Author: lhp <haipingg@163.com>
Date:   Mon Apr 10 14:57:45 2023 +0800

    fix:修复广告中途退出仍发放奖励bug

commit fd4e8b4a
Author: lhp <haipingg@163.com>
Date:   Mon Apr 10 11:10:20 2023 +0800

    fix:三方库获取不到权限导致应用崩溃

commit 2cda0a36
Merge: fd971013 a0bee0e1
Author: lhp <haipingg@163.com>
Date:   Fri Apr 7 17:40:30 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit fd971013
Author: lhp <haipingg@163.com>
Date:   Fri Apr 7 17:40:13 2023 +0800

    fix:tap退出登录失败

commit a0bee0e1
Merge: 8a5576f6 7caaa1d5
Author: zhuy <2832226065@qq.com>
Date:   Fri Apr 7 17:25:51 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 8a5576f6
Author: zhuy <2832226065@qq.com>
Date:   Fri Apr 7 17:25:38 2023 +0800

    FIX: 修复 texImage传 ahlfa的情况

commit 7caaa1d5
Author: lhp <haipingg@163.com>
Date:   Fri Apr 7 14:58:43 2023 +0800

    fix:大版本更新清除沙箱文件，支付宝特殊处理

commit 58146eee
Author: lhp <haipingg@163.com>
Date:   Thu Apr 6 16:10:57 2023 +0800

    fix:防混淆quick

commit 53dd9191
Merge: 04dab98b 949109a6
Author: lhp <haipingg@163.com>
Date:   Thu Apr 6 14:45:53 2023 +0800

    Merge branch 'master' into pi_app_test0

    # Conflicts:
    #	src/api/build.gradle
    #	src/api/src/main/AndroidManifest.xml
    #	src/api/src/main/java/com/pi/api/base/App.java
    #	src/build.gradle
    #	src/pi_app/src/main/assets/bin/2.0.6
    #	src/pi_app/src/main/assets/bin/2.1.3
    #	src/pi_app/src/main/assets/bin/2.7.2
    #	src/pi_app/src/main/java/com/pi/pi_app/AppActivity.java
    #	src/plugin_ad_admob/src/main/AndroidManifest.xml
    #	src/plugin_ad_admob/src/main/java/com/pi/plugin_ad_admob/AdRewardPlugin.java
    #	src/plugin_ad_admob/src/main/java/com/pi/plugin_ad_admob/AdSplashPlugin.java
    #	src/plugin_ad_admob/src/main/java/com/pi/plugin_ad_admob/SdkInstance.java
    #	src/plugin_ad_ks/src/main/java/com/pi/plugin_ad_ks/AdFullScreenPlugin.java
    #	src/plugin_ad_ks/src/main/java/com/pi/plugin_ad_ks/AdInterstitialPlugin.java
    #	src/plugin_ad_ks/src/main/java/com/pi/plugin_ad_ks/AdRewardPlugin.java
    #	src/plugin_ad_pangle/src/main/java/com/pi/plugin_ad_pangle/AdInterstitialPlugin.java
    #	src/plugin_ad_pangle/src/main/java/com/pi/plugin_ad_pangle/AdRewardPlugin.java
    #	src/plugin_ad_pangle/src/main/java/com/pi/plugin_ad_pangle/AdSplashPlugin.java
    #	src/plugin_facebook/build.gradle
    #	src/plugin_facebook/src/main/java/com/pi/plugin_facebook/SharePlugin.java
    #	src/plugin_facebook/src/main/res/values/strings.xml
    #	src/plugin_google/src/main/java/com/pi/plugin_google/LoginActivity.java
    #	src/plugin_google/src/main/java/com/pi/plugin_google/LoginPlugin.java
    #	src/plugin_google/src/main/java/com/pi/plugin_google/PayInstance.java
    #	src/plugin_google/src/main/java/com/pi/plugin_google/PayPlugin.java
    #	src/plugin_google/src/main/java/com/pi/plugin_google/SdkInstance.java
    #	src/plugin_manager/build.gradle
    #	src/plugin_manager/src/main/java/com/pi/plugin_manager/utils/PluginUtils.java
    #	src/plugin_quicksdk/src/main/java/com/pi/plugin_quicksdk/QuickSplashActivity.java
    #	src/plugin_snapshot/src/main/jniLibs/arm64-v8a/libgen_snapshot.so
    #	src/plugin_taptap/src/main/java/com/pi/plugin_taptap/LoginPlugin.java
    #	src/plugin_taptap/src/main/java/com/pi/plugin_taptap/SdkInstance.java
    #	src/plugin_taptap/src/main/java/com/pi/plugin_taptap/SpecialCall.java
    #	src/util/build.gradle
    #	src/util/src/main/AndroidManifest.xml
    #	src/util/src/main/java/com/pi/jsvm/JSBridge.java
    #	src/util/src/main/java/com/pi/other/LogHead.java
    #	src/util/src/main/java/com/pi/other/PiLog.java
    #	src/util/src/main/java/com/pi/other/UpdateUtils.java
    #	src/util/src/main/java/com/pi/util/UpdateManagerForPi.java
    #	src/util/src/main/jniLibs/arm64-v8a/libapp_center.so
    #	src/webview/build.gradle
    #	src/webview/src/main/java/com/pi/game/BaseGameActivity.java
    #	src/webview/src/main/java/com/pi/webview/WebViewProxy.java
    #	src/webview/src/main/java/com/pi/webview/X5WebView.java
    #	src/webview_app/build.gradle
    #	src/webview_app/proguard-rules.pro
    #	src/webview_app/src/main/AndroidManifest.xml
    #	src/webview_app/src/main/java/com/pi/webview_app/app/AppApplication.java

commit 04dab98b
Merge: c434bf6e 15cef3da
Author: lhp <haipingg@163.com>
Date:   Tue Apr 4 17:49:14 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit c434bf6e
Author: lhp <haipingg@163.com>
Date:   Tue Apr 4 17:48:58 2023 +0800

    fix:允许webview http访问

commit 15cef3da
Merge: 88b1ddf0 35dca626
Author: zhuy <2832226065@qq.com>
Date:   Tue Apr 4 17:41:29 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 88b1ddf0
Author: zhuy <2832226065@qq.com>
Date:   Tue Apr 4 17:41:21 2023 +0800

    fix: 同上

commit 35dca626
Merge: 699dbe84 7d88ba1b
Author: lhp <haipingg@163.com>
Date:   Tue Apr 4 17:26:41 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 699dbe84
Author: lhp <haipingg@163.com>
Date:   Tue Apr 4 17:23:12 2023 +0800

    fix:同上

commit 7d88ba1b
Merge: 4552697c 5642dc36
Author: zhuy <2832226065@qq.com>
Date:   Tue Apr 4 16:34:39 2023 +0800

    Merge branch 'pi_app_test0' of http://ser.yinengyun.com:10082/tech/pi_android into pi_app_test0

commit 4552697c
Author: zhuy <2832226065@qq.com>
Date:   Tue Apr 4 16:34:28 2023 +0800

    fix: draw_elements 闪退

commit 5642dc36
Author: lhp <haipingg@163.com>
Date:   Tue Apr 4 16:07:53 2023 +0800

    fix:同上

commit 949109a6
Author: lhp <haipingg@163.com>
Date:   Mon Apr 3 13:55:06 2023 +0800

    fix:android混淆

commit 8cdf2a79
Author: lhp <haipingg@163.com>
Date:   Mon Mar 27 11:06:53 2023 +0800

    fix:tinker版本与gradle版本冲突问题

commit bce98eb3
Author: lhp <haipingg@163.com>
Date:   Tue Mar 21 14:10:33 2023 +0800

    fix:tap登出

commit 0f9ece75
Author: lhp <haipingg@163.com>
Date:   Mon Mar 20 17:38:59 2023 +0800

    fix:tap单纯认证

commit f9fe73dd
Author: lhp <haipingg@163.com>
Date:   Wed Mar 15 14:03:49 2023 +0800

    fix:参数拼接

commit 7a7f34b8
Author: lhp <haipingg@163.com>
Date:   Tue Mar 14 19:06:52 2023 +0800

    fix:tap闪退

commit 62ad33bd
Author: lhp <haipingg@163.com>
Date:   Mon Mar 13 14:33:35 2023 +0800

    fix:网络请求增加channel字段

commit 48a76ddb
Author: lhp <haipingg@163.com>
Date:   Thu Mar 2 17:48:48 2023 +0800

    fix:权限问题

commit b677f3bf
Author: lhp <haipingg@163.com>
Date:   Thu Mar 2 16:03:54 2023 +0800

    fix:重启进程

commit 667ad5c3
Author: lhp <haipingg@163.com>
Date:   Wed Mar 1 17:07:04 2023 +0800

    fix:同上

commit 32ed0964
Author: lhp <haipingg@163.com>
Date:   Wed Mar 1 13:58:12 2023 +0800

    fix:注销改变登录状态

commit df1a7a46
Author: lhp <haipingg@163.com>
Date:   Wed Mar 1 10:49:36 2023 +0800

    fix:重启app接口

commit 95867871
Author: lhp <haipingg@163.com>
Date:   Tue Feb 28 18:40:06 2023 +0800

    fix:注销回调

commit a2ae5e71
Author: lhp <haipingg@163.com>
Date:   Mon Feb 27 18:37:05 2023 +0800

    fix:tap库更新

commit b4b8c229
Author: lhp <haipingg@163.com>
Date:   Mon Feb 27 16:29:22 2023 +0800

    fix:tap应用自启动问题

commit 30d8062e
Author: lhp <haipingg@163.com>
Date:   Fri Feb 24 17:56:42 2023 +0800

    fix:方法名更改

commit 9078feb3
Author: lhp <haipingg@163.com>
Date:   Fri Feb 24 16:55:54 2023 +0800

    fix:重启游戏，跳转网页接口

commit 728c57c5
Author: lhp <haipingg@163.com>
Date:   Mon Feb 20 18:04:25 2023 +0800

    fix:注销只注销账号

commit af963e27
Author: lhp <haipingg@163.com>
Date:   Mon Feb 20 16:34:55 2023 +0800

    fix:修复了两个应用不能同时打开的bug

commit 78cdc453
Author: lhp <haipingg@163.com>
Date:   Mon Feb 20 10:46:22 2023 +0800

    fix:蓝牙权限导致反射报错

commit ca9185c5
Author: lhp <haipingg@163.com>
Date:   Fri Feb 10 10:32:59 2023 +0800

    fix:闪屏页只实现淡出

commit e1296e4e
Author: lhp <haipingg@163.com>
Date:   Thu Feb 9 17:38:06 2023 +0800

    fix:bilbili自检，版本降低toast取消

commit fe2146c3
Author: lhp <haipingg@163.com>
Date:   Tue Feb 7 17:09:23 2023 +0800

    fix:quick初始化不再申请权限

commit 7206eccd
Author: lhp <haipingg@163.com>
Date:   Tue Feb 7 15:41:21 2023 +0800

    fix:quick权限禁用

commit 00bf9947
Author: lhp <haipingg@163.com>
Date:   Tue Feb 7 14:20:38 2023 +0800

    禁用部分权限

commit 43230b8a
Author: lhp <haipingg@163.com>
Date:   Mon Feb 6 17:50:21 2023 +0800

    fix:禁用非必要权限

commit 3383c56b
Author: lhp <haipingg@163.com>
Date:   Mon Feb 6 16:21:01 2023 +0800

    pi_app分支迁移google，闪屏页淡入淡出，动态更改安装apk权限，禁用获取手机状态权限，纯数字输入框，腾讯abs(X5浏览器)禁用

commit f6569991
Author: lhp <haipingg@163.com>
Date:   Wed Jan 18 18:41:50 2023 +0800

    fix:广告埋点请求

commit 8e0d94d1
Author: lhp <haipingg@163.com>
Date:   Tue Jan 17 15:02:38 2023 +0800

    fix:广告埋点bug

commit 3ee6d5c9
Author: lhp <haipingg@163.com>
Date:   Mon Jan 16 10:38:19 2023 +0800

    fix:闪屏页

commit 106a723f
Author: lhp <haipingg@163.com>
Date:   Sat Jan 14 13:29:12 2023 +0800

    fix:广告埋点，日志上报，bilibili打包

commit ff9b6e58
Author: lhp <haipingg@163.com>
Date:   Wed Jan 11 13:51:41 2023 +0800

    fix:禁用bugly

commit ddd1de98
Author: lhp <haipingg@163.com>
Date:   Wed Jan 11 09:45:14 2023 +0800

    fix:沐雪上报及切换账号

commit 9eff1ae4
Author: lhp <haipingg@163.com>
Date:   Tue Jan 10 09:54:56 2023 +0800

    fix:沐雪退出接口

commit 517e099d
Author: lhp <haipingg@163.com>
Date:   Mon Jan 9 19:21:40 2023 +0800

    fix:回退so

commit 45fc5e96
Author: lhp <haipingg@163.com>
Date:   Mon Jan 9 19:07:38 2023 +0800

    fix:沐雪bug线程卡死

commit a6d9c938
Author: lhp <haipingg@163.com>
Date:   Mon Jan 9 17:39:46 2023 +0800

    fix:沐雪sdk

commit cbe5eb88
Merge: 88108a61 79d0c569
Author: lhp <haipingg@163.com>
Date:   Fri Dec 30 18:01:58 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit 88108a61
Author: lhp <haipingg@163.com>
Date:   Fri Dec 30 18:01:45 2022 +0800

    fix:quick 商品名不能传空

commit 79d0c569
Author: zhuy <2832226065@qq.com>
Date:   Fri Dec 30 13:52:34 2022 +0800

    feat:test2

commit 3508cc5a
Author: zhuy <2832226065@qq.com>
Date:   Fri Dec 30 13:26:33 2022 +0800

    feat: test1

commit a9ae5eea
Author: lhp <haipingg@163.com>
Date:   Thu Dec 29 18:53:42 2022 +0800

    fix:上报，区服问题

commit 0821bdd1
Author: lhp <haipingg@163.com>
Date:   Thu Dec 29 15:53:49 2022 +0800

    fix:咪咕单条数据变化数据上报

commit 12fa1d0b
Author: zhuy <2832226065@qq.com>
Date:   Tue Dec 27 12:52:11 2022 +0800

    feat: 去掉断言

commit 93ae32a7
Author: zhuy <2832226065@qq.com>
Date:   Tue Dec 27 12:31:25 2022 +0800

    feat: 纹理加载失败

commit f019d0b2
Author: zhuy <2832226065@qq.com>
Date:   Tue Dec 27 12:04:36 2022 +0800

    feat:snapshot

commit 62237b16
Author: zhuy <2832226065@qq.com>
Date:   Mon Dec 26 20:28:59 2022 +0800

    feat: make_not_current

commit ee2495e0
Author: zhuy <2832226065@qq.com>
Date:   Mon Dec 26 10:37:28 2022 +0800

    feat: 切换闪退

commit 8df959cb
Merge: f4b0d22f 76afd269
Author: zhuy <2832226065@qq.com>
Date:   Wed Dec 14 11:16:10 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit f4b0d22f
Author: zhuy <2832226065@qq.com>
Date:   Wed Dec 14 11:15:48 2022 +0800

    feat: 添加 isContextLost 函数

commit 76afd269
Merge: d43e4a52 f98d01b6
Author: lhp <haipingg@163.com>
Date:   Mon Dec 12 18:14:45 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit d43e4a52
Author: lhp <haipingg@163.com>
Date:   Mon Dec 12 18:14:33 2022 +0800

    fix:两个apk包不能同时安装问题

commit f98d01b6
Merge: 00aaa1d1 0e46c309
Author: zhuy <2832226065@qq.com>
Date:   Mon Dec 12 16:02:03 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit 00aaa1d1
Author: zhuy <2832226065@qq.com>
Date:   Mon Dec 12 16:01:23 2022 +0800

    fix: 同上

commit 0e46c309
Author: lhp <haipingg@163.com>
Date:   Fri Dec 9 17:57:37 2022 +0800

    fix:防沉迷代码复原

commit d2abdbda
Author: lhp <haipingg@163.com>
Date:   Fri Dec 9 17:31:39 2022 +0800

    fix:taptap防沉迷几率重复唤起bug

commit 0e0933c7
Author: lhp <haipingg@163.com>
Date:   Fri Dec 9 11:02:48 2022 +0800

    fix:咪咕数据上报bug

commit 51ad7c35
Merge: 336f3a43 f594da03
Author: lhp <haipingg@163.com>
Date:   Thu Dec 8 16:54:46 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit 336f3a43
Author: lhp <haipingg@163.com>
Date:   Thu Dec 8 16:54:33 2022 +0800

    fix:taptap库更新

commit c1bcc8e3
Author: lhp <haipingg@163.com>
Date:   Thu Dec 8 16:51:54 2022 +0800

    fix:咪咕闪退bug，启用bugly

commit f594da03
Author: zhuy <2832226065@qq.com>
Date:   Thu Dec 8 11:31:34 2022 +0800

    fix: 同上

commit 41c2cde1
Merge: 0e1cd054 9416aec5
Author: zhuy <2832226065@qq.com>
Date:   Thu Dec 8 10:30:23 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit 0e1cd054
Author: zhuy <2832226065@qq.com>
Date:   Thu Dec 8 10:30:10 2022 +0800

    fix: 適配安卓13

commit 9416aec5
Author: lhp <haipingg@163.com>
Date:   Wed Dec 7 15:10:51 2022 +0800

    fix:咪咕数据上报资源冲突

commit fde56c74
Author: lhp <haipingg@163.com>
Date:   Sat Dec 3 16:15:10 2022 +0800

    fix：tinker停用

commit 30bd1db1
Merge: e0f2798b 3e7368be
Author: lhp <haipingg@163.com>
Date:   Sat Dec 3 15:30:04 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit e0f2798b
Author: lhp <haipingg@163.com>
Date:   Sat Dec 3 15:29:51 2022 +0800

    fix:咪咕数据上报

commit 3e7368be
Author: zhuy <2832226065@qq.com>
Date:   Fri Dec 2 19:19:40 2022 +0800

    fix: 修复 安卓13 崩溃

commit fd7007b9
Author: zhuy <2832226065@qq.com>
Date:   Thu Dec 1 15:00:20 2022 +0800

    fix: 修复 ws 递归死循环

commit a92c25d0
Author: lhp <haipingg@163.com>
Date:   Wed Nov 30 14:29:14 2022 +0800

    fix:facebook分享功能

commit d20ec76d
Author: lhp <haipingg@163.com>
Date:   Thu Nov 17 17:17:32 2022 +0800

    fix:taptap用户唯一id及库更新

commit 978490dd
Author: lhp <haipingg@163.com>
Date:   Mon Nov 14 10:51:07 2022 +0800

    fix:Ironsource中google应用id可为空

commit ddd860d6
Author: lhp <haipingg@163.com>
Date:   Fri Nov 11 19:10:55 2022 +0800

    fix:添加获取手机帧率接口，广告bug修改

commit c4e63404
Author: lhp <haipingg@163.com>
Date:   Thu Nov 10 17:55:16 2022 +0800

    fix:ironsource海外聚合广告添加

commit 4784a4e5
Author: lhp <haipingg@163.com>
Date:   Wed Nov 9 18:12:17 2022 +0800

    fix:taptap更新库

commit 501a71b5
Author: lhp <haipingg@163.com>
Date:   Thu Nov 3 16:15:16 2022 +0800

    fix:快手广告切换横竖屏

commit d70337cf
Author: lhp <haipingg@163.com>
Date:   Wed Nov 2 19:05:07 2022 +0800

    fix:更新快照

commit 6b262508
Author: lhp <haipingg@163.com>
Date:   Wed Nov 2 15:08:16 2022 +0800

    fix:TikTok广告接入(google，快手，facebook广告回调修复)

commit bb0f5a10
Author: lhp <haipingg@163.com>
Date:   Wed Nov 2 13:37:40 2022 +0800

    fix:添加生成快照模块

commit eb6c77b4
Author: lhp <haipingg@163.com>
Date:   Tue Nov 1 15:32:02 2022 +0800

    fix:快照日志(未完善)

commit 4889e22c
Author: lhp <haipingg@163.com>
Date:   Mon Oct 31 18:45:16 2022 +0800

    fix:应用宝(quick)未成年防沉迷退出

commit d6aa7581
Author: lhp <haipingg@163.com>
Date:   Mon Oct 31 14:30:40 2022 +0800

    fix:oppo退出横屏

commit b518dcc2
Author: lhp <haipingg@163.com>
Date:   Mon Oct 31 11:29:22 2022 +0800

    fix:quick修改最低应用version

commit b4ce02c9
Author: lhp <haipingg@163.com>
Date:   Fri Oct 28 16:06:17 2022 +0800

    更新blankj版本，tap审核隐私问题

commit 2e7fc728
Author: lhp <haipingg@163.com>
Date:   Thu Oct 27 16:28:50 2022 +0800

    fix:msa获取OAID v8版本修改

commit 7b5b5a67
Author: lhp <haipingg@163.com>
Date:   Wed Oct 26 17:58:20 2022 +0800

    fix:msa移动安全联盟获取OAID

commit 470f830c
Author: lhp <haipingg@163.com>
Date:   Mon Oct 24 18:13:00 2022 +0800

    fix:获取OAID

commit 4a25194e
Author: lhp <haipingg@163.com>
Date:   Mon Oct 17 17:35:55 2022 +0800

    fix:taptap登录反复唤起修改

commit 673bbb6e
Author: lhp <haipingg@163.com>
Date:   Thu Oct 13 13:08:26 2022 +0800

    fix；打无渠道包

commit 94a39c29
Author: lhp <haipingg@163.com>
Date:   Wed Oct 12 13:32:48 2022 +0800

    fix:TapTap防沉迷

commit 42d39dcb
Author: lhp <haipingg@163.com>
Date:   Wed Oct 12 10:57:54 2022 +0800

    fix；防沉迷完善

commit 60e7f2c4
Author: lhp <haipingg@163.com>
Date:   Tue Oct 11 19:16:52 2022 +0800

    fix:taptao防沉迷

commit e0396568
Author: lhp <haipingg@163.com>
Date:   Tue Oct 11 16:53:09 2022 +0800

    fix:taptap静默登录，防沉迷

commit e724821f
Author: lhp <haipingg@163.com>
Date:   Sun Oct 9 17:46:45 2022 +0800

    fix:google支付补单

commit df2cbaca
Author: lhp <haipingg@163.com>
Date:   Fri Sep 30 17:48:43 2022 +0800

    fix:应用宝登录闪退问题

commit 197bdddf
Author: lhp <haipingg@163.com>
Date:   Thu Sep 29 17:08:21 2022 +0800

    fix:vivo权限

commit 56aa04d3
Author: lhp <haipingg@163.com>
Date:   Thu Sep 29 15:42:24 2022 +0800

    fix；vivo权限

commit 9b596a14
Author: lhp <haipingg@163.com>
Date:   Thu Sep 29 15:27:20 2022 +0800

    fix:vivo审核

commit e583a518
Author: lhp <haipingg@163.com>
Date:   Thu Sep 29 13:35:29 2022 +0800

    fix:vivo权限

commit 6a2d0349
Author: lhp <haipingg@163.com>
Date:   Thu Sep 29 10:40:14 2022 +0800

    fix:vivo审核

commit c22ba87e
Author: lhp <haipingg@163.com>
Date:   Mon Sep 26 16:53:24 2022 +0800

    fix:google支付，小米闪退

commit 69b3f919
Merge: 027942d8 3f9602a9
Author: zhuy <2832226065@qq.com>
Date:   Thu Sep 22 12:12:13 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit 027942d8
Author: zhuy <2832226065@qq.com>
Date:   Thu Sep 22 12:04:09 2022 +0800

    fix: 取消http证书严格模式

commit 3f9602a9
Author: zhuy <2832226065@qq.com>
Date:   Thu Sep 22 12:04:09 2022 +0800

    fix: 取消http证书严格模式

commit d61a1bab
Author: lhp <haipingg@163.com>
Date:   Thu Sep 22 11:23:19 2022 +0800

    fix:更改打印

commit 8efb2efd
Author: lhp <haipingg@163.com>
Date:   Tue Sep 20 15:48:50 2022 +0800

    fix；添加获取androidId接口

commit ca7f2d4c
Author: lhp <haipingg@163.com>
Date:   Tue Sep 20 10:15:50 2022 +0800

    fix:一键登录

commit 3c20dd91
Author: lhp <haipingg@163.com>
Date:   Mon Sep 19 17:48:33 2022 +0800

    fix:google支付

commit 13851fa5
Author: lhp <haipingg@163.com>
Date:   Mon Sep 19 15:24:14 2022 +0800

    fix:一键登录

commit 0dadef8d
Author: lhp <haipingg@163.com>
Date:   Mon Sep 19 15:12:36 2022 +0800

    fix:一键登录

commit b76c9ca2
Author: lhp <haipingg@163.com>
Date:   Mon Sep 19 15:01:49 2022 +0800

    fix:一键登录

commit 04652764
Author: lhp <haipingg@163.com>
Date:   Thu Sep 15 17:10:55 2022 +0800

    fix:阿里云一键登录

commit b93aeb9f
Author: lhp <haipingg@163.com>
Date:   Thu Sep 15 13:10:32 2022 +0800

    fix:google登录token刷新

commit 7a509d45
Author: lhp <haipingg@163.com>
Date:   Mon Aug 29 17:47:56 2022 +0800

    fix:华为审核

commit 7680a879
Author: lhp <haipingg@163.com>
Date:   Thu Aug 25 17:50:07 2022 +0800

    fix:google支付修改

commit b00b7a91
Author: lhp <haipingg@163.com>
Date:   Mon Aug 22 10:14:41 2022 +0800

    fix:更新流程更改

commit 8e050531
Author: lhp <haipingg@163.com>
Date:   Fri Aug 19 17:07:38 2022 +0800

    fix:打包冲突

commit 9c6d196d
Author: lhp <haipingg@163.com>
Date:   Fri Aug 19 10:00:12 2022 +0800

    fix:华为HMS集成问题

commit 153c03a3
Author: lhp <haipingg@163.com>
Date:   Wed Aug 17 15:12:38 2022 +0800

    fix:华为混淆又来了

commit a59c4056
Author: lhp <haipingg@163.com>
Date:   Wed Aug 17 10:06:49 2022 +0800

    fix:bugly初始化延后，thinker恢复初始化

commit f32cfac0
Author: lhp <haipingg@163.com>
Date:   Tue Aug 16 16:30:36 2022 +0800

    fix:thiker不再初始化

commit 204e0135
Author: lhp <haipingg@163.com>
Date:   Tue Aug 16 15:58:19 2022 +0800

    fix:bugly,thinker插件暂时弃用

commit 42ca047c
Merge: 30612880 a1a1fa0b
Author: lhp <haipingg@163.com>
Date:   Mon Aug 15 18:39:22 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit 30612880
Author: lhp <haipingg@163.com>
Date:   Mon Aug 15 18:39:12 2022 +0800

    fix:接入广告facebook

commit 37fd2a3d
Author: lhp <haipingg@163.com>
Date:   Mon Aug 15 18:25:56 2022 +0800

    fix:抹除权限(音频，相机)

commit a1a1fa0b
Merge: 8bf287b4 0cef39c3
Author: zhuy <2832226065@qq.com>
Date:   Mon Aug 15 13:43:35 2022 +0800

    Merge branch 'master' of http://ser.yinengyun.com:10082/tech/pi_android

commit 8bf287b4
Author: zhuy <2832226065@qq.com>
Date:   Mon Aug 15 13:42:43 2022 +0800

    feat: 提供字符串与arrybuffer互转

commit 0cef39c3
Author: lhp <haipingg@163.com>
Date:   Fri Aug 12 18:45:55 2022 +0800

    fix:google广告接入(主)，打印日志统一更改为英文(次)

commit d420e844
Author: lhp <haipingg@163.com>
Date:   Fri Aug 12 11:02:55 2022 +0800

    fix:设备id权限

commit c1696067
Author: lhp <haipingg@163.com>
Date:   Fri Aug 12 10:42:32 2022 +0800

    fix:设备id获取问题

commit d7f291fe
Author: lhp <haipingg@163.com>
Date:   Thu Aug 11 17:19:21 2022 +0800

    fix:华为混淆HMS

commit e4669f44
Author: lhp <haipingg@163.com>
Date:   Tue Aug 9 14:05:11 2022 +0800

    fix:华为显示我们自己退出出框

commit fbd5bb5c
Author: lhp <haipingg@163.com>
Date:   Tue Aug 9 13:25:12 2022 +0800

    fix:OPPO弹出框显示横屏更改

commit bd17b975
Author: lhp <haipingg@163.com>
Date:   Tue Aug 9 11:20:31 2022 +0800

    fix：设备id更改

commit 1cc02b89
Author: lhp <haipingg@163.com>
Date:   Mon Aug 8 17:17:42 2022 +0800

    fix:设备id不能在隐私政策前获取