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

Merge remote-tracking branch 'origin/temp' into dev

Browse Source
This commit is contained in:
CsHeng
2017-12-15 11:00:08 +08:00
parent 765b4c3afa bf7b0b0a82
commit a022526e7e
128 changed files with 3328 additions and 2705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/gh/gamecenter/WebActivity.java
View File

@ -161,7 +161,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
}
// 增加actionBar Button
RelativeLayout reuse_actionbar = mContentView.findViewById(R.id.reuse_actionbar);
RelativeLayout reuse_actionbar = findViewById(R.id.reuse_actionbar);
mShareIv = LayoutInflater.from(this).inflate(R.layout.menu_action_share, reuse_actionbar, false); // 绑定parentView 否则会丢失宽高
RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) mShareIv.getLayoutParams();
params.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
@ -188,7 +188,7 @@ public class WebActivity extends BaseActivity implements View.OnClickListener{
}
initTitle(webTitle);
setNavigationTitle(webTitle);
webView.loadUrl(webUrl);