Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

# Conflicts:
#	app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyFriend;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyRank;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 import com.sheep.jiuyan.samllsheep.utils.G;
@@ -161,9 +162,9 @@ public class FgtAskgetmoney extends BaseCompatFragment {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
                     @Override
                     public void onError(BaseMessage baseMessage) {
-
                         ViewUtil.newInstance().hideProgress(activity);
-                        G.showToast(baseMessage.getMsg()+"");
+                        if(BuildConfig.DEBUG)
+                            G.showToast(baseMessage);
                     }
 
                     @Override

app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java

@@ -21,10 +21,12 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.Gravity;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
@@ -45,7 +47,9 @@ import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 import com.sheep.gamegroup.model.api.RedPackageMoney;
 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;
@@ -66,6 +70,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
+import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.NestedScrollView;
@@ -79,8 +84,6 @@ import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
-import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyRank;
-import com.sheep.gamegroup.view.fragment.FgtMyGame;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -170,6 +173,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     ViewPagerAutoHeigh mViewPager;
     @BindView(R.id.tabLayout)
     TabLayout tabLayout;
+    @BindView(R.id.homepage_item_get_award_name_tv)
+    TextView homepage_item_get_award_name_tv;
+    @BindView(R.id.homepage_item_money_tv)
+    TextView homepage_item_money_tv;
+    @BindView(R.id.homepage_item_juan_tv)
+    TextView homepage_item_juan_tv;
 
 
     @Inject
@@ -222,6 +231,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
     };
 
+    @RequiresApi(api = Build.VERSION_CODES.M)
     /**
      * @return 是否显示红包
      */
@@ -362,6 +372,16 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                             ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
                             params.height = G.HEIGHT - toolBarPositionY - tabLayout.getHeight() + 1;
                             mViewPager.setLayoutParams(params);
+                            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) {
@@ -458,9 +478,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 }
                 if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
                     isShowMd = !isShowMd;
-                    CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId());
                 }
             }
+            addNewTask();
             SheepApp.getInstance().setShowQB(isShowQB);
             SheepApp.getInstance().setShowMidong(isShowMd);
             adpHomeListGrideview.notifyDataSetChanged();
@@ -512,6 +532,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void call(BaseMessage o) {
 
+                if(o != null){
+                    CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
+                }
             }
         });
         adpViewPagerDetail.cleanListFragment();
@@ -550,8 +573,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         adpHomeListGrideview = new AdpHomeListGrideview(homeListEntitysGridview, activity);
         home_list_gridview_listview.setAdapter(adpHomeListListview);
         home_list_gridview_gv.setAdapter(adpHomeListGrideview);
-    }
 
+        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)){
+                    return;
+                }
+                HomeListEntity homeListEntity= homeListEntitysGridview.get(position);
+                UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
+                if(homeListEntity.getJump().equals("-2")){
+                    setValueList(!homeListEntity.isSelect());
+                    homeListEntity.setSelect(!homeListEntity.isSelect());
+                }else {
+                    CommonUtil.getInstance()
+                            .goWhere(activity, homeListEntity, "首页");
+                }
+                adpHomeListGrideview.notifyDataSetChanged();
+            }
+        });
+    }
     private void refreshTaskList() {
         DataUtil.getInstance().isTaskListChange(getClass());
         tryMakeMoneyPresenter.returnTask(is_succession, show_game_task);
@@ -771,19 +812,20 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 boolean isShowQB = false;
                 boolean isShowMd = false;
                 for (int i = 0; i < homeListEntitys.size(); i++) {
-                    if (i < 4) {
-                        homeListEntitysGridview.add(homeListEntitys.get(i));
-                    } else {
-                        homeListEntitysListview.add(homeListEntitys.get(i));
-                    }
+//                    if (i < 4) {
+//                        homeListEntitysGridview.add(homeListEntitys.get(i));
+//                    } else {
+//                        homeListEntitysListview.add(homeListEntitys.get(i));
+//                    }
+                    homeListEntitysGridview.add(homeListEntitys.get(i));
                     if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
                         isShowQB = !isShowQB;
                     }
                     if (homeListEntitys.get(i).getJump().equals("14")) {//幂动科技
                         isShowMd = !isShowMd;
-                        CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId());
                     }
                 }
