Bläddra i källkod

修复标题栏无法隐藏的问题

zengjiebin 7 år sedan
förälder
incheckning
131e8abf14

+ 0 - 4
app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -1,14 +1,10 @@
 package com.sheep.gamegroup.absBase;
 
-import android.app.Activity;
-import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v4.app.FragmentActivity;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
 import android.view.Window;

+ 4 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -10,6 +10,7 @@ import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
@@ -51,8 +52,6 @@ public class ActWeb extends BaseActWeb {
 
     @BindView(R.id.webview)
     WebView mWebView;
-    @BindView(R.id.layout_navigationBar)
-    View layout_navigationBar;
 
     private String title;//title为空时,不显示整个标题栏
     private boolean needJsInteract;//是否需要js交互,有js交互的会对url进行操作:拼接token到后面
@@ -468,6 +467,8 @@ public class ActWeb extends BaseActWeb {
 
     @Override
     public void showTitleBar(boolean isShow) {
-        ViewUtil.setVisibility(layout_navigationBar, isShow);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+            actionBar.hide();
     }
 }

+ 4 - 3
app/src/main/java/com/sheep/gamegroup/view/activity/ActWebX5.java

@@ -10,6 +10,7 @@ import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
+import android.support.v7.app.ActionBar;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.view.View;
@@ -51,8 +52,6 @@ public class ActWebX5 extends BaseActWeb {
 
     @BindView(R.id.webview)
     WebView mWebView;
-    @BindView(R.id.layout_navigationBar)
-    View layout_navigationBar;
 
     private String title;//title为空时,不显示整个标题栏
     private boolean needJsInteract;//是否需要js交互,有js交互的会对url进行操作:拼接token到后面
@@ -469,7 +468,9 @@ public class ActWebX5 extends BaseActWeb {
 
     @Override
     public void showTitleBar(boolean isShow) {
-        ViewUtil.setVisibility(layout_navigationBar, isShow);
+        ActionBar actionBar = getSupportActionBar();
+        if(actionBar != null)
+            actionBar.hide();
     }
 
 }

+ 3 - 1
app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -40,6 +40,7 @@ import com.sheep.gamegroup.util.MyFileNameGenerator;
 import com.sheep.gamegroup.util.RefreshUtil;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.gamegroup.view.activity.GameCertificationActivity;
 import com.sheep.jiuyan.samllsheep.service.AutoCheckService;
 import com.sheep.jiuyan.samllsheep.service.DownloadService;
@@ -397,10 +398,11 @@ public class SheepApp extends MultiDexApplication {
                 SysAppUtil.showVersionInfo(activity, SpUtils.getIgnoreMd5());
             } else if (YmConfig.isAvf(activity)) {
                 YmConfig.showTipDialog(activity, YmConfig.TYPE_ADD_VIEW);
+            } else if(activity instanceof ActMain){//进入主页时检查插件更新
+                PluginUtil.initPlugin();
             }
 
             if (mActivityCount == 0) {
-                PluginUtil.initPlugin();
                 if (ConfigUtil.getInstance().isUpgrade()) {
                     Beta.autoDownloadOnWifi = !BuildConfig.DEBUG;
                     Bugly.init(getApplicationContext(), Config.BUGLY_APPID, BuildConfig.DEBUG);