Commit Graph

143 Commits

Author SHA1 Message Date
9432e34571 reformat code & optimize import & reorder entries 2017-04-27 14:27:17 +08:00
fc2f20ee6e Merge branch 'dev' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into dev
Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java
2017-04-26 15:59:44 +08:00
cfa70feac5 应用上报 2017-04-26 15:56:19 +08:00
khy
a0cae1b7b8 游戏详情接入游戏推荐(大家都在玩),优化代码 2017-04-26 15:34:58 +08:00
khy
5798ba9e89 Merge remote-tracking branch 'origin/dev' into dev 2017-04-25 19:17:20 +08:00
khy
919e3c386d 增加MessageService(更改域名), 取消显示公告 2017-04-25 19:16:58 +08:00
d23a2df809 1、systembar tint/switchbutton/mipush做了更新整理
2、部分跳转常量整理
3、工程结构整理,基本国内几个sdk解决完了
2017-04-25 18:45:10 +08:00
khy
39cd66032d 修改Handler 在 ondestroy时 remove全部消息,Context获取的Manager,改为Application Context持有,游戏列表增加开服信息 2017-04-24 19:14:47 +08:00
khy
1fe9e259b4 消息页面对接数据接口, 礼包重复领取,删除无用文件 2017-04-21 16:32:44 +08:00
khy
8f99987696 游戏求版本功能(未对接接口), 文章详情优化(文章内容跳转未做),消息中心(未接接口),首页资讯改版,跳转意见反馈规则汇总 2017-04-14 16:07:36 +08:00
khy
8ba099024e 去卡片化, 开服表, 首页游戏-资讯改版,游戏专题增加标签(还差一个接口) 2017-03-22 15:25:05 +08:00
417b597d1d 添加启动安装或卸载时5分钟的监听(扫描本地包,检查指定包是否存在或不存在) 2017-03-13 10:18:38 +08:00
khy
fba0a6ec71 更改换默认头像规则, 快传安装游戏后清空消息栏消息 2017-03-08 10:01:56 +08:00
6b9921c5a7 去除无用import 2017-03-02 11:26:24 +08:00
75695812ee 代码合并 2017-03-02 11:23:19 +08:00
eae0414cb4 插件标签修改,tinker接入 2017-03-02 10:28:41 +08:00
khy
7b203bedfc 界面优化 增加历史礼包(有未解决BUG)和关于页面 2017-03-02 10:25:45 +08:00
c292e79d94 DownloadItemUtils.updateItem 参数简化 2017-02-13 11:31:52 +08:00
a29c0bd466 新版apk package过滤机制 2017-02-09 17:39:16 +08:00
c045d4e2cc Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3
Conflicts:
	app/src/main/java/com/gh/gamecenter/download/GameUpdateFragmentAdapter.java
2017-01-20 17:14:07 +08:00
b2d568d646 entrance检查与统一 2017-01-20 17:11:03 +08:00
khy
2ddaf3ee66 修复弹窗文案显示不全问题和游戏检查更新接口拼凑错误问题 2017-01-19 15:18:07 +08:00
khy
560c34afed 首页专题模块不盖住轮播图 2017-01-17 11:06:08 +08:00
a8a9e58fe9 Response的onFailure参数修改为HttpException 2017-01-11 12:00:20 +08:00
4fc10d360a 跳转修改 2017-01-09 11:53:13 +08:00
659d6fc263 项目修改与整理 2017-01-04 16:16:34 +08:00
94b4d730e3 修改getToken逻辑 2016-12-29 17:50:12 +08:00
419a4d830f 重命名gift为libao 2016-12-29 11:35:32 +08:00
c01db35297 同步2.2修改 2016-12-26 17:04:24 +08:00
e8cbbbb4bc Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3
Conflicts:
	PushSDK/build/intermediates/bundles/debug/classes.jar
	PushSDK/build/intermediates/bundles/release/classes.jar
	PushSDK/build/intermediates/incremental/mergeAssets/androidTest/debug/merger.xml
	PushSDK/build/intermediates/incremental/mergeAssets/debug/merger.xml
	PushSDK/build/intermediates/incremental/mergeAssets/release/merger.xml
	PushSDK/build/intermediates/incremental/mergeResourcesandroidTest/debug/merger.xml
	PushSDK/build/intermediates/incremental/packageResourcesdebug/merger.xml
	PushSDK/build/intermediates/incremental/packageResourcesrelease/merger.xml
	PushSDK/build/intermediates/mockable-android-22.jar
	PushSDK/build/intermediates/res/resources-debug-androidTest.ap_
	PushSDK/build/outputs/aar/PushSDK-debug.aar
	PushSDK/build/outputs/aar/PushSDK-release.aar
2016-12-26 16:13:24 +08:00
f2500aeb6e 推送消息跳转 2016-12-26 15:31:21 +08:00
khy
0df714b9ea 合并优化 2016-12-23 16:53:09 +08:00
e2e4f53d3e 针对助手2.3版本关注数据的迁移 2016-12-23 11:22:57 +08:00
4b2e3d876b 阴影添加,对接v1d1的user.ghzhushou.com接口 2016-12-23 11:00:40 +08:00
46668e32f6 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3
Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java
2016-12-21 17:20:23 +08:00
khy
3f98bcea33 优化礼包模块 2016-12-21 10:41:48 +08:00
920bacd5aa 修改HomeFragment 2016-12-14 10:59:35 +08:00
f05f95dc41 切换CountDownLatch用Observable.merge 2016-12-13 15:30:02 +08:00
e29741cf17 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3
Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java
	app/src/main/java/com/gh/gamecenter/adapter/SubjectAdapter.java
2016-12-12 16:54:45 +08:00
3cbc850d12 项目整理 2016-12-12 16:34:19 +08:00
khy
3b5f921c01 首页改版, 游戏专题优化(游戏主页actionbar下载数没同步) 2016-12-09 18:33:23 +08:00
c7ceb5cf82 去除volley 2016-12-05 18:43:58 +08:00
khy
3d82162b4d 修复平台名字为null问题 2016-12-02 17:39:21 +08:00
khy
0fcf70a2bf Merge remote-tracking branch 'origin/2.2' into 2.2
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/MessageDetailActivity.java
#	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
#	app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java
2016-11-30 10:39:35 +08:00
khy
68f8bee146 文章详情增加评论入口 2016-11-30 10:29:35 +08:00
21f1a161c9 Merge branch '2.2' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.2
Conflicts:
	app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
2016-11-29 10:59:15 +08:00
a31d2cd28b 去除volley 中TAG的滥用导致无法重复加载同一url,项目整理 2016-11-29 10:49:45 +08:00
c2f2672421 增加跳转意见反馈页面带content参数 2016-11-28 17:25:53 +08:00
f77a4eb3cb 删除静态searchHint的使用 2016-11-28 11:22:57 +08:00
khy
2dabd5492f 版本更新推送增加了一个“从不”的选项,修复微信好友分享不能扫描二维码问题 2016-11-24 17:19:23 +08:00