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

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/kfzs/duanduan/fragment/FgtFind.java
#	app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
#	app/src/main/java/com/kfzs/duanduan/react/TabsHelper.java
#	app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java
#	app/src/main/java/com/sheep/gamegroup/view/adapter/DownloadWelfareAdapter.java
#	app/src/main/res/layout/act_audit_layout.xml
#	app/src/main/res/layout/common_tab_vp.xml
#	app/src/main/res/layout/homepage_act_layout.xml
#	app/src/main/res/layout/homepage_item_get_award.xml
#	app/src/main/res/layout/tablayout_viewpager_layout.xml
#	app/src/main/res/values/strings.xml

app/src/main/AndroidManifest.xml

@@ -199,6 +199,9 @@
         <activity android:name="com.sheep.gamegroup.view.activity.ChangeTelAct"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActBindMobileRegister"
+            android:screenOrientation="portrait"
+            android:launchMode="singleTask"/>
         <activity android:name="com.sheep.gamegroup.view.activity.TaskDetailAct"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.DialogToastAct"
@@ -355,9 +358,6 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.FeedbackAct"
             android:screenOrientation="portrait" />
-        <activity
-            android:name="com.sheep.gamegroup.view.activity.ActMainGame"
-            android:screenOrientation="portrait" />
 
 
         <activity
@@ -578,6 +578,14 @@
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.ActivityMessages"
             android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActGameCenter"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActDownloadWelfareList"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActGiftCenter"
+            android:screenOrientation="portrait"/>
+        <activity android:name="com.sheep.gamegroup.view.activity.ActMyWelfare"
+            android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.MessageReplyDetailActivity"
             android:screenOrientation="portrait"/>
         <activity android:name="com.sheep.gamegroup.view.activity.MessageInteractionDetailActivity"

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

@@ -4,19 +4,17 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
 import android.support.v4.widget.NestedScrollView;
 import android.text.TextUtils;
 import android.view.MotionEvent;
 import android.view.View;
-
-import com.kfzs.duanduan.ActMain;
-import com.tencent.smtt.sdk.WebView;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSONObject;
+import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.BaseCompatFragment;
 import com.kfzs.duanduan.mine.GiftpackListAdapter;
 import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
@@ -26,6 +24,7 @@ import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.StringUtils;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyFriend;
@@ -57,7 +56,7 @@ public class FgtAskgetmoney extends BaseCompatFragment {
     @BindView(R.id.tv_money)
     TextView tvMoney;
     @BindView(R.id.ask_bg)
-    WebView ask_bg;
+    ImageView ask_bg;
     @BindView(R.id.ask_top_1)
     View ask_top_1;
     @BindView(R.id.ask_top_2)
@@ -96,30 +95,31 @@ public class FgtAskgetmoney extends BaseCompatFragment {
         }
         unbinder = ButterKnife.bind(this, mContentView);
 
-
-        String content = "<!DOCTYPEhtml>\n" +
-                "<html>\n" +
-                "  <head>\n" +
-                "    <title>HTML字符串</title>\n" +
-                "    <metahttp-equivmetahttp-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n" +
-                "    <meta name=\"viewport\" content=\"width=" + G.WIDTH + ", user-scalable=no\">\n" +
-                "    <style type=\"text/css\">\n" +
-                "      body {\n" +
-                "        margin: 0;\n" +
-                "        padding: 0;\n" +
-                "      }\n" +
-                "      img {\n" +
-                "        padding: 0;\n" +
-                "        margin: 0;\n" +
-                "      }\n" +
-                "    </style>\n" +
-                "  </head>\n" +
-                "  <body>\n" +
-                "    <img src=\"http://cdngame.kuaifazs.com/yaoqingzq_bg.png\" width=\"100%\">\n" +
-                "  </body>\n" +
-                "</html>";
-        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
-        ask_bg.loadData(content, "text/html", "UTF-8");
+//
+//        String content = "<!DOCTYPEhtml>\n" +
+//                "<html>\n" +
+//                "  <head>\n" +
+//                "    <title>HTML字符串</title>\n" +
+//                "    <metahttp-equivmetahttp-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n" +
+//                "    <meta name=\"viewport\" content=\"width=" + G.WIDTH + ", user-scalable=no\">\n" +
+//                "    <style type=\"text/css\">\n" +
+//                "      body {\n" +
+//                "        margin: 0;\n" +
+//                "        padding: 0;\n" +
+//                "      }\n" +
+//                "      img {\n" +
+//                "        padding: 0;\n" +
+//                "        margin: 0;\n" +
+//                "      }\n" +
+//                "    </style>\n" +
+//                "  </head>\n" +
+//                "  <body>\n" +
+//                "    <img src=\"http://cdngame.kuaifazs.com/yaoqingzq_bg.png\" width=\"100%\">\n" +
+//                "  </body>\n" +
+//                "</html>";
+//        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
+//        ask_bg.loadData(content, "text/html", "UTF-8");
+        GlideImageLoader.setImage(ask_bg, "http://cdngame.kuaifazs.com/yaoqingzq_bg.png");
 //                16,18,19
         LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
         layoutParams1.height = G.WIDTH * 660 / 625;

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

@@ -62,35 +62,16 @@ public class FgtFind extends BaseCompatFragment {
         layout_navigationBar.setVisibility(View.GONE);
         mAdapter = new GiftpackListAdapter(getFragmentManager(), SheepApp.getInstance());
         mAdapter.add(FgtFindChild.newInstance(0), "全部");
-        pager.setAdapter(mAdapter);
-        indicator.setupWithViewPager(pager);
-        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-            @Override
-            public void onPageScrolled(int i, float v, int i1) {
-
-            }
-
-            @Override
-            public void onPageSelected(int i) {
-                position = i;
-                FIND_TAG.onEvent("find_tag_name", ListUtil.hasIndex(list, i - 1) ? list.get(i - 1).getName() : "全部");
-            }
-
-            @Override
-            public void onPageScrollStateChanged(int i) {
-
-            }
-        });
-        CommonUtil.getInstance().reflex(indicator, activity);
-
-        pager.setCurrentItem(0);
     }
 
     private void initData() {
         //尝试获取缓存数据
         List<FindTag> newList = DataUtil.getInstance().getCacheList(ApiKey.articles_tags, FindTag.class);
-        loadList(newList);
-        initNetData();
+        if(ListUtil.isEmpty(newList)){
+            initNetData();
+        } else {
+            loadList(newList);
+        }
     }
 
     private int onResumeCount = 0;
@@ -98,7 +79,7 @@ public class FgtFind extends BaseCompatFragment {
     @Override
     public void onResume() {
         super.onResume();
-        if (list.isEmpty() && onResumeCount != 0)//非第一次时，并且没有数据时调用该接口
+        if (list.isEmpty() && onResumeCount != 0)//非第一次时，或者没有数据时调用该接口
             initNetData();
         onResumeCount++;
     }
@@ -110,15 +91,13 @@ public class FgtFind extends BaseCompatFragment {
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if (list.isEmpty()) {//无数据时加载网络获取的新数据，否则不加载新数据
-                            List<FindTag> newList = baseMessage.getDatas(FindTag.class);
+                        List<FindTag> newList = baseMessage.getDatas(FindTag.class);
+                        if(list.isEmpty() && !ListUtil.isEmpty(newList))//有缓存时不会加载，没有缓存时获取到数据会加载
                             loadList(newList);
-                        }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        G.showToast(baseMessage);
                     }
                 });
     }
@@ -128,34 +107,45 @@ public class FgtFind extends BaseCompatFragment {
         if (!ListUtil.isEmpty(newList)) {
             list.clear();
             ListUtil.addAll(list, newList);
-            loadMore();
-        }
-    }
+            CommonUtil.getInstance().initUrlConfigByNet("awaken_on", new Action1<String>() {
+                @Override
+                public void call(String url) {
+                    int awaken_on = NumberFormatUtils.parseInteger(url);
+                    int count = 1;
+                    if (awaken_on == 1) {
+                        count++;
+                        mAdapter.add(new FgtRouser(), "看点");
+                    }
+                    for (FindTag findLabel : list) {
+                        mAdapter.add(FgtFindChild.newInstance(findLabel.getId()), findLabel.getName());
+                        count++;
+                    }
+                    pager.setAdapter(mAdapter);
+                    indicator.setupWithViewPager(pager);
+                    pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+                        @Override
+                        public void onPageScrolled(int i, float v, int i1) {
 
-    private List<FindTag> list = ListUtil.emptyList();
+                        }
 
-    private void loadMore() {
+                        @Override
+                        public void onPageSelected(int i) {
+                            FIND_TAG.onEvent("find_tag_name", ListUtil.hasIndex(list, i - 1) ? list.get(i - 1).getName() : "全部");
+                        }
 
-        CommonUtil.getInstance().initUrlConfigByNet("awaken_on", new Action1<String>() {
-            @Override
-            public void call(String url) {
-                int awaken_on = NumberFormatUtils.parseInteger(url);
+                        @Override
+                        public void onPageScrollStateChanged(int i) {
 
-                if (awaken_on == 1) {
-                    mAdapter.add(new FgtRouser(), "看点");
-                }
-                for (FindTag findLabel : list) {
-                    mAdapter.add(FgtFindChild.newInstance(findLabel.getId()), findLabel.getName());
-                }
-                mAdapter.notifyDataSetChanged();
-                CommonUtil.getInstance().reflex(indicator, activity);
-                pager.setCurrentItem(position);
-                pager.setOffscreenPageLimit(mAdapter.getCount());
+                        }
+                    });
+                    CommonUtil.getInstance().reflex(indicator, activity);
+                    pager.setOffscreenPageLimit(count);
 
-            }
-        });
+                }
+            });
+        }
     }
 
