From b816fcd07aabc4db55e14cd623e41367e1e22479 Mon Sep 17 00:00:00 2001
From: mwang <8205347@qq.com>
Date: Thu, 11 Apr 2019 18:20:10 +0800
Subject: [PATCH] working on title

---
 .../main/java/com/novelbook/android/Main2Activity.java | 10 +++++-----
 .../com/novelbook/android/netutils/HttpMethods.java    |  8 ++------
 zhuike/src/main/res/layout/app_bar_main2.xml           |  2 +-
 zhuike/src/main/res/layout/fragment_jingxuan_cates.xml |  1 +
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/zhuike/src/main/java/com/novelbook/android/Main2Activity.java b/zhuike/src/main/java/com/novelbook/android/Main2Activity.java
index cf937d5..637dc95 100644
--- a/zhuike/src/main/java/com/novelbook/android/Main2Activity.java
+++ b/zhuike/src/main/java/com/novelbook/android/Main2Activity.java
@@ -279,13 +279,13 @@ private  int bottomSelectedIndex;
     public  void swithToolbarItems( ) {
 
         Log.e( TAG, "swithToolbarItems: " );
-        boolean showToggle =bottomSelectedIndex !=1;
+        boolean showToggle =true;//bottomSelectedIndex !=1;
         boolean showSpinner = bottomSelectedIndex ==1;
         boolean showTitle = bottomSelectedIndex !=1;
         String title =  bottomSelectedIndex==0?"我的书架":"排行榜";
-
-        toggle.setDrawerIndicatorEnabled(showToggle);
-        toggle.syncState();
+      //  txtTitle.setVisibility(View.GONE);
+     //   toggle.setDrawerIndicatorEnabled(showToggle);
+      //  toggle.syncState();
 
         spinner.setVisibility( showSpinner?View.VISIBLE:View.GONE);
 
@@ -296,7 +296,7 @@ private  int bottomSelectedIndex;
           title ="";
         }
         txtTitle.setText(title);
-         this.setTitle(title);
+       //  this.setTitle(title);
 
     }
 
diff --git a/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java b/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java
index f468e09..d6e963f 100644
--- a/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java
+++ b/zhuike/src/main/java/com/novelbook/android/netutils/HttpMethods.java
@@ -244,7 +244,7 @@ public class HttpMethods {
         public Response intercept(Chain chain) throws IOException {
             Response originalResponse = chain.proceed(chain.request());
             String cacheControl = originalResponse.header("Cache-Control");
-            int maxAge =0; //一小时
+            int maxAge =60*60; //一小时
             if (cacheControl == null || cacheControl.contains("no-store") || cacheControl.contains("no-cache") ||
                     cacheControl.contains("must-revalidate") || cacheControl.contains("max-age=0")) { //目标网站禁用cache则设置为1小时
                 return originalResponse.newBuilder()
@@ -252,11 +252,7 @@ public class HttpMethods {
                         .header("Cache-Control", "public, max-age=" + maxAge)
                         .build();
             } else {
-                return originalResponse.newBuilder()
-                        .removeHeader("Pragma")
-                        .header("Cache-Control", "public, max-age=" + maxAge)
-                        .build();
-            //   return originalResponse;
+                  return originalResponse;
             }
         }
     };
diff --git a/zhuike/src/main/res/layout/app_bar_main2.xml b/zhuike/src/main/res/layout/app_bar_main2.xml
index 9b76a17..30771d9 100644
--- a/zhuike/src/main/res/layout/app_bar_main2.xml
+++ b/zhuike/src/main/res/layout/app_bar_main2.xml
@@ -37,7 +37,7 @@
                 android:layout_weight="1"
                 android:visibility="visible"
                 android:textColor="@color/white"
-                android:background="@color/colorAccent"
+
                 />
             <android.support.v7.widget.AppCompatSpinner
                 android:id="@+id/sexSelect"
diff --git a/zhuike/src/main/res/layout/fragment_jingxuan_cates.xml b/zhuike/src/main/res/layout/fragment_jingxuan_cates.xml
index 1e69084..de3a751 100644
--- a/zhuike/src/main/res/layout/fragment_jingxuan_cates.xml
+++ b/zhuike/src/main/res/layout/fragment_jingxuan_cates.xml
@@ -4,6 +4,7 @@
 android:layout_width="match_parent"
 android:layout_height="80dp"
 android:orientation="horizontal"
+    android:visibility="gone"
 android:gravity="center">
     <LinearLayout
         android:id="@+id/llTuijian2"