ui page refact

app/src/main/AndroidManifest.xml

@@ -900,6 +900,10 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" /> <!-- 小绵羊3.4.5 足迹 -->
         <activity
+            android:name="com.sheep.gamegroup.module.user.activity.ActMyCart"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppActionTheme" /> <!-- 小绵羊3.4.5 足迹 -->
+        <activity
             android:name="com.sheep.gamegroup.view.activity.ActFootprint"
             android:screenOrientation="portrait"
             android:theme="@style/AppActionTheme" /> <!-- 小绵羊3.4.5 收徒红包 -->

app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -80,24 +80,6 @@ public abstract class BaseActivity extends RxAppCompatActivity implements BackHa
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
-//        if (BuildConfig.DEBUG) {
-//            StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder()
-//                    .detectDiskReads()
-//                    .detectDiskWrites()
-//                    .detectNetwork()
-//                    .penaltyLog()
-//                    .build());
-//            StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder()
-//                    .detectLeakedSqlLiteObjects()
-////                    .detectLeakedClosableObjects()
-//                    .penaltyLog()
-//                    .penaltyDeath()
-//                    .build());
-//        }
-//        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.O && isTranslucentOrFloating()) {
-//            boolean result = fixOrientation();
-//            LogUtil.println("onCreate fixOrientation when Oreo, result = " + result);
-//        }
         super.onCreate(savedInstanceState);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
             Window win = getWindow();
@@ -116,6 +98,13 @@ public abstract class BaseActivity extends RxAppCompatActivity implements BackHa
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
 //            window.setStatusBarColor(Color.TRANSPARENT);
         }
+        if(showWhiteStatusBar()){
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                getWindow().addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+                getWindow().setStatusBarColor(getResources().getColor(android.R.color.white));
+            }
+        }
 
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
@@ -136,6 +125,7 @@ public abstract class BaseActivity extends RxAppCompatActivity implements BackHa
             EventBus.getDefault().register(this);
         initSlidr();
     }
+    protected boolean showWhiteStatusBar(){return false;}
     protected int getTitleLayoutId(){
         return R.layout.title;
     }

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

@@ -13,6 +13,8 @@ public class NewbieTask implements Serializable{
 
     private int id;
 
+    private String icon;
+
     private String desc;
 
     private String name;
@@ -38,6 +40,14 @@ public class NewbieTask implements Serializable{
         this.status = status;
     }
 
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+
     public int getUser_task_id() {
         return user_task_id;
     }

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

@@ -56,7 +56,7 @@ public class UserEntity implements Serializable {
     private int bind_flag;//绑定表示 二进制形式 从低到高 第一位手机号 第二位QQ号 第三位微信
     private int level;//用户等级 0：普通用户     1：VIP用户
     private int vip_time;//用户vip期限
-    private int user_type;//用户类型： 1普通用户 2游戏用户
+    private int user_type;//用户类型： 1普通用户 2游戏用户 3商城店员
 
     public int getPackage_cate() {
         return package_cate;
@@ -453,8 +453,13 @@ public class UserEntity implements Serializable {
     //用户类型： 1普通用户 2游戏用户
     public static final int USRE_TYPE_NOR = 1;
     public static final int USRE_TYPE_GAME = 2;
+    public static final int USRE_TYPE_ASSIST = 3;
 
     public boolean isGameUser() {
         return user_type == USRE_TYPE_GAME;
     }
+
+    public boolean isShopAssist(){
+        return user_type == USRE_TYPE_ASSIST;
+    }
 }

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

@@ -16,6 +16,7 @@ public class WebParams implements Serializable {
     private String title = "加载中";//页面默认标题
     private boolean needJsInteract = true;
     private boolean showTitle = true;
+    private boolean showProgress = true;
     private boolean forResult = false;
     private boolean refreshClick = true;
     private int action;
@@ -60,6 +61,15 @@ public class WebParams implements Serializable {
         return this;
     }
 
+    public WebParams hideProgress(){
+        this.showProgress = false;
+        return this;
+    }
+
+    public boolean isShowProgress(){
+        return this.showProgress;
+    }
+
     public WebParams setForResult(boolean forResult) {
         this.forResult = forResult;
         return this;

app/src/main/java/com/sheep/gamegroup/module/guide/NewbieGuideHelper.java

@@ -23,6 +23,7 @@ import com.app.hubert.guide.model.RelativeGuide;
 import com.app.hubert.guide.core.Controller;
 import com.kfzs.duanduan.cardview.ScreenUtil;
 import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.event.EventTypes;
 import com.sheep.gamegroup.module.game.fragment.FgtGameCenter;
 import com.sheep.gamegroup.module.home.fragment.FgtHome;
 import com.sheep.gamegroup.module.home.fragment.FgtMainHeader;
@@ -112,7 +113,7 @@ public class NewbieGuideHelper {
                         } else if (type == GUIDE_MALL) {
                             EventBus.getDefault().post(new BigEvent(GUIDE_NEXT_GAME));
                         } else if (type == GUIDE_GAME) {
-
+                            EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SHOW_NEW_USER_HONG_BAO));
                         }
                     }
                 })
@@ -312,6 +313,7 @@ public class NewbieGuideHelper {
             view.findViewById(R.id.cancel_guide_btn).setOnClickListener(v -> {
                 goon = false;
                 controller.remove();
+                EventBus.getDefault().post(BigEvent.get().setEventTypes(EventTypes.FGT_SHEEP_SHOW_NEW_USER_HONG_BAO));
             });
         }
     }

app/src/main/java/com/sheep/gamegroup/module/user/FgtGameTaskOrderList.java

