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

256 Commits

Author SHA1 Message Date
黄壮华
fc68b9add5 DownloadEntry修改为DownloadEntity 2016-09-13 07:23:02 +08:00
huangzhuanghua
d95d5d5e6b 添加安装、卸载游戏处理 2016-09-09 19:52:53 +08:00
huangzhuanghua
69d86affd0 解决合并后的bug 2016-09-09 18:31:02 +08:00
huangzhuanghua
9f5374f4fd Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 
Conflicts:
	app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
	app/src/main/res/drawable/progressbar_normal_radius_style.xml
	app/src/main/res/layout/fragment_news.xml
	app/src/main/res/layout/plugin_container_fragments.xml
 2016-09-09 18:27:32 +08:00
huangzhuanghua
f858ba0b70 整理 2016-09-09 18:23:54 +08:00
khy
b9a2374f8f Issue ：游戏详情-插件介绍显示优化 2016-09-09 16:47:22 +08:00
khy
73c0af47db Merge remote-tracking branch 'origin/2.0' into 2.0 
# Conflicts:
#	app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
#	app/src/main/java/com/gh/gamecenter/NewsDetailActivity.java
 2016-09-09 10:34:21 +08:00
khy
72f62b595d Issue 68：游戏详情优化汇总 2016-09-09 10:30:14 +08:00
huangzhuanghua
5316164f00 Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 2016-09-09 08:28:49 +08:00
huangzhuanghua
a14646d2e2 游戏详情、新闻详情下载按钮的修改 2016-09-09 08:28:24 +08:00
黄壮华
1135334a95 资讯-关注页面整理 2016-09-08 22:24:03 +08:00
huangzhuanghua
5462167d85 gamedetails_item_loading修改为gamedetail_item_loading 2016-09-08 18:50:33 +08:00
huangzhuanghua
b7c3856785 Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 2016-09-08 18:48:56 +08:00
huangzhuanghua
92ad0838e7 游戏详情整理、Config.isShow()修改 2016-09-08 18:48:22 +08:00
khy
ae405d54d5 修改轮播图点的选中颜色 2016-09-08 16:50:38 +08:00
khy
d9ea9cf1ba Merge remote-tracking branch 'origin/2.0' into 2.0 
# Conflicts:
#	app/src/main/res/drawable-hdpi/home1_selected.png
#	app/src/main/res/drawable-hdpi/home1_unselected.png
#	app/src/main/res/drawable-hdpi/home2_selected.png
#	app/src/main/res/drawable-hdpi/home2_unselected.png
#	app/src/main/res/drawable-hdpi/home3_selected.png
#	app/src/main/res/drawable-hdpi/home3_unselected.png
#	app/src/main/res/drawable/oval_hint_dn.xml
#	app/src/main/res/drawable/oval_hint_up.xml
#	app/src/main/res/layout/activity_main.xml
 2016-09-08 16:46:13 +08:00
khy
5c4a65d278 Issue UI优化汇总完成 2016-09-08 16:37:32 +08:00
huangzhuanghua
cbc543b981 修改多版本下载时，使用移动网络的提示方式 2016-09-08 11:05:56 +08:00
huangzhuanghua
a22f59aab6 去掉setClickable 2016-09-08 09:19:12 +08:00
huangzhuanghua
9b7c5e7756 去掉setClickable 2016-09-08 09:18:42 +08:00
huangzhuanghua
e2591a54d6 DataWatcher修改 2016-09-08 09:11:22 +08:00
huangzhuanghua
9180089787 Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 2016-09-07 18:52:30 +08:00
huangzhuanghua
bd892a4cf1 解决final int position导致的bug 2016-09-07 18:52:21 +08:00
khy
1dd895ebef 修复微信好友和微信朋友圈无法分享问题（正式打包生效） 2016-09-07 18:17:22 +08:00
khy
c416adc980 Merge remote-tracking branch 'origin/2.0' into 2.0 2016-09-07 11:29:59 +08:00
khy
6737b17e43 修正游戏和新闻大图显示不全问题 2016-09-07 11:27:48 +08:00
huangzhuanghua
3300d61a53 修改下载管理相关文件名、修复查看大图单击无法退出问题、资讯-攻略去重导致的奔溃bug 2016-09-07 11:23:27 +08:00
huangzhuanghua
defbbc7b44 资讯-关注添加阅读量 2016-09-07 09:50:04 +08:00
huangzhuanghua
a77e1ebf61 搜索为空提示修改、排序数字居中修改 2016-09-06 18:35:59 +08:00
huangzhuanghua
6834be0909 合并 2016-09-06 18:21:27 +08:00
huangzhuanghua
9d3640f6b9 Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 
Conflicts:
	app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
 2016-09-06 18:21:13 +08:00