+                addNewTask();
                 SheepApp.getInstance().setShowQB(isShowQB);
                 SheepApp.getInstance().setShowMidong(isShowMd);
                 adpHomeListGrideview.notifyDataSetChanged();
@@ -810,9 +852,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_layout.setVisibility(View.GONE);
 
     }
-
     private int onResumeCount = 0;
-
     @Override
     public void onResume() {
         super.onResume();
@@ -836,6 +876,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         if (onResumeCount == 0)//第一次才调用
 //            Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
             onResumeCount++;
+
         viewRobDuty.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -1192,4 +1233,54 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             }
         });
     }
+
+    /**
+     * 新手任务
+     */
+    private void addNewTask(){
+//        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
+        {
+            HomeListEntity homeListEntity = new HomeListEntity();
+            homeListEntity.setTitle("新手任务");
+            homeListEntity.setDesc("新手任务");
+            homeListEntity.setJump("-1");
+            homeListEntity.setIcon(R.mipmap.homepage_xinshourw+"");
+            homeListEntitys.add(0, homeListEntity);
+
+        }
+        if(homeListEntitys.size() > 8){
+            HomeListEntity homeListEntity = new HomeListEntity();
+            homeListEntity.setTitle("查看更多");
+            homeListEntity.setDesc("查看更多");
+            homeListEntity.setJump("-2");
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            homeListEntitys.add(7, homeListEntity);
+        }
+        onResumeCount++;
+        setValueList(false);
+    }
+
+    private void setValueList(boolean flag) {
+        homeListEntitysGridview.clear();
+        for(int i=0;i<homeListEntitys.size();i++){
+            if(flag){
+                homeListEntitysGridview.add(homeListEntitys.get(i));
+            }else {
+                if(i<8){
+                    homeListEntitysGridview.add(homeListEntitys.get(i));
+                }
+            }
+
+        }
+        if(homeListEntitysGridview.size() > 8){
+            HomeListEntity homeListEntity = new HomeListEntity();
+            homeListEntity.setTitle("查看更多");
+            homeListEntity.setDesc("查看更多");
+            homeListEntity.setJump("-2");
+            homeListEntity.setSelect(flag);
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            homeListEntitysGridview.set(7, homeListEntity);
+        }
+        adpHomeListGrideview.notifyDataSetChanged();
+    }
 }

app/src/main/java/com/kfzs/duanduan/react/MainTab.java