-    private int position = 0;//默认选中第一个
+    private List<FindTag> list = ListUtil.emptyList();
 
 }

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

@@ -0,0 +1,20 @@
+package com.kfzs.duanduan.fragment;
+
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+
+/**
+ * Created by realicing on 2018/8/30.
+ * realicing@sina.com
+ */
+public class FgtNull extends BaseFragment {
+    @Override
+    public int getLayoutId() {
+        return R.layout.empty;
+    }
+
+    @Override
+    public void onViewCreated() {
+
+    }
+}

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

@@ -217,38 +217,47 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
-    public Handler mHanderl = new Handler(Looper.getMainLooper()) {
+    public static final int WHAT_LOAD_USER_INFO = 0;//加载用户信息
+    public static final int WHAT_LOAD_RUN_TASK = 1;//加载正在进行的任务列表
+    public static final int WHAT_UPDATE_VP_HEIGHT = 2;//刷新viewpager高度
+    public static final int WHAT_TRY_SHOW_HB = 7;//尝试显示红包
+    public Handler mHandler = new Handler(Looper.getMainLooper()) {
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
             switch (msg.what) {
-                case 0:
+                case WHAT_LOAD_USER_INFO:
                     loadUserInfo();
                     break;
-                case 1:
+                case WHAT_LOAD_RUN_TASK:
                     tryMakeMoneyAdp.clear();
-                    if (!ListUtil.isEmpty(allTaskAcceptedTaskList)) {
-                        if (recyclerview_line != null)
-                            recyclerview_line.setVisibility(View.VISIBLE);
+                    //正在进行中的任务列表
+                    boolean isAcceptedTaskListEmpty = ListUtil.isEmpty(allTaskAcceptedTaskList);
+                    if(!isAcceptedTaskListEmpty){
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RUN_TASK, allTaskAcceptedTaskList));
                     }
-                    if (!ListUtil.isEmpty(releaseEtyLists)) {
+                    //正在进行中的任务下面的线是否显示
+                    if(recyclerview_line != null)
+                        recyclerview_line.setVisibility(isAcceptedTaskListEmpty ? View.GONE : View.VISIBLE);
+
+                    //发布的任务列表----注：3.0开始已经没有展示，使用viewpager展示
+                    if(!ListUtil.isEmpty(releaseEtyLists)) {
                         tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists));
                     }
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     checkAndInitView();
                     break;
-                case 2:
+                case WHAT_UPDATE_VP_HEIGHT:
                     FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(curPosition);
-                    if (mViewPager == null || item == null) {
+                    if(mViewPager == null || item == null){
                         return;
                     }
                     int count = item.getDataCount();
                     ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
-                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96) + getResources().getDimensionPixelSize(R.dimen.content_padding));
+                    params.height = count == 0 ? G.HEIGHT / 2 : (count * getResources().getDimensionPixelSize(R.dimen.content_padding_96)+getResources().getDimensionPixelSize(R.dimen.content_padding));
                     mViewPager.setLayoutParams(params);
                     break;
-                case 7:
+                case WHAT_TRY_SHOW_HB:
                     isShowRedPackages(activity);
                     break;
             }
@@ -455,7 +464,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.homepage_act_layout);
         activity = getActivity();
-        DataUtil.getInstance().isTaskListChange(getClass());
         showPDialog();
         initView();
         initListener();
@@ -491,7 +499,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
          */
         adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
         adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0, "is_hot"), "每日必做");
-        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1, "about_to_begin"), "即将开始");
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(1,"about_to_begin"), "即将开始");
 
 //        mViewPager.setOffscreenPageLimit(2);
         mViewPager.setAdapter(adpViewPagerDetail);
@@ -507,7 +515,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void onPageSelected(int position) {
                 curPosition = position;
-                mHanderl.sendEmptyMessage(2);//重新计算viewpager高度
+                mHandler.sendEmptyMessage(WHAT_UPDATE_VP_HEIGHT);//重新计算viewpager高度
             }
 
             @Override
@@ -612,26 +620,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //用户信息
         userEntity = DataUtil.getInstance().getUserEntity();
-        if (userEntity != null) {
+        if(userEntity != null){
             loadUserInfo();
         }
         //任务
 //        List<TaskReleaseEty> cacheTaskReleaseEtyList = DataUtil.getInstance().getCacheList(ApiKey.release_task, TaskReleaseEty.class);
 //        if (cacheTaskReleaseEtyList != null) {
 //            releaseEtyLists.addAll(cacheTaskReleaseEtyList);
-//            mHanderl.sendEmptyMessage(1);
+//            mHandler.sendEmptyMessage(WHAT_LOAD_RUN_TASK);
 //        }
 
 
         //实时动态
         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();
@@ -640,7 +648,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) {
@@ -652,7 +660,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);
@@ -709,7 +717,8 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homepageItemNoticeMv.stopFlipping();
             homepageItemNoticeMv.startFlipping();
         }
-        pagePresenter.getUserInfo();
+        if(onResumeCount > 0 || userEntity == null)//非第一次才更新用户信息
+            pagePresenter.getUserInfo();
 
         if (views.size() < 1) {
             pagePresenter.getAwardDetail();
@@ -723,21 +732,21 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             @Override
             public void call(BaseMessage o) {
 
-                if (o != null) {
+                if(o != null){
                     CashAwarsEntity cashAwarsEntity = o.getData(CashAwarsEntity.class);
-                    if (cashAwarsEntity != null) {
-
-                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward() + ""));
-                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash() + ""));
-                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare() + ""));
-                        homepage_item_get_award_name_tv.setText(award + "");
-                        homepage_item_money_tv.setText(cash + "");
-                        homepage_item_juan_tv.setText(welfare + "");
+                    if(cashAwarsEntity != null){
+
+                        String award = String.format(activity.getResources().getString(R.string.homepage_award), FormatAny.getInstance().formatString(cashAwarsEntity.getAward()+""));
+                        String cash = String.format(activity.getResources().getString(R.string.homepage_cash), FormatAny.getInstance().formatString(cashAwarsEntity.getCash()+""));
+                        String welfare = String.format(activity.getResources().getString(R.string.homepage_welfare), FormatAny.getInstance().formatString(cashAwarsEntity.getWelfare()+""));
+                        homepage_item_get_award_name_tv.setText(award+"");
+                        homepage_item_money_tv.setText(cash+"");
+                        homepage_item_juan_tv.setText(welfare+"");
                     }
                 }
             }
         });
-        if (!isFirst) {
+        if(!isFirst){
             for (int i = 0; i < adpViewPagerDetail.getCount(); i++) {
                 FgtTryMakeMoney item = (FgtTryMakeMoney) adpViewPagerDetail.getItem(i);
                 item.refreshData();
@@ -773,14 +782,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         home_list_gridview_gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                HomeListEntity homeListEntity = ListUtil.getItem(homeListEntitysGridview, position);
-                if (homeListEntity == null) {
+                HomeListEntity homeListEntity= ListUtil.getItem(homeListEntitysGridview, position);
+                if(homeListEntity == null){
                     return;
                 }
                 UMConfigUtils.IdEvent.HOME_LIST.commit(homeListEntity.getId());
-                if ("-2".equals(homeListEntity.getJump())) {
+                if("-2".equals(homeListEntity.getJump())){
                     setValueList(!homeListEntity.isSelect());
-                } else {
+                }else {
                     CommonUtil.getInstance()
                             .goWhere(activity, homeListEntity, "首页");
                 }
@@ -789,7 +798,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     }
 
     private void refreshTaskList() {
-        DataUtil.getInstance().isTaskListChange(getClass());
         tryMakeMoneyPresenter.returnTask(is_succession, show_game_task);
         RequestParameEty parameEty = new RequestParameEty();
         parameEty.setHashMap(
@@ -800,7 +808,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
                                 1,
                                 0,
                                 0,
-                                "-1",
+                                 "-1",
                                 3));
 //        tryMakeMoneyPresenter.releaseTask(parameEty);
     }
@@ -847,11 +855,11 @@ 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);
-        mHanderl.sendEmptyMessage(0);
+        mHandler.sendEmptyMessage(WHAT_LOAD_USER_INFO);
     }
 
     @Override
@@ -890,14 +898,14 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     @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);
         } else {
             allTaskAcceptedTaskList.clear();
         }
