Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' of https://git.oschina.net/dreamhua/GH-ASSISTv1.45 into 2.3

Browse Source 
Conflicts:
	app/src/main/java/com/gh/gamecenter/MainActivity.java
This commit is contained in:
huangzhuanghua
2016-12-21 17:20:23 +08:00
parent 627f513da0 df1eec07e5
commit 46668e32f6
27 changed files with 919 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/gh/base/BaseDetailActivity.java
View File

@ -48,6 +48,8 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
protected TextView detail_tv_per;
protected LinearLayout reuse_ll_loading;
protected LinearLayout reuse_no_connection;
protected LinearLayout reuse_none_data;
protected TextView reuse_tv_none_data;
protected ImageView iv_share;
protected GameEntity gameEntity;
@ -113,6 +115,8 @@ public abstract class BaseDetailActivity extends BaseActivity implements View.On
detail_tv_per = (TextView) findViewById(R.id.detail_tv_per);
reuse_ll_loading = (LinearLayout) findViewById(R.id.reuse_ll_loading);
reuse_no_connection = (LinearLayout) findViewById(R.id.reuse_no_connection);
reuse_none_data = (LinearLayout) findViewById(R.id.reuse_none_data);
reuse_tv_none_data = (TextView) findViewById(R.id.reuse_tv_none_data);
detail_ll_bottom.setOnClickListener(this);
detail_tv_download.setOnClickListener(this);