@@ -16,7 +16,7 @@ import com.sheep.jiuyan.samllsheep.R;
  */
 
 public enum MainTab {
-    FgtSmallSheep(R.string.mine_hoggerel) {
+    FgtSmallSheep(R.string.main_tab_make_money) {
         @Override
         public Fragment getFragment() {
             return new FgtSmallSheep();

app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java

@@ -17,6 +17,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.DrawablesHelper;
 import com.sheep.gamegroup.util.SysAppUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.ArrayList;
@@ -106,8 +107,10 @@ public class TabsHelper {
                         view_pager_container.setCurrentItem(position, false);
                         int sheepPosition = MainTab.FgtSmallSheep.ordinal();
                         int personnalPosition = MainTab.FgtPersonnalCenter.ordinal();
+                        int auditPosition = MainTab.FgtMainAudit.ordinal();
                         FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
                         FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
+                        FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(auditPosition);
                         if(position == sheepPosition){
                             fgtSmallSheep.onResume();
                         } else {
@@ -116,6 +119,9 @@ public class TabsHelper {
                         if(position == personnalPosition){
                             personnalCenter.onResume();
                         }
+                        if(position == auditPosition){
+                            auditFgt.onResume();
+                        }
                         checkWhichPage(position);
                     }
 

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -806,7 +806,7 @@ public interface ApiService {
      * 获取用户未做金额
      * can_receive_awar
      */
-    @GET("app/user/can_receive_awar")
+    @GET("app/user/can_receive_award")
     Observable<BaseMessage> getCanREceiveAwar();
     /**
      * 任务审核

app/src/main/java/com/sheep/gamegroup/model/entity/CashAwarsEntity.java

@@ -0,0 +1,38 @@
+package com.sheep.gamegroup.model.entity;
+
+import java.io.Serializable;
+
+/**
+ *
+ * Created by ljy on 2018/8/21.
+ */
+
+public class CashAwarsEntity implements Serializable {
+    private String welfare;//: 27994,
+    private String award;//: 47504.47,
+    private String cash;//: 19510.47
+
+    public String getWelfare() {
+        return welfare;
+    }
+
+    public void setWelfare(String welfare) {
+        this.welfare = welfare;
+    }
+
+    public String getAward() {
+        return award;
+    }
+
+    public void setAward(String award) {
+        this.award = award;
+    }
+
+    public String getCash() {
+        return cash;
+    }
+
+    public void setCash(String cash) {
+        this.cash = cash;
+    }
+}

app/src/main/java/com/sheep/gamegroup/model/entity/HomeListEntity.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.text.TextUtils;
+
 /**
  * 首页list
  * Created by ljy on 2018/5/10.
@@ -10,7 +12,7 @@ public class HomeListEntity {
     private String Desc;//	string描述
     private String Icon;//	string图标地址
     private int Id;//	integer ($int64)
-    private String Jump;//	string跳转（h5填跳转地址，原生：1试玩赚钱，2邀请赚钱，3躺着赚钱，4办卡赚钱）
+    private String Jump;//	string跳转（h5填跳转地址，原生：1试玩赚钱，2邀请赚钱，3躺着赚钱，4办卡赚钱）-1新手任务
     private String Order;//	integer ($int64)排序，默认99，越小越靠前
     private String Title;//	string标题
     private int Type;//	integer ($int64)类型（0不跳转，1h5，2原生）
@@ -18,6 +20,15 @@ public class HomeListEntity {
     private int IsHot;//	   int	  `orm:"column(is_hot);null" description:"是否是热门标签 0:不是 1:是"`
     private String UpdateTime;//	integer ($int64)更新时间
     private String Url;//	integer ($int64)更新时间
+    private boolean select;
+
+    public boolean isSelect() {
+        return select;
+    }
+
+    public void setSelect(boolean select) {
+        this.select = select;
+    }
 
     public String getUrl() {
         return Url;
@@ -45,7 +56,7 @@ public class HomeListEntity {
     }
 
     public String getIcon() {
-        return Icon;
+        return TextUtils.isEmpty(Icon)?"0":Icon;
     }
 
     public void setIcon(String icon) {

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -15,6 +15,7 @@ import android.support.v7.app.AlertDialog;
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.widget.ImageView;
@@ -39,6 +40,8 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
 import com.sheep.gamegroup.model.entity.HomeListEntity;
+import com.sheep.gamegroup.model.entity.NewbieTask;
+import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.model.entity.TaskEty;
@@ -50,6 +53,9 @@ import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.usage.AppUsageManager;
 import com.sheep.gamegroup.view.activity.GameTaskOrderListAct;
+import com.sheep.gamegroup.view.dialog.DialogNewbieTask1;
+import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
+import com.sheep.gamegroup.view.dialog.DialogNewbieTaskRegistSuccess;
 import com.sheep.gamegroup.view.dialog.DialogShare;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
@@ -68,15 +74,18 @@ import com.zhy.http.okhttp.callback.FileCallBack;
 
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
+import org.xutils.ex.DbException;
 
 import java.io.File;
 import java.lang.reflect.Field;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.security.MessageDigest;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
@@ -87,6 +96,7 @@ import rx.functions.Action1;
 import rx.schedulers.Schedulers;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.LINK_SHARE;
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.XIAOMI_GAME_RECEIVE;
 import static com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp.PUBLIC_TAG_PREFIX_TEXTVIEW_LIST;
@@ -407,6 +417,11 @@ public class CommonUtil {
     public void goNative(Context context, HomeListEntity entity, String from) {
 
         switch (Integer.valueOf(entity.getJump())) {
+            case -1://试玩赚钱
+
+                DialogNewbieTaskList.tryShowDialog((Activity) context);
+                NEWBIE_TASK.onEvent();
+                break;
             case 1://试玩赚钱
 
                 Jump2View.getInstance().goTryplayView(context, null);
@@ -1827,4 +1842,74 @@ public class CommonUtil {
                     }
                 });
     }
+
+    /**
+     * 是否添加新手任务
+     */
+    public boolean addNewTask(final Activity activity, final UserEntity userEntity) {
+        if (userEntity == null) {
+            return false;
+        }
+        if (userEntity.getIs_new() == 2) { //1新用户 2老用户
+            return false;
+        } else {
+            NewbieTaskRecord newbie_task_record = null;
+            try {
+                newbie_task_record = MyDbManager.getInstance().dbFindNewbieTaskRecord(userEntity.getInvitation_code());
+            } catch (DbException e) {
+                e.printStackTrace();
+            }
+            boolean dontShowNewbieTaskDialog = newbie_task_record == null || newbie_task_record.isDontShowNewbieTaskDialog();//默认可以显示对话框
+            if (!userEntity.isNewRegistUser() || dontShowNewbieTaskDialog) {
+                final NewbieTaskRecord finalNewbie_task_record = newbie_task_record;
+                SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                List<NewbieTask> newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                                if (newbieTaskList != null && !newbieTaskList.isEmpty() && newbieTaskList.size() > 1 && !newbieTaskList.get(1).getFinished()) {//了解小绵羊任务未完成时
+                                    DialogNewbieTaskRegistSuccess.showDialog(activity, finalNewbie_task_record, newbieTaskList.get(0));
+                                } else if (newbieTaskList != null && !newbieTaskList.isEmpty()) {
+                                    finalNewbie_task_record.setDontShowNewbieTaskDialog(true);
+                                    MyDbManager.getInstance().saveOrUpdate(finalNewbie_task_record);//设置为不再显示新手对话框
+                                    List<NewbieTask> taskList = new ArrayList<>();
+                                    NewbieTask task = null;
+                                    for (NewbieTask newbieTask : newbieTaskList) {
+                                        if (newbieTask.getFinished()) {//已经完成
+                                            task = newbieTask;
+                                        } else {
+                                            taskList.add(newbieTask);
+                                        }
+                                    }
+                                    DialogNewbieTask1.showDialog(activity, taskList, task);
+                                } else {
+                                    if (BuildConfig.DEBUG)
+                                        G.showToast("测试：服务器数据错误,新手任务数据为空");
+                                }
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                            }
+                        });
+            }
+            return true;
+        }
+    }
+
+    /**
+     * 设置游戏标识文本，如：现金，福利
+     * @param textView
+     * @param taskReleaseEty
+     */
+    public void setTaskTagText(TextView textView, TaskReleaseEty taskReleaseEty) {
+        textView.setVisibility(View.VISIBLE);
+        ViewUtil.setColorMapText(textView, String.format(Locale.CHINA, "%s", taskReleaseEty.getCashOrWelfare()), taskReleaseEty.getCashOrWelfare(), "#FD2D54");
+        textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 9);
+        int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
+        textView.setPadding(4*padding, padding, 4*padding, padding);
+    }
 }

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1448,6 +1448,7 @@ public class Jump2View {
             G.showToast("敬请期待");
             return;
         }
+        CommonUtil.getInstance().initMiDong(activity, DataUtil.getInstance().getUserId());
         if(SheepApp.getInstance().isInitMidong()){
             Intent intent = new Intent(activity, ActMiDong.class);
             activity.startActivity(intent);

app/src/main/java/com/sheep/gamegroup/view/activity/ActWeb.java

@@ -27,21 +27,18 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.jiuyan.samllsheep.utils.ClassFileHelper;
-import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import com.yalantis.ucrop.util.FileUtils;
-import com.zhy.http.okhttp.OkHttpUtils;
-import com.zhy.http.okhttp.callback.FileCallBack;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import okhttp3.Call;
 
 import static com.kfzs.duanduan.bean.KFIntentKeys.EXTRA_WEBVIEW_NO_TITLE;
 
@@ -234,10 +231,22 @@ public class ActWeb extends BaseCompatActivity {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
                 try {
-                    view.loadUrl(url);
+                    //微信H5支付核心代码
+                    if (url.startsWith("weixin://wap/pay?")) {
+                        Intent intent = new Intent();
+                        intent.setAction(Intent.ACTION_VIEW);
+                        intent.setData(Uri.parse(url));
+                        startActivity(intent);
+                        return true;
+                    } else {
+                        Map<String, String> extraHeaders = new HashMap<>();
+                        extraHeaders.put("Referer", "http://17xmy.com");
+                        view.loadUrl(url, extraHeaders);
+                    }
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
+
                 return true;
             }
 

app/src/main/java/com/sheep/gamegroup/view/activity/SplashAct.java

@@ -120,6 +120,8 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
                 case 0:
                     if(!isRequestCodePermissions && !isLoaddingData && timerIsFinish())
                         gotoNext();
+                    else
+                        sendHandlerMessages(100);
                     break;
                 case 1:
                     if(SysAppUtil.isNewSmallSheep(false)){//新版本只显示引导页面，不展示弹窗和开屏广告

app/src/main/java/com/sheep/gamegroup/view/activity/TaskDetailAct.java

@@ -320,7 +320,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 case 1001:
                     break;
                 default:
-                    setBottomState();
                     break;
             }
         } else if (taskEty.isGameReservationCantDownload()) {//游戏任务中还不可以下载的预约任务
@@ -353,6 +352,18 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                 setBottomState2();
                 break;
         }
+        if (gettaskAcceptedEty != null){//只要有任务记录就获取下载状态
+            switch (taskEty.getTask_type()) {// 1时间试玩任务 2 信用卡任务 3应用下载 4h5业务 1001畅思 1000连续任务， 1002 1003游戏任务 1004 小米游戏任务
+                case 4://h5业务
+                case 2:
+                case 1001:
+                case 1000://连续任务
+                    break;
+                default://只要有任务记录就获取下载状态
+                    setBottomState();
+                    break;
+            }
+        }
     }
 
     /**
@@ -413,7 +424,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                     //审核失败
                     btnUpImag.setText("重新提交");
                     btnUpImag.setVisibility(View.VISIBLE);
-                    btnTaskItem.setVisibility(View.GONE);
+                    btnTaskItem.setVisibility(View.VISIBLE);
                     break;
                 //不可操作
                 case 7:// "提交审核";
@@ -447,7 +458,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
      * 正在进行的任务的状态设置
      */
     private void setBottomState() {
-        taskEty.setRunTask(1);
         setBtnStr(taskEty, mDownloadTaskService, new Action1<Object>() {
             @Override
             public void call(Object o) {

app/src/main/java/com/sheep/gamegroup/view/adapter/AdpHomeListGrideview.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.view.adapter;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -56,36 +57,24 @@ public class AdpHomeListGrideview extends BaseAdapter {
             holder = (ViewHolder) tag;
         }else {
             holder = new ViewHolder();
-            convertView = LayoutInflater.from(context).inflate(R.layout.adp_homelist_gridview, null);
-            holder.hot_tv = convertView.findViewById(R.id.hot_tv);
+            convertView = LayoutInflater.from(context).inflate(R.layout.adp_homelist_gridview_new, null);
+            holder.gridview_item_tag_tv = convertView.findViewById(R.id.gridview_item_tag_tv);
             holder.gridview_item_name_tv = convertView.findViewById(R.id.gridview_item_name_tv);
-            holder.gridview_item_detail_tv = convertView.findViewById(R.id.gridview_item_detail_tv);
             holder.gridview_item_icon_iv = convertView.findViewById(R.id.gridview_item_icon_iv);
             convertView.setTag(holder);
         }
         final HomeListEntity entity = getItem(position);
-        ViewUtil.setText(holder.hot_tv, entity.getTip());
-        holder.hot_tv.setVisibility(entity.hasTip()?View.VISIBLE: View.GONE);
-        holder.hot_tv.setTextColor(entity.getTipColor());
+        ViewUtil.setText(holder.gridview_item_tag_tv, entity.getTip());
         ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
-        ViewUtil.setText(holder.gridview_item_detail_tv, entity.getDesc());
         Glide.with(context)
-                .load(entity.getIcon())
-                .apply(new RequestOptions().dontAnimate())
+                .load(entity.getId() == 0 ? Integer.valueOf(entity.getIcon()) : entity.getIcon())
+                .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /2, G.WIDTH /4 /2))
                 .into(holder.gridview_item_icon_iv);
-        convertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                UMConfigUtils.IdEvent.HOME_LIST.commit(entity.getId());
-                CommonUtil.getInstance()
-                        .goWhere(context, entity, "首页");
-            }
-        });
         return convertView;
     }
 
     class ViewHolder{
-        TextView gridview_item_name_tv, gridview_item_detail_tv, hot_tv;
+        TextView gridview_item_name_tv, gridview_item_tag_tv;
         ImageView gridview_item_icon_iv;
     }
 }

