调整UI与修复bug

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

@@ -164,6 +164,7 @@ public class FgtFindChild extends BaseCompatFragment {
                 ViewUtil.setTextTime(find_item_time, item.getCreated_at(), "yyyy-MM-dd");
                 ViewUtil.setImage(find_item_iv, item.getPictures());
                 ViewUtil.setText(find_item_des, item.getDes());
+                item.removeNullTag();
                 if(ListUtil.isEmpty(item.getTages())){
                     find_item_tags.setVisibility(View.GONE);
                 } else {

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

@@ -83,24 +83,24 @@ public class FgtPersonalCenter extends BaseCompatFragment {
     protected void initView(Bundle savedInstanceState) {
         setContentView(R.layout.fgt_personalcenter_layout);
         activity = getActivity();
-        TitleBarUtils titleBarUtils = TitleBarUtils.getInstance()
-                .setTitleBackgroud(mContentView, R.drawable.sp_bg_gradient_blue_nocorners)
-                .setShowOrHideLine(mContentView, false)
-                .setRightImgBotton(mContentView, R.mipmap.setting, new View.OnClickListener() {
+        mContentView.findViewById(R.id.ibtn_baseactivity_right).setOnClickListener( new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
                         Jump2View.getInstance().goSetting(activity, null);
                     }
                 });
         if (activity instanceof PersonalCenterAct) {
-            titleBarUtils.setTitle(mContentView, "个人中心")
-                    .setTitleColor(mContentView, getResources().getColor(R.color.white))
-                    .setTitleListen(mContentView, R.drawable.narrow_back_white, new View.OnClickListener() {
-                        @Override
-                        public void onClick(View view) {
-                            activity.finish();
-                        }
-                    });
+            mContentView.findViewById(R.id.txt_baseactivity_title).setVisibility(View.VISIBLE);
+            mContentView.findViewById(R.id.img_baseactivity_title).setVisibility(View.VISIBLE);
+            mContentView.findViewById(R.id.img_baseactivity_title).setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    activity.finish();
+                }
+            });
+        } else {
+            mContentView.findViewById(R.id.img_baseactivity_title).setVisibility(View.INVISIBLE);
+            mContentView.findViewById(R.id.txt_baseactivity_title).setVisibility(View.INVISIBLE);
         }
     }
 

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

@@ -421,7 +421,6 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         //详情分享地址
         CommonUtil.getInstance().initUrlConfigByNet(activity);
-        Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
     }
     public void refreshData() {
         SysAppUtil.checkNet(new Action1<Integer>() {
@@ -546,6 +545,9 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
         }
         BaseMessage baseMessage = (BaseMessage) o;
         userEntity = JSON.parseObject(JSONObject.toJSONString(baseMessage.getData()), UserEntity.class);
+        if(userEntity == null){
+            return;
+        }
         //保存用户id信息
         PreferenceUtils.setPrefString(SheepApp.mContext, UMConfigUtils.LOGIN_OPENID, userEntity.getOpen_id());
         //保存用户邀请人邀请码
@@ -561,6 +563,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
             e.printStackTrace();
         }
         mHanderl.sendEmptyMessage(0);
+        Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
     }
 
     @Override

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

@@ -1,10 +1,14 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.text.TextUtils;
+
 import com.alibaba.fastjson.annotation.JSONField;
 import com.sheep.gamegroup.util.ListUtil;
 
 import java.util.List;
 
+import rx.functions.Action1;
+
 /**
  * Created by realicing on 2018/6/27.
  * realicing@sina.com
@@ -185,8 +189,14 @@ public class FindItem {
         return type == 1;//类型 1：游戏 2：咨询 3：转跳 4：任务 5：栏目
     }
 
+    //清除空的或者没有名字的标签
+    public void removeNullTag() {
+        ListUtil.removeItem(tages, new ListUtil.CallBack<FindTag, Boolean>(){
 
-
-
-
+            @Override
+            public Boolean call(FindTag findTag) {
+                return findTag == null || TextUtils.isEmpty(findTag.getName());
+            }
+        });
+    }
 }

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

@@ -67,7 +67,7 @@ public class CacheInterceptor implements Interceptor {
                         ACache aCache = ACache.get(SheepApp.getInstance());
                         if (response.code() == 200 && "GET".equals(request.method())) {//成功则缓存get数据
                             LogUtil.println("sheepLog", "aCache", "key", "=", key);
-                            aCache.put(key, result, 3600*24);//缓存一天
+                            aCache.put(key, result, 300);//默认缓存5分钟
                         } else {
                             aCache.remove(key);
                         }

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

@@ -1,6 +1,8 @@
 package com.sheep.gamegroup.util;
 
 
+import com.sheep.gamegroup.model.entity.FindTag;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -86,4 +88,20 @@ public class ListUtil {
         Collections.addAll(list, items);
         return list;
     }
+
+    public static <T> void removeItem(List<T> list, CallBack<T, Boolean> callBack) {
+        if(isEmpty(list)){
+            return;
+        }
+        List<T> removeList = emptyList();
+        for (T t : list) {
+            if(callBack.call(t))
+                removeList.add(t);
+        }
+        list.removeAll(removeList);
+    }
+
+    public static interface CallBack<I, R>{
+        public R call(I i);
+    }
 }

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

@@ -318,7 +318,7 @@ public class ActFindGame extends BaseActivity {
     private void loadData(final FindApp findApp) {
         this.findApp = findApp;
         //游戏简介与下载
-        ViewUtil.setImage(find_game_iv, findApp.getIcon());
+        GlideImageLoader.setGameImage(find_game_iv, findApp.getIcon());
         ViewUtil.setText(find_game_name_tv, findApp.getName());
         isNeedReservation = !findApp.isCanDonload();//这里认为只有两种状态：可下载与预约下载
         if (isNeedReservation)

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

@@ -78,7 +78,7 @@ public class ActMainGame extends BaseActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.personalcenter_act_layout;
+        return R.layout.act_main_game;
     }
 
     @Override

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

@@ -71,7 +71,7 @@ public class GamemakeMoneyAct extends BaseActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.try_makemoney_act_layout;
+        return R.layout.act_game_make_money;
     }
 
     @Override

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

@@ -31,6 +31,7 @@ import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.RxjavaCountDownTimer;
 import com.sheep.gamegroup.util.SysAppUtil;
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
@@ -116,7 +117,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         @Override
         public void handleMessage(Message msg) {
             super.handleMessage(msg);
-            if(!isRequestCodePermissions /*&& !isLoaddingData */&& timerIsFinish())
+            if(!isRequestCodePermissions && !isLoaddingData && timerIsFinish())
                 gotoNext();
 
         }
