|
|
@@ -223,7 +223,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
case 1:
|
|
|
tryMakeMoneyAdp.clear();
|
|
|
if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
|
|
|
- recyclerview_line.setVisibility(View.VISIBLE);
|
|
|
+ if(recyclerview_line != null)
|
|
|
+ recyclerview_line.setVisibility(View.VISIBLE);
|
|
|
tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
|
|
|
}
|
|
|
if(!ListUtil.isEmpty(releaseEtyLists)) {
|
|
|
@@ -369,8 +370,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- @RequiresApi(api = Build.VERSION_CODES.M)
|
|
|
@SuppressLint("ClickableViewAccessibility")
|
|
|
public void initListener() {
|
|
|
scrollView.setOnTouchListener(new View.OnTouchListener() {
|
|
|
@@ -403,31 +402,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- scrollView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
|
|
|
- @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();
|
|
|
-//// 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();
|
|
|
-// }
|
|
|
- }
|
|
|
- });
|
|
|
|
|
|
refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
|
|
|
@Override
|
|
|
@@ -652,7 +626,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
|
|
|
|
|
|
- @OnClick({R.id.recharge, R.id.withdrawal,
|
|
|
+ @OnClick({R.id.recharge, R.id.withdrawal, R.id.view_rob_duty,
|
|
|
R.id.newbie_task, R.id.icon_img_iv, R.id.user_layout
|
|
|
})
|
|
|
public void onViewClicked(View view) {
|
|
|
@@ -676,6 +650,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
case R.id.recharge://充值
|
|
|
Jump2View.getInstance().goRechargeAct(activity, "首页");
|
|
|
break;
|
|
|
+ case R.id.view_rob_duty://抢任务弹框
|
|
|
+ ViewUtil.showRobDutyDialog(getActivity(), getView());
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -918,13 +895,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
|
|
|
refreshTaskList();
|
|
|
-
|
|
|
- viewRobDuty.setOnClickListener(new View.OnClickListener() {
|
|
|
- @Override
|
|
|
- public void onClick(View v) {
|
|
|
- ViewUtil.showRobDutyDialog(getActivity(), getView());
|
|
|
- }
|
|
|
- });
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1258,7 +1228,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
popupWindow.setOutsideTouchable(false);
|
|
|
popupWindow.setBackgroundDrawable(new BitmapDrawable());
|
|
|
backgroundAlpha(0.7f, mActivity);
|
|
|
- popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
|
|
|
+ try {
|
|
|
+ popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
|
|
|
tvMoney.setText("1.8");
|
|
|
tvNew.setText("新人红包");
|