app/src/main/java/com/sheep/gamegroup/view/adapter/TaskListItemAdp.java

@@ -85,8 +85,16 @@ public class TaskListItemAdp extends BaseAdapter {
             return convertView;
         }
         ViewUtil.setText(holder.name_tv, ety.getRelease_task().getName());
-        ViewUtil.setText(holder.date_tv, TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
-        holder.price_tv.setText(returnValue(ety));
+        ViewUtil.setText(holder.date_tv, "提交时间:"+TimeUtil.getDate(TimeUtil.FORMAT, NumberFormatUtils.parseLong(ety.getUpdate_time())));
+        String stateStr = "";
+        if(ety.getStatus() == 3){
+            stateStr = "+"+ ety.getRelease_task().getBonus() +"元";
+            holder.price_tv.setTextColor(context.getResources().getColor(R.color.txt_red));
+        }else {
+            stateStr = ety.getRelease_task().getBonus() +"元";
+            holder.price_tv.setTextColor(context.getResources().getColor(R.color.time_created));
+        }
+        holder.price_tv.setText(stateStr);
         convertView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -94,7 +102,7 @@ public class TaskListItemAdp extends BaseAdapter {
             }
         });
         TestUtil.setDebugDownLoad(context, convertView, ety.getRelease_task().getTask());
