zhaoyi пре 8 година
родитељ
комит
650c6fe21e

+ 6 - 6
app/src/main/java/com/sheep/jiuyan/samllsheep/Config.java

@@ -15,15 +15,15 @@ public class Config {
         return mConfig;
     }
 
-        public String mBaseUrl = "http://10.8.220.132:8088";
-//        public String mBaseUrl = "http://10.8.220.130:8088";
-//        public String mBaseUrl = "http://10.8.220.213:8088";
-//    public String mBaseUrl = "http://10.8.220.130:8088";
-    //    public String mBaseUrl = "http://api.task.bandaimi.com";
+    //        public String mBaseUrl = "http://10.8.220.132:8088";
+    //        public String mBaseUrl = "http://10.8.220.130:8088";
+    //        public String mBaseUrl = "http://10.8.220.213:8088";
+    //    public String mBaseUrl = "http://10.8.220.130:8088";
+    public String mBaseUrl = "http://api.task.bandaimi.com";
     //      public String mBaseUrl = "http://test.ss.shouyouquan.com";
     public final static String WX_APPID = "wx3c0376c4fcc8b723";
     public final static String BUGLY_APPID = "0dd998212c";
-    public String[] mUrlList = new String[]{"http://10.8.220.213:8088","http://10.8.220.132:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
+    public String[] mUrlList = new String[]{"http://10.8.220.213:8088", "http://10.8.220.132:8088", "http://test.ss.shouyouquan.com", "http://10.8.220.130:8088", "http://api.task.bandaimi.com"};
 
     public void setBaseUrl(String url) {
         this.mBaseUrl = url;

+ 2 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/LoginActivity.java

@@ -89,14 +89,14 @@ public class LoginActivity extends BaseActivity {
                 loginFromHw();
             }
         });
-        if (BuildConfig.DEBUG)
+       /* if (BuildConfig.DEBUG)
             mTvRegister.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
                 public boolean onLongClick(View v) {
                     initDialog();
                     return true;
                 }
-            });
+            });*/
     }
 
     private void initDialog() {

+ 2 - 2
app/src/main/java/com/sheep/jiuyan/samllsheep/page/MainActivity.java

@@ -109,7 +109,7 @@ public class MainActivity extends BaseActivity {
 
     @Override
     public void initListener() {
-
+/*
         if (BuildConfig.DEBUG)
             mImgBag.setOnLongClickListener(new View.OnLongClickListener() {
                 @Override
@@ -117,7 +117,7 @@ public class MainActivity extends BaseActivity {
                     initDialog();
                     return true;
                 }
-            });
+            });*/
         //防止右滑一部分后,还能下拉刷新。
         mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override

+ 4 - 2
app/src/main/res/layout/fgt_main_page_task.xml

@@ -163,7 +163,8 @@
 
     <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -184,7 +185,8 @@
             <android.support.v7.widget.RecyclerView
                 android:id="@+id/recy_fgt_main_page_task"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="match_parent"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
             </android.support.v7.widget.RecyclerView>
 

+ 16 - 16
app/src/main/res/layout/main_activity.xml

@@ -28,18 +28,6 @@
                     app:contentScrim="@color/colorPrimary"
                     app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
-
-                    <android.support.v7.widget.Toolbar
-                        android:layout_width="match_parent"
-                        android:layout_height="@dimen/layout_heigh_default"
-                        android:layout_gravity="top"
-                        app:contentInsetLeft="0dp"
-                        app:contentInsetStart="0dp"
-                        app:layout_collapseMode="pin">
-
-                        <include layout="@layout/title"/>
-                    </android.support.v7.widget.Toolbar>
-
                     <android.support.constraint.ConstraintLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -108,6 +96,17 @@
 
                     </android.support.constraint.ConstraintLayout>
 
+                    <android.support.v7.widget.Toolbar
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/layout_heigh_default"
+                        android:layout_gravity="top"
+                        app:contentInsetLeft="0dp"
+                        app:contentInsetStart="0dp"
+                        app:layout_collapseMode="pin">
+
+                        <include layout="@layout/title"/>
+                    </android.support.v7.widget.Toolbar>
+
                 </android.support.design.widget.CollapsingToolbarLayout>
 
                 <com.sheep.jiuyan.samllsheep.page.view.RappTabLayout
@@ -117,21 +116,22 @@
                     android:background="@color/colorPrimary"/>
             </android.support.design.widget.AppBarLayout>
 
-            <android.support.v4.widget.NestedScrollView
+          <!--  <android.support.v4.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:fillViewport="true"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
+                app:layout_behavior="@string/appbar_scrolling_view_behavior">-->
 
                 <android.support.v4.view.ViewPager
                     android:id="@+id/viewpager_main_activity"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@color/white">
+                    android:background="@color/white"
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
                 </android.support.v4.view.ViewPager>
 
-            </android.support.v4.widget.NestedScrollView>
+            <!--</android.support.v4.widget.NestedScrollView>-->
 
         </android.support.design.widget.CoordinatorLayout>