-        mHanderl.sendEmptyMessage(1);
+        mHandler.sendEmptyMessage(WHAT_LOAD_RUN_TASK);
     }
 
     @Override
@@ -918,17 +926,17 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             G.showToast(" 网络错误！");
         }
         allTaskAcceptedTaskList.clear();
-        mHanderl.sendEmptyMessage(1);
+        mHandler.sendEmptyMessage(WHAT_LOAD_RUN_TASK);
     }
 
     @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;
-                mHanderl.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(WHAT_LOAD_RUN_TASK);
             }
         }
     }
@@ -962,7 +970,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);
@@ -987,7 +995,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);
@@ -1003,7 +1011,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);
@@ -1063,11 +1071,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();
                     }
@@ -1077,8 +1085,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             userEntity = result;
             loadUserInfo();
         }
-        if (DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
+        if(onResumeCount > 0)
             refreshTaskList();
+        onResumeCount++;
         setAnimation(ivDuty);
     }
 
@@ -1130,13 +1139,13 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     public void onEventMainThread(BigEvent event) {
         switch (event.getEventTypes()) {
             case ONFRESH_FGT_FAMLLSHEEP:
-                mHanderl.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(WHAT_LOAD_RUN_TASK);
                 break;
             case FGT_SHEEP_REFRESH_H:
-                mHanderl.sendEmptyMessage(2);
+                mHandler.sendEmptyMessage(WHAT_UPDATE_VP_HEIGHT);
                 break;
             case FGT_SHEEP_SHOW_NEW_USER_HONG_BAO:
-                mHanderl.sendEmptyMessage(7);
+                mHandler.sendEmptyMessage(WHAT_TRY_SHOW_HB);
                 break;
         }
     }