-        holder.detail_task_tv.setText(ety.getRemarks());
+        holder.detail_task_tv.setText(returnValue3(ety, holder.detail_task_tv));
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
                 .apply(new RequestOptions().placeholder(R.mipmap.icon))
@@ -141,4 +149,31 @@ public class TaskListItemAdp extends BaseAdapter {
         }
         return stateStr;
     }
+    private String returnValue3(TaskAcceptedEty ety, TextView textView){
+        String stateStr = "已接受任务";
+        switch (ety.getStatus()){
+            default:
+            case 1://提交中
+            case 2:
+            case 7:
+                textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_x);
+                textView.setTextColor(context.getResources().getColor(R.color.btn_color_main_stroke));
+                textView.setText("审核中");
+                break;
+            case 3://完成
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setText("已完成");
+                break;
+            case 4://失败
+            case 5:
+            case 6:
+            case 8:
+                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_x);
+                textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
+                textView.setText("重新提交");
+                break;
+        }
+        return stateStr;
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -12,6 +13,8 @@ import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskAuditEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.ViewUtil;
+import com.sheep.gamegroup.view.activity.ActMyMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
@@ -41,6 +44,8 @@ public class FgtMainAudit extends BaseCompatFragment {
     TabLayout indicator;
     @BindView(R.id.pager)
     ViewPager pager;
+    @BindView(R.id.my_money_dingxiang_amount_iv)
+    ImageView my_money_dingxiang_amount_iv;
     Unbinder unbinder;
     private Activity activity;
 
@@ -65,6 +70,14 @@ public class FgtMainAudit extends BaseCompatFragment {
         new_tab();
         initData();
 
+        my_money_dingxiang_amount_iv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                ViewUtil.showOrienteeringDetails(activity);
+            }
+        });
+
     }
 
     @Override
