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/ActWeb.java

@@ -6,11 +6,12 @@ import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
+
 import android.webkit.JavascriptInterface;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ImageButton;
 import android.widget.TextView;
 

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

@@ -8,7 +8,7 @@ import android.support.v4.widget.NestedScrollView;
 import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 

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

@@ -1,12 +1,10 @@
 package com.kfzs.duanduan.fragment;
 
 import android.annotation.SuppressLint;
-import android.app.ActionBar;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.graphics.Color;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -20,8 +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.view.Gravity;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -29,7 +25,6 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.PopupWindow;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONArray;
@@ -40,16 +35,14 @@ import com.kfzs.duanduan.event.BigEvent;
 import com.kfzs.duanduan.react.ConfigUtil;
 import com.kfzs.duanduan.react.SharedPreferences;
 import com.kfzs.duanduan.utils.NumberFormatUtils;
-import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
+import com.kfzs.duanduan.utils.dlg.FormatAny;
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 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;
@@ -113,7 +106,6 @@ import butterknife.Unbinder;
 import rx.functions.Action1;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
-import static com.sheep.gamegroup.util.ViewUtil.backgroundAlpha;
 
 public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContract.View, TryMakeMoneyContract.View {
 
@@ -170,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)
@@ -179,6 +171,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     TextView homepage_item_money_tv;
     @BindView(R.id.homepage_item_juan_tv)
     TextView homepage_item_juan_tv;
+    @BindView(R.id.recyclerview_line)
+    View recyclerview_line;
 
 
     @Inject
@@ -217,10 +211,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();
@@ -232,18 +227,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     };
 
     @RequiresApi(api = Build.VERSION_CODES.M)
-    /**
-     * @return 是否显示红包
-     */
-    private void isShowRedPackage() {
-        if (userEntity == null) {
-            userEntity = DataUtil.getInstance().getUserEntity();
-        }
-        if (((userEntity.getNewbie_task_status() & (1 << 4)) == 0) && (userEntity.getParent_code().equals("")) && (userEntity.getIs_new() == 1)) {
-            showRedPackage(getActivity(), LayoutInflater.from(getContext()).inflate(R.layout.homepage_act_layout, null));
-        }
-    }
-
     @Override
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.homepage_act_layout);
@@ -260,7 +243,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet(null, null);
-        isShowRedPackage();
     }
 
 
@@ -282,29 +264,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
          * tablayout
          */
         adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "即将开始");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
 
-        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);
         CommonUtil.getInstance().reflex(tabLayout, activity);
     }
@@ -364,29 +330,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() {
-                            toolBarPositionY = tabLayout.getHeight();
-                            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();
+//                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();
+//                }
             }
         });
 
@@ -419,7 +381,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if (userEntity != null) {
+        if(userEntity != null){
             loadUserInfo();
         }
         //任务
@@ -432,13 +394,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();
@@ -447,7 +409,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) {
@@ -459,7 +421,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);
@@ -491,7 +453,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     int toolBarPositionY;
-
     /**
      * 刷新数据
      */
@@ -534,6 +495,15 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                 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+"");
+                    }
                 }
             }
         });
@@ -546,7 +516,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             public void run() {
                 toolBarPositionY = tabLayout.getHeight();
                 ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                params.height = G.HEIGHT - toolBarPositionY - tabLayout.getHeight() + 1;
+                params.height = G.HEIGHT - toolBarPositionY - tabLayout.getHeight()+1;
                 mViewPager.setLayoutParams(params);
             }
         });
@@ -584,12 +554,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                 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();
             }
         });
     }
@@ -605,7 +573,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                "-1",
+                                 "-1",
                                 3));
 //        tryMakeMoneyPresenter.releaseTask(parameEty);
     }
@@ -645,7 +613,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);
@@ -679,14 +647,12 @@ 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);
@@ -720,7 +686,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;
@@ -758,7 +724,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);
@@ -783,7 +749,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);
@@ -799,7 +765,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);
@@ -857,11 +823,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     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();
                     }