@@ -0,0 +1,139 @@
+package com.sheep.gamegroup.module.user;
+
+import android.os.Handler;
+import android.view.View;
+import android.widget.ListView;
+
+import com.sheep.gamegroup.event.BigEvent;
+import com.sheep.gamegroup.model.entity.BaseMessage;
+import com.sheep.gamegroup.model.entity.GameTaskOrderEnty;
+import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
+import com.sheep.gamegroup.view.adapter.AdpGameTaskOrderList;
+import com.sheep.gamegroup.view.customview.RefreshLayout;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.SheepApp;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.utils.G;
+
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import io.reactivex.android.schedulers.AndroidSchedulers;
+import io.reactivex.schedulers.Schedulers;
+
+public class FgtGameTaskOrderList extends BaseFragment {
+    @BindView(R.id.withdrawal_listview)
+    ListView withdrawalListview;
+    @BindView(R.id.swipe_container)
+    RefreshLayout swipe_container;
+    @BindView(R.id.empty_view)
+    View empty_view;
+
+    private int page = 1;//页数
+    private int per_page = DataUtil.PER_PAGE;
+    private ArrayList<GameTaskOrderEnty> listData = new ArrayList<>();
+    private AdpGameTaskOrderList adp;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.withdrawal_list;
+    }
+
+    @Override
+    public void onViewCreated() {
+        EventBus.getDefault().register(this);
+        swipe_container.setFooterView(getContext(), withdrawalListview, R.layout.listview_footer);
+        adp = new AdpGameTaskOrderList(getActivity() , listData);
+        withdrawalListview.setAdapter(adp);
+
+        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
+            @Override
+            public void onRefresh() {
+                refreshData();
+            }
+        });
+
+        swipe_container.setOnLoadListener(new RefreshLayout.OnLoadListener() {
+            @Override
+            public void onLoad() {
+                swipe_container.setLoading(false);
+                if(listData != null && listData.size() >= per_page*page){
+                    page += 1;
+                    initData();
+                }else {
+
+                    new Handler().postDelayed(new Runnable() {
+                        @Override
+                        public void run() {
+                            swipe_container.setRefreshing(false);
+                        }
+                    },1000);
+                }
+
+            }
+        });
+        initData();
+    }
+
+    public void initData() {
+        empty_view.setVisibility(View.INVISIBLE);
+        SheepApp.getInstance().getNetComponent()
+                .getApiService()
+                .getConsumptionOrders(page, per_page)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
+                    @Override
+                    public void onNext(BaseMessage baseMessage) {
+                        List<GameTaskOrderEnty> arrayList = baseMessage.getDatas(GameTaskOrderEnty.class);
+                        if(arrayList != null && arrayList.size()>0){
+                            listData.addAll(arrayList);
+                        }
+                        notifyDataSetChanged();
+                    }
+
+                    @Override
+                    public void onError(BaseMessage baseMessage) {
+                        notifyDataSetChanged();
+                        G.showToast(baseMessage.getMsg()+"");
+                    }
+                });
+    }
+
+    private void refreshData() {
+        listData.clear();
+        page = 1;
+        initData();
+    }
+
+    private void notifyDataSetChanged(){
+        if(swipe_container == null || empty_view == null){
+            return;
+        }
+        CommonUtil.getInstance().updateEmptyView(empty_view, listData.isEmpty());
+        hideProgress();
+        swipe_container.setRefreshing(false);
+        adp.notifyDataSetChanged();
+    }
+
+    @Subscribe
+    public void onEventMainThread(BigEvent event) {
+        switch (event.getEventTypes()) {
+            case ONFRESH_GAMETASK_ORDER_LIST_PAGE:
+                refreshData();
+                break;
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        EventBus.getDefault().unregister(this);
+        super.onDestroy();
+    }
+}

app/src/main/java/com/sheep/gamegroup/module/user/activity/ActMyCart.java

@@ -0,0 +1,74 @@
+package com.sheep.gamegroup.module.user.activity;
+
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
+
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.WebParams;
+import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
+import com.sheep.gamegroup.module.webview.fragment.FgtWebX5;
+import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
+import com.sheep.gamegroup.view.fragment.FgtGameFocusList;
+import com.sheep.gamegroup.view.fragment.FgtUserFocusLogList;
+import com.sheep.jiuyan.samllsheep.Config;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.snail.antifake.jni.EmulatorDetectUtil;
+
+import butterknife.BindView;
+
+/**
+ * Created by realicing on 2018/11/22.
+ * realicing@sina.com
+ * 小绵羊3.4.5新界面--我的关注
+ */
+public class ActMyCart extends BaseActivity {
+    @Override
+    protected int getLayoutId() {
+        return R.layout.common_tab_vp;
+    }
+
+    @BindView(R.id.indicator)
+    TabLayout indicator;
+    @BindView(R.id.pager)
+    ViewPager pager;
+    private TitleFragmentListAdapter mAdapter;
+
+    @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
+    public void initView() {
+        TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
+                .setTitle(this, "我的购物车")
+                .setTitleFinish(this);
+
+    }
+
+
+    @Override
+    public void initData() {
+        mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
+        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_CART) + "?only=1").hideProgress()), "遇见预约");
+        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_CART) + "&only=1&Authorization="+SpUtils.getToken(this)).hideProgress()), "有范商城");
+        pager.setAdapter(mAdapter);
+        indicator.setupWithViewPager(pager);
+        pager.setCurrentItem(0);
+        pager.setOffscreenPageLimit(mAdapter.getCount());
+        CommonUtil.getInstance().reflex(indicator, this);
+    }
+
+    private Fragment getWebFragment(WebParams params) {
+        if (EmulatorDetectUtil.isEmulator()) {
+            return FgtWeb.newInstance(params);
+        } else {
+            return FgtWebX5.newInstance(params);
+        }
+    }
+}

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWeb.java

@@ -345,7 +345,9 @@ public class FgtWeb extends BaseFgtWeb {
                     });
                     act_web_loading_iv.startAnimation(animation);
                 }
-                ViewUtil.setVisibility(act_web_loading_pb, newProgress != 100);
+                if (webParams.isShowProgress()) {
+                    ViewUtil.setVisibility(act_web_loading_pb, newProgress != 100);
+                }
                 if (act_web_loading_pb != null)
                     act_web_loading_pb.setProgress(newProgress);
                 super.onProgressChanged(view, newProgress);

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -337,7 +337,9 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                     });
                     act_web_loading_iv.startAnimation(animation);
                 }