huangzhuanghua
4e392eeb14 根据issues整理项目 2016-09-06 18:15:41 +08:00
khy
4ce778f76f 修复下载BUG，修复资讯-关注BUG，修改游戏详情-资讯攻略标签背景 2016-09-06 17:49:46 +08:00
khy
160bb20eed Merge remote-tracking branch 'origin/2.0' into 2.0 2016-09-06 10:24:19 +08:00
khy
27c73369da 分享文案修改 2016-09-06 10:23:01 +08:00
huangzhuanghua
6cbb033326 统一gameMap、statusMap 2016-09-05 18:57:16 +08:00
khy
bfd31516ba 分享模块，下载合集微调 2016-09-05 11:14:24 +08:00
huangzhuanghua
da664e5869 文件整理、修改 2016-09-04 18:35:43 +08:00
huangzhuanghua
cae1f78025 Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 2016-09-02 18:46:12 +08:00
huangzhuanghua
8b282eaf8a 文件整理、修改 2016-09-02 18:40:45 +08:00
huangzhuanghua
b5b65ecd41 Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 
Conflicts:
	app/src/main/res/drawable/oval_hint_up.xml
	app/src/main/res/layout/game_download_dialog.xml
 2016-09-02 18:38:36 +08:00
khy
87b47a9c31 下载合集 修改二级版本背景，微调布局 2016-09-02 18:11:48 +08:00
huangzhuanghua
6dd0c75cdc 文件整理 2016-09-02 17:14:05 +08:00
khy
5f3f2139c1 下载合集删除无用Log 2016-09-02 17:05:22 +08:00
khy
ef97c913cf 下载合集 2016-09-02 16:57:20 +08:00
huangzhuanghua
b1df05ea47 合并后解决冲突、bug 2016-08-31 14:57:45 +08:00
huangzhuanghua
a270946ce2 Merge branch '2.0' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.0 
Conflicts:
	app/src/main/java/com/gh/common/util/ImageUtils.java
	app/src/main/java/com/gh/gamecenter/GameDetailsActivity.java
	app/src/main/java/com/gh/gamecenter/game/Game1FragmentAdapter.java
	app/src/main/java/com/gh/gamecenter/game/GameListAdapter.java
	app/src/main/java/com/gh/gamecenter/game/NewGame2FragmentAdapter.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameDetailsFragment.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameInformationFragment.java
	app/src/main/java/com/gh/gamecenter/gamedetails/GameStrategyFragment.java
	app/src/main/res/drawable/border_white_bg.xml
	app/src/main/res/layout/game_news_type_list_item.xml
	app/src/main/res/layout/home_consolegame_item.xml
	app/src/main/res/layout/home_game_test_item.xml
 2016-08-31 14:46:50 +08:00
huangzhuanghua
efc19441cd 文件整理 2016-08-31 14:41:42 +08:00
khy
803ec482fb 合集 2016-08-31 14:33:10 +08:00
khy
dac71dfd55 游戏新闻，游戏新闻搜索 2016-08-31 14:32:09 +08:00