@@ -871,11 +837,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = result;
             loadUserInfo();
         }
-        if (DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
+        if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
             refreshTaskList();
-        if (onResumeCount == 0)//第一次才调用
-//            Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
-            onResumeCount++;
 
         viewRobDuty.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -1143,7 +1106,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;
@@ -1186,52 +1149,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             });
             builder.show();
         }
-    }
 
-    /**
-     * 邀请成功后在个人资料显示领红包弹窗
-     *
-     * @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);
-        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);
-        TextView tvNew = view.findViewById(R.id.tv_flag1);
-        final PopupWindow popupWindow = new PopupWindow(mActivity);
-        popupWindow.setContentView(view);
-        popupWindow.setAnimationStyle(R.style.Rising);
-        popupWindow.setWidth(ActionBar.LayoutParams.MATCH_PARENT);
-        popupWindow.setHeight(ActionBar.LayoutParams.MATCH_PARENT);
-        popupWindow.setTouchable(true);
-        popupWindow.setFocusable(true);
-        popupWindow.setOutsideTouchable(false);
-        popupWindow.setBackgroundDrawable(new BitmapDrawable());
-        backgroundAlpha(0.7f, mActivity);
-        popupWindow.showAtLocation(viewAnchor, Gravity.CENTER, 0, 0);
-        popupWindow.setOnDismissListener(new ViewUtil.PopDismissListener(mActivity));
-        tvMoney.setText("");
-        tvNew.setText("新人红包");
-        tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CommonUtil.getInstance().updateUserInfo(null);
-                popupWindow.dismiss();
-            }
-        });
-        ivClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                popupWindow.dismiss();
-            }
-        });
-        ivClose.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                popupWindow.dismiss();
-            }
-        });
     }
 
     /**
@@ -1278,7 +1196,11 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            if (flag) {
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
+            } else {
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
+            }
             homeListEntitysGridview.set(7, homeListEntity);
         }
         adpHomeListGrideview.notifyDataSetChanged();

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

@@ -8,31 +8,31 @@ import java.io.Serializable;
  */
 
 public class CashAwarsEntity implements Serializable {
-    private String welfare;//: 27994,
-    private String award;//: 47504.47,
-    private String cash;//: 19510.47
+    private double welfare;//: 27994,
+    private double award;//: 47504.47,
+    private double cash;//: 19510.47
 
-    public String getWelfare() {
+    public double getWelfare() {
         return welfare;
     }
 
-    public void setWelfare(String welfare) {
+    public void setWelfare(double welfare) {
         this.welfare = welfare;
     }
 
-    public String getAward() {
+    public double getAward() {
         return award;
     }
 
-    public void setAward(String award) {
+    public void setAward(double award) {
         this.award = award;
     }
 
-    public String getCash() {
+    public double getCash() {
         return cash;
     }
 
-    public void setCash(String cash) {
+    public void setCash(double cash) {
         this.cash = cash;
     }
 }

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

@@ -21,6 +21,15 @@ public class HomeListEntity {
     private String UpdateTime;//	integer ($int64)更新时间
     private String Url;//	integer ($int64)更新时间
     private boolean select;
+    private int Tag;//标签类型（0无，1热门，2最新，3现金，4活跃，5福利）
+
+    public int getTag() {
+        return Tag;
+    }
+
+    public void setTag(int tag) {
+        Tag = tag;
+    }
 
     public boolean isSelect() {
         return select;

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

@@ -22,13 +22,14 @@ import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.ScrollingMovementMethod;
 import android.util.DisplayMetrics;
+import android.util.TypedValue;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.EditText;
@@ -51,6 +52,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.Container;
 import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.GameAccountEntity;
+import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.PayEntity;
 import com.sheep.gamegroup.model.entity.RobTask;
 import com.sheep.gamegroup.model.entity.TaskEty;
@@ -1256,4 +1258,31 @@ public class ViewUtil {
     public static String getNetImgByName(String name) {
         return String.format(Locale.CHINA, "http://cdngame.kuaifazs.com/%s.png", name);
     }
+
+    /**
+     * 标签类型（0无，1热门，2最新，3现金，4活跃，5福利）
+     * homepage item statues
+     */
+    public void showGridviewStatues(Context context, TextView textView, HomeListEntity entity){
+        textView.setVisibility(View.INVISIBLE);
+
+        switch (entity.getTag()){
+            default:
+
+                break;
+            case 3:
+                textView.setVisibility(View.VISIBLE);
+                textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setText("现金");
+                break;
+            case 4:
+                textView.setVisibility(View.VISIBLE);
+                textView.setBackgroundResource(R.drawable.shape_red_f07422_stroke_retangle_no_lb);
+                textView.setTextColor(context.getResources().getColor(R.color.red_F07422));
+                textView.setText("活跃");
+                break;
+        }
+
+    }
 }

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

@@ -3,10 +3,10 @@ package com.sheep.gamegroup.view.activity;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
@@ -57,7 +57,7 @@ public class ActCreditCardWeb extends BaseCompatActivity {
         webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
             findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);

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

@@ -10,7 +10,7 @@ import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RatingBar;

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

@@ -15,10 +15,12 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+
+import com.tencent.smtt.export.external.interfaces.IX5WebChromeClient;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -91,7 +93,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected final FrameLayout.LayoutParams COVER_SCREEN_PARAMS = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
     private View customView;
     private FrameLayout fullscreenContainer;
-    private WebChromeClient.CustomViewCallback customViewCallback;
+    private IX5WebChromeClient.CustomViewCallback customViewCallback;
 
 
     @BindView(R.id.refresh)
@@ -201,7 +203,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
             }
 
             @Override
-            public void onShowCustomView(View view, CustomViewCallback callback) {
+            public void onShowCustomView(View view, IX5WebChromeClient.CustomViewCallback callback) {
                 showCustomView(view, callback);
                 setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);//设置横屏
             }
@@ -219,7 +221,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
      * 视频播放全屏
      */
 
-    private void showCustomView(View view, WebChromeClient.CustomViewCallback callback) {
+    private void showCustomView(View view, IX5WebChromeClient.CustomViewCallback callback) {
         // if a view already exists then immediately terminate the new one
         if (customView != null) {
             callback.onCustomViewHidden();

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

@@ -2,10 +2,10 @@ package com.sheep.gamegroup.view.activity;
 
 import android.os.Bundle;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;

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

@@ -2,10 +2,10 @@ package com.sheep.gamegroup.view.activity;
 
 import android.os.Bundle;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 import com.kfzs.duanduan.BaseCompatActivity;
 import com.kfzs.duanduan.bean.KFIntentKeys;

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

@@ -2,7 +2,7 @@ package com.sheep.gamegroup.view.activity;
 
 import android.text.method.ScrollingMovementMethod;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;

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

@@ -5,7 +5,7 @@ import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;

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

@@ -1,7 +1,7 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.view.View;
-import android.webkit.WebView;
+import com.tencent.smtt.sdk.WebView;
 import android.widget.TextView;
 
 import com.sheep.gamegroup.absBase.BaseActivity;

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

@@ -11,13 +11,13 @@ import android.provider.MediaStore;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.DownloadListener;
+import com.tencent.smtt.sdk.DownloadListener;
 import android.webkit.JavascriptInterface;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.sdk.ValueCallback;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 import com.kfzs.duanduan.BaseCompatActivity;
 import com.sheep.gamegroup.util.CommonUtil;
@@ -83,7 +83,7 @@ public class ActWeb extends BaseCompatActivity {
             e.printStackTrace();
         }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
             findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);

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

@@ -5,10 +5,10 @@ import android.os.Build;
 import android.os.Bundle;
 import android.view.KeyEvent;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import android.widget.TextView;
 
 import com.kfzs.duanduan.BaseCompatActivity;
@@ -83,7 +83,7 @@ public class ActXinwanWeb extends BaseCompatActivity {
         webViewSettings = mWebView.getSettings();
         webViewSettings.setJavaScriptCanOpenWindowsAutomatically(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
+//            webViewSettings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
         }
         if (getIntent().hasExtra(EXTRA_WEBVIEW_NO_TITLE)) {//不显示标题
             findViewById(R.id.appbar_act_webview).setVisibility(View.GONE);

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

@@ -8,10 +8,11 @@ import android.support.annotation.RequiresApi;
 import android.text.Html;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;

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

@@ -6,26 +6,23 @@ import android.os.Bundle;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

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

@@ -6,40 +6,35 @@ import android.os.Bundle;
 import android.support.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.kfzs.duanduan.datashare.DDProviderHelper;
 import com.kfzs.duanduan.datashare.provider.download.DownLoadInfo;
+import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 import com.sheep.gamegroup.model.entity.TaskEty;
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 import com.sheep.gamegroup.model.util.EntityUtils;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
-import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DeviceUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.MyListview;
 import com.sheep.gamegroup.util.TimeUtil;
 import com.sheep.gamegroup.util.UMConfigUtils;
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
-import com.sheep.gamegroup.absBase.AbsChooseImageActivity;
 import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.PackageUtil;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 import java.util.Locale;
 

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

@@ -132,6 +132,9 @@ public class TaskListAct extends BaseActivity implements TaskListContract.View {
         if(object instanceof BaseMessage){
             List<TaskAcceptedEty> releaseEtyList = ((BaseMessage) object).getDataList(TaskAcceptedEty.class);
             ListUtil.addAll(etyList, releaseEtyList);
+
+            if(!etyList.isEmpty())
+                etyList.add(null);//底部部分----我是有底线的
         }
         notifyDataSetChanged();
     }

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

@@ -2,10 +2,10 @@ package com.sheep.gamegroup.view.activity;
 
 import android.text.TextUtils;
 import android.view.View;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;

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

@@ -64,11 +64,11 @@ public class AdpHomeListGrideview extends BaseAdapter {
             convertView.setTag(holder);
         }
         final HomeListEntity entity = getItem(position);
-        ViewUtil.setText(holder.gridview_item_tag_tv, entity.getTip());
+        ViewUtil.newInstance().showGridviewStatues(context,holder.gridview_item_tag_tv, entity);
         ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
         Glide.with(context)
                 .load(entity.getId() == 0 ? Integer.valueOf(entity.getIcon()) : entity.getIcon())
-                .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /2, G.WIDTH /4 /2))
+                .apply(new RequestOptions().dontAnimate().override(G.WIDTH / 4 /3, G.WIDTH /4 /3))
                 .into(holder.gridview_item_icon_iv);
         return convertView;
     }

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

@@ -65,6 +65,9 @@ public class TaskListItemAdp extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
+        if(position == getCount()-1){
+            return LayoutInflater.from(context).inflate(R.layout.find_item_bottom, null);
+        }
         Object tag = convertView == null ? null : convertView.getTag();
         ViewHolder holder;
         if(tag instanceof ViewHolder){
@@ -102,7 +105,7 @@ public class TaskListItemAdp extends BaseAdapter {
             }
         });
         TestUtil.setDebugDownLoad(context, convertView, ety.getRelease_task().getTask());
-        holder.detail_task_tv.setText(returnValue3(ety, holder.detail_task_tv));
+        returnValue3(ety, holder.detail_task_tv);
         Glide.with(context)
                 .load(ety.getRelease_task().getTask().getIcon())
                 .apply(new RequestOptions().placeholder(R.mipmap.icon))
@@ -156,20 +159,24 @@ public class TaskListItemAdp extends BaseAdapter {
             case 1://提交中
             case 2:
             case 7:
-                textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_x);
+                textView.setBackgroundResource(R.drawable.shape_blue_stroke_rectangle_10_radius);
                 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.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
                 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.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_10_radius);
+                textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
+                textView.setText("任务失败");
+                break;
+            case 6:
+                textView.setBackgroundResource(R.drawable.shape_gray_stroke_rectangle_10_radius);
                 textView.setTextColor(context.getResources().getColor(R.color.gray_CCCCCC));
                 textView.setText("重新提交");
                 break;

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

@@ -80,6 +80,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     private Context context;
     private int from;// 1 来自主页
     private int type = 0;//0:推荐 1:热门 2:预约 3:游戏推荐
+    private String show_type;
     private int is_succession;//0:一般任务 1:连续任务
 
     public TryMakeMoneyAdp(Context context) {
@@ -151,6 +152,9 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
     public void addType(int type){
         this.type = type;
     }
+    public void addShowType(String show_type){
+        this.show_type = show_type;
+    }
     /**
      * 传入is_succession
      */
@@ -587,7 +591,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                                 "截止时间:" + taskReleaseEty.getDeadline());
                     }
                 }
-                if (i == 0) {
+                if (i == 0 && TextUtils.isEmpty(show_type)) {
                     viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.VISIBLE);
                     if (isBegin == 1) {
                         ((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv)).setImageResource(R.mipmap.jijiangks);

app/src/main/java/com/sheep/gamegroup/view/customview/WebViewForScrollView.java

@@ -3,7 +3,7 @@ package com.sheep.gamegroup.view.customview;
         import android.content.Context;
         import android.util.AttributeSet;
         import android.view.View;
-        import android.webkit.WebView;
+        import com.tencent.smtt.sdk.WebView;
 
 /**
  * WebViewForScrollView

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

@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -67,6 +68,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private List<TaskReleaseEty> releaseEtyLists = new ArrayList<>();
     private List<TaskReleaseEty> releaseEtyListsBegin = new ArrayList<>();
     private int type = 0;
+    private String show_type;
     private int is_succession;//0:一般任务 1:连续任务
 
     private void checkAndInitView() {
@@ -97,6 +99,14 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         fgtTryMakeMoney.setArguments(bundle);
         return fgtTryMakeMoney;
     }
+    public static FgtTryMakeMoney newInstance(int type,String show_type){
+        FgtTryMakeMoney fgtTryMakeMoney = new FgtTryMakeMoney();
+        Bundle bundle = new Bundle();
+        bundle.putInt("type", type);
+        bundle.putString("show_type", show_type);
+        fgtTryMakeMoney.setArguments(bundle);
+        return fgtTryMakeMoney;
+    }
 
     public FgtTryMakeMoney() {
     }
@@ -109,6 +119,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         Bundle bundle = getArguments();
         if(bundle != null){
             type = bundle.getInt("type", 0);
+            show_type = bundle.getString("show_type", "");
         }
         return rootView;
     }
@@ -150,6 +161,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         recyclerview.setLayoutManager(new LinearLayoutManager(activity));
         tryMakeMoneyAdp = new TryMakeMoneyAdp(activity);
         tryMakeMoneyAdp.addType(type);
+        tryMakeMoneyAdp.addShowType(show_type);
         tryMakeMoneyAdp.setIs_succession(is_succession);
         tryMakeMoneyAdp.addPresenter(presenter);
         for (int i = 0; i < LIST_COUNT; i++) {
@@ -204,7 +216,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         }
         CommonUtil.getInstance().resetEmptyView(empty_view);
         //加载缓存
-        type = 0;
+        if(TextUtils.isEmpty(show_type))
+            type = 0;
         if(isFirstCache){
             //注释掉获取缓存的正在进行的任务
             List<TaskAcceptedEty> cacheTaskAcceptedEtyList;
@@ -226,7 +239,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             getFromACache(type);
         }
         //加载网络数据
-        type = 0;
+        if(TextUtils.isEmpty(show_type))
+            type = 0;
         getFromNetWork(type);
     }
 
@@ -346,7 +360,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             }
             notifyDataSetChanged();
         }
-        getFromNetWork(++type);
+        getFromNetWorkFirst(type);
     }
 
     @Override
@@ -360,7 +374,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                 break;
         }
         notifyDataSetChanged();
-        getFromNetWork(++type);
+        getFromNetWorkFirst(type);
     }
 
     @Subscribe
@@ -396,6 +410,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      * 发布的任务
      * type: 0 1
      */
+    private void getFromAcacheFirst(int type){
+        if(TextUtils.isEmpty(show_type)){
+            getFromACache(++type);
+        }
+    }
     private void getFromACache(int type){
         if(type > 1){
             return;
@@ -409,7 +428,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                     releaseEtyLists.clear();
                     releaseEtyLists.addAll(cacheTaskReleaseEtyList);
                     notifyDataSetChanged();
-                    getFromACache(++type);
+                    getFromAcacheFirst(type);
                 }
                 break;
             case 1:
@@ -419,7 +438,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                     releaseEtyListsBegin.clear();
                     releaseEtyListsBegin.addAll(cacheTaskReleaseEtyList);
                     notifyDataSetChanged();
-                    getFromACache(++type);
+                    getFromAcacheFirst(type);
                 }
                 break;
         }
@@ -428,6 +447,11 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      * 发布的任务
      * type: 0 1
      */
+    private void getFromNetWorkFirst(int type){
+        if(TextUtils.isEmpty(show_type)){
+            getFromNetWork(++type);
+        }
+    }
     private void getFromNetWork(int type){
         if(type > 1){
             initAcceptedTaskList();
@@ -439,7 +463,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                         .setHashMap(1,
                                 100,
                                 SheepApp.getInstance().getConnectAddress().getPlatForm(),
-                                0,
+                                TextUtils.isEmpty(show_type)?0:show_type.equals("is_hot")?1:0,
                                 0,
                                 type,
                                 task_type,

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -32,6 +32,7 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.tencent.bugly.Bugly;
 import com.tencent.bugly.beta.Beta;
+import com.tencent.smtt.sdk.QbSdk;
 
 import rx.functions.Action1;
 
@@ -114,6 +115,18 @@ public class SheepApp extends BaseApplication {
             connectAddress = ConnectAddress.sheep.getDefultConnectAddress();
             registerActivityLifecycleCallbacks(activityLifecycleCallbacks);
             initNet();
+            QbSdk.initX5Environment(this, new QbSdk.PreInitCallback() {
+                @Override
+                public void onCoreInitFinished() {
+                    LogUtil.println("SheepApp", "QbSdk", "initX5Environment", "onCoreInitFinished");
+                }
+
+                @Override
+                public void onViewInitFinished(boolean b) {
+                    LogUtil.println("SheepApp", "QbSdk", "initX5Environment", "onViewInitFinished", b);
+
+                }
+            });
             ChannelContent.getInstance().initChannelContent(this);
         }
     }

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/tab_find_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_find_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_find"/>
+    <item android:drawable="@drawable/homepage_faxian_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/homepage_faxian_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/homepage_faxian"/>
 
 </selector>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/tab_personalcenter_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_personalcenter_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_personalcenter"/>
+    <item android:drawable="@drawable/homepage_wode_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/homepage_wode_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/homepage_wode"/>
 
 </selector>

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:drawable="@drawable/tab_task_click" android:state_activated="true"/>
-    <item android:drawable="@drawable/tab_task_click" android:state_pressed="true"/>
-    <item android:drawable="@drawable/tab_task"/>
+    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_activated="true"/>
+    <item android:drawable="@drawable/homepage_zhuanqian_click" android:state_pressed="true"/>
+    <item android:drawable="@drawable/homepage_zhuanqian"/>
 
 </selector>

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

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

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

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

app/src/main/res/drawable/shape_red_f07422_stroke_retangle_no_lb.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="#F07422" />
+</shape>

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

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

app/src/main/res/layout-um/umeng_socialize_oauth_dialog.xml

@@ -89,7 +89,7 @@
         <!--android:orientation="horizontal"-->
         <!--android:visibility="visible" />-->
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

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

@@ -10,7 +10,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@mipmap/audit_top_bg"
-        android:paddingTop="@dimen/status_bar_height"
         android:paddingBottom="@dimen/content_padding_15">
 
 
@@ -34,7 +33,7 @@
             android:gravity="center"
             android:text="@string/app_name"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_4"
+            android:textSize="@dimen/text_size_5"
             app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +43,7 @@
             android:id="@+id/number_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="@dimen/text_size_25"
+            android:textSize="@dimen/text_size_3"
             android:textColor="@color/white"
             android:text=""
             android:gravity="center"

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

@@ -323,7 +323,7 @@
                             android:textSize="15sp" />
 
                     </LinearLayout>
-                    <WebView
+                    <com.tencent.smtt.sdk.WebView
                         android:id="@+id/find_game_info_wv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

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

@@ -17,7 +17,7 @@
         android:textColor="#939393"
         android:textSize="13sp" />
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/act_notice_content_wb"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

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

@@ -209,7 +209,7 @@
                         android:layout_width="match_parent"
                         android:text="公司简介" />
 
-                    <WebView
+                    <com.tencent.smtt.sdk.WebView
                         android:id="@+id/about_us_other_wv"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content" />

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

@@ -44,7 +44,7 @@
             android:text="@string/app_name"
             android:textColor="#939393"
             android:textSize="13sp" />
-        <WebView
+        <com.tencent.smtt.sdk.WebView
             android:id="@+id/act_notice_content_wb"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>

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

@@ -7,7 +7,7 @@
 
     <include
         layout="@layout/title"/>
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="0dp"

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

@@ -7,7 +7,7 @@
 
     <include
         layout="@layout/title"/>
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webview"
         android:layout_width="match_parent"
         android:layout_height="0dp"

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

@@ -2,7 +2,11 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/content_padding_10"
+    android:paddingEnd="@dimen/content_padding_10"
+    android:paddingStart="@dimen/content_padding_10"
+    android:paddingTop="@dimen/content_padding_10">
 
     <LinearLayout
         android:id="@+id/linearlayout"

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

@@ -47,8 +47,18 @@
             <include
                 layout="@layout/homepage_item_notice_and_currenttime"/>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="#fff5f5f5"/>
+
             <include
                 layout="@layout/homepage_item_get_award"/>
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginBottom="@dimen/dp_10"
+                android:background="#fff5f5f5"/>
 
             <include
                 layout="@layout/homepage_item_notice"
@@ -76,6 +86,15 @@
                 android:paddingLeft="@dimen/content_padding_10"
                 android:paddingRight="@dimen/content_padding_10"/>
 
+            <View
+                android:id="@+id/recyclerview_line"
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:layout_marginBottom="@dimen/content_padding_8"
+                android:layout_marginTop="@dimen/content_padding_8"
+                android:background="#fff5f5f5"
+                android:visibility="gone"/>
+
             <!--选项卡-->
             <include
                 layout="@layout/tablayout_viewpager_layout"/>

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

@@ -34,17 +34,17 @@
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_12"/>
+        android:textSize="@dimen/text_size_1"/>
 
     <TextView
         android:id="@+id/homepage_item_juan_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="1234324"
+        android:text=""
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/homepage_item_get_award_name_tv"
         android:layout_marginTop="@dimen/common_margin_10"
         android:textColor="@color/black_999999"
-        android:textSize="@dimen/text_size_12"/>
+        android:textSize="@dimen/text_size_1"/>
 
 </android.support.constraint.ConstraintLayout>

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

@@ -7,7 +7,7 @@
     android:layout_width="280dp"
     android:layout_height="250dp" >
 
-        <WebView
+        <com.tencent.smtt.sdk.WebView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/wvPopwin"/>

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

@@ -50,7 +50,7 @@
         android:progress="0"
         android:progressDrawable="@drawable/jpush_richpush_progressbar"
         style="?android:attr/progressBarStyleHorizontal" />
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:id="@+id/fullWebView"

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

@@ -12,23 +12,12 @@
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabLayout"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            android:background="@color/white"
-            app:tabGravity="fill"
-            app:tabIndicatorColor="?attr/main_color"
-            app:tabIndicatorHeight="3dp"
-            app:tabMode="fixed"
-            app:tabSelectedTextColor="?attr/main_color"
-            app:tabTextAppearance="@style/TablLayoutTextStyle"
-            app:tabTextColor="@color/B" />
+            style="@style/style_tab"/>
     </LinearLayout>
 
     <include layout="@layout/line_1px_hor" />
 
-    <!--app:layout_behavior="@string/appbar_scrolling_view_behavior"-->
-    <com.kfzs.duanduan.view.ViewPagerAutoHeigh
+    <android.support.v4.view.ViewPager
         android:id="@+id/viewpager_act_game_details"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

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

@@ -318,12 +318,10 @@
                         style="@style/nomal_txt_style"
                         android:layout_marginBottom="@dimen/content_padding_small"/>
 
-                    <WebView
+                    <com.tencent.smtt.sdk.WebView
                         android:id="@+id/web_text"
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                    </WebView>
+                        android:layout_height="wrap_content"/>
                 </LinearLayout>
 
                 <LinearLayout

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

@@ -41,7 +41,7 @@
                 android:layout_height="wrap_content"
                 android:text="2018/02/14 14:41"
                 android:layout_below="@+id/name_tv"
-                android:textSize="@dimen/text_size_3"
+                android:textSize="@dimen/text_size_2"
                 android:textColor="@color/txt_black_818181"
                 android:layout_marginBottom="@dimen/content_padding_small"/>
         </RelativeLayout>

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

@@ -89,7 +89,7 @@
         <!--android:orientation="horizontal"-->
         <!--android:visibility="visible" />-->
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"

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

@@ -23,7 +23,7 @@
             android:layout_height="match_parent"
             android:background="#FFD269">
 
-            <WebView
+            <com.tencent.smtt.sdk.WebView
                 android:id="@+id/ask_bg"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />

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

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/dialog_msg_wv"
         android:layout_width="match_parent"
         android:layout_marginLeft="10dp"

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

@@ -86,4 +86,8 @@
     <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>
+
+    <string name="homepage_award">你还有%s元的奖励未领取</string>
+    <string name="homepage_cash">现金任务未完成：%s元</string>
+    <string name="homepage_welfare">游戏福利未领取：%s元</string>
 </resources>

view/build.gradle

@@ -30,6 +30,7 @@ android {
 dependencies {
     compile "com.android.support:appcompat-v7:$supportLibVersion"
     compile "com.android.support:support-v4:$supportLibVersion"
+    compile files('libs/tbs_sdk_thirdapp_v3.6.0.1325.jar')
 //    compile 'com.github.bumptech.glide:glide:3.7.0'
 //    compile ('jp.wasabeef:glide-transformations:2.0.2'){
 //        exclude group: 'com.github.bumptech.glide', module: 'glide'

view/src/main/java/com/kfzs/android/view/widget/SafeWebView.java

@@ -9,13 +9,13 @@ import android.os.Build;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
-import android.webkit.JsPromptResult;
-import android.webkit.JsResult;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
+import com.tencent.smtt.export.external.interfaces.JsPromptResult;
+import com.tencent.smtt.export.external.interfaces.JsResult;
+import com.tencent.smtt.sdk.ValueCallback;
+import com.tencent.smtt.sdk.WebChromeClient;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

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

@@ -75,6 +75,7 @@
     <color name="gray_F0F0F0">#F0F0F0</color>
     <color name="yellow_D3AF57">#D3AF57</color>
     <color name="red_FD2D54">#FD2D54</color>
+    <color name="red_F07422">#F07422</color>
     <color name="gray_CCCCCC">#CCCCCC</color>
 
 </resources>