-                ViewUtil.setVisibility(act_web_loading_pb, newProgress != 100);
+                if(webParams.isShowProgress()) {
+                    ViewUtil.setVisibility(act_web_loading_pb, newProgress != 100);
+                }
                 if (act_web_loading_pb != null)
                     act_web_loading_pb.setProgress(newProgress);
                 super.onProgressChanged(view, newProgress);

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

@@ -476,7 +476,8 @@ public class CommonUtil {
         Activity activity = (Activity) context;
         switch (Integer.valueOf(jump.getJump())) {
             case JUMP_NEW_USER_TASK://新手任务
-                DialogNewbieTaskList.tryShowDialog(activity);
+//                DialogNewbieTaskList.tryShowDialog(activity);
+                Jump2View.getInstance().goNewbieTaskList(context, null);
                 NEWBIE_TASK.onEvent();
                 break;
             case JUMP_TRY_PLAY://试玩赚钱

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

@@ -79,6 +79,7 @@ import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
 import com.sheep.gamegroup.module.skin.util.SkinUtil;
 import com.sheep.gamegroup.module.task.VideoTaskActivity;
+import com.sheep.gamegroup.module.user.activity.ActMyCart;
 import com.sheep.gamegroup.module.user.activity.ActVip;
 import com.sheep.gamegroup.module.user.model.UserAddressInfo;
 import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
@@ -2728,6 +2729,12 @@ public class Jump2View {
         activity.startActivity(intent);
     }
 
+    public void goActMyCart() {
+        Activity activity = SheepApp.getInstance().getCurrentActivity();
+        Intent intent = new Intent(activity, ActMyCart.class);
+        activity.startActivity(intent);
+    }
+
     /**
      * 小绵羊3.4.5新增--跳转到足迹界面
      */
@@ -2893,6 +2900,14 @@ public class Jump2View {
         });
     }
 
+    public void gotoYYShopAssist(Context activity) {
+        CommonUtil.getInstance().getConfigValue(Config.KEY_YY_SHOP_ASSIST_URL, url -> {
+            if (TextUtils.isEmpty(url))
+                url = "http://smallstation.9yan.io/yy_shop/#/pages/clerk/index";
+            goWeb(activity, new WebParams(url, Config.YY_SHOP_NAME));
+        });
+    }
+
     public void gotoYYShopMerchandise(Context activity, String merId) {
         CommonUtil.getInstance().getConfigValue(Config.KEY_YY_SHOP_GOODS_URL, url -> {
             if (TextUtils.isEmpty(url)) {

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

@@ -1,15 +1,22 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.model.entity.WebParams;
+import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
+import com.sheep.gamegroup.module.webview.fragment.FgtWebX5;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.view.fragment.FgtGameFocusList;
 import com.sheep.gamegroup.view.fragment.FgtUserFocusLogList;
+import com.sheep.jiuyan.samllsheep.Config;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.utils.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.snail.antifake.jni.EmulatorDetectUtil;
 
 import butterknife.BindView;
 
@@ -31,6 +38,11 @@ public class ActMyFocus extends BaseActivity {
     private TitleFragmentListAdapter mAdapter;
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     public void initView() {
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
@@ -43,6 +55,8 @@ public class ActMyFocus extends BaseActivity {
     @Override
     public void initData() {
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
+        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_FOCUS) + "&only=1&Authorization="+SpUtils.getToken(this)).hideProgress()), "有范");
+        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_FOCUS) + "?only=1").hideProgress()), "遇见");
         mAdapter.add(new FgtGameFocusList(), "游戏");
         mAdapter.add(new FgtUserFocusLogList(), "人员");
         pager.setAdapter(mAdapter);
@@ -51,4 +65,12 @@ public class ActMyFocus extends BaseActivity {
         pager.setOffscreenPageLimit(mAdapter.getCount());
         CommonUtil.getInstance().reflex(indicator, this);
     }
+
+    private Fragment getWebFragment(WebParams params) {
+        if (EmulatorDetectUtil.isEmulator()) {
+            return FgtWeb.newInstance(params);
+        } else {
+            return FgtWebX5.newInstance(params);
+        }
+    }
 }

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

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.view.activity;
 import android.app.Activity;
 import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
+import android.view.View;
 
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.absBase.BaseActivity;
@@ -47,10 +48,11 @@ public class ActMyWelfare extends BaseActivity {
     private TitleFragmentListAdapter mAdapter;
     @Override
     public void initListener() {
+        indicator.setVisibility(View.GONE);
         mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
-        mAdapter.add(new FgtMyDownloadWelfareList(), "下载奖励");
+//        mAdapter.add(new FgtMyDownloadWelfareList(), "下载奖励");
         mAdapter.add(new FgtMyGift(), "我的礼包");
-        mAdapter.add(new FgtWelfareUseRecord(), "使用记录");
+//        mAdapter.add(new FgtWelfareUseRecord(), "使用记录");
         pager.setAdapter(mAdapter);
         indicator.setupWithViewPager(pager);
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {

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

@@ -1,12 +1,19 @@
 package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.WindowManager;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
+import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.NewbieTask;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.NewbieTaskAdp;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
@@ -32,32 +39,35 @@ public class ActNewbieTaskList extends BaseActivity {
     ListView withdrawalListview;
     @BindView(R.id.swipe_container)
     RefreshLayout swipe_container;
+    @BindView(R.id.total_money_tv)
+    TextView total_money_tv;
+    @BindView(R.id.got_money_tv)
+    TextView got_money_tv;
 
-    private Activity activity;
     private NewbieTaskAdp adp;
     private List<NewbieTask> etyList = new ArrayList<>();
     private List<NewbieTask> newbieTaskList = new ArrayList<>();
 
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
+    @Override
     protected int getLayoutId() {
         return R.layout.act_newbie_task_list;
     }
 
     @Override
     public void initView() {
-        activity = this;
         TitleBarUtils.getInstance()
-                .setTitle(this, getString(R.string.task_center))
+                .setShowOrHide(this, true)
+                .setTitle(this, getString(R.string.fresh_gift))
                 .setTitleFinish(this);
         swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
-        adp = new NewbieTaskAdp(activity, etyList);
+        adp = new NewbieTaskAdp(this, etyList);
         withdrawalListview.setAdapter(adp);
-        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                initData();
-            }
-        });
+        swipe_container.setOnRefreshListener(() -> initData());
     }
 
     @Override
@@ -65,24 +75,28 @@ public class ActNewbieTaskList extends BaseActivity {
 
     }
 
-    private void setRefresh(){
-        if(swipe_container.isRefreshing()){
+    private void setRefresh() {
+        if (swipe_container.isRefreshing()) {
             return;
         }
         swipe_container.setRefreshing(true);
         initData();
     }
+
     @Override
     public void initData() {
         etyList.clear();
         SheepApp.getInstance().getNetComponent().getApiService().getNewbieTask()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         swipe_container.setRefreshing(false);
-                        newbieTaskList = baseMessage.getDatas(NewbieTask.class);
+                        NewbieTaskResult result = baseMessage.getData(NewbieTaskResult.class);
+                        ViewUtil.setText(total_money_tv, String.format("完成任务领%s元现金", NumberFormatUtils.retain1(result.total_amount)));
+                        ViewUtil.setText(got_money_tv, String.format("¥%s", NumberFormatUtils.retain1(result.success_amount)));
+                        newbieTaskList = result.data;
                         etyList.addAll(newbieTaskList);
                         adp.notifyDataSetChanged();
                     }
@@ -95,11 +109,19 @@ public class ActNewbieTaskList extends BaseActivity {
                     }
                 });
     }
