Commit Graph

4940 Commits

Author SHA1 Message Date
8b22361213 接入 Sentry 2020-11-18 11:54:19 +08:00
407686ca5b 处理链接为空的图片复用问题 2020-11-17 17:39:22 +08:00
89b7b45ba0 测试修改后的MTA 2020-11-17 17:37:21 +08:00
383d6e7700 Merge branch 'feature-bbs-search' into dev-4.5.0
# Conflicts:
#	app/src/main/AndroidManifest.xml
2020-11-16 16:35:23 +08:00
edce98e4c6 光环助手V4.5.0-视频活动优化(第1期)(6) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1046 2020-11-16 15:30:00 +08:00
a2c3873c8d 【光环助手V4.5.0】论坛搜索功能及部分优化(帖子搜索) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1049 2020-11-16 14:15:52 +08:00
7990353d08 Merge branch 'release' into dev-4.5.0
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/gh/common/exposure/meta/MetaUtil.kt
#	dependencies.gradle
2020-11-16 09:57:33 +08:00
951768e070 暂时屏蔽 MTA 部分代码 2020-11-13 10:04:46 +08:00
69f29fe83b 光环助手V4.5.0-视频投稿数据埋点 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1047 2020-11-12 16:42:10 +08:00
88e28b2388 优化获取经 BASE64 编码后 IMEI 的逻辑 2020-11-12 15:52:08 +08:00
538bc6f97c 调整下载 CDN 日志的请求头名称 2020-11-12 15:17:19 +08:00
b1940125f4 Merge branch 'feature-issues1070' into dev-4.5.0 2020-11-12 14:46:26 +08:00
e1f8e293c2 修改查看权限详情不显示问题 2020-11-12 14:45:30 +08:00
0a49f27ed2 去掉 MTA 事件中获取 IMEI 的代码 2020-11-12 14:19:54 +08:00
d185d39985 暂时屏蔽广点通和头条推广 2020-11-12 11:51:48 +08:00
d9c98d39b5 Merge branch 'feature-issues1070' into dev-4.5.0 2020-11-12 11:39:33 +08:00
6949f2b2ff 光环助手V4.5.0-【APP合规】游戏详情页-游戏安装权限提示 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1070 2020-11-12 11:37:36 +08:00
2141440ec4 Merge branch 'hotfix-v4.3.8-218-bringBackTrackingSdk' into 'release'
重新接入第三方追踪SD,手动去掉了MTA的获取IMEI、IMSI等代码

See merge request halo/assistant-android!38
2020-11-12 11:31:44 +08:00
464c212638 处理 dataBinding 和 viewBinding 的冲突 2020-11-12 11:03:48 +08:00
dbe74b2091 修复游戏搜索页自动搜索失效的问题 2020-11-11 18:18:41 +08:00
ba55a5a61c 【光环助手V4.5.0】论坛推荐规则及部分优化 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1051 2020-11-11 14:26:36 +08:00
452a94f4a2 Merge branch 'hotfix-v4.3.8-218-bbs' into 'release'
修改评论详情更多操作点击任何一项都会触发删除评论弹窗

See merge request halo/assistant-android!37
2020-11-10 17:42:34 +08:00
310be97fe4 修改评论详情更多操作点击任何一项都会触发删除评论弹窗 2020-11-10 17:28:23 +08:00
2fc45777e4 光环助手V4.5.0】论坛搜索功能及部分优化(用户搜索) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1049 2020-11-10 17:16:46 +08:00
da283fc1f6 帖子作者显示置顶选项 2020-11-10 16:49:49 +08:00
fee4e4635c Merge branch 'feature-issues1068' into 'dev-4.5.0'
完成实名认证文案修改 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1068

