Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
508 Commits 121 Branches 327 Tags
93ec154b7e23f2eb07161347fffe139713188b8d
Commit Graph

467 Commits

Author SHA1 Message Date
khy
93ec154b7e Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/java/com/gh/common/util/ConcernUtils.java
 2017-01-09 17:54:16 +08:00
khy
ed71d3e348 优化汇总（20170106），礼包相关优化补充（20170104）， 快速点击弹窗按钮可能会出现卡死 2017-01-09 17:51:38 +08:00
huangzhuanghua
62fb61a8bb 优化网络劫持检测机制 2017-01-09 17:34:56 +08:00
huangzhuanghua
de75e67de7 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 2017-01-09 11:53:41 +08:00
huangzhuanghua
4fc10d360a 跳转修改 2017-01-09 11:53:13 +08:00
khy
40615976e1 Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/res/layout/game_normal_item.xml
 2017-01-04 16:33:40 +08:00
khy
c6bd428c46 专题入口界面调整 2017-01-04 16:32:32 +08:00
huangzhuanghua
1e077a7b0c Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	app/src/main/java/com/gh/base/GHPushMessageReceiver.java
	app/src/main/java/com/gh/base/GHUmengNotificationClickHandler.java
	app/src/main/java/com/gh/common/util/PostCommentUtils.java
	app/src/main/java/com/gh/gamecenter/MainActivity.java
	app/src/main/res/layout/fragment_personal.xml
	app/src/main/res/layout/game_test_item.xml
 2017-01-04 16:26:10 +08:00
huangzhuanghua
659d6fc263 项目修改与整理 2017-01-04 16:16:34 +08:00
khy
d56fa926d2 issues 优化汇总（20161230）， 文章详情加强评论功能，礼包功能补充（20161226） + 新增活跃的统计（未完成） 2017-01-04 15:32:10 +08:00
huangzhuanghua
321121d5ef 修改getToken 2016-12-30 09:24:54 +08:00
huangzhuanghua
a50b4ba041 Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3 
Conflicts:
	app/src/main/java/com/gh/common/util/LibaoUtils.java
 2016-12-30 09:24:11 +08:00
huangzhuanghua
94b4d730e3 修改getToken逻辑 2016-12-29 17:50:12 +08:00
khy
f4a946f5e2 解决本次合并冲突 2016-12-29 15:15:09 +08:00
khy
23a062abea Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/java/com/gh/common/util/LibaoUtils.java
#	app/src/main/java/com/gh/gamecenter/db/info/LibaoInfo.java
#	app/src/main/java/com/gh/gamecenter/entity/GiftEntity.java
#	app/src/main/java/com/gh/gamecenter/libao/Libao3FragmentAdapter.java
#	app/src/main/java/com/gh/gamecenter/retrofit/ApiService.java
 2016-12-29 14:53:21 +08:00
khy
986f67adf6 新闻详情增加评论列表 游戏列表增加礼包标识 2016-12-29 14:35:44 +08:00
huangzhuanghua
419a4d830f 重命名gift为libao 2016-12-29 11:35:32 +08:00
huangzhuanghua
814daa5d3c 添加libao.ghzhushou.com域名 2016-12-29 10:28:33 +08:00
khy
308bd369bc Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	PushSDK/build/intermediates/bundles/debug/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/debug/aapt/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/release/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/release/aapt/AndroidManifest.xml
#	PushSDK/build/intermediates/bundles/release/classes.jar
#	PushSDK/build/intermediates/manifest/androidTest/debug/AndroidManifest.xml
#	PushSDK/build/intermediates/res/resources-debug-androidTest.ap_
#	PushSDK/build/outputs/aar/PushSDK-debug.aar
#	PushSDK/build/outputs/aar/PushSDK-release.aar
 2016-12-28 10:24:29 +08:00
khy
80670a9c4b 界面优化 友盟增加so 2016-12-28 10:20:10 +08:00
huangzhuanghua
c01db35297 同步2.2修改 2016-12-26 17:04:24 +08:00
huangzhuanghua
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
huangzhuanghua
f2500aeb6e 推送消息跳转 2016-12-26 15:31:21 +08:00
khy
0df714b9ea 合并优化 2016-12-23 16:53:09 +08:00
khy
3ebbb27c3a Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/gh/common/util/GiftUtils.java
 2016-12-23 16:34:51 +08:00
khy
8e9cf4603c 增加安装指引 2016-12-23 16:28:06 +08:00
khy
c9147dc64d Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	.idea/modules.xml
 2016-12-23 11:57:31 +08:00
khy
aabca8f771 添加友盟推送，升级小米推送 2016-12-23 11:56:02 +08:00
huangzhuanghua
e2e4f53d3e 针对助手2.3版本关注数据的迁移 2016-12-23 11:22:57 +08:00
huangzhuanghua
4b2e3d876b 阴影添加，对接v1d1的user.ghzhushou.com接口 2016-12-23 11:00:40 +08:00
khy
a294484fb9 Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/ShareCardPicActivity.java
#	app/src/main/res/layout/gamedetail_item_gift.xml
 2016-12-22 20:56:50 +08:00
khy
8e0892498e 卡片分享根据链接生成二维码 2016-12-22 20:51:12 +08:00
khy
d571081625 礼包优化 2016-12-22 17:38:10 +08:00
huangzhuanghua
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
huangzhuanghua
627f513da0 解决代码合并后的问题 2016-12-21 17:16:45 +08:00
huangzhuanghua
5b5c87a07b 代码合并 2016-12-21 17:15:55 +08:00
khy
df1eec07e5 。。。。 2016-12-21 10:53:09 +08:00
khy
3f98bcea33 优化礼包模块 2016-12-21 10:41:48 +08:00
huangzhuanghua
11ac9f5f3e 统一数据收集 2016-12-19 16:33:55 +08:00
khy
66816e1a4c 增加礼包模块（未完成） 2016-12-18 18:06:53 +08:00
huangzhuanghua
920bacd5aa 修改HomeFragment 2016-12-14 10:59:35 +08:00
huangzhuanghua
f05f95dc41 切换CountDownLatch用Observable.merge 2016-12-13 15:30:02 +08:00
huangzhuanghua
8b0faa57aa 去除CardView 2016-12-13 11:11:53 +08:00
huangzhuanghua
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
huangzhuanghua
3cbc850d12 项目整理 2016-12-12 16:34:19 +08:00
khy
70e12db7b7 界面优化 2016-12-12 11:52:48 +08:00
khy
3b5f921c01 首页改版, 游戏专题优化(游戏主页actionbar下载数没同步) 2016-12-09 18:33:23 +08:00
khy
3c0b56c99a 合并修正 2016-12-06 17:29:44 +08:00
khy
ce841476ae Merge remote-tracking branch 'origin/2.3' into 2.3 
# Conflicts:
#	app/src/main/java/com/gh/common/util/PostCommentUtils.java
#	app/src/main/java/com/gh/gamecenter/retrofit/ApiServiceImpl.java
#	app/src/main/java/com/gh/gamecenter/retrofit/CommentService.java
#	app/src/main/java/com/gh/gamecenter/retrofit/CommentServiceImpl.java
 2016-12-06 17:18:18 +08:00
khy
110e7c9c29 新的攻略页面-完成 2016-12-06 17:12:44 +08:00