|
|
@@ -18,7 +18,6 @@ import android.support.v7.app.AlertDialog;
|
|
|
import android.support.v7.widget.LinearLayoutManager;
|
|
|
import android.support.v7.widget.RecyclerView;
|
|
|
import android.text.TextUtils;
|
|
|
-import android.util.Log;
|
|
|
import android.view.LayoutInflater;
|
|
|
import android.view.MotionEvent;
|
|
|
import android.view.View;
|
|
|
@@ -37,7 +36,6 @@ import com.kfzs.duanduan.react.ConfigUtil;
|
|
|
import com.kfzs.duanduan.react.SharedPreferences;
|
|
|
import com.kfzs.duanduan.utils.NumberFormatUtils;
|
|
|
import com.kfzs.duanduan.utils.dlg.FormatAny;
|
|
|
-import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
|
|
|
import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
|
|
|
import com.sheep.gamegroup.di.modules.SmallSheepModule;
|
|
|
import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
|
|
|
@@ -45,7 +43,6 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
|
|
|
import com.sheep.gamegroup.model.entity.BulletinEnty;
|
|
|
import com.sheep.gamegroup.model.entity.CashAwarsEntity;
|
|
|
import com.sheep.gamegroup.model.entity.Ext;
|
|
|
-import com.sheep.gamegroup.model.entity.GridViewEntity;
|
|
|
import com.sheep.gamegroup.model.entity.HomeListEntity;
|
|
|
import com.sheep.gamegroup.model.entity.MoreDataEntity;
|
|
|
import com.sheep.gamegroup.model.entity.RecyleObj;
|
|
|
@@ -165,7 +162,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
@BindView(R.id.iv_rob_duty)
|
|
|
ImageView ivDuty;
|
|
|
@BindView(R.id.viewpager_act_game_details)
|
|
|
- ViewPagerAutoHeigh mViewPager;
|
|
|
+ ViewPager mViewPager;
|
|
|
@BindView(R.id.tabLayout)
|
|
|
TabLayout tabLayout;
|
|
|
@BindView(R.id.homepage_item_get_award_name_tv)
|
|
|
@@ -270,27 +267,27 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "每日必做");
|
|
|
adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "即将开始");
|
|
|
|
|
|
- mViewPager.setOffscreenPageLimit(2);
|
|
|
+// mViewPager.setOffscreenPageLimit(2);
|
|
|
mViewPager.setAdapter(adpViewPagerDetail);
|
|
|
|
|
|
tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
|
|
|
- mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
|
|
|
- @Override
|
|
|
- public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void onPageSelected(int position) {
|
|
|
- mViewPager.reSetHeight();
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void onPageScrollStateChanged(int state) {
|
|
|
-
|
|
|
- }
|
|
|
- });
|
|
|
- tabLayout.setupWithViewPager(mViewPager);
|
|
|
+// mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
|
|
|
+// @Override
|
|
|
+// public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
|
|
|
+//
|
|
|
+// }
|
|
|
+//
|
|
|
+// @Override
|
|
|
+// public void onPageSelected(int position) {
|
|
|
+// mViewPager.reSetHeight();
|
|
|
+// }
|
|
|
+//
|
|
|
+// @Override
|
|
|
+// public void onPageScrollStateChanged(int state) {
|
|
|
+//
|
|
|
+// }
|
|
|
+// });
|
|
|
+// tabLayout.setupWithViewPager(mViewPager);
|
|
|
CommonUtil.getInstance().reflex(tabLayout, activity);
|
|
|
}
|
|
|
|
|
|
@@ -349,25 +346,25 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
@Override
|
|
|
public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
|
|
|
|
|
|
- try {
|
|
|
- tabLayout.post(new Runnable() {
|
|
|
- @Override
|
|
|
- public void run() {
|
|
|
- int count = mViewPager.getChildCount();
|
|
|
- if(count > 0){
|
|
|
- toolBarPositionY = tabLayout.getHeight();
|
|
|
+// try {
|
|
|
+// tabLayout.post(new Runnable() {
|
|
|
+// @Override
|
|
|
+// public void run() {
|
|
|
+// int count = mViewPager.getChildCount();
|
|
|
+// if(count > 0){
|
|
|
+// toolBarPositionY = tabLayout.getHeight();
|
|
|
+//// ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
|
|
|
// ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
|
|
|
- ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
|
|
|
- params.height = G.getRealPix(count * 50);
|
|
|
- mViewPager.setLayoutParams(params);
|
|
|
- LogUtil.logE("--------"+count+";height:"+mViewPager.getHeight()+","+mViewPager.getMeasuredHeight());
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- });
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- }
|
|
|
+// params.height = G.getRealPix(count * 50);
|
|
|
+// mViewPager.setLayoutParams(params);
|
|
|
+// LogUtil.logE("--------"+count+";height:"+mViewPager.getHeight()+","+mViewPager.getMeasuredHeight());
|
|
|
+// }
|
|
|
+//
|
|
|
+// }
|
|
|
+// });
|
|
|
+// } catch (Exception e) {
|
|
|
+// e.printStackTrace();
|
|
|
+// }
|
|
|
}
|
|
|
});
|
|
|
|