See merge request halo/assistant-android!35
2020-11-10 16:35:46 +08:00
cd922dd286 完成实名认证文案修改 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1068 2020-11-10 16:32:27 +08:00
97598d7330 【光环助手V4.5.0】论坛-作者增加具体跟帖数据的置顶功能https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1050 2020-11-10 15:02:35 +08:00
0db59a56d0 完成IMEI权限获取限制 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1069 2020-11-10 14:44:59 +08:00
b4c827bddf Merge branch 'feature-issues1064' into 'dev-4.5.0'
完成隐私政策弹窗优化 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1064

See merge request halo/assistant-android!32
2020-11-09 16:22:52 +08:00
caf3dfa9ee Merge branch 'feature-issues1053' into 'dev-4.5.0'
完成注销账号功能优化 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1053

See merge request halo/assistant-android!31
2020-11-09 16:17:28 +08:00
c2251e1ad6 BASE64转码请求头的IMEI内容 2020-11-09 16:11:39 +08:00
1cf9bfcca3 完成注销账号功能优化 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1053 2020-11-09 14:46:50 +08:00
992ec7bfe8 完成隐私政策弹窗优化 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1064 2020-11-09 11:52:04 +08:00
15d0ad6f49 Merge branch 'hotfix-v4.3.8-218-crash' into 'release'
1.修复推送页面注册闪退 2.捕抓部分设备获取音量大小时可能的闪退

See merge request halo/assistant-android!29
2020-11-09 09:46:53 +08:00
a2e2379073 1.修复推送页面注册闪退 2.捕抓部分设备获取音量大小时可能的闪退 2020-11-09 09:34:12 +08:00
80818dee55 重新接入第三方追踪SD,手动去掉了MTA的获取IMEI、IMSI等代码 2020-11-06 18:30:57 +08:00
2fa84e0ce1 修复修复弹窗关闭,encoded url 跳转和视频流刷新滑动的闪退 2020-11-05 19:17:43 +08:00
lyr
6fcd8397b6 修复"模拟器游戏创建桌面快捷方式时,由于图片过大而闪退"的Bug 2020-11-04 17:34:53 +08:00
c9f5cfd4aa Merge branch 'hotfix-v4.3.8-218-database-related' into 'release'
捕抓因磁盘空间不足导致的数据库插入异常

See merge request halo/assistant-android!27
2020-11-03 15:17:59 +08:00
d6c1f692be 捕抓因磁盘空间不足导致的数据库插入异常 2020-11-03 15:16:57 +08:00
12e6fb8330 补充遗漏提交的文件 :( 2020-11-03 11:30:33 +08:00
ad857d4500 Merge branch 'hotfix-v4.3.8-218-PackageManager_has_died' into 'release'
尝试处理PackageManager has died异常

See merge request halo/assistant-android!26
2020-11-03 11:02:58 +08:00
43d8d24c1c 尝试处理PackageManager has died异常 2020-11-03 10:44:19 +08:00
ca39f723e1 简单处理常见闪退 2020-11-03 09:15:20 +08:00
97ac4b03a3 处理合并异常 2020-11-02 10:27:30 +08:00
883a948b7b Merge branch 'feature-sdk-free' into dev
# Conflicts:
#	app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt
#	app/src/main/java/com/gh/common/im/ImManager.kt
#	app/src/main/java/com/gh/common/im/ImReceiver.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/desc/GameDetailCustomColumnAdapter.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingCommentItemViewHolder.kt
#	app/src/main/java/com/gh/gamecenter/gamedetail/rating/RatingReplyAdapter.kt
#	app/src/main/java/com/gh/gamecenter/personalhome/background/PersonalityBackgroundViewModel.kt
#	app/src/main/java/com/gh/gamecenter/user/UserRepository.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
#	dependencies.gradle
2020-11-02 10:03:28 +08:00
ebb279c42f 移除大部分第三方SDK 2020-11-02 09:45:24 +08:00
lyr
261e0cc45a 搜索页-未登录状态点击预约按钮也上传"search_click"点击事件 2020-10-30 15:01:21 +08:00
0357a0a71e 处理跳转模拟器传递meta格式错误 2020-10-30 10:30:04 +08:00