+
     private boolean isFirst = true;
+
+    public static class NewbieTaskResult{
+        float total_amount = 0;
+        float success_amount = 0;
+        List<NewbieTask> data;
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
-        if(isFirst){
+        if (isFirst) {
             isFirst = false;
         } else {
             setRefresh();

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

@@ -30,6 +30,9 @@ public class ActWebX5 extends BaseContainerActivity implements UMShareListener {
     private int orientPara;
 
     @Override
+    protected boolean showWhiteStatusBar(){return true;}
+
+    @Override
     protected Fragment initFragment() {
         initWebParams();
         if (EmulatorDetectUtil.isEmulator()) {

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

@@ -2,6 +2,9 @@ package com.sheep.gamegroup.view.activity;
 
 import android.app.Activity;
 import android.os.Handler;
+import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
+import android.support.v4.view.ViewPager;
 import android.view.View;
 import android.widget.ListView;
 
@@ -9,15 +12,25 @@ import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.GameTaskOrderEnty;
+import com.sheep.gamegroup.model.entity.WebParams;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.module.user.FgtGameTaskOrderList;
+import com.sheep.gamegroup.module.webview.fragment.FgtWeb;
+import com.sheep.gamegroup.module.webview.fragment.FgtWebX5;
 import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.view.adapter.AdpGameTaskOrderList;
+import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.view.customview.RefreshLayout;
+import com.sheep.gamegroup.view.fragment.FgtGameFocusList;
+import com.sheep.gamegroup.view.fragment.FgtUserFocusLogList;
+import com.sheep.jiuyan.samllsheep.Config;
 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.SpUtils;
 import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+import com.snail.antifake.jni.EmulatorDetectUtil;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -34,71 +47,31 @@ import io.reactivex.schedulers.Schedulers;
  */
 
 public class GameTaskOrderListAct extends BaseActivity {
-    @BindView(R.id.withdrawal_listview)
-    ListView withdrawalListview;
-    @BindView(R.id.swipe_container)
-    RefreshLayout swipe_container;
-    @BindView(R.id.empty_view)
-    View empty_view;
-    private Activity activity;
-
-    private int page = 1;//页数
-    private int per_page = DataUtil.PER_PAGE;
-    private ArrayList<GameTaskOrderEnty> listData = new ArrayList<>();
-    private AdpGameTaskOrderList adp;
+
+    @BindView(R.id.indicator)
+    TabLayout indicator;
+    @BindView(R.id.pager)
+    ViewPager pager;
+    private TitleFragmentListAdapter mAdapter;
+
     @Override
+    protected boolean showWhiteStatusBar() {
+        return true;
+    }
+
     protected int getLayoutId() {
-        return R.layout.withdrawal_list;
+        return R.layout.common_tab_vp;
     }
 
     @Override
     public void initView() {
-        activity = this;
         TitleBarUtils.getInstance()
                 .setShowOrHide(this, true)
                 .setTitle(this, "订单管理")
                 .setTitleFinish(this);
-        EventBus.getDefault().register(this);
-        swipe_container.setFooterView(this, withdrawalListview, R.layout.listview_footer);
-        adp = new AdpGameTaskOrderList(activity , listData);
-        withdrawalListview.setAdapter(adp);
-
-        swipe_container.setOnRefreshListener(new RefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                refreshData();
-            }
-        });
-
-        swipe_container.setOnLoadListener(new RefreshLayout.OnLoadListener() {
-            @Override
-            public void onLoad() {
-                swipe_container.setLoading(false);
-                if(listData != null && listData.size() >= per_page*page){
-                    page += 1;
-                    initData();
-                }else {
-
-                    new Handler().postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            swipe_container.setRefreshing(false);
-                        }
-                    },1000);
-                }
-
-            }
-        });
 
     }
 
-    private void refreshData() {
-        listData.clear();
-        page = 1;
-        initData();
-    }
-
-
     @Override
     public void initListener() {
 
@@ -106,51 +79,27 @@ public class GameTaskOrderListAct extends BaseActivity {
 
     @Override
     public void initData() {
-        empty_view.setVisibility(View.INVISIBLE);
-        SheepApp.getInstance().getNetComponent()
-                .getApiService()
-                .getConsumptionOrders(page, per_page)
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(activity) {
-                    @Override
-                    public void onNext(BaseMessage baseMessage) {
-                        List<GameTaskOrderEnty> arrayList = baseMessage.getDatas(GameTaskOrderEnty.class);
-                        if(arrayList != null && arrayList.size()>0){
-                            listData.addAll(arrayList);
-                        }
-                        notifyDataSetChanged();
-                    }
-
-                    @Override
-                    public void onError(BaseMessage baseMessage) {
-                        notifyDataSetChanged();
-                        G.showToast(baseMessage.getMsg()+"");
-                    }
-                });
-    }
-    private void notifyDataSetChanged(){
-        if(swipe_container == null || empty_view == null){
-            return;
-        }
-        CommonUtil.getInstance().updateEmptyView(empty_view, listData.isEmpty());
-        hideProgress();
-        swipe_container.setRefreshing(false);
-        adp.notifyDataSetChanged();
-    }
-
-    @Subscribe
-    public void onEventMainThread(BigEvent event) {
-        switch (event.getEventTypes()) {
-            case ONFRESH_GAMETASK_ORDER_LIST_PAGE:
-                refreshData();
-                break;
-        }
+        mAdapter = new TitleFragmentListAdapter(getSupportFragmentManager());
+        mAdapter.add(getWebFragment(new WebParams(Config.getYFShopUrl(Config.PATH_YF_SHOP_ORDER) + "&only=1&Authorization="+ SpUtils.getToken(this)).hideProgress()), "有范订单");
+        mAdapter.add(getWebFragment(new WebParams(Config.getUrlByPath(Config.PATH_YY_SHOP_ORDER) + "?only=1").hideProgress()), "遇见预约");
+        mAdapter.add(new FgtGameTaskOrderList(), "其他订单");
+        pager.setAdapter(mAdapter);
+        indicator.setupWithViewPager(pager);
+        pager.setCurrentItem(0);
+        pager.setOffscreenPageLimit(mAdapter.getCount());
+        CommonUtil.getInstance().reflex(indicator, this);
     }
 
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        EventBus.getDefault().unregister(this);
+    }
+
+    private Fragment getWebFragment(WebParams params) {
+        if (EmulatorDetectUtil.isEmulator()) {
+            return FgtWeb.newInstance(params);
+        } else {
+            return FgtWebX5.newInstance(params);
+        }
     }
 }

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

@@ -272,6 +272,9 @@ public class TaskDetailAct extends AbsChooseImageActivity implements TaskDetailC
     private boolean autoAcceptTask = true;
 
     @Override
+    protected boolean showWhiteStatusBar(){return true;}
+
+    @Override
     protected int getLayoutId() {
         return R.layout.task_detail_layout;
     }

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

@@ -19,6 +19,7 @@ import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.LogUtil;
 import com.sheep.gamegroup.util.TestUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.activity.ActMain;
 import com.sheep.jiuyan.samllsheep.BuildConfig;
 import com.sheep.jiuyan.samllsheep.R;
@@ -65,8 +66,6 @@ public class NewbieTaskAdp extends BaseAdapter {
         return 0;
     }
 
-    private final static int[] ids = {R.drawable.newbie_task_2, R.drawable.newbie_task_3, R.drawable.newbie_task_4, R.drawable.newbie_task_5, SkinUtil.getAppIcon(), R.drawable.newbie_task_6};
-
     @Override
     public View getView(final int position, View convertView, ViewGroup parent) {
         Object tag = convertView == null ? null : convertView.getTag();
@@ -84,17 +83,13 @@ public class NewbieTaskAdp extends BaseAdapter {
         }
 
         final NewbieTask ety = (NewbieTask) getItem(position);
-        holder.newbie_task_iv.setImageResource(ids[(ety.getId() + ids.length - 1) % ids.length]);
+        ViewUtil.setImage(holder.newbie_task_iv, ety.getIcon());
         holder.newbie_task_name_tv.setText(ety.getName());
         holder.newbie_task_money_tv.setText(String.format(Locale.CHINESE, "+%.1f元", ety.getAmount()));
-        holder.newbie_task_tv.setOnClickListener(new View.OnClickListener() {
-
-            @Override
-            public void onClick(View view) {
-                if (onClickListener != null)
-                    onClickListener.onClick(view);
-                doActionByTask(context, ety);
-            }
+        holder.newbie_task_tv.setOnClickListener((view) -> {
+            if (onClickListener != null)
+                onClickListener.onClick(view);
+            doActionByTask(context, ety);
         });
         switch (ety.getStatus()) {
             case 0:
@@ -138,15 +133,24 @@ public class NewbieTaskAdp extends BaseAdapter {
                     Jump2View.getInstance().goTryplayView(context, null);
                     break;
                 case 5://注册账号并登录
-                    if (BuildConfig.DEBUG) {
-                        G.showToast("测试：服务器返回数据错误，这个奖励可能没有完成？");
-                    }
-//                    if(TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
-                    isShow(context);
                     break;
                 case 6://加入官方QQ群
                     doActionByTaskQQ(context, task);
                     break;
+                case 7://试玩游戏
+                    Intent in = new Intent(context, ActMain.class);
+                    in.putExtra("SWITCH_TAB", 2);
+                    context.startActivity(in);
+                    break;
+                case 8://预约商城购物
+                    Jump2View.getInstance().gotoYYShop(context);
+                    ((Activity) context).finish();
+                    break;
+                case 9://有范商城购物
+                    Jump2View.getInstance().gotoYfShop(context);
+                    ((Activity) context).finish();
+                    break;
+
             }
         } else {
             if (BuildConfig.DEBUG)

app/src/main/java/com/sheep/gamegroup/view/dialog/DialogNewbieTaskList.java

@@ -27,7 +27,7 @@ import io.reactivex.schedulers.Schedulers;
 
 public class DialogNewbieTaskList {
 
-    public static AlertDialog showDialog(final Activity activity, List<NewbieTask> newbieTaskList) {
+    private static AlertDialog showDialog(final Activity activity, List<NewbieTask> newbieTaskList) {
         UMConfigUtils.onEvent(UMConfigUtils.Event.SHEEP_NEWBIE_TASK_LIST_DIALOG);
 
         View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);

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

@@ -163,6 +163,10 @@ public class FgtPersonalCenter extends BaseFragment {
     View my_card_layout;
     @BindView(R.id.login_name_tv)
     TextView loginNameTv;
+    @BindView(R.id.shop_assist_layout)
+    View shop_assist_layout;
+    @BindView(R.id.fgt_pc_item_shop_assist_v)
+    View fgt_pc_item_shop_assist_v;
 
     public UserEntity userEntity;
     private String faqUrl;
@@ -389,6 +393,8 @@ public class FgtPersonalCenter extends BaseFragment {
     }
 
     private void initWidget() {
+        ViewUtil.setVisibility(shop_assist_layout, userEntity.isShopAssist());
+        ViewUtil.setVisibility(fgt_pc_item_shop_assist_v, userEntity.isShopAssist());
         personalcenter_item_price_tv.setText(String.format(Locale.CHINA, "%s\u0020元", NumberFormatUtils.retainMost2W(userEntity.getBalance())));
         ViewUtil.setText(nameTv, userEntity.getNickname());
         sheepNumTv.setText(String.format(Locale.CHINA, "绵羊号：%s", userEntity.getInvitation_code()));
@@ -517,12 +523,12 @@ public class FgtPersonalCenter extends BaseFragment {
     @OnClick({R.id.icon_img_iv, R.id.account_detail_layout, R.id.personalcenter_item_price_ic,
             R.id.personalcenter_item_price_tag, R.id.personalcenter_item_price_tv,
             R.id.account_task_layout, R.id.proxy_service_layout, R.id.feedbook_layout,
-            R.id.recommend_friend_layout, R.id.faq_layout,
+            R.id.recommend_friend_layout, R.id.faq_layout, R.id.fgt_pc_item_gift_ll,
             R.id.version_layout, R.id.order_layout, R.id.proxy_game_account_layout,
-            R.id.audit_activity_cl, R.id.audit_success_cl, R.id.audit_failed_cl,
+            R.id.audit_activity_cl, R.id.audit_success_cl, R.id.audit_failed_cl,R.id.fgt_person_center_cart,
             R.id.iv_redpackage, R.id.fgt_person_center_my_focus, R.id.fgt_pc_item_vip_ll,
             R.id.voucher_layout, R.id.my_pet_layout, R.id.my_card_layout, R.id.be_vip_btn,
-            R.id.login_name_tv, R.id.edit_nickname_view, R.id.my_game_layout
+            R.id.login_name_tv, R.id.edit_nickname_view, R.id.my_game_layout, R.id.shop_assist_layout
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
@@ -631,6 +637,15 @@ public class FgtPersonalCenter extends BaseFragment {
                     G.shortToast("设置登录密码后不可修改登录名");
                 }
                 break;
+            case R.id.shop_assist_layout:
+                Jump2View.getInstance().gotoYYShopAssist(getContext());
+                break;
+            case R.id.fgt_pc_item_gift_ll:
+                Jump2View.getInstance().goMyWelfare(getActivity());
+                break;
+            case R.id.fgt_person_center_cart:
+                Jump2View.getInstance().goActMyCart();
+                break;
         }
     }
 

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

@@ -247,7 +247,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
                     tryMakeMoneyAdp.notifyDataSetChanged();
                     break;
                 case WHAT_TRY_SHOW_HB:
-                    isShowRedPackages(activity);
+                    ((ActMain)getActivity()).switchFragment(0);
+                    showRedPackage(activity);
                     break;
                 case WHAT_TRY_SHOW_NEWBIE_GUIDE:
                     CommonUtil.getInstance().checkNewbieGuideViewed(i -> {
@@ -435,54 +436,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
 
     /**
-     * 新手任务对话框中，注册账号并登录得红包，这里判断是否已经领取过了，如果领取过了就不显示，不然就显示
-     *
-     * @param obj ,Context对象
-     */
-    public void isShowRedPackages(Context obj) {
-        if (userEntity == null) {
-            userEntity = DataUtil.getInstance().getUserEntity();
-        }
-        if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
-            showRedPackage(obj);
-
-        }
-
-    }
-
-    /**
-     * @return 是否显示红包
-     */
-    public void isShowRedPackage() {
-        if (userEntity == null) {
-            userEntity = DataUtil.getInstance().getUserEntity();
-        }
-        if (userEntity == null) {
-            CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
-                @Override
-                public void call(UserEntity result) {
-                    if (result != null) {
-                        userEntity = result;
-                        showRedPackageNext();
-                    }
-                }
-            });
-        } else {
-            showRedPackageNext();
-        }
-    }
-
-    private void showRedPackageNext() {
-        if (SpUtils.getFirst("first" + userEntity.getId())) {//不是第一次进入APP
-            return;
-        }
-        SpUtils.saveFirst("first" + userEntity.getId(), true);//第一次登录成功后保存起来，下次进来就不再弹新人红包
-        if (((userEntity.getNewbie_task_status() & 16) == 0) && userEntity.getIs_new() == 1) {
-            showRedPackage(getContext());
-        }
-    }
-
-    /**
      * 初始化选项卡
      *
      * @param context 上下文参数
@@ -594,8 +547,6 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         }
         //每次进入主页都刷新一下url配置信息
         CommonUtil.getInstance().initUrlConfigByNet();
-        if (TestUtil.isLTVersion3_4_5())//3.4.5以前版本才调用下面的方法
-            isShowRedPackage();
         listRef = new WeakReference<>(home_list_rv);
     }
 
@@ -1467,10 +1418,8 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
         Activity mActivity = (Activity) context;
         View viewAnchor = LayoutInflater.from(context).inflate(R.layout.homepage_act_layout, null, false);
         View view = LayoutInflater.from(context).inflate(R.layout.dialog_redpackage_after_invitation, null, false);
-        TextView tvGetRedPackage = view.findViewById(R.id.tv_get_redpackage);
-        TextView tvMoney = view.findViewById(R.id.tv_money);
+        View tvGetRedPackage = view.findViewById(R.id.l_layout);
         ImageView ivClose = view.findViewById(R.id.iv_close);
-        TextView tvNew = view.findViewById(R.id.tv_flag1);
         final PopupWindow popupWindow = new PopupWindow(mActivity);
         popupWindow.setContentView(view);
         popupWindow.setAnimationStyle(R.style.Rising);
@@ -1487,22 +1436,17 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
             e.printStackTrace();
         }
         popupWindow.setOnDismissListener(new PopDismissListener(mActivity));
-        tvMoney.setText("1.8");
-        tvNew.setText("新人红包");
         tvGetRedPackage.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 popupWindow.dismiss();
-                getRedPackage(popupWindow);
-
+                Jump2View.getInstance().goNewbieTaskList(getContext(), null);
             }
         });
         ivClose.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 popupWindow.dismiss();
-
-
             }
         });
 

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

@@ -20,6 +20,9 @@ public class Config {
     public final static String YF_SHOP_HOME_SHEEP = "http://shop.17xmy.com/mobile/?pf=android.sheep.app";//小绵羊加载的有范商城主页地址
     public final static String YF_SHOP_HOME_SHEEP_TEST = "http://t.shop.17xmy.com/mobile/?pf=android.sheep.app";//小绵羊加载的有范商城主页地址
     public static final String YF_SHOP_ORDER_NUMBER_KEY = "order_number";
+    public final static String PATH_YF_SHOP_ORDER = "user.php?act=order_list";
+    public final static String PATH_YF_SHOP_CART = "flow.php";
+    public final static String PATH_YF_SHOP_FOCUS = "user.php?act=collection_list";
     //随便打
     public final static String SBD_NAME = "随便打";
 
@@ -49,6 +52,8 @@ public class Config {
     private static final String STATION_WELFARE = "/small_sheep_welfare/#";
     //游戏商城
     private static final String STATION_GAME_SHOP = "/game_mall/#";
+    //遇见预约
+    private static final String STATION_YY_SHOP = "yy_shop/#";
     //春节活动
     private static final String STATION_SPRING_FESTIVAL = "/newYearActive/#";
 
@@ -57,6 +62,7 @@ public class Config {
     public static final String KEY_YF_SHOP_URL = "yf_shop_url";
     public static final String KEY_YY_SHOP_URL = "yy_shop_url";
     public static final String KEY_YY_SHOP_GOODS_URL = "yy_shop_item_url";
+    public static final String KEY_YY_SHOP_ASSIST_URL = "yy_shop_assist_url";
     //龙猫竞猜分享地址 key
     public static final String KEY_LMJC_URL = "lmjc_url";
     //充值VIP地址的 key
@@ -91,6 +97,10 @@ public class Config {
     //游戏商城
     public static final String PATH_GAME_SHOP_HOME = STATION_GAME_SHOP + "/gameMallHome";
     public static final String PATH_GAME_SHOP_MY_GAME = STATION_GAME_SHOP + "/myGameRole";
+    //遇见预约
+    public static final String PATH_YY_SHOP_FOCUS = STATION_YY_SHOP + "/pages/cart/collection";
+    public static final String PATH_YY_SHOP_CART = STATION_YY_SHOP + "/pages/cart/myCart";
+    public static final String PATH_YY_SHOP_ORDER = STATION_YY_SHOP + "/pages/order/order";
     //赏金福利
     public static final String PATH_MONEY_REWARD_DETAIL = STATION_WELFARE + "/money-reward-detail";
     public static final String PATH_ACTIVITY_COIN_LIST = STATION_WELFARE + "/activity_coin_list";
@@ -114,15 +124,23 @@ public class Config {
     static {
         initSMALL_STATION_URL();
     }
-    public static void initSMALL_STATION_URL(){
+
+    public static void initSMALL_STATION_URL() {
         SMALL_STATION_URL = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? SMALL_STATION_URL_SHEEP : SMALL_STATION_URL_TEST;
 //        SMALL_STATION_URL = SMALL_STATION_URL_SHEEP;
     }
-    public static String getUrlByPath(String path, Object...query){
+
+    public static String getYFShopUrl(String sub) {
+        String url = TextUtils.equals(SheepApp.getInstance().getConnectAddress().name(), "sheep") ? "http://shop.17xmy.com/mobile/" : "http://t.shop.17xmy.com/mobile/";
+        url += sub + (sub.indexOf("?") < 0 ? "?" : "&") + "pf=android.sheep.app";
+        return url;
+    }
+
+    public static String getUrlByPath(String path, Object... query) {
         String url = SMALL_STATION_URL + path;
-        if(query != null && query.length > 0){
+        if (query != null && query.length > 0) {
             StringBuilder stringBuilder = new StringBuilder(url);
-            for (int i = 0; i + 1 < query.length;) {
+            for (int i = 0; i + 1 < query.length; ) {
                 stringBuilder.append(i == 0 && !url.contains("?") ? "?" : "&");
                 stringBuilder.append(query[i++]);
                 stringBuilder.append("=");
@@ -144,7 +162,7 @@ public class Config {
     public static final String KEY_ENABLE_CHECK_COPY_TEXT = "enable_check_copy_text";//是否开启粘贴板助手的key boolean
 
     //默认值
-    public static boolean dvbEnableCheckCopyText(){
+    public static boolean dvbEnableCheckCopyText() {
 //        return TestUtil.isTest();
         //游戏用户默认开启检查粘贴板
 //        UserEntity userEntity = DataUtil.getInstance().getUserEntity();

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

@@ -2,31 +2,60 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/bg_gray"
+    android:background="@color/white"
+    android:fitsSystemWindows="true"
     android:orientation="vertical">
 
-    <include layout="@layout/title" />
-    <TextView
-        android:id="@+id/my_price"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/fresh_task"
-        android:textColor="#7e7e7e"
-        android:textSize="14sp"
-        android:padding="@dimen/content_padding_10"/>
+        android:layout_height="52dp"
+        android:background="#F4F4F4"
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            android:id="@+id/total_money_tv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="完成任务领20元现金"
+            android:textColor="@color/black_333333"
+            android:textSize="15sp" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="5dp"
+            android:text="已领"
+            android:textColor="@color/black_333333"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/got_money_tv"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="¥20.0"
+            android:textColor="#FF2D4B"
+            android:textSize="12sp" />
+    </LinearLayout>
+
     <com.sheep.gamegroup.view.customview.RefreshLayout
         android:id="@+id/swipe_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:paddingLeft="12dp"
+        android:paddingRight="12dp">
 
         <ListView
             android:id="@+id/withdrawal_listview"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:listSelector="@color/transparent"
-            android:divider="@null"
             android:layout_margin="@dimen/content_padding_13"
-            android:scrollbars="none"/>
+            android:divider="@null"
+            android:listSelector="@color/transparent"
+            android:scrollbars="none" />
 
     </com.sheep.gamegroup.view.customview.RefreshLayout>
 </LinearLayout>

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

@@ -3,62 +3,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
+    <ImageView
         android:id="@+id/l_layout"
-        android:layout_width="300dp"
-        android:layout_height="290dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
         android:layout_centerInParent="true"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
-        android:background="@mipmap/get_redpackage_success">
-
-        <TextView
-            android:id="@+id/tv_flag1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="50dp"
-            android:text="    恭喜你！"
-            android:textColor="#ffffe0d7"
-            android:textSize="24sp" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/tv_flag1"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="20dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:id="@+id/tv_money"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="0.00"
-                android:textColor="#ffffe0d7"
-                android:textSize="38sp" />
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="元"
-                android:textColor="#ffffe0d7"
-                android:textSize="20sp" />
-        </LinearLayout>
-
-        <TextView
-            android:id="@+id/tv_get_redpackage"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="30dp"
-            android:background="@drawable/shape_get_redpackage_text_yellow"
-            android:gravity="center"
-            android:text="收下红包"
-            android:textColor="#ff3e2e08"
-            android:textSize="12sp" />
-    </RelativeLayout>
+        android:src="@mipmap/get_redpackage_success">
+    </ImageView>
 
     <ImageView
         android:id="@+id/iv_close"

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

@@ -6,6 +6,27 @@
     android:orientation="vertical">
 
     <LinearLayout
+        android:id="@+id/shop_assist_layout"
+        style="@style/style_item_container">
+
+        <ImageView
+            style="@style/style_item_img"
+            android:src="@mipmap/ic_assist" />
+
+        <TextView
+            style="@style/style_item_label"
+            android:text="店员端" />
+
+        <TextView style="@style/style_item_end_next" />
+
+    </LinearLayout>
+
+    <View
+        android:id="@+id/fgt_pc_item_shop_assist_v"
+        style="@style/style_item_line_new"
+        android:visibility="visible" />
+
+    <LinearLayout
         android:id="@+id/account_detail_layout"
         style="@style/style_item_container">
 
@@ -43,10 +64,32 @@
     </LinearLayout>
 
     <View
+        style="@style/style_item_line_new"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/fgt_pc_item_gift_ll"
+        style="@style/style_item_container">
+
+        <ImageView
+            style="@style/style_item_img"
+            android:src="@mipmap/ic_gift" />
+
+        <TextView
+            style="@style/style_item_label"
+            android:text="我的礼包" />
+
+        <TextView style="@style/style_item_end_next" />
+
+    </LinearLayout>
+
+    <View
         android:id="@+id/fgt_pc_item_my_pet_v"
         style="@style/style_item_line_new"
         android:visibility="gone" />
 
+
+
     <LinearLayout
         android:id="@+id/my_pet_layout"
         style="@style/style_item_container">
@@ -182,7 +225,7 @@
 
         <ImageView
             style="@style/style_item_img"
-            android:src="@mipmap/order_manager" />
+            android:src="@mipmap/ic_order" />
 
         <TextView
             style="@style/style_item_label"
@@ -195,6 +238,28 @@
     </LinearLayout>
 
     <View
+        android:id="@+id/line_person_center_my_cart"
+        style="@style/style_item_line_new" />
+
+    <LinearLayout
+        android:id="@+id/fgt_person_center_cart"
+        style="@style/style_item_container">
+
+        <ImageView
+            style="@style/style_item_img"
+            android:src="@mipmap/ic_cart" />
+
+        <TextView
+            style="@style/style_item_label"
+            android:text="购物车" />
+
+        <TextView
+            style="@style/style_item_end_next"
+            android:visibility="visible" />
+
+    </LinearLayout>
+
+    <View
         android:id="@+id/fgt_person_center_my_focus_line"
         style="@style/style_item_line_new"
         android:visibility="gone" />

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

@@ -20,6 +20,7 @@
         android:layout_alignParentTop="true"
         android:max="100"
         android:progress="0"
+        android:visibility="gone"
         android:progressDrawable="@drawable/lay_list_progress_yellow" />
 
     <ImageView

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

@@ -20,6 +20,7 @@
         android:layout_alignParentTop="true"
         android:max="100"
         android:progress="0"
+        android:visibility="gone"
         android:progressDrawable="@drawable/lay_list_progress_yellow" />
 
     <ImageView

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

@@ -1,15 +1,11 @@
 <?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="wrap_content"
+    android:layout_height="75dp"
     android:orientation="vertical">
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#FBFBFB"/>
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="74dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp">
 
@@ -19,8 +15,7 @@
             android:layout_height="40dp"
             android:padding="4dp"
             android:layout_alignParentStart="true"
-            android:layout_centerVertical="true"
-            android:src="@drawable/newbie_task_2" />
+            android:layout_centerVertical="true" />
 
         <TextView
             android:id="@+id/newbie_task_name_tv"
@@ -61,4 +56,8 @@
             android:text="去完成" />
 
     </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#e6e6e6"/>
 </LinearLayout>

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

@@ -193,6 +193,7 @@
     <string name="tip_not_gift_cash_game_or_else">不是礼包，不是现金奖励，不是游戏，还可能是什么</string>
     <string name="get_first_task_and_extra">获得首次奖励赚钱额外奖励</string>
     <string name="fresh_task">新手奖励</string>
+    <string name="fresh_gift">新手礼包</string>
     <string name="tip_invite_for_more_coin">首邀好友，好友下载并登录小绵羊，既可获得2.5绵羊币&#x000A;首邀好友完成新手奖励，邀请人可额外再获得2.5绵羊币</string>
     <string name="tip_invite_for_more_coin_20_percent">邀请好友完成奖励，可额外获取奖励的20%哦!</string>
     <string name="cancel_task_success">取消奖励成功</string>