|
@@ -149,7 +149,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
RelativeLayout rl_activity_html;
|
|
|
LinearLayout ll_activity_html;
|
|
|
private String mImageBase64;
|
|
|
- private boolean isNeedResetScreenOrientation =true;
|
|
|
+ private boolean isNeedResetScreenOrientation = true;
|
|
|
|
|
|
@Override
|
|
|
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
|
@@ -229,7 +229,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
}
|
|
|
int c_orientation = intent.getIntExtra("c_orientation", ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
|
|
|
isNeedResetScreenOrientation = c_orientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
|
|
|
- LOG.i("c_orientation:"+c_orientation+"--isNeedResetScreenOrientation:"+isNeedResetScreenOrientation);
|
|
|
+ LOG.i("c_orientation:" + c_orientation + "--isNeedResetScreenOrientation:" + isNeedResetScreenOrientation);
|
|
|
|
|
|
setStatusBarTextColor(intent.getBooleanExtra("statusBarTextColor", false));
|
|
|
if (isHideTitle) {
|
|
@@ -290,7 +290,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
} else {
|
|
|
webViewUrl = (url + "?Authorization=" + authorization);
|
|
|
}
|
|
|
- LOG.i("webViewUrl:"+webViewUrl);
|
|
|
+ LOG.i("webViewUrl:" + webViewUrl);
|
|
|
webView.loadUrl(webViewUrl);
|
|
|
} else {
|
|
|
webView.loadUrl(url);
|
|
@@ -463,7 +463,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
String shareUrl = WebParamsUtils.getShareUrl(content);
|
|
|
/*增加自定义按钮的分享面板*/
|
|
|
mShareAction = new ShareAction(HtmlActivity.this).setDisplayList(
|
|
|
- SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.SINA)
|
|
|
+ SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.SINA)
|
|
|
.setShareboardclickCallback(new ShareBoardlistener() {
|
|
|
@Override
|
|
|
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
|
|
@@ -503,7 +503,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
String videoUrl = content.optString("video");
|
|
|
/*增加自定义按钮的分享面板*/
|
|
|
mShareAction = new ShareAction(this).setDisplayList(
|
|
|
- SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.SINA)
|
|
|
+ SHARE_MEDIA.WEIXIN, SHARE_MEDIA.WEIXIN_CIRCLE, SHARE_MEDIA.SINA)
|
|
|
.setShareboardclickCallback(new ShareBoardlistener() {
|
|
|
@Override
|
|
|
public void onclick(SnsPlatform snsPlatform, SHARE_MEDIA share_media) {
|
|
@@ -528,7 +528,10 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
public void backIconChange(JSONObject message) {
|
|
|
try {
|
|
|
if (!TextUtils.isEmpty(message.toString())) {
|
|
|
- String icon = message.optJSONObject("content").optString("iconStyle");
|
|
|
+ JSONObject contentJson = message.optJSONObject("content");
|
|
|
+ String icon = contentJson.optString("iconStyle");
|
|
|
+ boolean backIconHide = contentJson.optBoolean("backIconHide", false);
|
|
|
+ ll_activity_html.setVisibility(backIconHide ? View.GONE : View.VISIBLE);
|
|
|
if (!TextUtils.isEmpty(icon)) {
|
|
|
if (icon.equals("black")) {
|
|
|
if (btnBack == null)
|
|
@@ -538,6 +541,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
if (btnBack == null)
|
|
|
return;
|
|
|
btnBack.setImageResource(com.cooleshow.base.R.drawable.ic_back_white);
|
|
|
+ } else if (TextUtils.equals(icon, "backIconHide")) {
|
|
|
+ //完全隐藏
|
|
|
+ headerBbarView.setVisibility(View.GONE);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1474,9 +1480,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
|
|
|
}
|
|
|
|
|
|
private void checkScreenOrientation() {
|
|
|
- LOG.i("isNeedResetScreenOrientation:"+isNeedResetScreenOrientation);
|
|
|
- if(isNeedResetScreenOrientation){
|
|
|
- if(getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE){
|
|
|
+ LOG.i("isNeedResetScreenOrientation:" + isNeedResetScreenOrientation);
|
|
|
+ if (isNeedResetScreenOrientation) {
|
|
|
+ if (getRequestedOrientation() == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
|
|
|
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
|
|
|
}
|
|
|
}
|