Commit Graph

175 Commits

Author SHA1 Message Date
ba2206931f 调整隐私弹窗UI https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1064 2020-11-26 10:14:22 +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
97598d7330 【光环助手V4.5.0】论坛-作者增加具体跟帖数据的置顶功能https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1050 2020-11-10 15:02:35 +08:00
992ec7bfe8 完成隐私政策弹窗优化 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1064 2020-11-09 11:52:04 +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
e4ca1d8406 光环助手V4.4.0-单机模拟器 1027测试(6,7,8,10) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1030 2020-10-27 16:19:00 +08:00
b7001cc996 Merge branch 'dev_4.4.0' into dev
# Conflicts:
#	app/src/main/java/com/gh/base/GHActivityLifecycleCallbacksImpl.java
#	app/src/main/java/com/gh/common/util/DownloadObserver.kt
#	app/src/main/java/com/gh/gamecenter/user/UserRepository.java
#	app/src/main/java/com/halo/assistant/HaloApp.java
2020-10-23 10:47:40 +08:00
20f8ba0de5 补充处理部分数据收集代码 2020-10-21 16:53:10 +08:00
lyr
f39574c8b3 大致完成"模拟器游戏"模块UI 2020-10-21 11:26:44 +08:00
6067a52fb1 光环助手V4.4.0-数据统计需求(单机模拟器)(二、2) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1033 2020-10-21 10:01:36 +08:00
b1079e84d8 大致完成模拟器游戏下载、模拟器下载与安装 2020-10-16 17:15:51 +08:00
d396ebda44 延迟一些与隐私政策相关的操作 2020-10-15 16:09:12 +08:00
15352bb379 调整隐私弹窗文案 2020-10-15 09:29:19 +08:00
b68536b561 调整隐私弹窗文案 2020-10-15 09:29:19 +08:00
762ee8d300 添加第三方SDK接入声明跳转 2020-10-15 09:29:19 +08:00
93126517b6 模拟器游戏下载记录使用本地数据库保存 2020-10-14 19:53:24 +08:00
b2100fe0e5 修改模拟器游戏保存路径 2020-10-13 17:18:08 +08:00
lyr
d7ae2b2aa4 修改"领取徽章弹窗显示的徽章图片不对"的问题 2020-09-25 14:54:05 +08:00
2ac4dd6c5a 光环助手V4.3.0-视频优化与新增功能汇总20200924测试(5,6,7) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/983 2020-09-24 18:24:41 +08:00
38044b1d2b 光环助手V4.3.0-视频优化与新增功能汇总 UI测试汇总 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/983 2020-09-24 11:38:38 +08:00
lyr
42f66cd543 个人主页增加礼仪测试通过弹窗 2020-09-22 14:15:45 +08:00
47f9c967b1 Merge branch 'dev_4.3.0' of gitlab.ghzs.com:halo/assistant-android into dev_4.3.0
# Conflicts:
#	app/src/main/res/values/colors.xml
2020-09-17 18:10:28 +08:00
lyr
76bb5d1052 基本完成"光环助手V4.3.0-徽章中心优化"前端部分https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/1003 2020-09-17 09:52:07 +08:00
afff3446c4 修改视频流评论投诉 2020-09-16 14:23:29 +08:00
add1339f4a 调整帖子详情更多按钮 2020-09-08 14:49:51 +08:00
a7a48ccf77 光环助手V4.3.0-视频优化与新增功能汇总 (5,7-9) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/983 2020-09-07 14:36:20 +08:00
3c8d0cb3ec 补充礼仪考试弹窗MTA统计 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/945 2020-08-31 10:26:16 +08:00
9680bea412 Merge branch 'dev' of gitlab.ghzs.com:halo/assistant-android into dev 2020-08-27 16:40:13 +08:00
e6f3ad5cc2 视频上传交互优化(第二期)20200827ui反馈 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/969 2020-08-27 16:39:35 +08:00
8c884b6d23 修复礼仪考试20200826测试问题2 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/945 2020-08-27 14:33:32 +08:00
74882f56ee 完成帖子详情20200825测试的(2, 4~10) 2020-08-25 17:47:19 +08:00
lyr
e1bb02f4e0 绑定手机号点击"跳过"增加弹窗提示 2020-08-21 18:24:33 +08:00
7e79b4e328 基本完成礼仪考试APP端功能 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/945 2020-08-20 19:53:10 +08:00
62570aed9e Merge remote-tracking branch 'origin/dev_lyr' into dev_4.2.0
# Conflicts:
#	app/src/main/java/com/gh/common/constant/Constants.java
#	dependencies.gradle
2020-08-19 17:45:17 +08:00
lyr
72e8c18f9c 1.完成登录界面UI改版;2.增加第三方抖音登录;3.增加账号安全模块 2020-08-18 15:57:02 +08:00
f3f876d213 完成礼仪考试功能的APP UI https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/945 2020-08-18 14:37:45 +08:00
c47365e626 光环助手V4.1.0-游戏评论功能强化 20200725测试问题2,20200727UI测试 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/925 2020-07-27 11:45:22 +08:00
06fddb7dcd 完成游戏管理apk包提供海外下载地址 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/930 2020-07-22 18:21:01 +08:00
3a38e746f6 Merge branch 'dev_4.1.0' of gitlab.ghzs.com:halo/assistant-android into dev_4.1.0 2020-07-21 14:38:05 +08:00
dd3bc9d39d 光环助手V4.1.0-游戏评论功能强化1-5,6(1) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/925 2020-07-21 14:38:01 +08:00
55b6ccb760 merge xapk branch 2020-07-21 14:35:01 +08:00
7d98a842f1 完成接入腾讯企点会话接待组件 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/928 2020-07-17 14:37:15 +08:00
9dc9add896 折叠评论UI 2020-07-16 09:11:05 +08:00
f83f719283 光环助手V4.1.0-安装游戏支持解压xapk文件(20200710补充) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/896 2020-07-13 11:16:31 +08:00
49b0b982f5 基本完成Xapk解压安装,还有部分细节可能要调整 2020-07-09 18:31:27 +08:00
bc33673533 完成MTA的AppKey替换和不需要事件的移除 https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/910 2020-06-22 09:54:28 +08:00
548aea8d13 光环助手V4.0.2-首页插件化提示区域优化(除4.4外,其它完成) https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/898 2020-06-17 17:39:05 +08:00
ed2630e016 光环助手V4.0.0-游戏详情数据统计(MTA)2-8 https://gitlab.ghzs.com/pm/halo-app-issues/issues/846 2020-04-23 17:57:21 +08:00