@@ -1341,7 +1350,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;
@@ -1391,7 +1400,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
      * 邀请成功后在个人资料显示领红包弹窗
      */
     public void showRedPackage(Context context) {
-        Activity mActivity = (Activity) context;
+        Activity mActivity = (Activity)context;
         View viewAnchor = LayoutInflater.from(context).inflate(R.layout.homepage_act_layout, null, false);
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
         TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
@@ -1451,7 +1460,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {
-                        if (popupWindow.isShowing()) {
+                        if (popupWindow.isShowing()){
                             popupWindow.dismiss();
                             isShowRedPackageWithCode();//兑换成功后弹出邀请红包
                         }
@@ -1463,9 +1472,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
     /**
      * 新手任务
      */
-    private void addNewTask() {
+    private void addNewTask(){
 
-        if (onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity, userEntity) && homeListEntitysGridview != null)//第一次才调用
+        if(onResumeCount == 0 && CommonUtil.getInstance().addNewTask(activity,userEntity) && homeListEntitysGridview != null)//第一次才调用
         {
             HomeListEntity homeListEntityNewTask = new HomeListEntity();
             homeListEntityNewTask.setTitle("新手任务");
@@ -1474,12 +1483,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             homeListEntityNewTask.setIcon(R.mipmap.homepage_xinshourw + "");
             homeListEntitys.add(0, homeListEntityNewTask);
         }
-        if (homeListEntitys.size() > 8) {
+        if(homeListEntitys.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setTitle("查看更多");
             homeListEntity.setDesc("查看更多");
             homeListEntity.setJump("-2");
-            homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+            homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             homeListEntitys.add(7, homeListEntity);
         }
         setValueList(false);
@@ -1487,28 +1496,28 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private void setValueList(boolean flag) {
         homeListEntitysGridview.clear();
-        for (int i = 0; i < homeListEntitys.size(); i++) {
-            if (flag) {
+        for(int i=0;i<homeListEntitys.size();i++){
+            if(flag){
                 homeListEntitysGridview.add(homeListEntitys.get(i));
-            } else {
-                if (i < 8) {
+            }else {
+                if(i<8){
                     homeListEntitysGridview.add(homeListEntitys.get(i));
                 }
             }
 
         }
-        if (homeListEntitysGridview.size() > 8) {
+        if(homeListEntitysGridview.size() > 8){
             HomeListEntity homeListEntity = new HomeListEntity();
             homeListEntity.setJump("-2");
             homeListEntity.setSelect(flag);
             if (flag) {
                 homeListEntity.setTitle("收起模块");
                 homeListEntity.setDesc("收起模块");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click + "");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd_click+"");
             } else {
                 homeListEntity.setTitle("查看更多");
                 homeListEntity.setDesc("查看更多");
-                homeListEntity.setIcon(R.mipmap.homepage_chakangd + "");
+                homeListEntity.setIcon(R.mipmap.homepage_chakangd+"");
             }
             homeListEntitysGridview.set(7, homeListEntity);
         }

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

@@ -5,6 +5,7 @@ import android.support.v4.app.Fragment;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.fragment.FgtAskgetmoney;
 import com.kfzs.duanduan.fragment.FgtFind;
+import com.kfzs.duanduan.fragment.FgtNull;
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 import com.sheep.gamegroup.view.fragment.FgtMainAudit;
@@ -51,7 +52,7 @@ public enum MainTab {
     Fgt_Find(R.string.main_tab_find) {
         @Override
         public Fragment getFragment() {
-            return new FgtFind();
+            return new FgtNull();
         }
 
         @Override

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

@@ -11,17 +11,14 @@ import com.kf.utils.ToastBuilder;
 import com.kfzs.duanduan.ActMain;
 import com.kfzs.duanduan.KFZSApp;
 import com.kfzs.duanduan.adp.ViewPagerFragmentAdapter;
-import com.kfzs.duanduan.adp.ViewPagerFragmentStateAdapter;
-import com.kfzs.duanduan.fragment.FgtFind;
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.DrawablesHelper;
+import com.sheep.gamegroup.util.LogUtil;
 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 com.sheep.jiuyan.samllsheep.utils.G;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -120,7 +117,7 @@ public class TabsHelper {
                         FgtSmallSheep fgtSmallSheep = (FgtSmallSheep) fragmentList.get(sheepPosition);
                         FgtPersonalCenter personnalCenter = (FgtPersonalCenter) fragmentList.get(personnalPosition);
                         FgtMainAudit auditFgt = (FgtMainAudit) fragmentList.get(auditPosition);
-                        FgtFind findFgt = (FgtFind) fragmentList.get(fPosition);
+//                        FgtFind findFgt = (FgtFind) fragmentList.get(fPosition);
                         if(position == sheepPosition){
                             fgtSmallSheep.onResume();
                         } else {
@@ -133,11 +130,12 @@ public class TabsHelper {
                             auditFgt.onResume();
                         }
                         if(position == fPosition){
-                            findFgt.onResume();
+//                            findFgt.onResume();
                         }
                         checkWhichPage(position);
                     }
 
+
                 }
             });
             index++;
@@ -204,7 +202,7 @@ public class TabsHelper {
 
     private void initViewPager() {
         LogUtil.logI("fragmentList.size---"+fragmentList.size());
-        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(activity.getSupportFragmentManager(),fragmentList);
+        ViewPagerFragmentAdapter mViewPagerFragmentAdapter = new ViewPagerFragmentAdapter(activity.getSupportFragmentManager(), fragmentList);
         view_pager_container.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
             @Override
@@ -218,6 +216,7 @@ public class TabsHelper {
                 if (lastPosition > -1)
                     tabs.get(lastPosition).setActivated(false);
                 tabs.get(position).setActivated(true);
+                showFind(position == MainTab.Fgt_Find.ordinal());
                 //更新position
                 lastPosition = position;
             }
@@ -233,10 +232,32 @@ public class TabsHelper {
         checkViewState(lastPosition);
     }
 
+    private void showFind(boolean isFind) {
+        View frame_container = activity.findViewById(R.id.frame_container);
+        if(isFind)
+            frame_container.bringToFront();
+        else
+            other_container.bringToFront();
+    }
+
     public void init() {
         initViews();
         initArrays();
         initViewPager();
+
+        FragmentTransaction transaction = activity.getSupportFragmentManager().beginTransaction();
+        Bundle bundle = new Bundle();
+        Fragment fragment = activity.getSupportFragmentManager().findFragmentByTag("tag");
+        if(fragment == null){
+            fragment = new FgtFind();
+            fragment.setArguments(bundle);
+            transaction.add(R.id.frame_container, fragment, "tag");
+            transaction.commitAllowingStateLoss();
+        }else {
+            fragment.setArguments(bundle);
+            transaction.replace(R.id.frame_container, fragment);
+            transaction.commitAllowingStateLoss();
+        }
     }
 
     private long lastbackrn = 0;

app/src/main/java/com/sheep/gamegroup/helper/TaskHelper.java

@@ -238,7 +238,6 @@ public class TaskHelper {
                                                 @Override
                                                 public void onNext(BaseMessage baseMessage) {
                                                     CommonUtil.getInstance().setTAskEnty(null);
-                                                    DataUtil.getInstance().setTaskListChanged();//主页任务列表发生变化，回到主页后自动刷新
                                                     refreshTask();
                                                 }
 

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

@@ -239,6 +239,22 @@ public interface ApiService {
      */
     @POST("app/user/sms_for_bind_mobile")
     Observable<BaseMessage> smsBindMobile(@Body JSONObject jsonObject);
+    /**
+     * 使用第三方登录时，未找到该qq对应的账号，不再直接创建账号，会先绑定手机号来注册新账号
+     * captcha	string
+     验证码 第二步需要
+     mobile	string
+     platform	string
+     登录返回来的platform
+     scope	string
+     传kfzs为官包 传空为邀请包
+     step	string
+     步骤：first发验证码 second绑定
+     token	string
+     登录返回来的token
+     */
+    @POST("app/auth/bind_mobile")
+    Observable<BaseMessage> bindMobileRegister(@Body JSONObject jsonObject);
 
     /**
      * 修改任务进度

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

@@ -1,12 +1,16 @@
 package com.sheep.gamegroup.model.entity;
 
+import java.io.Serializable;
+
 /**
  * 手机登录返回数据
  * Created by ljy on 2018/3/17.
  */
 
-public class LoginEntity {
+public class LoginEntity implements Serializable{
     private String token;//11@9667453894253cd1f3e9beec1bb063e9
+    private String code;
+    private String platform;
     private UserEntity user;
 
     public String getToken() {
@@ -24,4 +28,20 @@ public class LoginEntity {
     public void setUser(UserEntity user) {
         this.user = user;
     }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getPlatform() {
+        return platform;
+    }
+
+    public void setPlatform(String platform) {
+        this.platform = platform;
+    }
 }

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

@@ -542,7 +542,7 @@ public class TaskEty implements Serializable, IDownload {
         //先找审核失败的子任务
         TaskChild commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_FAIL);
         if(commitScreenShotTask == null){
-        //再找进行中的子任务
+            //再找进行中的子任务
             commitScreenShotTask = getCanCommitChild(TaskEty.STATUS_RUNNING);
         }
         return commitScreenShotTask == null ? -1 : commitScreenShotTask.getAlready_accepted_task_id();
@@ -581,12 +581,19 @@ public class TaskEty implements Serializable, IDownload {
      * @return
      */
     public boolean canCancelTask() {
-       switch (task_type){
-           case 1000:
-               TaskChild taskChild = ListUtil.getItem(child, 0);
-               return taskChild == null || taskChild.getStatus() == 3;
-           default:
-               return true;
-       }
+        switch (task_type){
+            case 1000:
+                TaskChild taskChild = ListUtil.getItem(child, 0);
+                return taskChild == null || taskChild.getStatus() == 3;
+            default:
+                return true;
+        }
+    }
+    /**
+     * 是否连续任务
+     * @return
+     */
+    public boolean isSuccession() {
+        return task_type == 1000;
     }
 }

app/src/main/java/com/sheep/gamegroup/model/util/SheepSubscriber.java

@@ -12,6 +12,7 @@ import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.NetUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 
 import rx.Subscriber;
 
@@ -52,6 +53,7 @@ public abstract class SheepSubscriber<T> extends Subscriber<T> {
                 ExceptionHandle.ResponeThrowable throwable = ExceptionHandle.handleException(e);
                 //token 过期
                 if(throwable.code == 401){
+                    SpUtils.saveToken(SheepApp.getInstance(), "");
                     Jump2View.getInstance().gotoLoginAgain();
                     return;
                 }

app/src/main/java/com/sheep/gamegroup/presenter/LoginPresenter.java

@@ -9,6 +9,7 @@ import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ChannelContent;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.FastJsonUtils;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.PreferenceUtils;
 import com.sheep.gamegroup.util.TestUtil;
@@ -84,6 +85,13 @@ public class LoginPresenter implements LoginContract.Presenter {
         LoginEntity loginEty = null;
         if(baseMessage!=null){
             loginEty =FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),LoginEntity.class);
+            if(loginEty.getCode() != null){
+                switch (loginEty.getCode()){
+                    case "bind_mobile":
+                        Jump2View.getInstance().goBindPhoneRegister(SheepApp.getInstance(), loginEty);
+                        return;
+                }
+            }
             SpUtils.saveToken(SheepApp.mContext, loginEty.getToken());
             DataUtil.getInstance().setUserEntity(loginEty.getUser());
             LogUtil.logI("token--------"+loginEty.getToken());

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

@@ -92,7 +92,6 @@ public class DataUtil {
      * @return
      */
     public String getInvitationCode() {
-        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if (userEntity != null && userEntity.getInvitation_code() != null)
             return userEntity.getInvitation_code();
         return "";
@@ -104,7 +103,6 @@ public class DataUtil {
      * @return
      */
     public String getUserId() {
-        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if (userEntity != null && userEntity.getId() != null)
             return userEntity.getId();
         return "";
@@ -116,7 +114,6 @@ public class DataUtil {
      * @return
      */
     public String getUserParentCode() {
-        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if (userEntity != null && userEntity.getParent_code() != null)
             return userEntity.getParent_code();
         return "";
@@ -128,7 +125,6 @@ public class DataUtil {
      * @return
      */
     public String getUserMobile() {
-        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if (userEntity != null && userEntity.getMobile() != null)
             return userEntity.getMobile();
         return "";
@@ -145,7 +141,6 @@ public class DataUtil {
      * @return
      */
     public String getUserWxOpenId() {
-        UserEntity userEntity = DataUtil.getInstance().getUserEntity();
         if (userEntity != null && userEntity.getWx_openid() != null)
             return userEntity.getWx_openid();
         return "";
@@ -238,38 +233,6 @@ public class DataUtil {
     }
 
     //-----------------------------------------缓存数据部分-----------------------------------------------------结束
-    //-----------------------------------------进行任务部分-----------------------------------------------------开始
-
-    /**
-     * 是否首页正在运行的任务与发布的任务列表发生变化
-     *
-     * @return
-     */
-    public boolean isTaskListChange(Class<?> tagClass) {
-        return isTaskListChange(tagClass.getName());
-    }
-
-    /**
-     * 是否首页正在运行的任务与发布的任务列表发生变化
-     *
-     * @return
-     */
-    public boolean isTaskListChange(String tag) {
-        if (tagList.contains(tag)) {//包含tag，说明使用该tag的地方已经刷新数据
-            return false;
-        } else {
-            tagList.add(tag);
-            return true;
-        }
-    }
-
-    private List<String> tagList = ListUtil.emptyList();
-
-    public void setTaskListChanged() {
-        tagList.clear();
-    }
-
-    //-----------------------------------------进行任务部分-----------------------------------------------------结束
 
     //-----------------------------------------其它数据部分-----------------------------------------------------开始
     private Map<String, Object> objectMap = new HashMap<>();

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

@@ -23,6 +23,7 @@ import com.sheep.gamegroup.model.entity.DialogConfig;
 import com.sheep.gamegroup.model.entity.DialogEntity;
 import com.sheep.gamegroup.model.entity.FindApp;
 import com.sheep.gamegroup.model.entity.FindItem;
+import com.sheep.gamegroup.model.entity.LoginEntity;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.entity.NewbieTaskRecord;
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
@@ -33,6 +34,7 @@ import com.sheep.gamegroup.model.entity.WebviewEntity;
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.view.activity.ActAudit;
+import com.sheep.gamegroup.view.activity.ActBindMobileRegister;
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 import com.sheep.gamegroup.view.activity.ActDownloadWelfareList;
@@ -639,13 +641,26 @@ public class Jump2View {
      */
     public void goBindPhone(Context context, Object o){
         Intent i = new Intent(context, ChangeTelAct.class);
-        if(o != null && o instanceof Integer)
+        if(o instanceof Integer){
             i.putExtra("where_from", (Integer) o);
+        }
         if(!(context instanceof Activity))
             i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(i);
     }
     /**
+     * 绑定手机页面并注册第三方账号
+     * @param context
+     * @param loginEntity
+     */
+    public void goBindPhoneRegister(Context context, LoginEntity loginEntity){
+        Intent intent = new Intent(context, ActBindMobileRegister.class);
+        intent.putExtra(LoginEntity.class.getSimpleName(), loginEntity);
+        if(!(context instanceof Activity))
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+    }
+    /**
      * 跳转到非wifi网络提示
      * @param context
      * @param o

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

@@ -100,7 +100,6 @@ public class ViewUtil {
 
     public static final int REQUEST_CODE_TASK_LIST = 110;
     private static ViewUtil viewUtil;
-    static int result = 0;
     static RobTask mRobTask;
 
     public static ViewUtil newInstance() {
@@ -535,6 +534,67 @@ public class ViewUtil {
         }
 
     }
+    /**
+     * 领取福利成功的对话框
+     *
+     * @param activity
+     * @param welfare
+     */
+    public static void shareGetWelfareDialog(final Activity activity, final Welfare welfare) {
+        View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
+        final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
+                .setView(dialog_parent)
+                .create();
+        TextView dialog_title = dialog_parent.findViewById(R.id.dialog_title);
+        View dialog_close = dialog_parent.findViewById(R.id.dialog_close);
+        LinearLayout dialog_center_ll = dialog_parent.findViewById(R.id.dialog_center_ll);
+        View view = LayoutInflater.from(activity).inflate(R.layout.x_get_welfare_dialog, dialog_center_ll, true);
+        dialog_title.setText("领取成功");
+
+        TextView dialog_btn_left = view.findViewById(R.id.dialog_btn_left);
+        TextView dialog_btn_right = view.findViewById(R.id.dialog_btn_right);
+        dialog_btn_left.setText("关闭");
+        dialog_btn_right.setText("启动游戏");
+
+        final TextView get_welfare_code_tv = view.findViewById(R.id.get_welfare_code_tv);
+        TextView get_welfare_copy_tv = view.findViewById(R.id.get_welfare_copy_tv);
+        TextView get_welfare_content_tv = view.findViewById(R.id.get_welfare_content_tv);
+        //TODO 设置内容与兑换码
+
+        get_welfare_copy_tv.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                StringUtils.CopyText(get_welfare_code_tv.getText().toString());
+            }
+        });
+
+        dialog_btn_right.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+                //TODO 启动游戏
+            }
+        });
+        dialog_btn_left.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+        dialog_close.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                dialog.dismiss();
+            }
+        });
+
+        try {
+            dialog.show();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+    }
 
     /**
      * 获取一个 View 的缓存视图
@@ -1299,7 +1359,8 @@ public class ViewUtil {
     public void showGridviewStatues(Context context, TextView textView, HomeListEntity entity) {
         textView.setVisibility(View.INVISIBLE);
 
-        int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
+        int padding1 = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_1);
+        int padding2 = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);
         switch (entity.getTag()) {
             default:
 
@@ -1309,14 +1370,14 @@ public class ViewUtil {
                 textView.setBackgroundResource(R.drawable.shape_red_stroke_rectangle_no_lb);
                 textView.setTextColor(context.getResources().getColor(R.color.red_FD2D54));
                 textView.setText("现金");
-               // textView.setPadding(2 * padding, padding, 1 * padding, padding);
+                textView.setPadding( padding2, padding1,  padding2, padding1);
                 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("活跃");
-              //  textView.setPadding(2 * padding, padding, 1 * padding, padding);
+                textView.setPadding( padding2, padding1,  padding2, padding1);
                 break;
         }
 

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

@@ -0,0 +1,192 @@
+package com.sheep.gamegroup.view.activity;
+
+import android.app.Activity;
+import android.support.v7.widget.AppCompatEditText;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.alibaba.fastjson.JSONObject;
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.LoginEntity;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.ChannelContent;
+import com.sheep.gamegroup.util.GlideImageLoader;
+import com.sheep.gamegroup.util.SelfCountDownTimer;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.utils.G;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import butterknife.BindView;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
+
+/**
+ * Created by ljy on 2018/3/27.
+ */
+
+public class ActBindMobileRegister extends BaseActivity {
+
+    @BindView(R.id.bind_mobile_register_phone_iv)
+    ImageView bindMobileRegisterPhoneIv;
+    @BindView(R.id.bind_mobile_register_phone_et)
+    AppCompatEditText bindMobileRegisterPhoneEt;
+    @BindView(R.id.bind_mobile_register_code_iv)
+    ImageView bindMobileRegisterCodeIv;
+    @BindView(R.id.bind_mobile_register_code_et)
+    AppCompatEditText bindMobileRegisterCodeEt;
+    @BindView(R.id.bind_mobile_register_code_tv)
+    TextView bind_mobile_register_code_tv;
+    private Activity activity;
+
+
+    @Override
+    protected int getLayoutId() {
+        return R.layout.act_bind_mobile_register;
+    }
+
+    @Override
+    public void initView() {
+        activity = this;
+        GlideImageLoader.setImage(bindMobileRegisterPhoneIv, "http://cdngame.kuaifazs.com/phone_icon_iv.png");
+        GlideImageLoader.setImage(bindMobileRegisterCodeIv, "http://cdngame.kuaifazs.com/code_icon_iv.png");
+        TitleBarUtils.getInstance()
+                .setTitle(this, "绑定手机号")
+                .setTitleFinish(this, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        finish();
+                    }
+                });
+    }
+
+    @Override
+    public void initListener() {
+        selfCountDownTimer = new SelfCountDownTimer(60 * 1000, 1000, SelfCountDownTimer.FULL_SECOND) {
+            @Override
+            public void onTimerRest() {
+                bind_mobile_register_code_tv.setText(getString(R.string.get_captcha));
+                bind_mobile_register_code_tv.setEnabled(true);
+            }
+
+            @Override
+            public void onTimerTick(long millisUntilFinished, int countTime) {
+                String textStr = countTime + " s";
+                bind_mobile_register_code_tv.setText(textStr);
+            }
+
+            @Override
+            public void onTimerFinish() {
+                selfCountDownTimer.reset(SelfCountDownTimer.FULL_SECOND);
+            }
+        };
+    }
+
+    private LoginEntity loginEntity;
+    @Override
+    public void initData() {
+        loginEntity = (LoginEntity) getIntent().getSerializableExtra(LoginEntity.class.getSimpleName());
+        if(loginEntity == null)//必须传入LoginEntity才能保证正常运行
+            finish();
+    }
+
+    private SelfCountDownTimer selfCountDownTimer;
+    /**
+     * 获取验证码
+     * captcha	string
+     验证码 第二步需要
+     mobile	string
+     platform	string
+     登录返回来的platform
+     scope	string
+     传kfzs为官包 传空为邀请包
+     step	string
+     步骤：first发验证码 second绑定
+     token	string
+     登录返回来的token
+     * @param view
+     */
+    public void getCaptcha(View view) {
+        bind_mobile_register_code_tv.setEnabled(false);
+        //检查手机号
+        final String mobile = bindMobileRegisterPhoneEt.getText().toString().trim();
+        if(!StringUtils.isMobile(mobile)){
+            G.showToast("请填写正确的手机号!");
+            return;
+        }
+        //提交数据获取验证码
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("mobile", mobile);
+        jsonObject.put("platform", loginEntity.getPlatform());
+        jsonObject.put("scope", ChannelContent.getInstance().getChannel_name());
+        jsonObject.put("step", "first");
+        jsonObject.put("token", loginEntity.getToken());
+        SheepApp.getInstance().getNetComponent().getApiService().bindMobileRegister(jsonObject)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                mMobile = mobile;
+                                selfCountDownTimer.start();
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                G.showToast(baseMessage);
+                                bind_mobile_register_code_tv.setEnabled(true);
+                            }
+                        });
+    }
+    private String mMobile;//获取验证码成功后得到手机号
+    /**
+     * 提交
+     * @param view
+     */
+    public void toCommit(View view) {
+        //检查验证码
+        final String captcha = bindMobileRegisterCodeEt.getText().toString().trim();
+        if(TextUtils.isEmpty(captcha)){
+            G.showToast("验证码不能为空!");
+            return;
+        }
+        if(captcha.length() != 6){
+            G.showToast(getString(R.string.toast_warning_phone_captcha_image_code_size));
+            return;
+        }
+        //提交数据注册手机号并绑定第三方账号
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("captcha", captcha);
+        jsonObject.put("mobile", mMobile);
+        jsonObject.put("platform", loginEntity.getPlatform());
+        jsonObject.put("scope", ChannelContent.getInstance().getChannel_name());
+        jsonObject.put("step", "second");
+        jsonObject.put("token", loginEntity.getToken());
+        SheepApp.getInstance().getNetComponent().getApiService().bindMobileRegister(jsonObject)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        G.showToast(baseMessage);
+                    }
+                });
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if(selfCountDownTimer != null){
+            selfCountDownTimer.cancel();
+        }
+    }
+}

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

@@ -180,7 +180,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
         WebViewClient wvc = new WebViewClient() {
             @Override
             public boolean shouldOverrideUrlLoading(WebView view, String url) {
-                 webView.loadUrl(url);
+                webView.loadUrl(url);
                 Jump2View.getInstance().goWeb(ActFindInformation.this, url);
                 return true;
             }
@@ -623,7 +623,6 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected void onResume() {
         super.onResume();
         taskHelper.onResume();
-        Aria.download(this).unRegister();
         try {
             if (webView != null) {
                 webView.resumeTimers();
@@ -639,6 +638,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
     protected void onDestroy() {
         super.onDestroy();
         LogUtil.logI("释放资源");
+        Aria.download(this).unRegister();
         EventBus.getDefault().unregister(this);
         taskHelper.destroy();
         if (webView != null) {

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

@@ -261,7 +261,6 @@ public class LoginAct extends BaseUMActivity implements LoginContract.View {
         }
     }
     private void goMain(String openId) {
-        LogUtil.logI("goMain--token----"+openId);
         SpUtils.saveToken(getApplicationContext(), openId);
         Jump2View.getInstance().goHomePageView(this, null);
         ActivityManager.getInstance().endActivity(LoginAct.class);

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

@@ -437,11 +437,7 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         btnUpImag.setVisibility(View.GONE);
                         break;
                     default:
-                        if(taskEty.getTask_type() == 1000)//连续任务
-                            setSuccessionTaskBottomState();
-                        else if(gettaskAcceptedEty.getStatus() == 6) {//试玩任务审核失败可以重新提交
-                            btnUpImag.setText("重新提交");
-                        }
+                        setOtherNormalTaskBtnState();
                         break;
                 }
                 break;
@@ -462,6 +458,32 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     }
 
     /**
+     * 设置连续任务与试玩任务两个按钮状态（任务未下线且有任务记录且是手动审核任务且已经安装应用）
+     * 注：前提是gettaskAcceptedEty不为空哦
+     */
+    private void setOtherNormalTaskBtnState() {
+        boolean isSuccession = taskEty.isSuccession();
+        if(isSuccession){//连续任务
+            setSuccessionTaskBottomState();
+        } else {
+            switch (gettaskAcceptedEty.getStatus()) {
+                case 1://"已接受任务";
+                case 2:// "正在进行中";
+                    break;
+                case 6://试玩任务审核失败可以重新提交
+                    btnUpImag.setText("重新提交");
+                    break;
+                case 7:// "提交审核";
+                    btnUpImag.setVisibility(View.GONE);
+                    break;
+                case 3://完成任务
+                    btnUpImag.setVisibility(View.GONE);
+                    break;
+            }
+        }
+    }
+
+    /**
      * 设置游戏任务中两个按钮的状态和文字显示（任务未下线且有任务记录）
      * 注：前提是gettaskAcceptedEty不为空哦
      */
@@ -641,7 +663,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                                 gettaskAcceptedEty = null;
                                 taskReleaseEty = null;
                                 CommonUtil.getInstance().setTAskEnty(null);
-                                DataUtil.getInstance().setTaskListChanged();
                                 presenter.taskDesc(releaseTaskId);
                             }
                         });
@@ -1112,8 +1133,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
                         taskReleaseEty.getTask().setRelease_task_id(taskReleaseEty.getId());
                         CommonUtil.getInstance().setTAskEnty(taskReleaseEty.getTask());
 
-                        DataUtil.getInstance().setTaskListChanged();//主页任务列表发生变化，回到主页后自动刷新
-
                         getAcceptedTaskDetail(releaseTaskId);
 
                     }
@@ -1223,15 +1242,19 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
         }
     }
 
+    private int onResumeCount = 0;
     @Override
     protected void onResume() {
         super.onResume();
-        if (taskReleaseEty == null || isFresh) {
-            isFresh = true;
-            freshData();
-        } else {
-            updateBottom();
+        if(onResumeCount > 0) {//第一次不加载
+            if (taskReleaseEty == null || isFresh) {
+                isFresh = true;
+                freshData();
+            } else {
+                updateBottom();
+            }
         }
+        onResumeCount++;
     }
 
     /**
@@ -1407,5 +1430,6 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     protected void onDestroy() {
         super.onDestroy();
         CommonUtil.getInstance().cancelAllTimers(CommonUtil.getInstance().timerHashMap);
+        Aria.download(this).unRegister();
     }
 }

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

@@ -1,10 +1,12 @@
 package com.sheep.gamegroup.view.adapter;
 
+import android.app.Activity;
 import android.content.Context;
 import android.view.View;
 
 import com.sheep.gamegroup.model.entity.Welfare;
 import com.sheep.gamegroup.util.ViewHolder;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 
 import java.util.List;
@@ -13,7 +15,7 @@ import java.util.List;
  * Created by realicing on 2018/8/28.
  * realicing@sina.com
  */
-public class DownloadWelfareAdapter extends AdbCommonRecycler<Welfare> {
+public class DownloadWelfareAdapter extends AdbCommonRecycler<Welfare> implements View.OnClickListener{
 
     public DownloadWelfareAdapter(Context context, List<Welfare> list) {
         super(context, list);
@@ -26,7 +28,13 @@ public class DownloadWelfareAdapter extends AdbCommonRecycler<Welfare> {
 
     @Override
     public void convert(ViewHolder holder, Welfare welfareCenter) {
+        holder.itemView.setOnClickListener(this);
         View item_download_welfare_line = holder.getView(R.id.item_download_welfare_line);
         item_download_welfare_line.setVisibility(holder.getAdapterPosition() + 1 == getItemCount() ? View.GONE : View.VISIBLE);
     }
+
+    @Override
+    public void onClick(View view) {
+        ViewUtil.shareGetWelfareDialog((Activity) context, null);
+    }
 }

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

@@ -87,7 +87,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
         initData();
     }
     public void initData() {
-        showProgress();
+//        showProgress();
 
         initAskTop5();
     }

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

@@ -25,7 +25,6 @@ import com.sheep.gamegroup.presenter.TryMakeMoneyPresenter;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ListUtil;
-import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.view.activity.GamemakeMoneyAct;
 import com.sheep.gamegroup.view.activity.TryMakeMoneyact;
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
@@ -36,7 +35,6 @@ import com.sheep.jiuyan.samllsheep.utils.G;
 
 import org.afinal.simplecache.ApiKey;
 import org.greenrobot.eventbus.EventBus;
-import org.greenrobot.eventbus.Subscribe;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -137,7 +135,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @Override
     public void onViewCreated() {
         activity = getActivity();
-        DataUtil.getInstance().isTaskListChange(getClass());
         initView();
         initData();
     }
@@ -156,8 +153,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
             task_type = "1002,1003,1004";
             isGameTask = true;
         }
-        EventBus.getDefault().register(this);
-//        ButterKnife.bind(this, mContentView);
         DaggerFgtTryMakeMoneyComponent.builder()
                 .netComponent(SheepApp.get(activity).getNetComponent())
                 .tryMakeMoneyModule(new TryMakeMoneyModule(FgtTryMakeMoney.this))
@@ -209,7 +204,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     }
     //强制刷新数据
     public void refreshData(){
-        DataUtil.getInstance().isTaskListChange(getClass());
         isFirstCache = false;
         if(TextUtils.isEmpty(show_type))
             if(refresh != null)
@@ -269,8 +263,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void onDestroyView() {
         super.onDestroyView();
         unbinder.unbind();
-
-        EventBus.getDefault().unregister(this);
     }
 
     @Override
@@ -310,7 +302,6 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     public void giveUpTaskSuccesView(Object object) {
         G.showToast("取消任务成功");
         CommonUtil.getInstance().setTAskEnty(null);
-        DataUtil.getInstance().setTaskListChanged();
         refreshData();
     }
 
@@ -389,24 +380,12 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
         getFromNetWorkFirst(type);
     }
 
-    @Subscribe
-    public void onEventMainThread(BigEvent event){
-        switch (event.getEventTypes()){
-            case ONFRESH_TRYMAKEMANY_PAGE:
-                break;
-        }
-    }
-
     private int onResumeCount = 0;
     @Override
     public void onResume() {
         super.onResume();
-        if (onResumeCount > 0 && presenter != null){
-            if(DataUtil.getInstance().isTaskListChange(getClass())) {//需要全部刷新
-                refreshData();
-            } else {
-                initAcceptedTaskList();
-            }
+        if (onResumeCount > 0 && presenter != null){//直接全部刷新
+            refreshData();
         }
         onResumeCount++;
     }
@@ -422,7 +401,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
      * 发布的任务
      * type: 0 1
      */
-    private void getFromAcacheFirst(int type){
+    private void getFromACacheFirst(int type){
         if(TextUtils.isEmpty(show_type)){
             this.type = ++type;
             getFromACache(this.type);
@@ -442,7 +421,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                         releaseEtyLists.clear();
                         releaseEtyLists.addAll(cacheTaskReleaseEtyList);
                         notifyDataSetChanged();
-                        getFromAcacheFirst(type);
+                        getFromACacheFirst(type);
                     }
                     break;
                 case 1:
@@ -452,7 +431,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
                         releaseEtyListsBegin.clear();
                         releaseEtyListsBegin.addAll(cacheTaskReleaseEtyList);
                         notifyDataSetChanged();
-                        getFromAcacheFirst(type);
+                        getFromACacheFirst(type);
                     }
                     break;
             }

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

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

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

@@ -23,9 +23,9 @@
             android:id="@+id/img_baseactivity_title"
             android:layout_width="wrap_content"
             android:layout_height="?attr/actionBarSize"
-            android:gravity="center_vertical"
-            android:paddingEnd="@dimen/content_padding_20"
             android:paddingStart="@dimen/content_padding_20"
+            android:paddingEnd="@dimen/content_padding_20"
+            android:gravity="center_vertical"
             android:scaleType="centerInside"
             android:src="@drawable/narrow_back_white"
             app:layout_constraintStart_toStartOf="parent"
@@ -49,66 +49,62 @@
             android:id="@+id/number_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:text=""
-            android:textColor="@color/white"
             android:textSize="@dimen/text_size_3"
+            android:textColor="@color/white"
+            android:text=""
+            android:gravity="center"
+            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title" />
+            app:layout_constraintStart_toStartOf="parent"/>
 
         <LinearLayout
+            android:layout_below="@+id/number_tv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/number_tv"
-            android:layout_marginTop="@dimen/content_padding_15"
+            app:layout_constraintTop_toBottomOf="@+id/number_tv"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/number_tv">
-
+            android:layout_marginTop="@dimen/content_padding_15">
             <TextView
                 android:id="@+id/audit_total_complete_tv"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
                 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:textSize="@dimen/text_size_13"/>
             <View
                 android:layout_width="1dp"
                 android:layout_height="20dp"
                 android:layout_gravity="center"
-                android:background="@color/disenable_color" />
-
+                android:background="@color/disenable_color"/>
             <TextView
                 android:id="@+id/audit_total_money_tv"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
                 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:textSize="@dimen/text_size_13"/>
             <View
                 android:layout_width="1dp"
                 android:layout_height="20dp"
                 android:layout_gravity="center"
-                android:background="@color/disenable_color" />
+                android:background="@color/disenable_color"/>
 
             <LinearLayout
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/audit_total_welfare_tv"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
                     android:layout_weight="1"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text=""
                     android:textColor="@color/white"
@@ -125,18 +121,9 @@
         </LinearLayout>
     </android.support.constraint.ConstraintLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:background="@color/white"
-        android:orientation="vertical">
-
-        <android.support.design.widget.TabLayout
-            android:id="@+id/indicator"
-            style="@style/style_tab" />
-
-        <include layout="@layout/line_1px_hor" />
-    </LinearLayout>
+    <android.support.design.widget.TabLayout
+        android:id="@+id/indicator"
+        style="@style/style_tab"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@color/bg_gray"
+    android:orientation="vertical"
+    tools:context="com.sheep.gamegroup.view.activity.ActBindMobileRegister">
+
+    <include layout="@layout/title" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="12dp"
+            android:layout_marginTop="@dimen/content_padding_13"
+            android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/content_padding_small"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/bind_mobile_register_phone_iv"
+                    android:layout_width="@dimen/icon_heigh_default"
+                    android:layout_height="@dimen/icon_heigh_default"
+                    android:layout_marginStart="9dp"
+                    android:src="@mipmap/icon" />
+
+                <android.support.v7.widget.AppCompatEditText
+                    android:id="@+id/bind_mobile_register_phone_et"
+                    style="@style/edt_style"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/edt_heigh_default"
+                    android:layout_marginStart="@dimen/content_padding_small"
+                    android:hint="请输入要绑定的手机号"
+                    android:inputType="phone"
+                    android:maxLength="11" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:layout_marginLeft="15dp"
+                android:layout_marginRight="15dp"
+                android:background="@color/white_bg_line" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/content_padding_small"
+                android:gravity="center_vertical"
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/bind_mobile_register_code_iv"
+                    android:layout_width="@dimen/icon_heigh_default"
+                    android:layout_height="@dimen/icon_heigh_default"
+                    android:layout_marginStart="9dp"
+                    android:src="@mipmap/icon" />
+
+                <android.support.v7.widget.AppCompatEditText
+                    android:id="@+id/bind_mobile_register_code_et"
+                    style="@style/edt_style"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/edt_heigh_default"
+                    android:layout_marginStart="@dimen/content_padding_small"
+                    android:layout_weight="2"
+                    android:hint="请输入验证码"
+                    android:inputType="number"
+                    android:maxLength="6"
+                    android:textSize="@dimen/text_size_3" />
+
+                <TextView
+                    android:id="@+id/bind_mobile_register_code_tv"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center|center_vertical"
+                    android:layout_marginLeft="@dimen/content_padding"
+                    android:layout_weight="1"
+                    android:gravity="center"
+                    android:text="@string/get_captcha"
+                    android:textColor="@color/txt_bule"
+                    android:onClick="getCaptcha"/>
+
+            </LinearLayout>
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/content_padding"
+            android:layout_marginStart="27dp"
+            android:layout_marginTop="@dimen/dp_10"
+            android:text="注意：为保证账号安全请验证你的手机号"
+            android:textColor="@color/black_666666"
+            android:textSize="13sp" />
+
+
+        <TextView
+            style="@style/style_button"
+            android:onClick="toCommit"
+            android:text="确 定" />
+
+    </LinearLayout>
+
+
+</LinearLayout>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/frame_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginBottom="@dimen/bottom_height" />

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

@@ -3,6 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <include layout="@layout/act_find"/>
     <LinearLayout
         android:id="@+id/other_container"
         android:layout_width="match_parent"
@@ -26,7 +27,6 @@
         android:layout_height="@dimen/app_nav_toolbar_height"
         android:layout_alignParentTop="true"
         android:visibility="gone"/>
-
     <RelativeLayout
         android:id="@+id/layout_bottom"
         android:layout_width="match_parent"

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

@@ -20,7 +20,7 @@
             android:paddingStart="@dimen/content_padding_10"
             android:paddingEnd="@dimen/content_padding_10"
             android:orientation="vertical">
-            <include layout="@layout/x_msg_dialog"/>
+            <include layout="@layout/x_get_welfare_dialog"/>
         </LinearLayout>
         <TextView
             android:id="@+id/dialog_title"

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

@@ -6,174 +6,167 @@
     android:background="@color/white"
     android:clipChildren="true">
 
-
-    <RelativeLayout
+    <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
+        android:id="@+id/refresh"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="true">
+        android:layout_height="wrap_content">
 
-        <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
-            android:id="@+id/refresh"
+        <android.support.v4.widget.NestedScrollView
+            android:id="@+id/scrollView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_vertical"
+            android:fillViewport="true"
+            android:scrollbars="none"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <android.support.v4.widget.NestedScrollView
-                android:id="@+id/scrollView"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="fill_vertical"
-                android:fillViewport="true"
-                android:scrollbars="none"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:focusable="true"
-                    android:focusableInTouchMode="true"
-                    android:orientation="vertical">
-
-                    <include
-                        layout="@layout/homepage_item_top2"
-                        android:visibility="gone" />
-
-                    <include layout="@layout/check_net_view" />
-
-                    <include layout="@layout/homepage_item_banner" />
-
-                    <include
-                        layout="@layout/homepage_item_gridview_listview"
-                        android:visibility="visible" />
-
-                    <include layout="@layout/homepage_item_notice_and_currenttime" />
-
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="10dp"
-                        android:background="#fff5f5f5" />
+                android:layout_height="wrap_content"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:orientation="vertical">
 
-                    <include layout="@layout/homepage_item_get_award" />
+                <include
+                    layout="@layout/homepage_item_top2"
+                    android:visibility="gone" />
 
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="1dp"
-                        android:layout_marginBottom="@dimen/dp_10"
-                        android:background="#fff5f5f5" />
+                <include layout="@layout/check_net_view" />
 
-                    <include
-                        layout="@layout/homepage_item_notice"
-                        android:visibility="gone" />
+                <include layout="@layout/homepage_item_banner" />
 
-                    <include
-                        layout="@layout/homepage_item_currenttime_reward"
-                        android:visibility="gone" />
+                <include
+                    layout="@layout/homepage_item_gridview_listview"
+                    android:visibility="visible" />
 
-                    <include
-                        layout="@layout/homepage_item_4module"
-                        android:visibility="gone" />
+                <include layout="@layout/homepage_item_notice_and_currenttime" />
 
-                    <include
-                        layout="@layout/homepage_item_liy_q"
-                        android:visibility="gone" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="10dp"
+                    android:background="#fff5f5f5" />
 
-                    <include
-                        layout="@layout/homepage_item_gridview_listview"
-                        android:visibility="gone" />
+                <include layout="@layout/homepage_item_get_award" />
 
-                    <android.support.v7.widget.RecyclerView
-                        android:id="@+id/recyclerview"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="vertical"
-                        android:paddingLeft="3dp"
-                        android:paddingRight="3dp" />
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:background="#fff5f5f5" />
 
-                    <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/homepage_item_notice"
+                    android:visibility="gone" />
 
-                    <!--选项卡-->
-                    <include layout="@layout/tablayout_viewpager_layout" />
+                <include
+                    layout="@layout/homepage_item_currenttime_reward"
+                    android:visibility="gone" />
 
-                    <include layout="@layout/find_item_bottom" />
+                <include
+                    layout="@layout/homepage_item_4module"
+                    android:visibility="gone" />
 
-                </LinearLayout>
+                <include
+                    layout="@layout/homepage_item_liy_q"
+                    android:visibility="gone" />
 
-            </android.support.v4.widget.NestedScrollView>
-        </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
+                <include
+                    layout="@layout/homepage_item_gridview_listview"
+                    android:visibility="gone" />
 
-        <com.kfzs.duanduan.view.DragRelativeLayout
-            android:id="@+id/newbie_task"
-            android:layout_width="40dp"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentEnd="true"
-            android:layout_marginBottom="@dimen/content_padding_20"
-            android:layout_marginEnd="@dimen/content_padding_10"
-            android:gravity="center"
-            android:paddingBottom="@dimen/content_padding_10"
-            android:paddingTop="@dimen/content_padding_10"
-            android:visibility="gone">
-
-            <ImageView
-                android:id="@+id/bg_newbie_task"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:scaleType="fitXY" />
-        </com.kfzs.duanduan.view.DragRelativeLayout>
+                <android.support.v7.widget.RecyclerView
+                    android:id="@+id/recyclerview"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:paddingLeft="3dp"
+                    android:paddingRight="3dp" />
 
-        <com.kfzs.duanduan.view.DragRelativeLayout
-            android:id="@+id/view_rob_duty"
-            android:layout_width="wrap_content"
+                <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" />
+
+                <include layout="@layout/find_item_bottom"/>
+
+            </LinearLayout>
+
+        </android.support.v4.widget.NestedScrollView>
+    </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
+
+    <com.kfzs.duanduan.view.DragRelativeLayout
+        android:id="@+id/newbie_task"
+        android:layout_width="40dp"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:layout_marginEnd="@dimen/content_padding_10"
+        android:gravity="center"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_10"
+        android:visibility="gone">
+
+        <ImageView
+            android:id="@+id/bg_newbie_task"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginEnd="13dp"
-            android:layout_alignParentRight="true"
-            android:layout_marginBottom="@dimen/content_padding_20"
-            android:gravity="right"
-            android:paddingBottom="@dimen/content_padding_10"
-            android:paddingTop="@dimen/content_padding_10"
-            android:visibility="visible">
-
-            <ImageView
-                android:id="@+id/iv_rob_duty"
-                android:layout_width="65dp"
-                android:layout_height="60dp"
-                android:adjustViewBounds="true"
-                android:scaleType="fitXY"
-                android:src="@mipmap/red_package_floatbtn" />
-        </com.kfzs.duanduan.view.DragRelativeLayout>
-
-        <TextView
-            android:id="@+id/test_change_user"
-            style="@style/style_button_small_yellow"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:layout_alignParentBottom="true"
-            android:layout_alignParentStart="true"
-            android:layout_margin="@dimen/content_padding_10"
-            android:paddingEnd="@dimen/content_padding_10"
-            android:paddingStart="@dimen/content_padding_10"
-            android:text="切换账号"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/test_change"
-            style="@style/style_button_small_yellow"
-            android:layout_width="wrap_content"
-            android:layout_height="30dp"
-            android:layout_above="@+id/test_change_user"
-            android:layout_alignParentStart="true"
-            android:layout_margin="@dimen/content_padding_10"
-            android:paddingEnd="@dimen/content_padding_10"
-            android:paddingStart="@dimen/content_padding_10"
-            android:text="切换服务器"
-            android:visibility="gone" />
-    </RelativeLayout>
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY" />
+    </com.kfzs.duanduan.view.DragRelativeLayout>
+
+    <com.kfzs.duanduan.view.DragRelativeLayout
+        android:id="@+id/view_rob_duty"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_marginBottom="@dimen/content_padding_20"
+        android:gravity="right"
+        android:layout_alignParentRight="true"
+        android:paddingBottom="@dimen/content_padding_10"
+        android:paddingTop="@dimen/content_padding_10"
+        android:visibility="visible">
+
+        <ImageView
+            android:id="@+id/iv_rob_duty"
+            android:layout_width="65dp"
+            android:layout_height="60dp"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@mipmap/red_package_floatbtn" />
+    </com.kfzs.duanduan.view.DragRelativeLayout>
+
+    <TextView
+        android:id="@+id/test_change_user"
+        style="@style/style_button_small_yellow"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
+        android:layout_margin="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingStart="@dimen/content_padding_10"
+        android:text="切换账号"
+        android:visibility="gone" />
+
+    <TextView
+        android:id="@+id/test_change"
+        style="@style/style_button_small_yellow"
+        android:layout_width="wrap_content"
+        android:layout_height="30dp"
+        android:layout_above="@+id/test_change_user"
+        android:layout_alignParentStart="true"
+        android:layout_margin="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:paddingStart="@dimen/content_padding_10"
+        android:text="切换服务器"
+        android:visibility="gone" />
 </RelativeLayout>

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

@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
-        android:paddingTop="@dimen/content_padding_2"
         android:src="@mipmap/homepage_jianglilq" />
 
     <TextView

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

@@ -4,9 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingLeft="@dimen/content_padding_10"
-    android:paddingTop="@dimen/content_padding_10"
-    android:paddingRight="@dimen/content_padding_10">
+    android:paddingTop="@dimen/content_padding_10">
 
     <com.sheep.gamegroup.util.MyGridview
         android:id="@+id/home_list_gridview_gv"
@@ -17,7 +15,6 @@
         android:numColumns="4"
         android:listSelector="@color/transparent"
         android:verticalSpacing="@dimen/content_padding_5"
-        android:horizontalSpacing="@dimen/content_padding_5"
         android:layout_marginBottom="@dimen/content_padding_5"/>
 
     <com.sheep.gamegroup.util.MyListview

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

@@ -73,7 +73,7 @@
             <android.support.v7.widget.AppCompatEditText
                 android:id="@+id/login_et_scope"
                 style="@style/style_login_et"
-                android:hint="请输入邀请码"
+                android:hint="请输入邀请码（非必填）"
                 android:inputType="phone"
                 android:maxLength="11"/>
             <View

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

@@ -8,16 +8,16 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:background="@color/white"
-        android:orientation="horizontal">
+        android:orientation="vertical">
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tabLayout"
             style="@style/style_tab"
             app:tabIndicatorHeight="2dp"
             android:layout_height="48dp"/>
+        <include layout="@layout/line_1px_hor" />
     </LinearLayout>
 
-    <include layout="@layout/line_1px_hor" />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager_act_game_details"

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

@@ -23,11 +23,11 @@
             android:layout_height="match_parent"
             android:background="#FFD269">
 
-            <com.tencent.smtt.sdk.WebView
+            <ImageView
                 android:id="@+id/ask_bg"
                 android:layout_marginTop="?attr/actionBarSize"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent" />
+                android:layout_height="wrap_content" />
 
             <!--底部有白条，用这一层覆盖-->
             <View

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

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/content_padding_20"
+        android:layout_marginStart="@dimen/content_padding_20"
+        android:text="兑换码已保存至“我的福利”中，请尽快使用！否则过期将不能使用！"
+        android:textColor="@color/black_666666"
+        android:textSize="13sp" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="30dp"
+        android:layout_marginEnd="@dimen/content_padding_20"
+        android:layout_marginStart="@dimen/content_padding_20"
+        android:layout_marginTop="16dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <TextView
+            android:id="@+id/get_welfare_code_tv"
+            android:layout_width="0dp"
+            android:layout_height="30dp"
+            android:layout_weight="1"
+            android:background="@drawable/shape_blue_rectangle_15"
+            android:gravity="start|center_vertical"
+            android:lines="1"
+            android:maxLines="1"
+            android:text="兑换码：854344W"
+            android:paddingLeft="@dimen/content_padding_10"
+            android:paddingRight="@dimen/content_padding_10"
+            android:singleLine="true"
+            android:textColor="#2EBEF2"
+            android:textSize="13sp" />
+
+        <TextView
+            android:id="@+id/get_welfare_copy_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="@dimen/content_padding_30"
+            android:layout_marginStart="12dp"
+            android:background="@drawable/selector_button_full_main"
+            android:gravity="center"
+            android:paddingEnd="20dp"
+            android:paddingStart="20dp"
+            android:text="复制"
+            android:textColor="@color/btn_color_main"
+            android:textSize="@dimen/text_size_12" />
+    </LinearLayout>
+
+
+    <TextView
+        android:id="@+id/get_welfare_content_tv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="13dp"
+        android:layout_marginEnd="@dimen/content_padding_20"
+        android:layout_marginStart="@dimen/content_padding_20"
+        android:layout_marginTop="12dp"
+        android:text="礼包内容：钻石*100，套装*1"
+        android:textColor="#999999"
+        android:textSize="11sp" />
+
+    <include layout="@layout/x_msg_dialog_btn" />
+</merge>

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

@@ -2,8 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginEnd="@dimen/content_padding_20"
-    android:layout_marginStart="@dimen/content_padding_20"
     android:orientation="horizontal">
 
     <TextView