|
|
@@ -212,7 +212,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
|
|
|
private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
|
|
|
private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
|
|
|
- Handler mHanderl = new Handler(Looper.getMainLooper()) {
|
|
|
+ public Handler mHanderl = new Handler(Looper.getMainLooper()) {
|
|
|
@Override
|
|
|
public void handleMessage(Message msg) {
|
|
|
super.handleMessage(msg);
|
|
|
@@ -222,11 +222,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
break;
|
|
|
case 1:
|
|
|
tryMakeMoneyAdp.clear();
|
|
|
- if(!ListUtil.isEmpty(allTaskAcceptedTaskList)){
|
|
|
+ if (!ListUtil.isEmpty(allTaskAcceptedTaskList)) {
|
|
|
recyclerview_line.setVisibility(View.VISIBLE);
|
|
|
tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
|
|
|
}
|
|
|
- if(!ListUtil.isEmpty(releaseEtyLists)) {
|
|
|
+ if (!ListUtil.isEmpty(releaseEtyLists)) {
|
|
|
tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists));
|
|
|
}
|
|
|
tryMakeMoneyAdp.notifyDataSetChanged();
|
|
|
@@ -236,14 +236,27 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
|
|
|
int count = item.getDataCount();
|
|
|
ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
|
|
|
- params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding_20));
|
|
|
+ params.height = count == 0 ? G.HEIGHT / 3 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96) + getResources().getDimensionPixelSize(R.dimen.content_padding_20));
|
|
|
mViewPager.setLayoutParams(params);
|
|
|
break;
|
|
|
+ case 7:
|
|
|
+ isShowRedPackages((Context)msg.obj);
|
|
|
+ LogUtil.logI("handle message");
|
|
|
+ break;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
};
|
|
|
|
|
|
+ public void isShowRedPackages(Context obj) {
|
|
|
+ if (userEntity == null) {
|
|
|
+ userEntity = DataUtil.getInstance().getUserEntity();
|
|
|
+ }
|
|
|
+ if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
|
|
|
+ showRedPackage(obj);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* @return 是否显示红包
|
|
|
*/
|
|
|
@@ -255,7 +268,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
userEntity = DataUtil.getInstance().getUserEntity();
|
|
|
}
|
|
|
if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
|
|
|
- showRedPackage(getActivity(), LayoutInflater.from(getContext()).inflate(R.layout.homepage_act_layout, null));
|
|
|
+ showRedPackage(getContext());
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -300,7 +313,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
*/
|
|
|
adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
|
|
|
adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
|
|
|
- adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
|
|
|
+ adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1, "about_to_begin"), "即将开始");
|
|
|
|
|
|
// mViewPager.setOffscreenPageLimit(2);
|
|
|
mViewPager.setAdapter(adpViewPagerDetail);
|
|
|
@@ -326,6 +339,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
});
|
|
|
CommonUtil.getInstance().reflex(tabLayout, activity);
|
|
|
}
|
|
|
+
|
|
|
private int curPosition = 0;
|
|
|
|
|
|
|
|
|
@@ -434,7 +448,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
|
|
|
//用户信息
|
|
|
userEntity = DataUtil.getInstance().getUserEntity();
|
|
|
- if(userEntity != null){
|
|
|
+ if (userEntity != null) {
|
|
|
loadUserInfo();
|
|
|
}
|
|
|
//任务
|
|
|
@@ -447,13 +461,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
|
|
|
//实时动态
|
|
|
List<MoreDataEntity> cacheMoreDataEtyList = DataUtil.getInstance().getCacheList(ApiKey.award_detail, MoreDataEntity.class);
|
|
|
- if(!ListUtil.isEmpty(cacheMoreDataEtyList)){
|
|
|
+ if (!ListUtil.isEmpty(cacheMoreDataEtyList)) {
|
|
|
invite(cacheMoreDataEtyList);
|
|
|
}
|
|
|
|
|
|
//公告
|
|
|
List<BulletinEnty> cacheBulletinEtyList = DataUtil.getInstance().getCacheList(ApiKey.bulletin, BulletinEnty.class);
|
|
|
- if(ListUtil.isEmpty(cacheBulletinEtyList)){
|
|
|
+ if (ListUtil.isEmpty(cacheBulletinEtyList)) {
|
|
|
homepageItemNoticeLayout.setVisibility(View.GONE);
|
|
|
} else {
|
|
|
bulletinEntyLists.clear();
|
|
|
@@ -462,7 +476,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
//轮播
|
|
|
List<SlideshowEty> cacheSlideshowEtyList = DataUtil.getInstance().getCacheList(ApiKey.slideshow, SlideshowEty.class);
|
|
|
- if(ListUtil.isEmpty(cacheSlideshowEtyList)){
|
|
|
+ if (ListUtil.isEmpty(cacheSlideshowEtyList)) {
|
|
|
banner.setVisibility(View.GONE);
|
|
|
} else {
|
|
|
for (SlideshowEty slideshowEty : cacheSlideshowEtyList) {
|
|
|
@@ -474,7 +488,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
//首页list
|
|
|
List<HomeListEntity> cacheHomeListEtyList = DataUtil.getInstance().getCacheList(ApiKey.home_list, HomeListEntity.class);
|
|
|
- if(ListUtil.isEmpty(cacheHomeListEtyList)){
|
|
|
+ if (ListUtil.isEmpty(cacheHomeListEtyList)) {
|
|
|
home_list_gridview_layout.setVisibility(View.GONE);
|
|
|
} else {
|
|
|
home_list_gridview_layout.setVisibility(View.VISIBLE);
|
|
|
@@ -545,21 +559,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
@Override
|
|
|
public void call(BaseMessage o) {
|
|
|
|
|
|
- if(o != null){
|
|
|
+ if (o != null) {
|
|
|
CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
|
|
|
- if(cashAwarsEntity != null){
|
|
|
-
|
|
|
- String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward()+""));
|
|
|
- String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash()+""));
|
|
|
- String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare()+""));
|
|
|
- homepage_item_get_award_name_tv.setText(award+"");
|
|
|
- homepage_item_money_tv.setText(cash+"");
|
|
|
- homepage_item_juan_tv.setText(welfare+"");
|
|
|
+ if (cashAwarsEntity != null) {
|
|
|
+
|
|
|
+ String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward() + ""));
|
|
|
+ String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash() + ""));
|
|
|
+ String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare() + ""));
|
|
|
+ homepage_item_get_award_name_tv.setText(award + "");
|
|
|
+ homepage_item_money_tv.setText(cash + "");
|
|
|
+ homepage_item_juan_tv.setText(welfare + "");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
- if(!isFirst){
|
|
|
+ if (!isFirst) {
|
|
|
for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
|
|
|
FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
|
|
|
item.refreshData();
|
|
|
@@ -567,6 +581,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
isFirst = false;
|
|
|
}
|
|
|
+
|
|
|
private boolean isFirst = true;
|
|
|
|
|
|
/**
|
|
|
@@ -594,20 +609,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
|
|
|
@Override
|
|
|
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
|
|
|
- if(null == homeListEntitysGridview.get(position)){
|
|
|
+ if (null == homeListEntitysGridview.get(position)) {
|
|
|
return;
|
|
|
}
|
|
|
- HomeListEntity homeListEntity= homeListEntitysGridview.get(position);
|
|
|
+ HomeListEntity homeListEntity = homeListEntitysGridview.get(position);
|
|
|
UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
|
|
|
- if(homeListEntity.getJump().equals("-2")){
|
|
|
+ if (homeListEntity.getJump().equals("-2")) {
|
|
|
setValueList(!homeListEntity.isSelect());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
CommonUtil.getInstance()
|
|
|
.goWhere(activity, homeListEntity, "首页");
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
private void refreshTaskList() {
|
|
|
DataUtil.getInstance().isTaskListChange(getClass());
|
|
|
tryMakeMoneyPresenter.returnTask(is_succession, show_game_task);
|
|
|
@@ -620,7 +636,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
1,
|
|
|
0,
|
|
|
0,
|
|
|
- "-1",
|
|
|
+ "-1",
|
|
|
3));
|
|
|
// tryMakeMoneyPresenter.releaseTask(parameEty);
|
|
|
}
|
|
|
@@ -660,7 +676,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
BaseMessage baseMessage = (BaseMessage) o;
|
|
|
userEntity = baseMessage.getData(UserEntity.class);
|
|
|
- if(userEntity == null){
|
|
|
+ if (userEntity == null) {
|
|
|
return;
|
|
|
}
|
|
|
DataUtil.getInstance().setUserEntity(userEntity);
|
|
|
@@ -696,12 +712,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
public void giveUpTaskFailView(Object o) {
|
|
|
|
|
|
}
|
|
|
+
|
|
|
private int is_succession = 3;//所有
|
|
|
private int show_game_task = 1;//包含游戏任务
|
|
|
+
|
|
|
@Override
|
|
|
public void returnTaskTaskUpdataView(Object object) {
|
|
|
boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.new_run_task(is_succession, show_game_task));
|
|
|
- if(isNewData) {
|
|
|
+ if (isNewData) {
|
|
|
BaseMessage baseMessage = (BaseMessage) object;
|
|
|
allTaskAcceptedTaskList = baseMessage.getDataList(TaskAcceptedEty.class);
|
|
|
AutoTaskListUtil.getInstance().loadList(allTaskAcceptedTaskList);
|
|
|
@@ -735,7 +753,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
@Override
|
|
|
public void releaseTaskTaskUpdataView(Object object) {
|
|
|
boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.release_task);
|
|
|
- if(isNewData && object instanceof BaseMessage) {
|
|
|
+ if (isNewData && object instanceof BaseMessage) {
|
|
|
List<TaskReleaseEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskReleaseEty.class);
|
|
|
if (releaseEtyList != null) {
|
|
|
releaseEtyLists = releaseEtyList;
|
|
|
@@ -773,7 +791,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
@Override
|
|
|
public void successSlideshow(BaseMessage baseMessage) {
|
|
|
boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
|
|
|
- if(isNewData){
|
|
|
+ if (isNewData) {
|
|
|
List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
|
|
|
if (ListUtil.isEmpty(slideshowEtyList)) {
|
|
|
banner.setVisibility(View.GONE);
|
|
|
@@ -798,7 +816,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
@Override
|
|
|
public void successbulletin(BaseMessage baseMessage) {
|
|
|
boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.bulletin);
|
|
|
- if(isNewData){
|
|
|
+ if (isNewData) {
|
|
|
List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
|
|
|
if (ListUtil.isEmpty(bulletinEntyList)) {
|
|
|
homepageItemNoticeLayout.setVisibility(View.GONE);
|
|
|
@@ -814,7 +832,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
public void successhomeList(BaseMessage baseMessage) {
|
|
|
checkAndInitView();
|
|
|
boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
|
|
|
- if(isNewData){
|
|
|
+ if (isNewData) {
|
|
|
List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
|
|
|
if (ListUtil.isEmpty(homeListEntityList)) {
|
|
|
home_list_gridview_layout.setVisibility(View.GONE);
|
|
|
@@ -867,16 +885,18 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
home_list_gridview_layout.setVisibility(View.GONE);
|
|
|
|
|
|
}
|
|
|
+
|
|
|
private int onResumeCount = 0;
|
|
|
+
|
|
|
@Override
|
|
|
public void onResume() {
|
|
|
super.onResume();
|
|
|
UserEntity result = DataUtil.getInstance().getUserEntity();
|
|
|
- if(result == null) {
|
|
|
+ if (result == null) {
|
|
|
CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
|
|
|
@Override
|
|
|
public void call(UserEntity item) {
|
|
|
- if(item != null) {
|
|
|
+ if (item != null) {
|
|
|
userEntity = item;
|
|
|
loadUserInfo();
|
|
|
}
|
|
|
@@ -886,7 +906,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
userEntity = result;
|
|
|
loadUserInfo();
|
|
|
}
|
|
|
- if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
|
|
|
+ if (DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
|
|
|
refreshTaskList();
|
|
|
|
|
|
viewRobDuty.setOnClickListener(new View.OnClickListener() {
|
|
|
@@ -1158,7 +1178,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
* 点击一条公告
|
|
|
*/
|
|
|
private void onClickNotice(BulletinEnty item) {
|
|
|
- switch (item.getJumpType()){// 跳转类型:11,任务 98,内部h5 99,外部h5
|
|
|
+ switch (item.getJumpType()) {// 跳转类型:11,任务 98,内部h5 99,外部h5
|
|
|
case 11:
|
|
|
Jump2View.getInstance().goTaskDetailView(activity, NumberFormatUtils.parseInteger(item.getJumpValue()));
|
|
|
break;
|
|
|
@@ -1203,13 +1223,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 邀请成功后在个人资料显示领红包弹窗
|
|
|
- *
|
|
|
- * @param mActivity 当前Activity
|
|
|
*/
|
|
|
- public void showRedPackage(final Activity mActivity, View viewAnchor) {
|
|
|
- View view = LayoutInflater.from(mActivity).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
|
|
|
+ public void showRedPackage(Context context) {
|
|
|
+ Activity mActivity = (Activity)context;
|
|
|
+ View viewAnchor = LayoutInflater.from(context).inflate(R.layout.homepage_act_layout, null, false);
|
|
|
+ View view = LayoutInflater.from(context).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
|
|
|
TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
|
|
|
TextView tvMoney = view.findViewById(R.id.tv_money);
|
|
|
ImageView ivClose = view.findViewById(R.id.iv_close);
|
|
|
@@ -1244,6 +1265,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
});
|
|
|
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 兑换红包
|
|
|
*
|
|
|
@@ -1259,31 +1281,31 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
LogUtil.logI("0------" + new Gson().toJson(baseMessage));
|
|
|
G.showToast(baseMessage.getMsg());
|
|
|
}
|
|
|
-
|
|
|
@Override
|
|
|
public void onNext(BaseMessage baseMessage) {
|
|
|
- if (popupWindow.isShowing()){
|
|
|
+ if (popupWindow.isShowing()) {
|
|
|
popupWindow.dismiss();
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
+
|
|
|
/**
|
|
|
* 新手任务
|
|
|
*/
|
|
|
- private void addNewTask(){
|
|
|
+ private void addNewTask() {
|
|
|
HomeListEntity homeListEntityNewTask = new HomeListEntity();
|
|
|
homeListEntityNewTask.setTitle("新手任务");
|
|
|
homeListEntityNewTask.setDesc("新手任务");
|
|
|
homeListEntityNewTask.setJump("-1");
|
|
|
- homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw+"");
|
|
|
+ homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
|
|
|
homeListEntitys.add(0, homeListEntityNewTask);
|
|
|
- if(homeListEntitys.size() > 8){
|
|
|
+ if (homeListEntitys.size() > 8) {
|
|
|
HomeListEntity homeListEntity = new HomeListEntity();
|
|
|
homeListEntity.setTitle("查看更多");
|
|
|
homeListEntity.setDesc("查看更多");
|
|
|
homeListEntity.setJump("-2");
|
|
|
- homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
|
|
|
+ homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
|
|
|
homeListEntitys.add(7, homeListEntity);
|
|
|
}
|
|
|
setValueList(false);
|
|
|
@@ -1291,26 +1313,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
|
|
|
|
|
|
private void setValueList(boolean flag) {
|
|
|
homeListEntitysGridview.clear();
|
|
|
- for(int i=0;i<homeListEntitys.size();i++){
|
|
|
- if(flag){
|
|
|
+ for (int i = 0; i < homeListEntitys.size(); i++) {
|
|
|
+ if (flag) {
|
|
|
homeListEntitysGridview.add(homeListEntitys.get(i));
|
|
|
- }else {
|
|
|
- if(i<8){
|
|
|
+ } else {
|
|
|
+ if (i < 8) {
|
|
|
homeListEntitysGridview.add(homeListEntitys.get(i));
|
|
|
}
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- if(homeListEntitysGridview.size() > 8){
|
|
|
+ if (homeListEntitysGridview.size() > 8) {
|
|
|
HomeListEntity homeListEntity = new HomeListEntity();
|
|
|
homeListEntity.setTitle("查看更多");
|
|
|
homeListEntity.setDesc("查看更多");
|
|
|
homeListEntity.setJump("-2");
|
|
|
homeListEntity.setSelect(flag);
|
|
|
if (flag) {
|
|
|
- homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
|
|
|
+ homeListEntity.setIcon(R.mipmap.homepage_chakangd_click + "");
|
|
|
} else {
|
|
|
- homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
|
|
|
+ homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
|
|
|
}
|
|
|
homeListEntitysGridview.set(7, homeListEntity);
|
|
|
}
|