Explorar o código

修复首页滑动不流畅与轮播图设置tab显示的代码不对称的问题

zengjiebin %!s(int64=7) %!d(string=hai) anos
pai
achega
5e2a5a4032

+ 5 - 14
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
+import android.support.v4.widget.NestedScrollView;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.LinearLayoutManager;
@@ -22,20 +23,17 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RadioGroup;
 import android.widget.RelativeLayout;
-import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.ReactUtil;
 import com.kfzs.duanduan.react.SharedPreferences;
-import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
@@ -47,7 +45,6 @@ import com.sheep.gamegroup.model.entity.BulletinEnty;
 import com.sheep.gamegroup.model.entity.Ext;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.MoreDataEntity;
-import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.RecyleObj;
 import com.sheep.gamegroup.model.entity.RecyleType;
 import com.sheep.gamegroup.model.entity.RequestParameEty;
@@ -57,12 +54,10 @@ import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.EntityUtils;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
-import com.sheep.gamegroup.util.AppUtil;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.Conversion2;
 import com.sheep.gamegroup.util.GlideImageLoader;
@@ -103,9 +98,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
-import rx.android.schedulers.AndroidSchedulers;
 import rx.functions.Action1;
-import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
 
@@ -150,7 +143,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @BindView(R.id.group_banner)
     RadioGroup group_banner;
     @BindView(R.id.scrollView)
-    ScrollView scrollView;
+    NestedScrollView scrollView;
     @BindView(R.id.newbie_task)
     View newbie_task;
     @BindView(R.id.refresh)
@@ -207,8 +200,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     checkAndInitView();
-                    recyclerview.setFocusable(false);
-                    scrollView.scrollTo(0,0);
                     break;
             }
 
@@ -313,8 +304,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
         });
 
-        //recyclerView 禁止滑动
-//        recyclerview.setNestedScrollingEnabled(false);
     }
 
     public void initData() {
@@ -364,8 +353,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * recyclerview
      */
     private void recyclerInitView() {
-
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
+        //recyclerView 解决滑动不流畅问题
+        recyclerview.setHasFixedSize(true);
+        recyclerview.setNestedScrollingEnabled(false);
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         for (int i = 0; i < 2; i++) {
             tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.NONE, null));

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/util/ImageGlarryDrawable.java

@@ -126,6 +126,7 @@ public class ImageGlarryDrawable<T> {
         }
 
         if (mList.size() > 1) {//有两张或以上图片,开始轮播
+            mRadioGroup.setVisibility(View.VISIBLE);
             if (!mIsMoved) {
                 mIsMoved = true;
                 handler.removeMessages(1);

+ 10 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActSearchGame.java

@@ -170,7 +170,7 @@ public class ActSearchGame extends BaseActivity {
                 convertView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
-                        Jump2View.getInstance().goTaskDetailView(activity, item.getId());
+                        search_game_input.setText(item.getName());
                     }
                 });
                 return true;
@@ -355,6 +355,15 @@ public class ActSearchGame extends BaseActivity {
     }
 
     @Override
+    public void onBackPressed() {
+        if(search_game_input.getText().toString().isEmpty()) {
+            super.onBackPressed();
+        } else {
+            search_game_input.setText("");
+        }
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
 

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

@@ -9,7 +9,7 @@
         android:id="@+id/refresh"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-    <ScrollView
+    <android.support.v4.widget.NestedScrollView
         android:id="@+id/scrollView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -17,6 +17,8 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
             android:orientation="vertical">
 
             <include
@@ -54,7 +56,7 @@
                 android:paddingLeft="@dimen/content_padding_10"
                 android:paddingRight="@dimen/content_padding_10"/>
         </LinearLayout>
-    </ScrollView>
+    </android.support.v4.widget.NestedScrollView>
     </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
 
     <com.kfzs.duanduan.view.DragRelativeLayout

+ 1 - 3
app/src/main/res/layout/item_search_game.xml

@@ -3,9 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@color/white"
-    android:paddingTop="@dimen/content_padding"
-    android:paddingBottom="@dimen/content_padding"
-    >
+    android:padding="@dimen/content_padding">
 
     <include layout="@layout/find_information_bottom_item" />