@@ -85,6 +98,8 @@ public class FgtMainAudit extends BaseCompatFragment {
                         String audit_total_money = String.format(activity.getResources().getString(R.string.audit_total_money), taskAuditEntity.getFinish_cash());
                         String audit_total_welfare = String.format(activity.getResources().getString(R.string.audit_total_welfare), taskAuditEntity.getWelfare_award());
 
+                        if(numberTv == null)
+                            return;
                         numberTv.setText(audit_total_audit+"");
                         auditTotalCompleteTv.setText(audit_total_complete+"");
                         auditTotalMoneyTv.setText(audit_total_money+"");
@@ -120,5 +135,16 @@ public class FgtMainAudit extends BaseCompatFragment {
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, activity);
     }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        try {
+            initData();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }
 

app/src/main/res/drawable/shape_blue_stroke_rectangle_x.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#2EBEF2" />
+</shape>

app/src/main/res/drawable/shape_gray_stroke_rectangle_x.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <corners
+        android:topLeftRadius="10dp"
+        android:topRightRadius="10dp"
+        android:bottomRightRadius="10dp"/>
+    <stroke
+        android:width="1dp"
+        android:color="#CCCCCC" />
+</shape>

app/src/main/res/layout/act_audit_layout.xml

@@ -87,15 +87,32 @@
                 android:layout_height="20dp"
                 android:layout_gravity="center"
                 android:background="@color/disenable_color"/>