@@ -144,16 +145,42 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     public void initView() {
         activity = this;
         GlideImageLoader.setImage(login_bg_img, "http://cdngame.kuaifazs.com/login_bg_img.png");
-        Advertising cacheAdvertising = CommonUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
-        if(cacheAdvertising != null){
-            advertising = cacheAdvertising;
-            try {
-                loadAdvertising();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        } else {
+        if(SysAppUtil.isNewSmallSheep(false)){//新版本只显示引导页面，不展示弹窗和开屏广告
             sendHandlerMessages(1000);
+        } else {
+            Advertising cacheAdvertising = CommonUtil.getInstance().getCacheResult(ApiKey.advertisements(1), Advertising.class);
+            if (cacheAdvertising != null) {
+                isLoaddingData = false;
+                advertising = cacheAdvertising;
+                try {
+                    loadAdvertising();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            } else {
+                SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(1)
+                        .subscribeOn(Schedulers.io())
+                        .observeOn(AndroidSchedulers.mainThread())
+                        .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                            @Override
+                            public void onNext(BaseMessage baseMessage) {
+                                CommonUtil.getInstance().resetCacheTime(ApiKey.advertisements(1), 3600*5);//开屏广告最多缓存5个小时
+                                isLoaddingData = false;
+                                advertising = baseMessage.getData(Advertising.class);
+                                try {
+                                    loadAdvertising();
+                                } catch (Exception e) {
+                                    e.printStackTrace();
+                                }
+                            }
+
+                            @Override
+                            public void onError(BaseMessage baseMessage) {
+                                isLoaddingData = false;
+                                sendHandlerMessages(10);
+                            }
+                        });
+            }
         }
     }
 
@@ -161,32 +188,15 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
     public void initListener() {
 
     }
-//    private boolean isLoaddingData = true;//是否正在获取开屏广告数据
+    private boolean isLoaddingData = true;//是否正在获取开屏广告数据
     private Advertising advertising;
     @Override
     public void initData() {
-        if(SysAppUtil.isNewSmallSheep(false)){//新版本只显示引导页面，不展示弹窗和开屏广告
-//            isLoaddingData = false;
-        }
-        SheepApp.getInstance().getNetComponent().getApiService().getAdvertising(1)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-//                        isLoaddingData = false;
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-//                        isLoaddingData = false;
-                    }
-                });
     }
 
     private void loadAdvertising() {
         if(advertising.isImage()) {
-            if(!TextUtils.equals("http://staticcdn.kuaifazs.com/upload/static/201807/16/e0/bf/bnjb9S.jpg",advertising.getDisplay_src())) {
+            if(!TextUtils.equals("http://staticcdn.kuaifazs.com/upload/static/201807/25/16/76/L0Om90.jpg",advertising.getDisplay_src())) {
                 Glide.with(activity).load(advertising.getDisplay_src()).into(splash_bg);
             }
 //            btnJoin.setVisibility(View.GONE);
@@ -218,7 +228,7 @@ public class SplashAct extends BaseActivity implements EasyPermissions.Permissio
         mHandler.removeMessages(0);
         if(advertising.getShow_time() > 0) {
             splash_skip.setVisibility(View.VISIBLE);
-            timer = RxjavaCountDownTimer.getInstance(/*BuildConfig.DEBUG ? 1 : */advertising.getShow_time())
+            timer = RxjavaCountDownTimer.getInstance(/*BuildConfig.DEBUG ? 10 : */advertising.getShow_time())
                     .setOnTickListener(new RxjavaCountDownTimer.OnTickListener() {
                         @Override
                         public void onFinish() {

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

@@ -5,20 +5,13 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
-import android.util.Log;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 
 import com.kfzs.duanduan.ActDownloadMgr;
 import com.kfzs.duanduan.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
-import com.sheep.gamegroup.model.entity.GridViewEntity;
-import com.sheep.gamegroup.util.MyGridview;
 import com.sheep.gamegroup.util.UMConfigUtils;
 import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
-import com.sheep.gamegroup.view.adapter.AdpTrymakemoneyTabGridview;
 import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
@@ -26,11 +19,8 @@ import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 
-import java.util.ArrayList;
-
 import butterknife.BindView;
 import butterknife.ButterKnife;
-import butterknife.OnClick;
 
 /**
  * 试着赚钱页面
@@ -42,23 +32,9 @@ public class TryMakeMoneyact extends BaseActivity {
     TabLayout indicator;
     @BindView(R.id.pager)
     ViewPager pager;
-    @BindView(R.id.tab_gridview)
-    MyGridview tabGridview;
-    @BindView(R.id.select_tab_iv)
-    ImageView selectTabIv;
-    @BindView(R.id.task_gridview_layout)
-    LinearLayout task_gridview_layout;
     private Activity activity;
 
     private AdpTryMakemoney mAdapter;
-    private String[] titles = new String[]{"推荐任务", "即将开始"};
-
-    private AdpTrymakemoneyTabGridview tabGridviewAdp;
-    private ArrayList<Object> gridviewListAll = new ArrayList<>();
-    private ArrayList<Object> gridviewList = new ArrayList<>();
-    private boolean clickFlag = false;
-    private GridViewEntity gridViewEntity;//选中的
-    private int select;
 
     private int is_succession;//0:一般任务 1:连续任务
 
@@ -95,104 +71,21 @@ public class TryMakeMoneyact extends BaseActivity {
                 });
 
         mAdapter = new AdpTryMakemoney(getSupportFragmentManager(), this);
-        mAdapter.add(FgtTryMakeMoney.newInstance(0), titles[0]);
+        mAdapter.add(FgtTryMakeMoney.newInstance(0), "");
 //        mAdapter.add(FgtTryMakeMoney.newInstance(2), titles[1]);
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
 
-        tabGridviewAdp = new AdpTrymakemoneyTabGridview(activity, gridviewList);
-        tabGridview.setAdapter(tabGridviewAdp);
-        indicator.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
-            @Override
-            public void onTabSelected(TabLayout.Tab tab) {
-                if(tab.getPosition() == 0){
-                    task_gridview_layout.setVisibility(View.GONE);
-                }else {
-                    task_gridview_layout.setVisibility(View.GONE);
-                }
-            }
-
-            @Override
-            public void onTabUnselected(TabLayout.Tab tab) {
-
-            }
-
-            @Override
-            public void onTabReselected(TabLayout.Tab tab) {
-
-            }
-        });
-        /*
-          v2.6
-         */
         indicator.setVisibility(View.GONE);
     }
 
     @Override
     public void initListener() {
-        tabGridview.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                if(gridViewEntity == gridviewList.get(position)){
-                    return;
-                }
-                select = position;
-                gridViewEntity = (GridViewEntity) gridviewList.get(position);
-                for(int i=0;i<gridviewList.size();i++){
-                    if(position == i){
-                        ((GridViewEntity) gridviewList.get(i)).setSelectState(true);
-                    }else {
-                        ((GridViewEntity) gridviewList.get(i)).setSelectState(false);
-
-                    }
-                    tabGridviewAdp.notifyDataSetChanged();
-                }
-                try{
-                    //刷新界面
-                    mAdapter.getItem(indicator.getSelectedTabPosition()).onResume();
-                    Log.e("-----select position",indicator.getSelectedTabPosition()+"");
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-        });
     }
 
     @Override
     public void initData() {
         //真tm神经病 需求改了无数次
-        task_gridview_layout.setVisibility(View.GONE);
-//        if(is_succession == 0){
-//            SheepApp.get(activity)
-//                    .getNetComponent()
-//                    .getApiService()
-//                    .getChildTask(1)
-//                    .subscribeOn(Schedulers.io())
-//                    .observeOn(AndroidSchedulers.mainThread())
-//                    .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-//                        @Override
-//                        public void onError(BaseMessage baseMessage) {
-//                            G.showToast(baseMessage.getMsg()+"");
-//                            task_gridview_layout.setVisibility(View.GONE);
-//                        }
-//
-//                        @Override
-//                        public void onNext(BaseMessage baseMessage) {
-//
-//                            task_gridview_layout.setVisibility(View.VISIBLE);
-//                            List<GridViewEntity> entityList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), GridViewEntity.class);
-//                            if(entityList != null){
-//                                gridviewListAll.clear();
-//                                gridviewListAll.add(new GridViewEntity(true, -1, "全部" ));
-//                                gridviewListAll.addAll(entityList);
-//                                setValueList2(clickFlag);
-//                            }
-//                        }
-//                    });
-//        }else {
-//            task_gridview_layout.setVisibility(View.GONE);
-//        }
-
     }
 
     @Override
@@ -202,20 +95,6 @@ public class TryMakeMoneyact extends BaseActivity {
         ButterKnife.bind(this);
     }
 
-    @OnClick(R.id.select_tab_iv)
-    public void onViewClicked() {
-        clickFlag = !clickFlag;
-        setValueList2(clickFlag);
-        tabGridviewAdp.notifyDataSetChanged();
-    }
-
-    /**
-     * 获取tab的值，fragment调用
-     */
-    public GridViewEntity getTabValue(){
-        return gridViewEntity;
-    }
-
     /**
      * 获取is_succession，是否是连续任务
      */
@@ -223,37 +102,6 @@ public class TryMakeMoneyact extends BaseActivity {
         return is_succession;
     }
 
-
-    /**
-     * test
-     * list 赋值
-     */
-    private void setValueList() {
-        gridviewListAll.clear();
-        for (int i = 0; i < 10; i++) {
-            if(i == 0){
-                gridviewListAll.add(new GridViewEntity(true, "click_" + i));
-            }else {
-                gridviewListAll.add(new GridViewEntity(false, "click_" + i));
-            }
-
-        }
-        setValueList2(clickFlag);
-    }
-    private void setValueList2(boolean flag) {
-        gridviewList.clear();
-        if(flag || gridviewListAll.size() <= 4){
-            gridviewList.addAll(gridviewListAll);
-            selectTabIv.setRotation(180);
-        }else {
-            selectTabIv.setRotation(0);
-            for (int i = 0; i < 4; i++) {
-                gridviewList.add(gridviewListAll.get(i));
-            }
-        }
-        tabGridviewAdp.notifyDataSetChanged();
-    }
-
     @Override
     protected void onDestroy() {
         super.onDestroy();

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

@@ -61,19 +61,14 @@ public class AdpHomeListGrideview extends BaseAdapter {
             holder.gridview_item_name_tv = convertView.findViewById(R.id.gridview_item_name_tv);
             holder.gridview_item_detail_tv = convertView.findViewById(R.id.gridview_item_detail_tv);
             holder.gridview_item_icon_iv = convertView.findViewById(R.id.gridview_item_icon_iv);
-            // 获取屏幕宽度
-            int W = G.WIDTH <G.HEIGHT ? G.WIDTH : G.HEIGHT;
-            int cricleRadius = W / 2 - 40;
-            int h = cricleRadius  / 2 - 20;
-            convertView.setLayoutParams(new AbsListView.LayoutParams(cricleRadius, h));
             convertView.setTag(holder);
         }
         final HomeListEntity entity = getItem(position);
         ViewUtil.setText(holder.hot_tv, entity.getTip());
         holder.hot_tv.setVisibility(entity.hasTip()?View.VISIBLE: View.GONE);
         holder.hot_tv.setTextColor(entity.getTipColor());
-        holder.gridview_item_name_tv.setText(entity.getTitle()+"");
-        holder.gridview_item_detail_tv.setText(entity.getDesc()+"");
+        ViewUtil.setText(holder.gridview_item_name_tv, entity.getTitle());
+        ViewUtil.setText(holder.gridview_item_detail_tv, entity.getDesc());
         Glide.with(context)
                 .load(entity.getIcon())
                 .apply(new RequestOptions().dontAnimate())

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

@@ -71,8 +71,8 @@ public class AdpHomeListListview extends BaseAdapter {
                 .load(entity.getIcon())
                 .apply(new RequestOptions().dontAnimate())
                 .into(holder.q_iv);
-        holder.q_name_tv.setText(entity.getTitle()+"");
-        holder.q_dec_tv.setText(entity.getDesc()+"");
+        ViewUtil.setText(holder.q_name_tv, entity.getTitle());
+        ViewUtil.setText(holder.q_dec_tv, entity.getDesc());
 
         if(position == getCount()-1){
             holder.line_ly_q_view.setVisibility(View.GONE);

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

@@ -20,7 +20,9 @@ import com.sheep.gamegroup.model.entity.ScreenshotsEntity;
 import com.sheep.gamegroup.model.entity.TaskChild;
 import com.sheep.gamegroup.model.entity.TaskDescEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.MyListview;
+import com.sheep.gamegroup.util.ViewHolder;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -157,86 +159,48 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
         }
 
         /*
-          holder.recycler_screenshot_view.setAdapter(new ArrayAdapter<ScreenshotsEntity>(context, R.layout.taskdetail_desc_item_screens, descEntity.getScreenshotsList()){
-        @Override
-        public boolean convert(int position, View convertView, ViewGroup parent, ScreenshotsEntity item) {
-        ScreenshotsEntity taskDescEntity = item;
-        if (taskDescEntity == null)
-        return true;
-        ImageView screens_iv = convertView.findViewById(R.id.screens_iv);
-        TextView screens_tv = convertView.findViewById(R.id.screens_tv);
-
-        screens_iv.setScaleType(ImageView.ScaleType.FIT_CENTER);
-        int with = G.WIDTH / 3;
-        int heigth = with ;
-        screens_iv.setLayoutParams(new LinearLayout.LayoutParams(with, heigth));
-
-        screens_tv.setText("" + taskDescEntity.getDesc());
-        Glide.with(context)
-        .load(taskDescEntity.getImg())
-        .into(screens_iv);
-        return true;
-        }
-        });
-          截图
+         * 截图
          */
-        if(descEntity.getScreenshotsList() != null && descEntity.getScreenshotsList().size() > 0){
+        if(!ListUtil.isEmpty(descEntity.getScreenshotsList())){
             final ArrayList<String> imgListStr = new ArrayList<>();
-            imgListStr.clear();
             for(ScreenshotsEntity s: descEntity.getScreenshotsList()){
                 imgListStr.add(s.getImg());
             }
 
-//        CarouselLayoutManager layoutManager = new CarouselLayoutManager(CarouselLayoutManager.HORIZONTAL,true);
-//        layoutManager.setPostLayoutListener(new CarouselZoomPostLayoutListener());
-//            holder.recycler_screenshot_view.addOnScrollListener(new CenterScrollListener());
-//        layoutManager.setMaxVisibleItems(1);
             LinearLayoutManager layoutManager = new LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false);
             holder.recycler_screenshot_view.setHasFixedSize(true);
             holder.recycler_screenshot_view.setLayoutManager(layoutManager);
-//            holder.recycler_screenshot_view.addItemDecoration(new SpaceItemDecoration(5));
-            holder.recycler_screenshot_view.setAdapter(new RecyclerView.Adapter() {
-                @NonNull
+            holder.recycler_screenshot_view.setAdapter(new AdbCommonRecycler<ScreenshotsEntity>(context, descEntity.getScreenshotsList()){
                 @Override
-                public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-                    LinearLayout view = (LinearLayout) LayoutInflater.from(context)
-                            .inflate(R.layout.taskdetail_desc_item_screens, viewGroup, false);
-                    RecyclerView.ViewHolder viewHolder = new RecyclerView.ViewHolder(view) {
-                        @Override
-                        public String toString() {
-                            return super.toString();
-                        }
-                    };
-                    return viewHolder;
+                public int getViewIdByType(int type) {
+                    return R.layout.taskdetail_desc_item_screens;
                 }
 
                 @Override
-                public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int i) {
-                    ScreenshotsEntity taskDescEntity = descEntity.getScreenshotsList().get(i);
+                public void convert(final com.sheep.gamegroup.util.ViewHolder viewHolder, ScreenshotsEntity item) {
                     ImageView screens_iv = viewHolder.itemView.findViewById(R.id.screens_iv);
                     TextView screens_tv = viewHolder.itemView.findViewById(R.id.screens_tv);
 
-                    if(TextUtils.isEmpty(taskDescEntity.getDesc())){
+                    if(TextUtils.isEmpty(item.getDesc())){
                         screens_tv.setVisibility(View.GONE);
                     }else {
                         screens_tv.setVisibility(View.VISIBLE);
-                        screens_tv.setText("" + taskDescEntity.getDesc());
+                        screens_tv.setText(item.getDesc());
                         screens_tv.setMaxWidth(with);
                     }
 
 
                     Glide.with(context)
-                            .load(taskDescEntity.getImg())
-                            .apply(new RequestOptions().placeholder(R.drawable.loading_01))
+                            .load(item.getImg())
                             .into(screens_iv);
                     screens_iv.setOnClickListener(new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {
                             try{
-                                if(imgListStr != null && imgListStr.size()>0){
+                                if(!ListUtil.isEmpty(imgListStr)){
                                     PhotoPreview.builder()
                                             .setPhotos(imgListStr)
-                                            .setCurrentItem(i)
+                                            .setCurrentItem(viewHolder.getAdapterPosition())
                                             .setShowDeleteButton(false)
                                             .start((Activity) context, 101);
                                 }
@@ -248,10 +212,6 @@ public class TaskdetailSonListviewAdp extends BaseAdapter {
                     });
                 }
 
-                @Override
-                public int getItemCount() {
-                    return descEntity.getScreenshotsList()==null?0:descEntity.getScreenshotsList().size();
-                }
             });
         }
 

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

@@ -187,8 +187,7 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }
                 viewHolder.itemView.setTag(TAG_ID_TEMP, item.getId());
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
-                viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
-                viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
+                viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.GONE);
 
                 if(i == getItemCount()-1){
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
@@ -212,7 +211,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                                 false);
                     }
                 });
-                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
 
                 //CommonUtil.getInstance().getCharSequence(context, item.getName(), "")
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(item.getName()+"");
@@ -463,15 +461,13 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 GlideImageLoader.setGameImage((ImageView) viewHolder.itemView.findViewById(R.id.item_icon_iv), taskEty.getIcon());
                 viewHolder.itemView.setEnabled(false);
                 ((TextView) viewHolder.itemView.findViewById(R.id.item_date_tv)).setVisibility(View.GONE);
-                viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
-                viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
+                viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.GONE);
 
                 if (i == getItemCount() - 1) {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
                 } else {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
-                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
 
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
                 TextView detail_task_tv_down = viewHolder.itemView.findViewById(R.id.detail_task_tv_down);
@@ -587,40 +583,29 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     }
                 }
                 if (i == 0) {
-                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
-                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
-                    String titleStr;
-                    int resourceId = R.mipmap.task_hot_icon;
+                    viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.VISIBLE);
                     if (isBegin == 1) {
-
-                        titleStr = "即将开始";
+                        ((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv)).setImageResource(R.mipmap.jijiangks);
+                        ((TextView) viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("即将开始");
                     } else {
                         switch (type) {
-                            case 0:
-                                titleStr = "可接取";
-                                break;
                             case 1:
-                                titleStr = "每日必做";
-                                viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.VISIBLE);
-                                Glide.with(context)
-                                        .load(resourceId)
-                                        .apply(new RequestOptions().placeholder(resourceId))
-                                        .into((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv));
+                                ((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv)).setImageResource(R.mipmap.remenyx);
+                                ((TextView) viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("每日必做");
                                 break;
                             case 2:
-                                titleStr = "即将开始";
+                                ((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv)).setImageResource(R.mipmap.jijiangks);
+                                ((TextView) viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("即将开始");
                                 break;
+                            case 0:
                             default:
-                                titleStr = "可接取";
+                                ((ImageView) viewHolder.itemView.findViewById(R.id.item_title_iv)).setImageResource(R.mipmap.kejiequ);
+                                ((TextView) viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("可接取");
                                 break;
                         }
                     }
-
-                    ((TextView) viewHolder.itemView.findViewById(R.id.item_title_tv)).setText(titleStr + "");
-
                 } else {
-                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
-                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
+                    viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.GONE);
                 }
                 if (i == getItemCount() - 1) {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
@@ -628,7 +613,6 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                     viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.VISIBLE);
                 }
                 TestUtil.setDebugDownLoad(context, viewHolder.itemView, taskEty);
-                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
                 TextView detail_task_tv = viewHolder.itemView.findViewById(R.id.detail_task_tv);
 
 
@@ -749,16 +733,14 @@ public class TryMakeMoneyAdp extends AdpCommonRecy<RecyleObj> {
                 }
                     viewHolder.itemView.setTag(TAG_ID_TEMP, etyList.get(i).getId());
                 if(i == 0){
-
+                    viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.VISIBLE);
                     viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.VISIBLE);
                     ((TextView)viewHolder.itemView.findViewById(R.id.item_title_tv)).setText("进行中");
                 }else{
-                    viewHolder.itemView.findViewById(R.id.item_title_tv).setVisibility(View.GONE);
-                    viewHolder.itemView.findViewById(R.id.item_title_iv).setVisibility(View.GONE);
+                    viewHolder.itemView.findViewById(R.id.task_top).setVisibility(View.GONE);
                 }
                 viewHolder.itemView.findViewById(R.id.line_tv).setVisibility(View.GONE);
 
-                viewHolder.itemView.findViewById(R.id.cancel_task_tv).setVisibility(View.GONE);
 
                 ((TextView)viewHolder.itemView.findViewById(R.id.item_name_tv)).setText(taskReleaseEty.getName()+"");
                 TaskHelper.setTaskTypeText((TextView) viewHolder.itemView.findViewById(R.id.item_num_tv), taskReleaseEty);

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

@@ -492,7 +492,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
 //                }
 //                cacheTaskReleaseEtyList.removeAll(removeList);
                 releaseEtyLists.addAll(cacheTaskReleaseEtyList);
-                tryMakeMoneyAdp.add(RecyleObj.make(RecyleType.RELEASE_TASK, releaseEtyLists), position);
+                tryMakeMoneyAdp.add(RecyleObj.make(type == 0 ? RecyleType.RELEASE_TASK : RecyleType.BEGIN_TASK, releaseEtyLists), position);
                 position++;
 
                 type++;

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

@@ -29,18 +29,7 @@
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabBackground="@android:color/transparent"
-        app:tabIndicatorHeight="4dp"
-        app:tabGravity="center"
-        app:tabIndicatorColor="#4bc1fe"
-        app:tabPadding="7dp"
-        app:tabMode="scrollable"
-        app:tabSelectedTextColor="#4bc1fe"
-        app:tabTextColor="#444444"
-        app:tabTextAppearance="@style/SheepTabLayoutTextAppearance"
-        />
+        style="@style/style_tab"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@color/bg_gray">
+
+    <include
+        layout="@layout/title"/>
+
+    <LinearLayout
+        android:id="@+id/show_flow_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:paddingStart="@dimen/content_padding_10"
+        android:paddingEnd="@dimen/content_padding_10"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:visibility="visible">
+        <TextView
+            style="@style/style_ash_tv"
+            android:layout_marginRight="@dimen/common_margin_10"
+            android:text="任务流程:"/>
+        <TextView
+            style="@style/style_ash_num"
+            android:text="1"/>
+        <TextView
+            style="@style/style_ash_tv"
+            android:text="下载游戏"/>
+        <ImageView
+            style="@style/style_ash_img"
+            android:src="@mipmap/arrow_right_img"/>
+        <!--<View-->
+            <!--android:layout_width="6dp"-->
+            <!--android:layout_height="6dp"-->
+            <!--android:background="@drawable/sp_bg_circle_ash"/>-->
+        <TextView
+            style="@style/style_ash_num"
+            android:text="2"/>
+        <TextView
+            style="@style/style_ash_tv"
+            android:text="试玩游戏"/>
+        <ImageView
+            style="@style/style_ash_img"
+            android:src="@mipmap/arrow_right_img"/>
+        <TextView
+            style="@style/style_ash_num"
+            android:text="3"/>
+        <TextView
+            style="@style/style_ash_tv"
+            android:text="领取奖励"/>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/task_gridview_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/content_padding_3"
+        android:paddingRight="@dimen/content_padding"
+        android:paddingBottom="@dimen/content_padding_small"
+        android:paddingTop="@dimen/content_padding_small"
+        android:background="@color/white"
+        android:visibility="gone">
+        <com.sheep.gamegroup.util.MyGridview
+            android:id="@+id/tab_gridview"
+            android:layout_width="0dp"
+            android:layout_weight="1"
+            android:layout_height="wrap_content"
+            android:numColumns="4"
+            android:scrollbars="none"
+            android:listSelector="@android:color/transparent"
+            android:gravity="center_horizontal"/>
+
+        <ImageView
+            android:id="@+id/select_tab_iv"
+            android:layout_width="@dimen/view_size_30"
+            android:layout_height="@dimen/view_size_30"
+            android:padding="@dimen/content_padding_small"
+            android:src="@mipmap/arrow_down" />
+
+    </LinearLayout>
+    <android.support.design.widget.TabLayout
+        android:id="@+id/indicator"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+        app:tabIndicatorColor="#4bc1fe"
+        app:tabGravity="fill"
+        app:tabSelectedTextColor="#4bc1fe"
+        app:tabTextColor="#444444"
+        android:background="@color/white"
+        app:tabMode="fixed" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dip"
+        android:layout_weight="1" />
+
+</LinearLayout>

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

@@ -0,0 +1,19 @@
+<?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"
+    android:background="@color/white_light"
+    android:orientation="vertical">
+    <include layout="@layout/title" />
+    <include
+        android:id="@+id/layout_main_activity_toolbar"
+        layout="@layout/toolbar_main_activity"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/app_nav_toolbar_height"
+        android:visibility="gone"/>
+    <FrameLayout
+        android:id="@+id/frame_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+</LinearLayout>

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

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:background="@color/gray_F5F5F5">
 
@@ -11,18 +10,7 @@
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabBackground="@android:color/transparent"
-        app:tabIndicatorHeight="4dp"
-        app:tabGravity="center"
-        app:tabIndicatorColor="#4bc1fe"
-        app:tabPadding="2dp"
-        app:tabMode="fixed"
-        app:tabSelectedTextColor="#4bc1fe"
-        app:tabTextColor="#444444"
-        app:tabTextAppearance="@style/SheepTabLayoutTextAppearance"
-        />
+        style="@style/style_tab"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -5,10 +5,10 @@
     android:layout_height="wrap_content"
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:orientation="horizontal"
-    android:paddingBottom="@dimen/content_padding_small"
+    android:paddingBottom="@dimen/content_padding_10"
     android:paddingEnd="@dimen/content_padding_10"
-    android:paddingStart="@dimen/content_padding_15"
-    android:paddingTop="@dimen/content_padding_small">
+    android:paddingStart="@dimen/content_padding_10"
+    android:paddingTop="@dimen/content_padding_10">
 
     <TextView
         android:id="@+id/gridview_item_name_tv"
@@ -23,10 +23,11 @@
     <TextView
         android:id="@+id/gridview_item_detail_tv"
         style="@style/nomal_txt_style_11"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/content_padding_10"
         android:text="下载应用领现金"
+        android:singleLine="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/gridview_item_icon_iv"
         app:layout_constraintStart_toStartOf="parent"
@@ -47,14 +48,11 @@
 
     <ImageView
         android:id="@+id/gridview_item_icon_iv"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:adjustViewBounds="true"
-        android:maxHeight="@dimen/view_size_65"
-        android:maxWidth="@dimen/view_size_65"
         android:src="@mipmap/home_try_play_circle_bg"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/gridview_item_detail_tv" />
+        app:layout_constraintEnd_toEndOf="parent"/>
 </android.support.constraint.ConstraintLayout>

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

@@ -6,40 +6,44 @@
 
     <ImageView
         android:id="@+id/q_iv"
-        android:layout_width="@dimen/view_size_55"
-        android:layout_height="@dimen/view_size_55"
+        android:layout_width="43dp"
+        android:layout_height="43dp"
+        android:layout_marginBottom="@dimen/content_padding_small"
+        android:layout_marginTop="@dimen/content_padding_small"
         android:src="@mipmap/home_q_circle_bg"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintBottom_toTopOf="@+id/line_ly_q_view"
-        android:padding="@dimen/content_padding_small"
-        android:layout_marginRight="@dimen/content_padding_small"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/q_name_tv"
+        style="@style/txt_style_16_black"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="充值Q币"
-        app:layout_constraintTop_toTopOf="@+id/q_iv"
+        android:layout_marginStart="@dimen/content_padding_small"
         app:layout_constraintBottom_toBottomOf="@+id/q_iv"
-        app:layout_constraintLeft_toRightOf="@+id/q_iv"
-        style="@style/txt_style_16_black"/>
+        app:layout_constraintStart_toEndOf="@+id/q_iv"
+        app:layout_constraintTop_toTopOf="@+id/q_iv" />
 
     <TextView
         android:id="@+id/q_dec_tv"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:gravity="right"
         android:text="平台绵羊币，充值更便宜"
-        app:layout_constraintTop_toTopOf="@+id/q_iv"
         app:layout_constraintBottom_toBottomOf="@+id/q_iv"
-        app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toRightOf="@+id/q_name_tv"
-        android:gravity="right"/>
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/q_iv" />
 
     <View
         android:id="@+id/line_ly_q_view"
         android:layout_width="match_parent"
         android:layout_height="1sp"
         android:background="@color/bg_gray"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintBottom_toBottomOf="parent" />
 
     <TextView
         android:id="@+id/hot_tv"
@@ -48,9 +52,9 @@
         android:layout_marginStart="@dimen/content_padding_10"
         android:layout_marginTop="6dp"
         android:text="hot~"
-        android:textSize="13sp"
         android:textColor="@color/red"
+        android:textSize="13sp"
+        app:layout_constraintBottom_toBottomOf="@+id/q_name_tv"
         app:layout_constraintStart_toEndOf="@+id/q_name_tv"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="@+id/q_name_tv"/>
+        app:layout_constraintTop_toTopOf="parent" />
 </android.support.constraint.ConstraintLayout>

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

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_gray"
@@ -18,16 +17,7 @@
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"
-        android:layout_width="match_parent"
-        android:layout_height="36dp"
-        app:tabBackground="@android:color/transparent"
-        app:tabIndicatorHeight="1dp"
-        app:tabGravity="center"
-        app:tabIndicatorColor="#2ebef2"
-        app:tabMode="scrollable"
-        app:tabSelectedTextColor="#2ebef2"
-        app:tabTextAppearance="@style/SheepTabLayoutTextAppearance"
-        />
+        style="@style/style_tab"/>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/pager"

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

@@ -7,9 +7,54 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="120dp"
+        android:layout_height="150dp"
         android:background="@mipmap/home_blue_bg">
+        <RelativeLayout
+            android:id="@+id/layout_navigationBar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize">
 
+            <ImageView
+                android:id="@+id/img_baseactivity_title"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerVertical="true"
+                android:gravity="center_vertical"
+                android:minWidth="?attr/actionBarSize"
+                android:visibility="gone"
+                android:scaleType="centerInside"
+                android:src="@drawable/narrow_back_white"/>
+
+            <TextView
+                android:id="@+id/txt_baseactivity_title"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_centerInParent="true"
+                android:gravity="center"
+                android:visibility="gone"
+                android:text="@string/personal_center"
+                android:textColor="@color/white"
+                android:textSize="18sp"/>
+
+            <!--右边图片按钮-->
+            <ImageButton
+                android:id="@+id/ibtn_baseactivity_right"
+                android:layout_width="?attr/actionBarSize"
+                android:layout_height="match_parent"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:background="@color/translate"
+                android:src="@mipmap/setting"
+                android:gravity="center"
+                android:minWidth="?attr/actionBarSize"/>
+
+
+            <include layout="@layout/title_bottom_line"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:visibility="gone"/>
+        </RelativeLayout>
         <ImageView
             android:id="@+id/icon_img_iv"
             android:layout_width="@dimen/view_size_60"
@@ -17,9 +62,8 @@
             android:layout_marginBottom="@dimen/content_padding"
             android:layout_marginStart="@dimen/content_padding_15"
             android:src="@drawable/icon"
-            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/layout_navigationBar" />
 
         <TextView
             android:id="@+id/name_tv"

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

@@ -10,8 +10,6 @@
         android:background="@color/bg_gray"
         android:orientation="vertical">
 
-        <include layout="@layout/title" />
-
         <include layout="@layout/fgt_personacenter_item_top" />
 
         <include layout="@layout/fgt_personalcenter_item_center_one" />

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

@@ -56,14 +56,15 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="15dp">
 
         <TextView
             android:id="@+id/find_item_des"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="17dp"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/find_item_download"
             android:maxLines="2"
@@ -73,12 +74,12 @@
             android:textSize="14sp" />
         <TextView
             android:id="@+id/find_item_download"
-            android:layout_marginTop="@dimen/content_padding_15"
             style="@style/style_button_find"
             android:layout_marginStart="5dp"
             app:layout_constraintStart_toEndOf="@+id/find_item_des"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             android:text="下载游戏" />
 
 <!--        <TextView

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

@@ -6,8 +6,8 @@
     android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
     android:orientation="vertical"
     android:minHeight="@dimen/view_size_80"
-    android:paddingLeft="@dimen/content_padding_18"
-    android:paddingRight="@dimen/content_padding_10"
+    android:paddingStart="@dimen/content_padding"
+    android:paddingEnd="@dimen/content_padding_10"
     android:paddingTop="@dimen/content_padding_10"
     android:paddingBottom="@dimen/content_padding_10"
     android:layout_margin="@dimen/content_padding_10">
@@ -20,14 +20,15 @@
             android:id="@+id/item_title_iv"
             android:layout_width="@dimen/content_padding_20"
             android:layout_height="@dimen/content_padding_20"
-            android:src="@mipmap/current_time_icon"
-            android:layout_marginRight="@dimen/content_padding_small"/>
+            android:src="@mipmap/current_time_icon"/>
         <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginStart="@dimen/content_padding_small"
             android:text="实时动态"
-            android:textSize="@dimen/text_size_15"
-            android:textColor="@color/black_191919"/>
+            android:textColor="@color/black"
+            android:textSize="15sp"/>
     </LinearLayout>
     <com.sunfusheng.marqueeview.MarqueeView
         android:id="@+id/upview1"

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

@@ -5,13 +5,6 @@
     android:background="@color/white_light"
     android:orientation="vertical">
 
-    <include
-        android:id="@+id/layout_main_activity_toolbar"
-        layout="@layout/toolbar_main_activity"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/app_nav_toolbar_height"
-        android:layout_alignParentTop="true"
-        android:visibility="gone"/>
     <FrameLayout
         android:id="@+id/frame_container"
         android:layout_width="match_parent"

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

@@ -21,7 +21,7 @@
         android:id="@+id/splash_bg"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
+        android:scaleType="fitXY"
         android:src="@drawable/splash_bg_img" />
     <View
         android:id="@+id/splash_click_view"

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

@@ -3,100 +3,81 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/bg_gray">
+    android:background="@color/bg_gray"
+    android:orientation="vertical">
 
-    <include
-        layout="@layout/title"/>
+    <include layout="@layout/title" />
 
-    <LinearLayout
-        android:id="@+id/show_flow_layout"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:paddingStart="@dimen/content_padding_10"
-        android:paddingEnd="@dimen/content_padding_10"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:visibility="visible">
-        <TextView
-            style="@style/style_ash_tv"
-            android:layout_marginRight="@dimen/common_margin_10"
-            android:text="任务流程:"/>
-        <TextView
-            style="@style/style_ash_num"
-            android:text="1"/>
-        <TextView
-            style="@style/style_ash_tv"
-            android:text="下载游戏"/>
-        <ImageView
-            style="@style/style_ash_img"
-            android:src="@mipmap/arrow_right_img"/>
-        <!--<View-->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <android.support.design.widget.TabLayout
+            android:id="@+id/indicator"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/white"
+            app:tabGravity="fill"
+            app:tabIndicatorColor="#4bc1fe"
+            app:tabMode="fixed"
+            app:tabSelectedTextColor="#4bc1fe"
+            app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
+            app:tabTextColor="#444444" />
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/pager"
+            android:layout_width="match_parent"
+            android:layout_marginTop="27dp"
+            android:layout_height="match_parent"/>
+        <LinearLayout
+            android:id="@+id/show_flow_layout"
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_gravity="center_horizontal"
+            android:gravity="center"
+            android:orientation="horizontal"
+            android:paddingEnd="@dimen/content_padding_10"
+            android:paddingStart="@dimen/content_padding_10"
+            android:visibility="visible">
+
+            <TextView
+                style="@style/style_ash_tv"
+                android:layout_marginRight="@dimen/common_margin_10"
+                android:text="任务流程:" />
+
+            <TextView
+                style="@style/style_ash_num"
+                android:text="1" />
+
+            <TextView
+                style="@style/style_ash_tv"
+                android:text="下载游戏" />
+
+            <ImageView
+                style="@style/style_ash_img"
+                android:src="@mipmap/arrow_right_img" />
+            <!--<View-->
             <!--android:layout_width="6dp"-->
             <!--android:layout_height="6dp"-->
             <!--android:background="@drawable/sp_bg_circle_ash"/>-->
-        <TextView
-            style="@style/style_ash_num"
-            android:text="2"/>
-        <TextView
-            style="@style/style_ash_tv"
-            android:text="试玩游戏"/>
-        <ImageView
-            style="@style/style_ash_img"
-            android:src="@mipmap/arrow_right_img"/>
-        <TextView
-            style="@style/style_ash_num"
-            android:text="3"/>
-        <TextView
-            style="@style/style_ash_tv"
-            android:text="领取奖励"/>
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/task_gridview_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:paddingLeft="@dimen/content_padding_3"
-        android:paddingRight="@dimen/content_padding"
-        android:paddingBottom="@dimen/content_padding_small"
-        android:paddingTop="@dimen/content_padding_small"
-        android:background="@color/white"
-        android:visibility="gone">
-        <com.sheep.gamegroup.util.MyGridview
-            android:id="@+id/tab_gridview"
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="wrap_content"
-            android:numColumns="4"
-            android:scrollbars="none"
-            android:listSelector="@android:color/transparent"
-            android:gravity="center_horizontal"/>
+            <TextView
+                style="@style/style_ash_num"
+                android:text="2" />
 
-        <ImageView
-            android:id="@+id/select_tab_iv"
-            android:layout_width="@dimen/view_size_30"
-            android:layout_height="@dimen/view_size_30"
-            android:padding="@dimen/content_padding_small"
-            android:src="@mipmap/arrow_down" />
+            <TextView
+                style="@style/style_ash_tv"
+                android:text="试玩游戏" />
 
-    </LinearLayout>
-    <android.support.design.widget.TabLayout
-        android:id="@+id/indicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabTextAppearance="@android:style/TextAppearance.Holo.Medium"
-        app:tabIndicatorColor="#4bc1fe"
-        app:tabGravity="fill"
-        app:tabSelectedTextColor="#4bc1fe"
-        app:tabTextColor="#444444"
-        android:background="@color/white"
-        app:tabMode="fixed" />
+            <ImageView
+                style="@style/style_ash_img"
+                android:src="@mipmap/arrow_right_img" />
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/pager"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
+            <TextView
+                style="@style/style_ash_num"
+                android:text="3" />
 
+            <TextView
+                style="@style/style_ash_tv"
+                android:text="领取奖励" />
+        </LinearLayout>
+    </RelativeLayout>
 </LinearLayout>

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

@@ -3,61 +3,47 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/content_padding_12"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/content_padding_small"
-    android:paddingLeft="12dp"
-    android:paddingRight="12dp"
-    android:paddingTop="12dp">
-
-    <LinearLayout
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/task_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
         android:orientation="horizontal">
 
         <ImageView
             android:id="@+id/item_title_iv"
             android:layout_width="@dimen/content_padding_20"
             android:layout_height="@dimen/content_padding_20"
-            android:layout_marginRight="@dimen/content_padding_small"
+            android:layout_marginStart="12dp"
             android:src="@mipmap/task_ing_icon" />
 
         <TextView
             android:id="@+id/item_title_tv"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="13dp"
-            android:layout_weight="1"
+            android:layout_width="match_parent"
+            android:layout_height="20dp"
+            android:layout_marginEnd="12dp"
+            android:layout_marginStart="@dimen/content_padding_small"
+            android:layout_toEndOf="@+id/item_title_iv"
             android:text="进行中"
             android:textColor="@color/black"
-            android:textSize="15dp" />
+            android:textSize="15sp" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_marginTop="36dp"
+            android:background="@color/gray_F0F0F0" />
+    </RelativeLayout>
 
-        <TextView
-            android:id="@+id/cancel_task_tv"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="13dp"
-            android:background="@drawable/sp_bg_gradient_rectangle_blue"
-            android:gravity="center"
-            android:minWidth="@dimen/view_size_80"
-            android:padding="@dimen/content_padding_3"
-            android:text="取消任务"
-            android:textColor="@color/white"
-            android:textSize="@dimen/text_size_12"
-            android:visibility="gone" />
-    </LinearLayout>
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            android:id="@+id/task_type_tv"
-            style="@style/style_button_find"
-            android:text="取消任务"
-            android:visibility="invisible"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="16dp">
 
         <ImageView
             android:id="@+id/item_icon_iv"
@@ -89,18 +75,20 @@
             android:id="@+id/item_money"
             android:layout_width="@dimen/find_bt_with"
             android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
             android:gravity="center"
             android:text="+10元"
             android:textColor="@color/txt_red"
             android:textSize="20sp"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <LinearLayout
             android:id="@+id/item_name_tv_ll"
             android:layout_width="0dp"
             android:layout_height="70dp"
-            android:orientation="vertical"
             android:layout_marginStart="@dimen/content_padding"
+            android:orientation="vertical"
             app:layout_constraintEnd_toStartOf="@+id/task_type_tv"
             app:layout_constraintStart_toEndOf="@+id/item_icon_iv">
 
@@ -114,10 +102,12 @@
                 android:text=""
                 android:textColor="#444444"
                 android:textSize="14sp" />
+
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="3"/>
+                android:layout_weight="3" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -146,7 +136,8 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0dp"
-                android:layout_weight="1"/>
+                android:layout_weight="1" />
+
             <LinearLayout
                 android:id="@+id/item_date_layout"
                 android:layout_width="match_parent"
@@ -176,54 +167,68 @@
             </LinearLayout>
         </LinearLayout>
 
+
+        <TextView
+            android:id="@+id/task_type_tv"
+            style="@style/style_button_find"
+            android:text="取消任务"
+            android:visibility="invisible"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/detail_task_tv_center"
+            style="@style/style_button_find"
+            android:layout_centerInParent="true"
+            android:text="取消任务"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
         <RelativeLayout
             android:id="@+id/detail_task_layout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="5dp"
             app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
             app:layout_constraintEnd_toEndOf="parent">
 
             <TextView
                 android:id="@+id/detail_task_tv"
                 style="@style/style_button_find"
-                android:layout_marginTop="@dimen/content_padding_small"
                 android:text="取消任务" />
 
             <TextView
                 android:id="@+id/detail_task_tv_down"
                 style="@style/style_button_find"
-                android:layout_marginTop="@dimen/content_padding_small"
                 android:text="取消任务"
                 android:visibility="gone" />
 
         </RelativeLayout>
-
-        <TextView
-            android:id="@+id/detail_task_tv_center"
-            style="@style/style_button_find"
-            android:layout_centerInParent="true"
-            android:text="取消任务"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/item_icon_iv"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
     </android.support.constraint.ConstraintLayout>
 
     <TextView
         android:id="@+id/countdown_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp"
+        android:layout_marginTop="16dp"
         android:background="@drawable/sp_rectangle_bg_gray_radius"
         android:padding="@dimen/content_padding_small"
         android:text="若1小时35分22秒后任务未完成，该任务自动取消，您可以重新接受该任务"
         android:textColor="@color/txt_black_8e8e8e"
         android:textSize="@dimen/text_size_10"
         android:visibility="gone" />
-
-    <TextView
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/content_padding_16"/>
+    <View
         android:id="@+id/line_tv"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
-        android:layout_marginTop="@dimen/content_padding_20"
-        android:background="@color/white_bg_line" />
+        android:layout_marginEnd="12dp"
+        android:layout_marginStart="12dp"
+        android:background="@color/gray_F0F0F0" />
 </LinearLayout>

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

@@ -20,7 +20,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingBottom="@dimen/content_padding_4"
-        android:paddingTop="@dimen/content_padding_16"
         android:background="@drawable/x_shap_shadow_bg_rectgangle_white">
 
     </android.support.v7.widget.RecyclerView>

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

@@ -91,7 +91,7 @@
     <dimen name="orienteering_item_gao">40dp</dimen>
     <dimen name="orienteering_list_empty_gao">240dp</dimen>
 
-    <dimen name="find_bt_with">90dp</dimen>
+    <dimen name="find_bt_with">71dp</dimen>
     <dimen name="find_icon_with">70dp</dimen>
     <dimen name="find_game_top">68dp</dimen>
     <dimen name="find_game_top2">144dp</dimen>

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

@@ -376,4 +376,15 @@
         <item name="android:textColor">@color/G</item>
         <item name="android:textSize">15sp</item>
     </style>
+    <style name="style_tab">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">36dp</item>
+        <item name="tabBackground">@android:color/transparent</item>
+        <item name="tabIndicatorHeight">1dp</item>
+        <item name="tabGravity">center</item>
+        <item name="tabIndicatorColor">#2ebef2</item>
+        <item name="tabMode">scrollable</item>
+        <item name="tabSelectedTextColor">#2ebef2</item>
+        <item name="tabTextAppearance">@style/SheepTabLayoutTextAppearance</item>
+    </style>
 </resources>

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

@@ -7,7 +7,7 @@
     <string name="unknown_error">未知错误，请稍候再试</string>
     <string name="error_data">暂无数据，请稍候再试</string>
     <string name="error_link">暂无地址，请稍候再试</string>
-    <string name="error_download_link">暂无下载地址</string>
+    <string name="error_download_link">暂无下载</string>
     <string name="error_package_link">暂无包名，请稍候再试</string>
     <string name="wushuju">还没有数据哦</string>
     <string name="wushuju_net_error">网络错误，请稍候再试</string>