-            <TextView
-                android:id="@+id/audit_total_welfare_tv"
+
+            <LinearLayout
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text=""
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_13"/>
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/audit_total_welfare_tv"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text=""
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_size_13" />
+
+                <ImageView
+                    android:id="@+id/my_money_dingxiang_amount_iv"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_gravity="right"
+                    android:padding="10dp"
+                    android:src="@mipmap/question_mark" />
+            </LinearLayout>
         </LinearLayout>
     </android.support.constraint.ConstraintLayout>
 

app/src/main/res/layout/adp_homelist_gridview_new.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+
+    <LinearLayout
+        android:id="@+id/linearlayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:gravity="center"
+        android:layout_marginTop="@dimen/content_padding_4">
+
+        <ImageView
+            android:id="@+id/gridview_item_icon_iv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:src="@mipmap/home_try_play_circle_bg"/>
+
+        <TextView
+            android:id="@+id/gridview_item_name_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="试玩赚钱"
+            android:textSize="10sp"
+            android:textColor="@color/black_6_3"
+            android:layout_marginTop="@dimen/content_padding_small"/>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/gridview_item_tag_tv"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="试玩赚钱"
+        android:textSize="7sp"
+        android:textColor="@color/black_6_3"
+        android:layout_toRightOf="@+id/linearlayout"/>
+</RelativeLayout>

app/src/main/res/layout/homepage_item_get_award.xml

@@ -12,7 +12,8 @@
         android:id="@+id/homepage_item_get_award_iv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/homepage_item_jiangli"/>
+        android:src="@mipmap/homepage_item_jiangli"
+        android:paddingTop="@dimen/content_padding_2"/>
 
     <TextView
         android:id="@+id/homepage_item_get_award_name_tv"
@@ -28,7 +29,7 @@
         android:id="@+id/homepage_item_money_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="1234324"
+        android:text=""
         app:layout_constraintStart_toStartOf="@id/homepage_item_get_award_name_tv"
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"

app/src/main/res/layout/homepage_item_gridview_listview.xml

@@ -15,11 +15,11 @@
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
         android:scrollbars="none"
-        android:numColumns="2"
+        android:numColumns="4"
         android:listSelector="@color/transparent"
-        android:verticalSpacing="@dimen/content_padding_8"
-        android:horizontalSpacing="@dimen/content_padding_8"
-        android:layout_marginBottom="@dimen/content_padding_8"/>
+        android:verticalSpacing="@dimen/content_padding_5"
+        android:horizontalSpacing="@dimen/content_padding_5"
+        android:layout_marginBottom="@dimen/content_padding_5"/>
 
     <com.sheep.gamegroup.util.MyListview
         android:id="@+id/home_list_gridview_listview"

app/src/main/res/layout/homepage_item_notice_and_currenttime.xml

@@ -4,7 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:paddingTop="@dimen/content_padding_10"
-    android:paddingBottom="@dimen/content_padding_10"
     android:layout_margin="@dimen/content_padding_10">
 
     <ImageView

app/src/main/res/values/str_appstore_strings.xml

@@ -21,6 +21,7 @@
     <string name="main_tab_find">发现</string>
     <string name="main_tab_audit">审核</string>
     <string name="main_tab_invite">邀请</string>
+    <string name="main_tab_make_money">赚钱</string>
 
     <string name="hot_person_game">人气游戏</string>
     <string name="best_game">精品游戏</string>

app/src/main/res/values/strings.xml

@@ -19,7 +19,7 @@
     <string name="agent_extract">推广提成余额：%s元</string>
     <string name="recharge_amount">充值余额：%s元</string>
     <string name="available_amount">可提现金额：%s元</string>
-    <string name="dingxiang_amount">定向货币余额：%s元</string>
+    <string name="dingxiang_amount">福利余额：%s元</string>
 
     <string name="rechargeq_amount">当前绵羊币余额：%s元</string>
 
@@ -82,8 +82,8 @@
     <string name="cancel">取消</string>
 
     <string name="audit_total_audit">%s\n审核中</string>
-    <string name="audit_total_complete">%s个\n累计完成</string>
-    <string name="audit_total_money">%s元\n累计现金</string>
-    <string name="audit_total_welfare">%s元\n累计完成</string>
+    <string name="audit_total_complete">%s个\n\n累计完成</string>
+    <string name="audit_total_money">%s元\n\n累计现金</string>
+    <string name="audit_total_welfare">%s元\n\n累计福利</string>
     <string name="my_invitation_str">我的邀请码:%s</string>
 </resources>

view/src/main/res/values/colors.xml

@@ -74,5 +74,7 @@
     <color name="black_6_e">#eeeeee</color>
     <color name="gray_F0F0F0">#F0F0F0</color>
     <color name="yellow_D3AF57">#D3AF57</color>
+    <color name="red_FD2D54">#FD2D54</color>
+    <color name="gray_CCCCCC">#CCCCCC</color>
 
 </resources>