Startsida Utforska Hjälp
Registrera dig Logga in
xmy_android
/
small_sheep_android
Bevaka 3
Stjärnmärk 0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

review code

liujiangyao 7 år sedan
förälder
96ff38db5f
incheckning
4fc7450b67
94 ändrade filer med 1888 tillägg och 627 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 2 0
      app/src/main/AndroidManifest.xml
  2. 264 0
      app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java
  3. 9 7
      app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
  4. 7 1
      app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
  5. 92 13
      app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
  6. 9 7
      app/src/main/java/com/kfzs/duanduan/react/MainTab.java
  7. 1 1
      app/src/main/java/com/kfzs/duanduan/view/ViewPagerAutoHeigh.java
  8. 14 2
      app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java
  9. 9 0
      app/src/main/java/com/sheep/gamegroup/model/entity/Friend.java
  10. 47 0
      app/src/main/java/com/sheep/gamegroup/model/entity/TaskAuditEntity.java
  11. 1 1
      app/src/main/java/com/sheep/gamegroup/presenter/TaskListPresenter.java
  12. 1 1
      app/src/main/java/com/sheep/gamegroup/presenter/TryMakeMoneyPresenter.java
  13. 73 0
      app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
  14. 9 0
      app/src/main/java/com/sheep/gamegroup/util/Jump2View.java
  15. 30 0
      app/src/main/java/com/sheep/gamegroup/util/NestedScrollView.java
  16. 4 1
      app/src/main/java/com/sheep/gamegroup/util/TestUtil.java
  17. 54 0
      app/src/main/java/com/sheep/gamegroup/view/activity/ActAudit.java
  18. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardWeb.java
  19. 1 1
      app/src/main/java/com/sheep/gamegroup/view/activity/ActFindInformation.java
  20. 21 400
      app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java
  21. 5 0
      app/src/main/java/com/sheep/gamegroup/view/adapter/AdpTryMakemoney.java
  22. 118 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyFriend.java
  23. 219 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java
  24. 145 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java
  25. 124 0
      app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java
  26. 10 0
      app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java
  27. BIN
      app/src/main/res/drawable-xhdpi/tab_click_shenhe.png
  28. BIN
      app/src/main/res/drawable-xhdpi/tab_click_yaoqing.png
  29. BIN
      app/src/main/res/drawable-xhdpi/tab_shenhe.png
  30. BIN
      app/src/main/res/drawable-xhdpi/tab_yaoqing.png
  31. BIN
      app/src/main/res/drawable-xxhdpi/tab_click_shenhe.png
  32. BIN
      app/src/main/res/drawable-xxhdpi/tab_click_yaoqing.png
  33. BIN
      app/src/main/res/drawable-xxhdpi/tab_shenhe.png
  34. BIN
      app/src/main/res/drawable-xxhdpi/tab_yaoqing.png
  35. 7 0
      app/src/main/res/drawable/button_full_nomal_yellow_click.xml
  36. 8 0
      app/src/main/res/drawable/drawable_selector_askgetmoney.xml
  37. 8 0
      app/src/main/res/drawable/drawable_selector_audit.xml
  38. 8 0
      app/src/main/res/drawable/shape_green_stroke_rectangle.xml
  39. 8 0
      app/src/main/res/drawable/shape_red_stroke_rectangle.xml
  40. 8 0
      app/src/main/res/drawable/shape_yellow_stroke_rectangle.xml
  41. 111 0
      app/src/main/res/layout/act_audit_layout.xml
  42. 12 0
      app/src/main/res/layout/activity_main.xml
  43. 133 0
      app/src/main/res/layout/ask_getmoney_act_item_three_notice_layout.xml
  44. 78 0
      app/src/main/res/layout/fgt_askgetmoney_friend.xml
  45. 84 0
      app/src/main/res/layout/fgt_askgetmoney_rank.xml
  46. 6 4
      app/src/main/res/layout/fgt_personalcenter_item_center_one.xml
  47. 41 13
      app/src/main/res/layout/homepage_act_layout.xml
  48. 37 0
      app/src/main/res/layout/tablayout_viewpager_layout.xml
  49. 27 162
      app/src/main/res/layout/x_ask_getmoney_act_layout.xml
  50. 7 7
      app/src/main/res/layout/x_ask_getmoney_act_layout_include.xml
  51. 3 3
      app/src/main/res/layout/x_ask_getmoney_act_layout_item.xml
  52. 1 2
      app/src/main/res/layout/x_item_view.xml
  53. BIN
      app/src/main/res/mipmap-xhdpi/ask_getmoney_hongbao.webp
  54. BIN
      app/src/main/res/mipmap-xhdpi/ask_getmoney_jiaren.webp
  55. BIN
      app/src/main/res/mipmap-xhdpi/ask_getmoney_qun.webp
  56. BIN
      app/src/main/res/mipmap-xhdpi/audit_top_bg.webp
  57. BIN
      app/src/main/res/mipmap-xhdpi/get_redpackage_success.png
  58. BIN
      app/src/main/res/mipmap-xhdpi/get_redpackage_success.webp
  59. BIN
      app/src/main/res/mipmap-xhdpi/huanyige.png
  60. BIN
      app/src/main/res/mipmap-xhdpi/huanyige.webp
  61. BIN
      app/src/main/res/mipmap-xhdpi/invition_redpackage.png
  62. BIN
      app/src/main/res/mipmap-xhdpi/invition_redpackage.webp
  63. BIN
      app/src/main/res/mipmap-xhdpi/jijiangks.png
  64. BIN
      app/src/main/res/mipmap-xhdpi/jijiangks.webp
  65. BIN
      app/src/main/res/mipmap-xhdpi/kejiequ.png
  66. BIN
      app/src/main/res/mipmap-xhdpi/kejiequ.webp
  67. BIN
      app/src/main/res/mipmap-xhdpi/lijiq.png
  68. BIN
      app/src/main/res/mipmap-xhdpi/lijiq.webp
  69. BIN
      app/src/main/res/mipmap-xhdpi/myprice_off.png
  70. BIN
      app/src/main/res/mipmap-xhdpi/myprice_off.webp
  71. BIN
      app/src/main/res/mipmap-xhdpi/myprice_on.png
  72. BIN
      app/src/main/res/mipmap-xhdpi/myprice_on.webp
  73. BIN
      app/src/main/res/mipmap-xhdpi/order_manager.png
  74. BIN
      app/src/main/res/mipmap-xhdpi/order_manager.webp
  75. BIN
      app/src/main/res/mipmap-xhdpi/qiangrew_bg.png
  76. BIN
      app/src/main/res/mipmap-xhdpi/qiangrew_bg.webp
  77. BIN
      app/src/main/res/mipmap-xhdpi/red_package_floatbtn.png
  78. BIN
      app/src/main/res/mipmap-xhdpi/red_package_floatbtn.webp
  79. BIN
      app/src/main/res/mipmap-xhdpi/remenyx.png
  80. BIN
      app/src/main/res/mipmap-xhdpi/remenyx.webp
  81. BIN
      app/src/main/res/mipmap-xhdpi/xinjin_label.png
  82. BIN
      app/src/main/res/mipmap-xhdpi/xinjin_label.webp
  83. BIN
      app/src/main/res/mipmap-xxhdpi/ask_getmoney_hongbao.webp
  84. BIN
      app/src/main/res/mipmap-xxhdpi/ask_getmoney_jiaren.webp
  85. BIN
      app/src/main/res/mipmap-xxhdpi/ask_getmoney_qun.webp
  86. BIN
      app/src/main/res/mipmap-xxhdpi/ask_top5_tip.png
  87. BIN
      app/src/main/res/mipmap-xxhdpi/ask_top5_tip.webp
  88. BIN
      app/src/main/res/mipmap-xxhdpi/audit_top_bg.webp
  89. BIN
      app/src/main/res/mipmap-xxhdpi/setting.png
  90. BIN
      app/src/main/res/mipmap-xxhdpi/setting.webp
  91. 16 0
      app/src/main/res/values/dd_styles.xml
  92. 7 0
      app/src/main/res/values/gamegroup_color.xml
  93. 2 0
      app/src/main/res/values/str_appstore_strings.xml
  94. 6 0
      app/src/main/res/values/strings.xml

+ 2 - 0
app/src/main/AndroidManifest.xml
Visa fil 

@@ -191,6 +191,8 @@
 
             android:launchMode="singleTask"/>
 
             android:launchMode="singleTask"/>
 
         <activity android:name="com.sheep.gamegroup.view.activity.TaskListAct"
 
         <activity android:name="com.sheep.gamegroup.view.activity.TaskListAct"
 
             android:screenOrientation="portrait"/>
 
             android:screenOrientation="portrait"/>
 
+        <activity android:name="com.sheep.gamegroup.view.activity.ActAudit"
 
+            android:screenOrientation="portrait"/>
 
         <activity android:name="com.sheep.gamegroup.view.activity.GameTaskOrderListAct"
 
         <activity android:name="com.sheep.gamegroup.view.activity.GameTaskOrderListAct"
 
             android:screenOrientation="portrait"/>
 
             android:screenOrientation="portrait"/>
 
         <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalListAct"
 
         <activity android:name="com.sheep.gamegroup.view.activity.WithdrawalListAct"

+ 264 - 0
app/src/main/java/com/kfzs/duanduan/fragment/FgtAskgetmoney.java
Visa fil 

@@ -0,0 +1,264 @@
 
+package com.kfzs.duanduan.fragment;
 
+
 
+import android.app.Activity;
 
+import android.os.Bundle;
 
+import android.support.design.widget.TabLayout;
 
+import android.support.v4.view.ViewPager;
 
+import android.support.v4.widget.NestedScrollView;
 
+import android.text.TextUtils;
 
+import android.view.MotionEvent;
 
+import android.view.View;
 
+import android.webkit.WebView;
 
+import android.widget.LinearLayout;
 
+import android.widget.TextView;
 
+
 
+import com.alibaba.fastjson.JSONObject;
 
+import com.kfzs.duanduan.BaseCompatFragment;
 
+import com.kfzs.duanduan.mine.GiftpackListAdapter;
 
+import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
 
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
+import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 
+import com.sheep.gamegroup.model.entity.UserEntity;
 
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 
+import com.sheep.gamegroup.util.CommonUtil;
 
+import com.sheep.gamegroup.util.FastJsonUtils;
 
+import com.sheep.gamegroup.util.StringUtils;
 
+import com.sheep.gamegroup.util.ViewUtil;
 
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyFriend;
 
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyRank;
 
+import com.sheep.jiuyan.samllsheep.R;
 
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
+import com.sheep.jiuyan.samllsheep.utils.G;
 
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+import com.sunfusheng.marqueeview.MarqueeView;
 
+
 
+import butterknife.BindView;
 
+import butterknife.ButterKnife;
 
+import butterknife.OnClick;
 
+import butterknife.Unbinder;
 
+import rx.android.schedulers.AndroidSchedulers;
 
+import rx.functions.Action1;
 
+import rx.schedulers.Schedulers;
 
+
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.QR_COPY;
 
+
 
+/**
 
+ * Created by ljy on 2018/8/20.
 
+ */
 
+
 
+public class FgtAskgetmoney extends BaseCompatFragment {
 
+    @BindView(R.id.tv_size)
 
+    TextView tvSize;
 
+    @BindView(R.id.tv_money)
 
+    TextView tvMoney;
 
+    @BindView(R.id.ask_bg)
 
+    WebView ask_bg;
 
+    @BindView(R.id.ask_top_1)
 
+    View ask_top_1;
 
+    @BindView(R.id.ask_top_2)
 
+    View ask_top_2;
 
+    @BindView(R.id.ask_award_info)
 
+    MarqueeView ask_award_info;
 
+    @BindView(R.id.ask_scroll_view)
 
+    NestedScrollView scrollView;
 
+    @BindView(R.id.indicator)
 
+    TabLayout indicator;
 
+    @BindView(R.id.pager)
 
+    ViewPagerAutoHeigh pager;
 
+    @BindView(R.id.my_invitation_tv)
 
+    TextView my_invitation_tv;
 
+    @BindView(R.id.copy_my_invitation_tv)
 
+    TextView copy_my_invitation_tv;
 
+
 
+    private FriendAndAwardEntity mEntity;
 
+    Unbinder unbinder;
 
+    private Activity activity;
 
+
 
+    @Override
 
+    protected void initView(Bundle savedInstanceState) {
 
+        setContentView(R.layout.x_ask_getmoney_act_layout);
 
+        activity = getActivity();
 
+        unbinder = ButterKnife.bind(this, mContentView);
 
+
 
+        TitleBarUtils.getInstance()
 
+                .setTitle(mContentView, "邀请赚钱")
 
+                .setTitleListen(mContentView,0,null);
 
+        String content = "<!DOCTYPEhtml>\n" +
 
+                "<html>\n" +
 
+                "  <head>\n" +
 
+                "    <title>HTML字符串</title>\n" +
 
+                "    <metahttp-equivmetahttp-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n" +
 
+                "    <meta name=\"viewport\" content=\"width=" + G.WIDTH + ", user-scalable=no\">\n" +
 
+                "    <style type=\"text/css\">\n" +
 
+                "      body {\n" +
 
+                "        margin: 0;\n" +
 
+                "        padding: 0;\n" +
 
+                "      }\n" +
 
+                "      img {\n" +
 
+                "        padding: 0;\n" +
 
+                "        margin: 0;\n" +
 
+                "      }\n" +
 
+                "    </style>\n" +
 
+                "  </head>\n" +
 
+                "  <body>\n" +
 
+                "    <img src=\"http://cdngame.kuaifazs.com/ask_bg2.png\" width=\"100%\">\n" +
 
+                "  </body>\n" +
 
+                "</html>";
 
+        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
 
+        ask_bg.loadData(content, "text/html", "UTF-8");
 
+//                16,18,19
 
+        LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
 
+        layoutParams1.height = G.WIDTH * 690 / 625;
 
+        ask_top_1.setLayoutParams(layoutParams1);
 
+        LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) ask_top_2.getLayoutParams();
 
+        layoutParams2.height = G.WIDTH * 112 / 625;
 
+        ask_top_2.setLayoutParams(layoutParams2);
 
+
 
+        showViewpage();
 
+
 
+        initData();
 
+
 
+        initListener();
 
+
 
+    }
 
+
 
+    @Override
 
+    public void onDestroyView() {
 
+        super.onDestroyView();
 
+    }
 
+
 
+    public void initListener() {
 
+        scrollView.setOnTouchListener(new View.OnTouchListener() {
 
+            @Override
 
+            public boolean onTouch(View v, MotionEvent event) {
 
+                switch (event.getAction()) {
 
+                    case MotionEvent.ACTION_DOWN:
 
+                        if (ask_award_info != null) {
 
+                            //开始滚动
 
+                            ask_award_info.stopFlipping();
 
+                        }
 
+                        break;
 
+                    case MotionEvent.ACTION_UP:
 
+                    default:
 
+                        if (ask_award_info != null) {
 
+                            //开始滚动
 
+                            ask_award_info.startFlipping();
 
+                        }
 
+                        break;
 
+                }
 
+                return false;
 
+            }
 
+        });
 
+    }
 
+
 
+    private UserEntity userEntity;
 
+
 
+    public void initData() {
 
+        ViewUtil.newInstance().showProgress(activity);
 
+        SheepApp.getInstance().getNetComponent().getApiService().FriendCountAndAward()
 
+                .subscribeOn(Schedulers.io())
 
+                .observeOn(AndroidSchedulers.mainThread())
 
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
 
+                    @Override
 
+                    public void onError(BaseMessage baseMessage) {
 
+
 
+                        ViewUtil.newInstance().hideProgress(activity);
 
+                        G.showToast(baseMessage.getMsg()+"");
 
+                    }
 
+
 
+                    @Override
 
+                    public void onNext(BaseMessage baseMessage) {
 
+                        if(baseMessage!=null){
 
+                            mEntity = FastJsonUtils.toBean( JSONObject.toJSONString(baseMessage.getData()),FriendAndAwardEntity.class);
 
+                            ViewUtil.newInstance().hideProgress(activity);
 
+                            activity.runOnUiThread(new Runnable() {
 
+                                @Override
 
+                                public void run() {
 
+                                    tvSize.setText(mEntity.getFriend_count() + "");
 
+                                    tvMoney.setText(mEntity.getAward());
 
+                                }
 
+                            });
 
+                        }else{
 
+                            onError(baseMessage);
 
+                        }
 
+
 
+                    }
 
+                });
 
+        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
 
+            @Override
 
+            public void call(UserEntity result) {
 
+                if (result != null) {
 
+                    userEntity = result;
 
+                    String audit_total_audit = String.format(activity.getResources().getString(R.string.my_invitation_str), userEntity.getInvitation_code());
 
+                    my_invitation_tv.setText(audit_total_audit + "");
 
+                }
 
+            }
 
+        });
 
+    }
 
+
 
+
 
+
 
+    @Override
 
+    public void onStop() {
 
+        super.onStop();
 
+
 
+        if (ask_award_info != null) {
 
+            //停止滚动
 
+            ask_award_info.stopFlipping();
 
+        }
 
+    }
 
+
 
+    //显示分享对话框
 
+    public void showShareView() {
 
+        String url = userEntity.getShareLink();
 
+        String description = mEntity.getShare_desc();
 
+        ViewUtil.showShareDialog(activity, url, description);
 
+    }
 
+
 
+    public static final String[] tabNames = {"排行榜", "好友列表"};
 
+    private GiftpackListAdapter mAdapter;
 
+
 
+    private void showViewpage() {
 
+        mAdapter = new GiftpackListAdapter(getChildFragmentManager(), activity.getApplicationContext());
 
+        mAdapter.add(new FgtAskGetMoneyRank(), tabNames[0]);
 
+        mAdapter.add(new FgtAskGetMoneyFriend(), tabNames[1]);
 
+        pager.setOffscreenPageLimit(2);
 
+        pager.setAdapter(mAdapter);
 
+        indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
 
+        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
+            @Override
 
+            public void onPageScrolled(int i, float v, int i1) {
 
+
 
+            }
 
+
 
+            @Override
 
+            public void onPageSelected(int i) {
 
+                pager.reSetHeight();
 
+            }
 
+
 
+            @Override
 
+            public void onPageScrollStateChanged(int i) {
 
+
 
+            }
 
+        });
 
+
 
+        indicator.setupWithViewPager(pager);
 
+        CommonUtil.getInstance().reflex(indicator, activity);
 
+    }
 
+
 
+    @OnClick({R.id.copy_my_invitation_tv, R.id.ask_invite_tv})
 
+    public void onViewClicked(View view) {
 
+        switch (view.getId()) {
 
+            case R.id.copy_my_invitation_tv:
 
+                if(TextUtils.isEmpty(my_invitation_tv.getText().toString()))
 
+                    return;
 
+                QR_COPY.onEvent();
 
+                StringUtils.CopyText(my_invitation_tv.getText().toString());
 
+                G.showToast("复制邀请码成功");
 
+                break;
 
+            case R.id.ask_invite_tv:
 
+                showShareView();
 
+                break;
 
+        }
 
+    }
 
+}

+ 9 - 7
app/src/main/java/com/kfzs/duanduan/fragment/FgtFriendExtractPage.java
Visa fil 

@@ -1,6 +1,7 @@
 
 package com.kfzs.duanduan.fragment;
 
 package com.kfzs.duanduan.fragment;
 
 
 
 import android.app.Activity;
 
 import android.app.Activity;
 
+import android.support.v4.app.Fragment;
 
 import android.view.View;
 
 import android.view.View;
 
 import android.view.ViewGroup;
 
 import android.view.ViewGroup;
 
 import android.widget.LinearLayout;
 
 import android.widget.LinearLayout;
 
@@ -13,6 +14,7 @@ import com.sheep.gamegroup.util.CommonUtil;
 
 import com.sheep.gamegroup.util.TimeUtil;
 
 import com.sheep.gamegroup.util.TimeUtil;
 
 import com.sheep.gamegroup.util.ViewUtil;
 
 import com.sheep.gamegroup.util.ViewUtil;
 
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
 
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
 
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyFriend;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
 import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
@@ -42,11 +44,11 @@ public class FgtFriendExtractPage extends BaseFragment {
 
 
 
     private List<Friend> list = new ArrayList<>();
 
     private List<Friend> list = new ArrayList<>();
 
 
 
-    private Activity activity;
 
+    private Fragment activity;
 
     @Override
 
     @Override
 
     public void onViewCreated() {
 
     public void onViewCreated() {
 
         ButterKnife.bind(this, mView);
 
         ButterKnife.bind(this, mView);
 
-        activity = getActivity();
 
+        activity = getParentFragment();
 
         initData();
 
         initData();
 
     }
 
     }
 
 
 
@@ -68,11 +70,11 @@ public class FgtFriendExtractPage extends BaseFragment {
 
                 TextView friend_item_id = (TextView) view.getChildAt(j++);
 
                 TextView friend_item_id = (TextView) view.getChildAt(j++);
 
                 friend_item_id.setText(friend.getInvitation_code());
 
                 friend_item_id.setText(friend.getInvitation_code());
 
                 TextView friend_item_name = (TextView) view.getChildAt(j++);
 
                 TextView friend_item_name = (TextView) view.getChildAt(j++);
 
-                friend_item_name.setText(friend.getNickname());
 
+                friend_item_name.setText(TimeUtil.TimeStamp2Date(friend.getCreate_time(), "yyyy/MM/dd HH:mm"));
 
                 TextView friend_item_extract = (TextView) view.getChildAt(j++);
 
                 TextView friend_item_extract = (TextView) view.getChildAt(j++);
 
-                ViewUtil.setText(friend_item_extract, friend.getAward_amount());
 
+                friend_item_extract.setText(friend.getSource_page()+"");
 
                 TextView friend_item_time = (TextView) view.getChildAt(j);
 
                 TextView friend_item_time = (TextView) view.getChildAt(j);
 
-                friend_item_time.setText(TimeUtil.TimeStamp2Date(friend.getCreate_time(), "yyyy/MM/dd HH:mm"));
 
+                ViewUtil.setText(friend_item_time, friend.getAward_amount());
 
             } else {
 
             } else {
 
                 line.setVisibility(View.INVISIBLE);
 
                 line.setVisibility(View.INVISIBLE);
 
                 view.setVisibility(View.INVISIBLE);
 
                 view.setVisibility(View.INVISIBLE);
 
@@ -99,8 +101,8 @@ public class FgtFriendExtractPage extends BaseFragment {
 
                             baseMessage.setMsg("您还没有邀请到好友");
 
                             baseMessage.setMsg("您还没有邀请到好友");
 
                             onError(baseMessage);
 
                             onError(baseMessage);
 
                         } else {
 
                         } else {
 
-                            if (activity instanceof AskGetMoneyAct) {
 
-                                ((AskGetMoneyAct) activity).setFriendExtractCount(baseMessage.getTotal(), page, friendList.size());
 
+                            if (activity instanceof FgtAskGetMoneyFriend) {
 
+                                ((FgtAskGetMoneyFriend) activity).setFriendExtractCount(baseMessage.getTotal(), page, friendList.size());
 
                             }
 
                             }
 
                             list.addAll(friendList);
 
                             list.addAll(friendList);
 
                             notifyDataSetChanged();
 
                             notifyDataSetChanged();

+ 7 - 1
app/src/main/java/com/kfzs/duanduan/fragment/FgtPersonalCenter.java
Visa fil 

@@ -26,6 +26,7 @@ import com.sheep.gamegroup.util.DataUtil;
 
 import com.sheep.gamegroup.util.GlideImageLoader;
 
 import com.sheep.gamegroup.util.GlideImageLoader;
 
 import com.sheep.gamegroup.util.Jump2View;
 
 import com.sheep.gamegroup.util.Jump2View;
 
 import com.sheep.gamegroup.util.SysAppUtil;
 
 import com.sheep.gamegroup.util.SysAppUtil;
 
+import com.sheep.gamegroup.util.TestUtil;
 
 import com.sheep.gamegroup.util.ViewUtil;
 
 import com.sheep.gamegroup.util.ViewUtil;
 
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 
 import com.sheep.gamegroup.view.activity.PersonalCenterAct;
 
 import com.sheep.gamegroup.view.dialog.DialogShare;
 
 import com.sheep.gamegroup.view.dialog.DialogShare;
 
@@ -205,6 +206,11 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
                 ViewUtil.changeRedPackage(getActivity(),getView(),FgtPersonalCenter.this);
 
                 ViewUtil.changeRedPackage(getActivity(),getView(),FgtPersonalCenter.this);
 
                 break;
 
                 break;
 
             case R.id.icon_img_iv://图片
 
             case R.id.icon_img_iv://图片
 
+                if (TestUtil.isTest()) {
 
+                    TestUtil.test(activity);
 
+                } else
 
+                    Jump2View.getInstance().goPersionInfo(activity, null);
 
+                break;
 
             case R.id.account_detail_layout://个人资料
 
             case R.id.account_detail_layout://个人资料
 
                 Jump2View.getInstance().goPersionInfo(activity, null);
 
                 Jump2View.getInstance().goPersionInfo(activity, null);
 
                 break;
 
                 break;
 
@@ -212,7 +218,7 @@ public class FgtPersonalCenter extends BaseCompatFragment {
 
                 Jump2View.getInstance().goMyMoney(activity, null);
 
                 Jump2View.getInstance().goMyMoney(activity, null);
 
                 break;
 
                 break;
 
             case R.id.account_task_layout://任务记录
 
             case R.id.account_task_layout://任务记录
 
-                Jump2View.getInstance().goTaskList2View(activity, null);
 
+                Jump2View.getInstance().goAuditTastList(activity, null);
 
                 break;
 
                 break;
 
             case R.id.proxy_service_layout://代理
 
             case R.id.proxy_service_layout://代理
 
                 CommonUtil.getInstance().initUrlConfigByNet("agenturl", new Action1<String>(){
 
                 CommonUtil.getInstance().initUrlConfigByNet("agenturl", new Action1<String>(){

+ 92 - 13
app/src/main/java/com/kfzs/duanduan/fragment/FgtSmallSheep.java
Visa fil 

@@ -5,11 +5,14 @@ import android.app.Activity;
 
 import android.content.Context;
 
 import android.content.Context;
 
 import android.content.DialogInterface;
 
 import android.content.DialogInterface;
 
 import android.graphics.Color;
 
 import android.graphics.Color;
 
+import android.os.Build;
 
 import android.os.Bundle;
 
 import android.os.Bundle;
 
 import android.os.Handler;
 
 import android.os.Handler;
 
 import android.os.Looper;
 
 import android.os.Looper;
 
 import android.os.Message;
 
 import android.os.Message;
 
-import android.support.v4.widget.NestedScrollView;
 
+import android.support.annotation.RequiresApi;
 
+import android.support.design.widget.TabLayout;
 
+import android.support.v4.view.ViewPager;
 
 import android.support.v4.widget.SwipeRefreshLayout;
 
 import android.support.v4.widget.SwipeRefreshLayout;
 
 import android.support.v7.app.AlertDialog;
 
 import android.support.v7.app.AlertDialog;
 
 import android.support.v7.widget.LinearLayoutManager;
 
 import android.support.v7.widget.LinearLayoutManager;
 
@@ -21,18 +24,17 @@ import android.view.View;
 
 import android.view.ViewGroup;
 
 import android.view.ViewGroup;
 
 import android.widget.ImageView;
 
 import android.widget.ImageView;
 
 import android.widget.LinearLayout;
 
 import android.widget.LinearLayout;
 
-import android.widget.PopupWindow;
 
 import android.widget.TextView;
 
 import android.widget.TextView;
 
 
 
 import com.alibaba.fastjson.JSONArray;
 
 import com.alibaba.fastjson.JSONArray;
 
 import com.bumptech.glide.Glide;
 
 import com.bumptech.glide.Glide;
 
 import com.bumptech.glide.request.RequestOptions;
 
 import com.bumptech.glide.request.RequestOptions;
 
-import com.google.gson.Gson;
 
 import com.kfzs.duanduan.BaseCompatFragment;
 
 import com.kfzs.duanduan.BaseCompatFragment;
 
 import com.kfzs.duanduan.event.BigEvent;
 
 import com.kfzs.duanduan.event.BigEvent;
 
 import com.kfzs.duanduan.react.ConfigUtil;
 
 import com.kfzs.duanduan.react.ConfigUtil;
 
 import com.kfzs.duanduan.react.SharedPreferences;
 
 import com.kfzs.duanduan.react.SharedPreferences;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 
+import com.kfzs.duanduan.view.ViewPagerAutoHeigh;
 
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 
 import com.sheep.gamegroup.di.components.DaggerSmallSheepComponent;
 
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 
 import com.sheep.gamegroup.di.modules.SmallSheepModule;
 
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 
 import com.sheep.gamegroup.di.modules.TryMakeMoneyModule;
 
@@ -46,12 +48,10 @@ import com.sheep.gamegroup.model.entity.RecyleType;
 
 import com.sheep.gamegroup.model.entity.RequestParameEty;
 
 import com.sheep.gamegroup.model.entity.RequestParameEty;
 
 import com.sheep.gamegroup.model.entity.SlideshowEty;
 
 import com.sheep.gamegroup.model.entity.SlideshowEty;
 
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 
 import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 
-import com.sheep.gamegroup.model.entity.TaskEty;
 
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 
 import com.sheep.gamegroup.model.entity.TaskReleaseEty;
 
 import com.sheep.gamegroup.model.entity.UserEntity;
 
 import com.sheep.gamegroup.model.entity.UserEntity;
 
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 
 import com.sheep.gamegroup.model.util.AutoTaskListUtil;
 
 import com.sheep.gamegroup.model.util.EntityUtils;
 
 import com.sheep.gamegroup.model.util.EntityUtils;
 
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 
 import com.sheep.gamegroup.presenter.SmallSheepContract;
 
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 
 import com.sheep.gamegroup.presenter.SmallSheepPresenter;
 
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 
 import com.sheep.gamegroup.presenter.TryMakeMoneyContract;
 
@@ -61,9 +61,9 @@ import com.sheep.gamegroup.util.DataUtil;
 
 import com.sheep.gamegroup.util.GlideImageLoader;
 
 import com.sheep.gamegroup.util.GlideImageLoader;
 
 import com.sheep.gamegroup.util.Jump2View;
 
 import com.sheep.gamegroup.util.Jump2View;
 
 import com.sheep.gamegroup.util.ListUtil;
 
 import com.sheep.gamegroup.util.ListUtil;
 
-import com.sheep.gamegroup.util.LogUtil;
 
 import com.sheep.gamegroup.util.MyGridview;
 
 import com.sheep.gamegroup.util.MyGridview;
 
 import com.sheep.gamegroup.util.MyListview;
 
 import com.sheep.gamegroup.util.MyListview;
 
+import com.sheep.gamegroup.util.NestedScrollView;
 
 import com.sheep.gamegroup.util.SysAppUtil;
 
 import com.sheep.gamegroup.util.SysAppUtil;
 
 import com.sheep.gamegroup.util.TestUtil;
 
 import com.sheep.gamegroup.util.TestUtil;
 
 import com.sheep.gamegroup.util.UMConfigUtils;
 
 import com.sheep.gamegroup.util.UMConfigUtils;
 
@@ -71,8 +71,12 @@ import com.sheep.gamegroup.util.ViewUtil;
 
 import com.sheep.gamegroup.view.activity.NotificationsUtils;
 
 import com.sheep.gamegroup.view.activity.NotificationsUtils;
 
 import com.sheep.gamegroup.view.adapter.AdpHomeListGrideview;
 
 import com.sheep.gamegroup.view.adapter.AdpHomeListGrideview;
 
 import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 
 import com.sheep.gamegroup.view.adapter.AdpHomeListListview;
 
+import com.sheep.gamegroup.view.adapter.AdpTryMakemoney;
 
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 
 import com.sheep.gamegroup.view.adapter.TryMakeMoneyAdp;
 
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 
 import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 
+import com.sheep.gamegroup.view.fragment.FgtAskGetMoneyRank;
 
+import com.sheep.gamegroup.view.fragment.FgtMyGame;
 
+import com.sheep.gamegroup.view.fragment.FgtTryMakeMoney;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import com.sheep.jiuyan.samllsheep.utils.G;
 
 import com.sheep.jiuyan.samllsheep.utils.G;
 
@@ -98,9 +102,7 @@ import butterknife.BindView;
 
 import butterknife.ButterKnife;
 
 import butterknife.ButterKnife;
 
 import butterknife.OnClick;
 
 import butterknife.OnClick;
 
 import butterknife.Unbinder;
 
 import butterknife.Unbinder;
 
-import rx.android.schedulers.AndroidSchedulers;
 
 import rx.functions.Action1;
 
 import rx.functions.Action1;
 
-import rx.schedulers.Schedulers;
 
 
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
 
 import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
 
 
 
@@ -158,6 +160,10 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     View viewRobDuty;
 
     View viewRobDuty;
 
     @BindView(R.id.iv_rob_duty)
 
     @BindView(R.id.iv_rob_duty)
 
     ImageView ivDuty;
 
     ImageView ivDuty;
 
+    @BindView(R.id.viewpager_act_game_details)
 
+    ViewPagerAutoHeigh mViewPager;
 
+    @BindView(R.id.tabLayout)
 
+    TabLayout tabLayout;
 
 
 
 
 
     @Inject
 
     @Inject
 
@@ -182,6 +188,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     private AdpHomeListGrideview adpHomeListGrideview;
 
     private AdpHomeListGrideview adpHomeListGrideview;
 
     private AdpHomeListListview adpHomeListListview;
 
     private AdpHomeListListview adpHomeListListview;
 
     private TaskReleaseEty taskEty;
 
     private TaskReleaseEty taskEty;
 
+    private AdpTryMakemoney adpViewPagerDetail;
 
 
 
     private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
 
     private static final int LIST_COUNT = 2;//tryMakeMoneyAdp 总共有2条数据
 
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
 
     private static final RecyleObj NULL = RecyleObj.make(RecyleType.NONE, null);//空数据
 
@@ -241,6 +248,36 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         LinearLayout.LayoutParams bannerLayoutParams = (LinearLayout.LayoutParams) banner.getLayoutParams();
 
         LinearLayout.LayoutParams bannerLayoutParams = (LinearLayout.LayoutParams) banner.getLayoutParams();
 
         bannerLayoutParams.height = G.WIDTH * 25 / 72;
 
         bannerLayoutParams.height = G.WIDTH * 25 / 72;
 
         banner.setLayoutParams(bannerLayoutParams);
 
         banner.setLayoutParams(bannerLayoutParams);
 
+
 
+        /**
 
+         * tablayout
 
+         */
 
+        adpViewPagerDetail = new AdpTryMakemoney(getChildFragmentManager(), activity);
 
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "每日必做");
 
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "即将开始");
 
+
 
+        mViewPager.setOffscreenPageLimit(2);
 
+        mViewPager.setAdapter(adpViewPagerDetail);
 
+
 
+        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(mViewPager));
 
+        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
+            @Override
 
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
+
 
+            }
 
+
 
+            @Override
 
+            public void onPageSelected(int position) {
 
+                mViewPager.reSetHeight();
 
+            }
 
+
 
+            @Override
 
+            public void onPageScrollStateChanged(int state) {
 
+
 
+            }
 
+        });
 
+        tabLayout.setupWithViewPager(mViewPager);
 
+        CommonUtil.getInstance().reflex(tabLayout, activity);
 
     }
 
     }
 
 
 
 
 
@@ -261,6 +298,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
     }
 
     }
 
 
 
 
 
+    @RequiresApi(api = Build.VERSION_CODES.M)
 
     @SuppressLint("ClickableViewAccessibility")
 
     @SuppressLint("ClickableViewAccessibility")
 
     public void initListener() {
 
     public void initListener() {
 
         scrollView.setOnTouchListener(new View.OnTouchListener() {
 
         scrollView.setOnTouchListener(new View.OnTouchListener() {
 
@@ -293,6 +331,26 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
             }
 
             }
 
         });
 
         });
 
 
 
+        scrollView.setOnScrollChangeListener(new View.OnScrollChangeListener() {
 
+            @Override
 
+            public void onScrollChange(View v, int scrollX, int scrollY, int oldScrollX, int oldScrollY) {
 
+
 
+                try {
 
+                    tabLayout.post(new Runnable() {
 
+                        @Override
 
+                        public void run() {
 
+                            toolBarPositionY = tabLayout.getHeight();
 
+                            ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
 
+                            params.height = G.HEIGHT - toolBarPositionY - tabLayout.getHeight()+1;
 
+                            mViewPager.setLayoutParams(params);
 
+                        }
 
+                    });
 
+                } catch (Exception e) {
 
+                    e.printStackTrace();
 
+                }
 
+            }
 
+        });
 
+
 
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
 
         refresh.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
 
             @Override
 
             @Override
 
             public void onRefresh() {
 
             public void onRefresh() {
 
@@ -370,11 +428,12 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
             boolean isShowQB = false;
 
             boolean isShowQB = false;
 
             boolean isShowMd = false;
 
             boolean isShowMd = false;
 
             for (int i = 0; i < homeListEntitys.size(); i++) {
 
             for (int i = 0; i < homeListEntitys.size(); i++) {
 
-                if (i < 4) {
 
+                /*if (i < 4) {
 
                     homeListEntitysGridview.add(homeListEntitys.get(i));
 
                     homeListEntitysGridview.add(homeListEntitys.get(i));
 
                 } else {
 
                 } else {
 
                     homeListEntitysListview.add(homeListEntitys.get(i));
 
                     homeListEntitysListview.add(homeListEntitys.get(i));
 
-                }
 
+                }*/
 
+                homeListEntitysGridview.add(homeListEntitys.get(i));
 
                 if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
 
                 if (homeListEntitys.get(i).getJump().equals("6")) {//6Q币充值
 
                     isShowQB = !isShowQB;
 
                     isShowQB = !isShowQB;
 
                 }
 
                 }
 
@@ -392,6 +451,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         refreshData();
 
         refreshData();
 
     }
 
     }
 
 
 
+    int toolBarPositionY;
 
     /**
 
     /**
 
      * 刷新数据
 
      * 刷新数据
 
      */
 
      */
 
@@ -428,6 +488,25 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         pagePresenter.slideshow(null);//轮播
 
         pagePresenter.slideshow(null);//轮播
 
         pagePresenter.homeList();//首页list
 
         pagePresenter.homeList();//首页list
 
 
 
+        CommonUtil.getInstance().getUserNoDoingTaskMoney(new Action1<BaseMessage>() {
 
+            @Override
 
+            public void call(BaseMessage o) {
 
+
 
+            }
 
+        });
 
+        adpViewPagerDetail.cleanListFragment();
 
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "每日必做");
 
+        adpViewPagerDetail.add(FgtTryMakeMoney.newInstance(0), "即将开始");
 
+        adpViewPagerDetail.notifyDataSetChanged();
 
+        tabLayout.post(new Runnable() {
 
+            @Override
 
+            public void run() {
 
+                toolBarPositionY = tabLayout.getHeight();
 
+                ViewGroup.LayoutParams params = mViewPager.getLayoutParams();
 
+                params.height = G.HEIGHT - toolBarPositionY - tabLayout.getHeight()+1;
 
+                mViewPager.setLayoutParams(params);
 
+            }
 
+        });
 
     }
 
     }
 
 
 
     /**
 
     /**
 
@@ -467,7 +546,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
                                 0,
 
                                 0,
 
                                  "-1",
 
                                  "-1",
 
                                 3));
 
                                 3));
 
-        tryMakeMoneyPresenter.releaseTask(parameEty);
 
+//        tryMakeMoneyPresenter.releaseTask(parameEty);
 
     }
 
     }
 
 
 
 
 
@@ -728,7 +807,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
         if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
 
         if(DataUtil.getInstance().isTaskListChange(getClass()))//数据变化才刷新
 
             refreshTaskList();
 
             refreshTaskList();
 
         if(onResumeCount == 0)//第一次才调用
 
         if(onResumeCount == 0)//第一次才调用
 
-            Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
 
+//            Jump2View.getInstance().tryShowNewbieTask(activity, userEntity, newbie_task);
 
         onResumeCount++;
 
         onResumeCount++;
 
         viewRobDuty.setOnClickListener(new View.OnClickListener() {
 
         viewRobDuty.setOnClickListener(new View.OnClickListener() {
 
             @Override
 
             @Override
 
@@ -965,7 +1044,7 @@ public class FgtSmallSheep extends BaseCompatFragment implements SmallSheepContr
 
      * 公共
 
      * 公共
 
      */
 
      */
 
     private void inviteNotice(final List<BulletinEnty> bulletinEntyList) {
 
     private void inviteNotice(final List<BulletinEnty> bulletinEntyList) {
 
-        homepageItemNoticeLayout.setVisibility(View.VISIBLE);
 
+        homepageItemNoticeLayout.setVisibility(View.GONE);
 
 //        List<String> infoList = new ArrayList<>();
 
 //        List<String> infoList = new ArrayList<>();
 
 //        for(BulletinEnty bulletinEnty: bulletinEntyList){
 
 //        for(BulletinEnty bulletinEnty: bulletinEntyList){
 
 //            infoList.add(bulletinEnty.getContent()+"");
 
 //            infoList.add(bulletinEnty.getContent()+"");

+ 9 - 7
app/src/main/java/com/kfzs/duanduan/react/MainTab.java
Visa fil 

@@ -3,9 +3,11 @@ package com.kfzs.duanduan.react;
 
 import android.support.v4.app.Fragment;
 
 import android.support.v4.app.Fragment;
 
 
 
 import com.kfzs.duanduan.ActMain;
 
 import com.kfzs.duanduan.ActMain;
 
+import com.kfzs.duanduan.fragment.FgtAskgetmoney;
 
 import com.kfzs.duanduan.fragment.FgtFind;
 
 import com.kfzs.duanduan.fragment.FgtFind;
 
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 
 import com.kfzs.duanduan.fragment.FgtPersonalCenter;
 
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 
 import com.kfzs.duanduan.fragment.FgtSmallSheep;
 
+import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 
 
 /**
 
 /**
 
@@ -24,28 +26,28 @@ public enum MainTab {
 
             return R.drawable.drawable_selector_task;
 
             return R.drawable.drawable_selector_task;
 
         }
 
         }
 
     },
 
     },
 
-    /*FgtMainGame(R.string.tab_viewpager_gamestore) {
 
+    FgtMainAudit(R.string.main_tab_audit) {
 
         @Override
 
         @Override
 
         public Fragment getFragment() {
 
         public Fragment getFragment() {
 
-            return new FgtMainGame();
 
+            return new FgtMainAudit();
 
         }
 
         }
 
 
 
         @Override
 
         @Override
 
         public int getDrawableId() {
 
         public int getDrawableId() {
 
-            return R.drawable.drawable_selector_game;
 
+            return R.drawable.drawable_selector_audit;
 
         }
 
         }
 
     },
 
     },
 
-    FgtMainCategory(R.string.tab_viewpager_classification) {
 
+    FgtMainAskGetMoney(R.string.main_tab_invite) {
 
         @Override
 
         @Override
 
         public Fragment getFragment() {
 
         public Fragment getFragment() {
 
-            return new FgtMainCategory();
 
+            return new FgtAskgetmoney();
 
         }
 
         }
 
 
 
         @Override
 
         @Override
 
         public int getDrawableId() {
 
         public int getDrawableId() {
 
-            return R.drawable.drawable_selector_class;
 
+            return R.drawable.drawable_selector_askgetmoney;
 
         }
 
         }
 
-    },*/
 
+    },
 
     Fgt_Find(R.string.main_tab_find) {
 
     Fgt_Find(R.string.main_tab_find) {
 
         @Override
 
         @Override
 
         public Fragment getFragment() {
 
         public Fragment getFragment() {

+ 1 - 1
app/src/main/java/com/kfzs/duanduan/view/ViewPagerAutoHeigh.java
Visa fil 

@@ -46,7 +46,7 @@ public class ViewPagerAutoHeigh extends ViewPager {
 
             View child = getChildAt(i);
 
             View child = getChildAt(i);
 
             child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
 
             child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED));
 
             int h = child.getMeasuredHeight();
 
             int h = child.getMeasuredHeight();
 
-            mHeight[i] = h;
 
+            mHeight[i] = h < 300 ? 300:h;
 
             Log.e("-----------child" + i, "minHeight:" + h);
 
             Log.e("-----------child" + i, "minHeight:" + h);
 
         }
 
         }
 
         heightMeasureSpec = MeasureSpec.makeMeasureSpec(mHeight[getCurrentItem()], MeasureSpec.EXACTLY);
 
         heightMeasureSpec = MeasureSpec.makeMeasureSpec(mHeight[getCurrentItem()], MeasureSpec.EXACTLY);

+ 14 - 2
app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java
Visa fil 

@@ -99,7 +99,7 @@ public interface ApiService {
 
      * 获取任务记录列表
 
      * 获取任务记录列表
 
      */
 
      */
 
     @GET("app/accepted_task/")
 
     @GET("app/accepted_task/")
 
-    Observable<BaseMessage> acceptedTask(@Query("page") int page, @Query("per_page") int per_page);
 
+    Observable<BaseMessage> acceptedTask(@Query("page") int page, @Query("per_page") int per_page, @Query("status") int status);
 
 
 
     /**
 
     /**
 
      * 领取任务
 
      * 领取任务
 
@@ -153,7 +153,7 @@ public interface ApiService {
 
      * 用户提现记录
 
      * 用户提现记录
 
      */
 
      */
 
     @GET("app/withdraw/")
 
     @GET("app/withdraw/")
 
-    Observable<BaseMessage> goWithdrawal(@Query("page") int page, @Query("per_page") int per_page, @Query("start_time ") String start_time, @Query("end_time ") String end_time);
 
+    Observable<BaseMessage> goWithdrawal(@Query("page") int page, @Query("per_page") int per_page, @Query("start_time") String start_time, @Query("end_time") String end_time);
 
 
 
 
 
     /**
 
     /**
 
@@ -791,4 +791,16 @@ public interface ApiService {
 
      */
 
      */
 
     @GET("app/user/invitation_top_record")
 
     @GET("app/user/invitation_top_record")
 
     Observable<BaseMessage> getInvitationTopRecord();
 
     Observable<BaseMessage> getInvitationTopRecord();
 
+    /**
 
+     * 获取用户未做金额
 
+     * can_receive_awar
 
+     */
 
+    @GET("app/user/can_receive_awar")
 
+    Observable<BaseMessage> getCanREceiveAwar();
 
+    /**
 
+     * 任务审核
 
+     * accepted_task/static_audit
 
+     */
 
+    @GET("app/accepted_task/static_audit")
 
+    Observable<BaseMessage> staticAudit();
 
 }
 
 }

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/Friend.java
Visa fil 

@@ -56,6 +56,15 @@ public class Friend {
 
     private String parent_code;
 
     private String parent_code;
 
 
 
     private int create_time;
 
     private int create_time;
 
+    private String source_page;
 
+
 
+    public String getSource_page() {
 
+        return TextUtils.isEmpty(source_page)?"":source_page;
 
+    }
 
+
 
+    public void setSource_page(String source_page) {
 
+        this.source_page = source_page;
 
+    }
 
 
 
     public void setAward_amount(String award_amount){
 
     public void setAward_amount(String award_amount){
 
         this.award_amount = award_amount;
 
         this.award_amount = award_amount;

+ 47 - 0
app/src/main/java/com/sheep/gamegroup/model/entity/TaskAuditEntity.java
Visa fil 

@@ -0,0 +1,47 @@
 
+package com.sheep.gamegroup.model.entity;
 
+
 
+import java.io.Serializable;
 
+
 
+/**
 
+ * 审核中心top
 
+ * Created by ljy on 2018/8/17.
 
+ */
 
+
 
+public class TaskAuditEntity implements Serializable {
 
+    private String finish_cash;// 67150.72,
 
+    private String audit_count;// 0,
 
+    private String welfare_award;// 67150.72,
 
+    private String finish_count;// 0
 
+
 
+    public String getFinish_cash() {
 
+        return finish_cash;
 
+    }
 
+
 
+    public void setFinish_cash(String finish_cash) {
 
+        this.finish_cash = finish_cash;
 
+    }
 
+
 
+    public String getAudit_count() {
 
+        return audit_count;
 
+    }
 
+
 
+    public void setAudit_count(String audit_count) {
 
+        this.audit_count = audit_count;
 
+    }
 
+
 
+    public String getWelfare_award() {
 
+        return welfare_award;
 
+    }
 
+
 
+    public void setWelfare_award(String welfare_award) {
 
+        this.welfare_award = welfare_award;
 
+    }
 
+
 
+    public String getFinish_count() {
 
+        return finish_count;
 
+    }
 
+
 
+    public void setFinish_count(String finish_count) {
 
+        this.finish_count = finish_count;
 
+    }
 
+}

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/presenter/TaskListPresenter.java
Visa fil 

@@ -27,7 +27,7 @@ public class TaskListPresenter implements TaskListContract.Presenter {
 
 
 
     @Override
 
     @Override
 
     public void acceptedTask(int page, int pre_page) {
 
     public void acceptedTask(int page, int pre_page) {
 
-        apiService.acceptedTask(page, pre_page)
 
+        apiService.acceptedTask(page, pre_page, 0)
 
                 .subscribeOn(Schedulers.io())
 
                 .subscribeOn(Schedulers.io())
 
                 .observeOn(AndroidSchedulers.mainThread())
 
                 .observeOn(AndroidSchedulers.mainThread())
 
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
 
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/presenter/TryMakeMoneyPresenter.java
Visa fil 

@@ -34,7 +34,7 @@ public class TryMakeMoneyPresenter implements TryMakeMoneyContract.Presenter {
 
 
 
     @Override
 
     @Override
 
     public void acceptedTask(RequestParameEty o) {
 
     public void acceptedTask(RequestParameEty o) {
 
-        apiService.acceptedTask(o.getPage(), o.getPer_page())
 
+        apiService.acceptedTask(o.getPage(), o.getPer_page(), 0)
 
                 .subscribeOn(Schedulers.io())
 
                 .subscribeOn(Schedulers.io())
 
                 .observeOn(AndroidSchedulers.mainThread())
 
                 .observeOn(AndroidSchedulers.mainThread())
 
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {
 
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.mContext) {

+ 73 - 0
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java
Visa fil 

@@ -1754,4 +1754,77 @@ public class CommonUtil {
 
                     }
 
                     }
 
                 });
 
                 });
 
     }
 
     }
 
+    /**
 
+     * 获取用户未做任务金额
 
+     */
 
+    public void getUserNoDoingTaskMoney(final Action1<BaseMessage> action1){
 
+
 
+        SheepApp.getInstance().getNetComponent().getApiService().getCanREceiveAwar()
 
+                .subscribeOn(Schedulers.io())
 
+                .observeOn(AndroidSchedulers.mainThread())
 
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
+                    @Override
 
+                    public void onNext(BaseMessage baseMessage) {
 
+
 
+                        if (action1 != null)
 
+                            action1.call(baseMessage);
 
+                    }
 
+
 
+                    @Override
 
+                    public void onError(BaseMessage baseMessage) {
 
+
 
+                        if (action1 != null)
 
+                            action1.call(null);
 
+                    }
 
+                });
 
+    }
 
+
 
+    /**
 
+     * 任务审核
 
+     */
 
+    public void staticAudit(final Action1<BaseMessage> action1){
 
+
 
+        SheepApp.getInstance().getNetComponent().getApiService().staticAudit()
 
+                .subscribeOn(Schedulers.io())
 
+                .observeOn(AndroidSchedulers.mainThread())
 
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
+                    @Override
 
+                    public void onNext(BaseMessage baseMessage) {
 
+
 
+                        if (action1 != null)
 
+                            action1.call(baseMessage);
 
+                    }
 
+
 
+                    @Override
 
+                    public void onError(BaseMessage baseMessage) {
 
+
 
+                        if (action1 != null)
 
+                            action1.call(null);
 
+                    }
 
+                });
 
+    }
 
+
 
+    /**
 
+     * 获取任务记录列表
 
+     */
 
+    public void getAudit(final Action1<BaseMessage> action1,int page, int pre_page, int type){
 
+        SheepApp.getInstance().getNetComponent().getApiService().acceptedTask(page, pre_page, type)
 
+                .subscribeOn(Schedulers.io())
 
+                .observeOn(AndroidSchedulers.mainThread())
 
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
+                    @Override
 
+                    public void onNext(BaseMessage baseMessage) {
 
+
 
+                        if (action1 != null)
 
+                            action1.call(baseMessage);
 
+                    }
 
+
 
+                    @Override
 
+                    public void onError(BaseMessage baseMessage) {
 
+
 
+                        if (action1 != null)
 
+                            action1.call(null);
 
+                    }
 
+                });
 
+    }
 
 }
 
 }

+ 9 - 0
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java
Visa fil 

@@ -32,6 +32,7 @@ import com.sheep.gamegroup.model.entity.VersionInfo;
 
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 
 import com.sheep.gamegroup.model.entity.WebviewEntity;
 
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 
 import com.sheep.gamegroup.model.entity.XianWanEntity;
 
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 
+import com.sheep.gamegroup.view.activity.ActAudit;
 
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 
 import com.sheep.gamegroup.view.activity.ActCreditCardTaskList;
 
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 
 import com.sheep.gamegroup.view.activity.ActCreditCardWeb;
 
 import com.sheep.gamegroup.view.activity.ActFindGame;
 
 import com.sheep.gamegroup.view.activity.ActFindGame;
 
@@ -1460,4 +1461,12 @@ public class Jump2View {
 
         activity.startActivity(intent);
 
         activity.startActivity(intent);
 
         XIAOMI_GAME_LIST.onEvent();
 
         XIAOMI_GAME_LIST.onEvent();
 
     }
 
     }
 
+    /**
 
+     * 审核列表
 
+     */
 
+    public void goAuditTastList(Activity activity, Object o){
 
+        Intent intent = new Intent(activity,ActAudit.class);
 
+        activity.startActivity(intent);
 
+        XIAOMI_GAME_LIST.onEvent();
 
+    }
 
 }
 
 }

+ 30 - 0
app/src/main/java/com/sheep/gamegroup/util/NestedScrollView.java
Visa fil 

@@ -0,0 +1,30 @@
 
+package com.sheep.gamegroup.util;
 
+
 
+import android.content.Context;
 
+import android.support.annotation.NonNull;
 
+import android.support.annotation.Nullable;
 
+import android.util.AttributeSet;
 
+
 
+/**
 
+ * Created by ljy on 2018/8/20.
 
+ */
 
+
 
+public class NestedScrollView extends android.support.v4.widget.NestedScrollView {
 
+    public NestedScrollView(@NonNull Context context) {
 
+        super(context);
 
+    }
 
+
 
+    public NestedScrollView(@NonNull Context context, @Nullable AttributeSet attrs) {
 
+        super(context, attrs);
 
+    }
 
+
 
+    public NestedScrollView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
 
+        super(context, attrs, defStyleAttr);
 
+    }
 
+
 
+    @Override
 
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
 
+        int expandSpec = MeasureSpec.makeMeasureSpec(Integer.MAX_VALUE >> 2,MeasureSpec.AT_MOST);
 
+        super.onMeasure(widthMeasureSpec, expandSpec);
 
+    }
 
+}

+ 4 - 1
app/src/main/java/com/sheep/gamegroup/util/TestUtil.java
Visa fil 

@@ -285,7 +285,7 @@ public class TestUtil {
 
      * @param activity
 
      * @param activity
 
      */
 
      */
 
     public static void test(final Activity activity) {
 
     public static void test(final Activity activity) {
 
-        final String[] items = {"复制token","复制打点数据","loading","progress","查看截图","复制imsi","小米游戏","测试可用金额","测试定位信息","测试apk的渠道","幂动科技","游戏搜索",
 
+        final String[] items = {"审核中心","复制token","复制打点数据","loading","progress","查看截图","复制imsi","小米游戏","测试可用金额","测试定位信息","测试apk的渠道","幂动科技","游戏搜索",
 
                 "游戏帐号","游戏代充","尝试开启第三方应用使用情况","测试代理页面","第三方应用使用情况",
 
                 "游戏帐号","游戏代充","尝试开启第三方应用使用情况","测试代理页面","第三方应用使用情况",
 
                 "开启第三方应用使用情况","h5跳转","新手对话框","md5","空间不足提示框",
 
                 "开启第三方应用使用情况","h5跳转","新手对话框","md5","空间不足提示框",
 
                 "显示已经安装应用列表","复制faq地址","复制代理地址","复制世界杯地址","任务游戏列表","世界杯活动","交通银行信用卡测试",
 
                 "显示已经安装应用列表","复制faq地址","复制代理地址","复制世界杯地址","任务游戏列表","世界杯活动","交通银行信用卡测试",
 
@@ -297,6 +297,9 @@ public class TestUtil {
 
                     @Override
 
                     @Override
 
                     public void onClick(DialogInterface dialog, int which) {
 
                     public void onClick(DialogInterface dialog, int which) {
 
                         switch (items[which]) {
 
                         switch (items[which]) {
 
+                            case "审核中心":
 
+                                Jump2View.getInstance().goAuditTastList(activity, null);
 
+                                break;
 
                             case "loading":
 
                             case "loading":
 
                                 DialogLoading.showDialog(activity);
 
                                 DialogLoading.showDialog(activity);
 
                                 break;
 
                                 break;

+ 54 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActAudit.java
Visa fil 

@@ -0,0 +1,54 @@
 
+package com.sheep.gamegroup.view.activity;
 
+
 
+import android.app.Activity;
 
+import android.os.Bundle;
 
+import android.support.v4.app.Fragment;
 
+import android.support.v4.app.FragmentTransaction;
 
+
 
+import com.sheep.gamegroup.absBase.BaseActivity;
 
+import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 
+import com.sheep.jiuyan.samllsheep.R;
 
+
 
+/**
 
+ * Created by ljy on 2018/8/16.
 
+ */
 
+
 
+public class ActAudit extends BaseActivity {
 
+    Activity activity;
 
+
 
+    @Override
 
+    protected int getLayoutId() {
 
+        return R.layout.personalcenter_act_layout;
 
+    }
 
+
 
+    @Override
 
+    public void initView() {
 
+        activity = this;
 
+
 
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
+        Bundle bundle = new Bundle();
 
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
 
+        if(fragment == null){
 
+            fragment = new FgtMainAudit();
 
+            fragment.setArguments(bundle);
 
+            transaction.add(R.id.frame_container, fragment, "tag");
 
+            transaction.commitAllowingStateLoss();
 
+        }else {
 
+            fragment.setArguments(bundle);
 
+            transaction.replace(R.id.frame_container, fragment);
 
+            transaction.commitAllowingStateLoss();
 
+        }
 
+
 
+
 
+    }
 
+
 
+    @Override
 
+    public void initListener() {
 
+
 
+    }
 
+
 
+    @Override
 
+    public void initData() {
 
+
 
+    }
 
+}

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActCreditCardWeb.java
Visa fil 

@@ -140,7 +140,7 @@ public class ActCreditCardWeb extends BaseCompatActivity {
 
     }
 
     }
 
     // 注入js函数监听
 
     // 注入js函数监听
 
     public void loadJs() {
 
     public void loadJs() {
 
-     //   mWebView.loadUrl("javascript:"+getJs());
 
+        mWebView.loadUrl("javascript:"+getJs());
 
     }
 
     }
 
     private String js;
 
     private String js;
 
     private String getJs(){
 
     private String getJs(){

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/activity/ActFindInformation.java
Visa fil 

@@ -86,7 +86,7 @@ public class ActFindInformation extends BaseActivity implements Action1<Integer>
 
         String title = getIntent().getStringExtra("title");
 
         String title = getIntent().getStringExtra("title");
 
 
 
         TitleBarUtils.getInstance()
 
         TitleBarUtils.getInstance()
 
-                .setTitle(this, TextUtils.isEmpty(title) ? "详情" : title)
 
+                .setTitle(this, /*TextUtils.isEmpty(title) ? "详情" : title*/"详情")
 
                 .setTitleFinish(this)
 
                 .setTitleFinish(this)
 
                 .setRightImgBotton(this, R.mipmap.share, new View.OnClickListener() {
 
                 .setRightImgBotton(this, R.mipmap.share, new View.OnClickListener() {
 
                     @Override
 
                     @Override

+ 21 - 400
app/src/main/java/com/sheep/gamegroup/view/activity/AskGetMoneyAct.java
Visa fil 

@@ -1,435 +1,56 @@
 
 package com.sheep.gamegroup.view.activity;
 
 package com.sheep.gamegroup.view.activity;
 
 
 
 import android.app.Activity;
 
 import android.app.Activity;
 
-import android.support.v4.view.ViewPager;
 
-import android.support.v4.widget.NestedScrollView;
 
-import android.support.v7.widget.LinearLayoutManager;
 
-import android.support.v7.widget.RecyclerView;
 
-import android.text.TextUtils;
 
-import android.util.SparseArray;
 
-import android.view.Gravity;
 
-import android.view.LayoutInflater;
 
-import android.view.MotionEvent;
 
-import android.view.View;
 
-import android.webkit.WebView;
 
-import android.widget.ImageView;
 
-import android.widget.LinearLayout;
 
-import android.widget.RelativeLayout;
 
-import android.widget.TextView;
 
+import android.os.Bundle;
 
+import android.support.v4.app.Fragment;
 
+import android.support.v4.app.FragmentTransaction;
 
 
 
-import com.kfzs.duanduan.fragment.FgtFriendExtractPage;
 
-import com.kfzs.duanduan.fragment.PagerAdapter;
 
+import com.kfzs.duanduan.fragment.FgtAskgetmoney;
 
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 
 import com.sheep.gamegroup.absBase.BaseUMActivity;
 
-import com.sheep.gamegroup.di.components.DaggerAskGetMoneyComponent;
 
-import com.sheep.gamegroup.di.modules.AskGetMoneyModule;
 
-import com.sheep.gamegroup.model.entity.AskAward;
 
-import com.sheep.gamegroup.model.entity.AskTop;
 
-import com.sheep.gamegroup.model.entity.BaseMessage;
 
-import com.sheep.gamegroup.model.entity.DialogConfig;
 
-import com.sheep.gamegroup.model.entity.FriendAndAwardEntity;
 
-import com.sheep.gamegroup.model.entity.UserEntity;
 
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 
-import com.sheep.gamegroup.presenter.AskGetMoneyContract;
 
-import com.sheep.gamegroup.presenter.AskGetMoneyPresenter;
 
-import com.sheep.gamegroup.util.CommonUtil;
 
-import com.sheep.gamegroup.util.DataUtil;
 
-import com.sheep.gamegroup.util.ListUtil;
 
-import com.sheep.gamegroup.util.ViewHolder;
 
-import com.sheep.gamegroup.util.ViewUtil;
 
-import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 
-import com.sheep.jiuyan.samllsheep.BuildConfig;
 
 import com.sheep.jiuyan.samllsheep.R;
 
 import com.sheep.jiuyan.samllsheep.R;
 
-import com.sheep.jiuyan.samllsheep.SheepApp;
 
-import com.sheep.jiuyan.samllsheep.utils.G;
 
-import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
-import com.sunfusheng.marqueeview.MarqueeView;
 
-import com.umeng.socialize.UMShareListener;
 
-import com.umeng.socialize.bean.SHARE_MEDIA;
 
-
 
-import java.util.List;
 
-import java.util.Locale;
 
-
 
-import javax.inject.Inject;
 
-
 
-import butterknife.BindView;
 
-import rx.android.schedulers.AndroidSchedulers;
 
-import rx.functions.Action1;
 
-import rx.schedulers.Schedulers;
 
 
 
 /**
 
 /**
 
  * Created by Administrator on 2018/3/19.
 
  * Created by Administrator on 2018/3/19.
 
  */
 
  */
 
 
 
-public class AskGetMoneyAct extends BaseUMActivity implements AskGetMoneyContract.View {
 
-
 
+public class AskGetMoneyAct extends BaseUMActivity{
 
 
 
-    @Inject
 
-    AskGetMoneyPresenter mPresenter;
 
-    @BindView(R.id.tv_size)
 
-    TextView tvSize;
 
-    @BindView(R.id.tv_money)
 
-    TextView tvMoney;
 
-    @BindView(R.id.friend_extract_vp)
 
-    ViewPager friend_extract_vp;
 
-    @BindView(R.id.friend_extract_page_tv)
 
-    TextView friend_extract_page_tv;
 
-    @BindView(R.id.friend_extract_last_page_tv)
 
-    TextView friend_extract_last_page_tv;
 
-    @BindView(R.id.friend_extract_next_page_tv)
 
-    TextView friend_extract_next_page_tv;
 
-    @BindView(R.id.ask_bg)
 
-    WebView ask_bg;
 
-    @BindView(R.id.ask_top_1)
 
-    View ask_top_1;
 
-    @BindView(R.id.ask_top_2)
 
-    View ask_top_2;
 
-    @BindView(R.id.ask_top5_not_you)
 
-    TextView ask_top5_not_you;
 
-    @BindView(R.id.ask_top5_list)
 
-    RecyclerView ask_top5_list;
 
-    @BindView(R.id.ask_award_info)
 
-    MarqueeView ask_award_info;
 
-    @BindView(R.id.ask_scroll_view)
 
-    NestedScrollView scrollView;
 
-    @BindView(R.id.empty_view)
 
-    View empty_view;
 
 
 
-    private FriendAndAwardEntity mEntity;
 
+    Activity activity;
 
 
 
     @Override
 
     @Override
 
     protected int getLayoutId() {
 
     protected int getLayoutId() {
 
-        return R.layout.x_ask_getmoney_act_layout;
 
+        return R.layout.personalcenter_act_layout;
 
     }
 
     }
 
 
 
-    private Activity activity;
 
-
 
     @Override
 
     @Override
 
     public void initView() {
 
     public void initView() {
 
         activity = this;
 
         activity = this;
 
-        TitleBarUtils.getInstance()
 
-                .setTitle(this, "邀请赚钱")
 
-                .setTitleFinish(this);
 
-        DaggerAskGetMoneyComponent.builder().askGetMoneyModule(new AskGetMoneyModule(this))
 
-                .netComponent(SheepApp.get(this).getNetComponent())
 
-                .build()
 
-                .inject(this);
 
-        initFriendExtractList();
 
-        initAskTop5View();
 
-        String content = "<!DOCTYPEhtml>\n" +
 
-                "<html>\n" +
 
-                "  <head>\n" +
 
-                "    <title>HTML字符串</title>\n" +
 
-                "    <metahttp-equivmetahttp-equiv=\"content-type\" content=\"text/html;charset=utf-8\">\n" +
 
-                "    <meta name=\"viewport\" content=\"width=" + G.WIDTH + ", user-scalable=no\">\n" +
 
-                "    <style type=\"text/css\">\n" +
 
-                "      body {\n" +
 
-                "        margin: 0;\n" +
 
-                "        padding: 0;\n" +
 
-                "      }\n" +
 
-                "      img {\n" +
 
-                "        padding: 0;\n" +
 
-                "        margin: 0;\n" +
 
-                "      }\n" +
 
-                "    </style>\n" +
 
-                "  </head>\n" +
 
-                "  <body>\n" +
 
-                "    <img src=\"http://cdngame.kuaifazs.com/ask_bg2.png\" width=\"100%\">\n" +
 
-                "  </body>\n" +
 
-                "</html>";
 
-        ask_bg.getSettings().setDefaultTextEncodingName("UTF-8");
 
-        ask_bg.loadData(content, "text/html", "UTF-8");
 
-//                16,18,19
 
-        LinearLayout.LayoutParams layoutParams1 = (LinearLayout.LayoutParams) ask_top_1.getLayoutParams();
 
-        layoutParams1.height = G.WIDTH * 690 / 625;
 
-        ask_top_1.setLayoutParams(layoutParams1);
 
-        LinearLayout.LayoutParams layoutParams2 = (LinearLayout.LayoutParams) ask_top_2.getLayoutParams();
 
-        layoutParams2.height = G.WIDTH * 112 / 625;
 
-        ask_top_2.setLayoutParams(layoutParams2);
 
-        ask_top5_not_you.setVisibility(View.INVISIBLE);
 
-    }
 
-
 
-    private List<AskTop> list = ListUtil.emptyList();
 
-    private AdbCommonRecycler<AskTop> adapter;
 
-
 
-    private void initAskTop5View() {
 
-        list.add(null);
 
-        ask_top5_list.setLayoutManager(new LinearLayoutManager(activity));
 
-        //ask_top5_list 解决滑动不流畅问题
 
-        ask_top5_list.setHasFixedSize(true);
 
-        ask_top5_list.setNestedScrollingEnabled(false);
 
-        adapter = new AdbCommonRecycler<AskTop>(activity, list) {
 
-
 
-            @Override
 
-            public int getItemViewType(int position) {
 
-                return position;
 
-            }
 
-
 
-            @Override
 
-            public int getViewIdByType(int type) {
 
-                switch (type) {
 
-                    case 0:
 
-                        return R.layout.x_ask_top5_title;
 
-                    default:
 
-                        return R.layout.x_ask_top5_item;
 
-                }
 
-            }
 
-
 
-            @Override
 
-            public void convert(ViewHolder holder, final AskTop item) {
 
-                View itemView = holder.itemView;
 
-                int position = holder.getAdapterPosition();
 
-                if (position == 0) {
 
-                    return;
 
-                }
 
-                TextView x_ask_top5_item_user = itemView.findViewById(R.id.x_ask_top5_item_user);
 
-                TextView x_ask_top5_item_money = itemView.findViewById(R.id.x_ask_top5_item_money);
 
-                TextView x_ask_top5_item_award = itemView.findViewById(R.id.x_ask_top5_item_award);
 
-                ImageView ask_top5_item_iv = itemView.findViewById(R.id.ask_top5_item_iv);
 
-
 
-                if (item == null) {//空数据占位置
 
-                    itemView.setVisibility(View.INVISIBLE);
 
-                    return;
 
-                }
 
-                ViewUtil.setText(x_ask_top5_item_user, String.format(Locale.CHINA, "昵称\n%s", item.getNickname()));
 
-                ViewUtil.setText(x_ask_top5_item_money, String.format(Locale.CHINA, "%d", item.getSum_friend()));
 
-                ViewUtil.setText(x_ask_top5_item_award, item.getPrize());
 
-                switch (position) {
 
-                    case 1:
 
-                        ask_top5_item_iv.setImageResource(R.mipmap.ask_top_1);
 
-                        break;
 
-                    case 2:
 
-                        ask_top5_item_iv.setImageResource(R.mipmap.ask_top_2);
 
-                        break;
 
-                    case 3:
 
-                        ask_top5_item_iv.setImageResource(R.mipmap.ask_top_3);
 
-                        break;
 
-                }
 
-
 
-
 
-            }
 
-        };
 
-        ask_top5_list.setAdapter(adapter);
 
-    }
 
-
 
-    @Override
 
-    public void initListener() {
 
-        scrollView.setOnTouchListener(new View.OnTouchListener() {
 
-            @Override
 
-            public boolean onTouch(View v, MotionEvent event) {
 
-                switch (event.getAction()) {
 
-                    case MotionEvent.ACTION_DOWN:
 
-                        if (ask_award_info != null) {
 
-                            //开始滚动
 
-                            ask_award_info.stopFlipping();
 
-                        }
 
-                        break;
 
-                    case MotionEvent.ACTION_UP:
 
-                    default:
 
-                        if (ask_award_info != null) {
 
-                            //开始滚动
 
-                            ask_award_info.startFlipping();
 
-                        }
 
-                        break;
 
-                }
 
-                return false;
 
-            }
 
-        });
 
-    }
 
-
 
-    private UserEntity userEntity;
 
-
 
-    @Override
 
-    public void initData() {
 
-        showProgress();
 
-        mPresenter.getTask(null);
 
-        CommonUtil.getInstance().updateUserInfo(new Action1<UserEntity>() {
 
-            @Override
 
-            public void call(UserEntity result) {
 
-                if (result != null)
 
-                    userEntity = result;
 
-            }
 
-        });
 
-        initAskTop5();
 
-    }
 
-
 
-    private void initAskTop5() {
 
-        SheepApp.getInstance().getNetComponent().getApiService().getInvitationTop(5)
 
-                .subscribeOn(Schedulers.io())
 
-                .observeOn(AndroidSchedulers.mainThread())
 
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
-                    @Override
 
-                    public void onNext(BaseMessage baseMessage) {
 
-                        List<AskTop> newList = baseMessage.getDataList(AskTop.class);
 
-                        if (ListUtil.isEmpty(newList)) {
 
-                            return;
 
-                        }
 
-                        list.addAll(newList);
 
-                        notifyDataSetChanged();
 
-                        String userId = DataUtil.getInstance().getUserId();
 
-                        boolean hasMe = false;
 
-                        for (AskTop item : newList) {
 
-                            if (TextUtils.equals(userId, item.getUser_id())) {
 
-                                hasMe = true;
 
-                                break;
 
-                            }
 
-                        }
 
-                        ask_top5_not_you.setVisibility(hasMe ? View.INVISIBLE : View.VISIBLE);
 
-                    }
 
-
 
-                    @Override
 
-                    public void onError(BaseMessage baseMessage) {
 
-                        notifyDataSetChanged();
 
-                        ask_top5_not_you.setVisibility(View.VISIBLE);
 
-                    }
 
-                });
 
-        SheepApp.getInstance().getNetComponent().getApiService().getInvitationTopRecord()
 
-                .subscribeOn(Schedulers.io())
 
-                .observeOn(AndroidSchedulers.mainThread())
 
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
-                    @Override
 
-                    public void onNext(BaseMessage baseMessage) {
 
-                        List<AskAward> newList = baseMessage.getDataList(AskAward.class);
 
-                        for (AskAward item : newList) {
 
-                            TextView moreView = (TextView) LayoutInflater.from(activity).inflate(R.layout.x_ask_award_item, null);
 
-                            moreView.setText(String.format(Locale.CHINA, "%s领取了%s", item.getNickname(), item.getPrize()));
 
-                            ask_award_info.addView(moreView);
 
-                        }
 
-                    }
 
-
 
-                    @Override
 
-                    public void onError(BaseMessage baseMessage) {
 
-
 
-                    }
 
-                });
 
-    }
 
 
 
-    private void notifyDataSetChanged() {
 
-        CommonUtil.getInstance().updateEmptyView(empty_view, list.size() == 1, true);
 
-        while (list.size() < 5) {
 
-            list.add(null);
 
+        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
+        Bundle bundle = new Bundle();
 
+        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
 
+        if(fragment == null){
 
+            fragment = new FgtAskgetmoney();
 
+            fragment.setArguments(bundle);
 
+            transaction.add(R.id.frame_container, fragment, "tag");
 
+            transaction.commitAllowingStateLoss();
 
+        }else {
 
+            fragment.setArguments(bundle);
 
+            transaction.replace(R.id.frame_container, fragment);
 
+            transaction.commitAllowingStateLoss();
 
         }
 
         }
 
-        adapter.notifyDataSetChanged();
 
-    }
 
-
 
-
 
-    @Override
 
-    public void NetSuccess(int code, String msg, String s) {
 
 
 
-    }
 
-
 
-    @Override
 
-    public void NetError(int code, String errorMsg) {
 
-        hideProgress();
 
-        G.showToast(errorMsg);
 
 
 
     }
 
     }
 
 
 
     @Override
 
     @Override
 
-    public void showTask(FriendAndAwardEntity entity) {
 
-        hideProgress();
 
-        mEntity = entity;
 
-        this.runOnUiThread(new Runnable() {
 
-            @Override
 
-            public void run() {
 
-                tvSize.setText(mEntity.getFriend_count() + "");
 
-                tvMoney.setText(mEntity.getAward());
 
-            }
 
-        });
 
-
 
-    }
 
-
 
-
 
-    private SparseArray<FgtFriendExtractPage> mTestFragments;
 
-    private int totalPage = 0;
 
-    public void setFriendExtractCount(int count, int page, int size) {
 
-        totalPage = ListUtil.getTotalPage(count, 5);
 
-        friend_extract_page_tv.setText(String.format(Locale.CHINA, "%d/%d", curPage, totalPage));
 
-        checkAddPage(page, size);
 
-    }
 
-
 
-    private void checkAddPage(int page, int size) {
 
-        if (curPage + 2 > page && size == FgtFriendExtractPage.per_page) {//已经到最后一页面,且数据是满的，可以添加一页面
 
-            int nextPage = page + 1;
 
-            if (mTestFragments.get(nextPage) == null) {
 
-//                if(BuildConfig.DEBUG) G.showToast("添加新的一页:" + nextPage);
 
-                mTestFragments.put(nextPage, FgtFriendExtractPage.newInstance(nextPage));
 
-                mPagerAdapter.notifyDataSetChanged();
 
-            } else {
 
-//                if(BuildConfig.DEBUG) G.showToast("不用添加新的一页:" + nextPage);
 
-            }
 
-        }
 
-        if (size > FgtFriendExtractPage.per_page) {
 
-            if (BuildConfig.DEBUG) G.showToast("页面" + page + "的数据为：" + size);
 
-        }
 
-    }
 
-
 
-    private int curPage = 1;
 
-    private PagerAdapter mPagerAdapter;
 
-
 
-    private void initFriendExtractList() {
 
-        mTestFragments = new SparseArray<>();
 
-        mTestFragments.put(1, FgtFriendExtractPage.newInstance(1));
 
-        mPagerAdapter = new PagerAdapter(getSupportFragmentManager(), mTestFragments);
 
-        friend_extract_vp.setAdapter(mPagerAdapter);
 
-        friend_extract_vp.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
-            @Override
 
-            public void onPageScrolled(int i, float v, int i1) {
 
-
 
-            }
 
-
 
-            @Override
 
-            public void onPageSelected(int i) {
 
-                curPage = i + 1;
 
-                friend_extract_page_tv.setText(String.format(Locale.CHINA, "%d/%d", curPage, totalPage));
 
-                checkAddPage(curPage, mTestFragments.get(curPage).getList().size());
 
-            }
 
-
 
-            @Override
 
-            public void onPageScrollStateChanged(int i) {
 
+    public void initListener() {
 
 
 
-            }
 
-        });
 
-        friend_extract_last_page_tv.setOnClickListener(new View.OnClickListener() {
 
-            @Override
 
-            public void onClick(View view) {
 
-                friend_extract_vp.setCurrentItem(curPage - 2);
 
-            }
 
-        });
 
-        friend_extract_next_page_tv.setOnClickListener(new View.OnClickListener() {
 
-            @Override
 
-            public void onClick(View view) {
 
-                friend_extract_vp.setCurrentItem(curPage);
 
-            }
 
-        });
 
     }
 
     }
 
 
 
     @Override
 
     @Override
 
-    protected void onStop() {
 
-        super.onStop();
 
-
 
-        if (ask_award_info != null) {
 
-            //停止滚动
 
-            ask_award_info.stopFlipping();
 
-        }
 
-    }
 
-
 
-    //显示分享对话框
 
-    public void showShareView(View view) {
 
-        String url = userEntity.getShareLink();
 
-        String description = mEntity.getShare_desc();
 
-        ViewUtil.showShareDialog(activity, url, description);
 
-    }
 
+    public void initData() {
 
 
 
-    //显示邀请好友排行榜top5的规则的对话框
 
-    public void showAstTop5Tip(View view) {
 
-        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("活动说明")
 
-                .setMsg(".每天实时更新排行数据。\n" +
 
-                        ".根据当月已赚赏金（定向货币除外）和邀请人数进行排行\n" +
 
-                        ".每个月前5名可获取排行奖励。\n" +
 
-                        ".每个月月底最后一天24：00可公布结果，获奖的用户需通过“小绵羊领头羊”公众号发送获奖截图证明及收货信息，核对信息真实后，会第一时间发放！\n" +
 
-                        ".本活动最终解释权归成都橙风有量科技有限公司所有！")
 
-                .setMsgGravity(Gravity.START)
 
-                .setTheme(DialogConfig.THEME_PURPLE)
 
-                .setBtnLeftText("我知道了"));
 
     }
 
     }
 
 }
 
 }

+ 5 - 0
app/src/main/java/com/sheep/gamegroup/view/adapter/AdpTryMakemoney.java
Visa fil 

@@ -26,6 +26,11 @@ public class AdpTryMakemoney extends FragmentStatePagerAdapter {
 
         mTitles.add(title);
 
         mTitles.add(title);
 
     }
 
     }
 
 
 
+    public void cleanListFragment(){
 
+        mListFragment.clear();
 
+        mTitles.clear();
 
+    }
 
+
 
     @Override
 
     @Override
 
     public Fragment getItem(int position) {
 
     public Fragment getItem(int position) {
 
         return (Fragment) mListFragment.get(position);
 
         return (Fragment) mListFragment.get(position);

+ 118 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyFriend.java
Visa fil 

@@ -0,0 +1,118 @@
 
+package com.sheep.gamegroup.view.fragment;
 
+
 
+import android.app.Activity;
 
+import android.support.v4.view.ViewPager;
 
+import android.util.SparseArray;
 
+import android.view.View;
 
+import android.widget.TextView;
 
+
 
+import com.kfzs.duanduan.fragment.FgtFriendExtractPage;
 
+import com.kfzs.duanduan.fragment.PagerAdapter;
 
+import com.kfzs.duanduan.view.ViewPagerPlus;
 
+import com.sheep.gamegroup.util.ListUtil;
 
+import com.sheep.jiuyan.samllsheep.BuildConfig;
 
+import com.sheep.jiuyan.samllsheep.R;
 
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
+import com.sheep.jiuyan.samllsheep.utils.G;
 
+
 
+import java.util.Locale;
 
+
 
+import butterknife.BindView;
 
+import butterknife.ButterKnife;
 
+
 
+/**
 
+ * Created by ljy on 2018/8/17.
 
+ */
 
+
 
+public class FgtAskGetMoneyFriend extends BaseFragment {
 
+
 
+    @BindView(R.id.friend_extract_vp)
 
+    ViewPagerPlus friend_extract_vp;
 
+    @BindView(R.id.friend_extract_last_page_tv)
 
+    TextView friend_extract_last_page_tv;
 
+    @BindView(R.id.friend_extract_page_tv)
 
+    TextView friend_extract_page_tv;
 
+    @BindView(R.id.friend_extract_next_page_tv)
 
+    TextView friend_extract_next_page_tv;
 
+    private Activity activity;
 
+
 
+    @Override
 
+    public int getLayoutId() {
 
+        return R.layout.fgt_askgetmoney_friend;
 
+    }
 
+
 
+    @Override
 
+    public void onViewCreated() {
 
+        ButterKnife.bind(this, mView);
 
+        activity = getActivity();
 
+
 
+        initView();
 
+    }
 
+
 
+    private void initView() {
 
+        initFriendExtractList();
 
+    }
 
+
 
+    private SparseArray<FgtFriendExtractPage> mTestFragments;
 
+    private int totalPage = 0;
 
+    public void setFriendExtractCount(int count, int page, int size) {
 
+        totalPage = ListUtil.getTotalPage(count, 5);
 
+        friend_extract_page_tv.setText(String.format(Locale.CHINA, "%d/%d", curPage, totalPage));
 
+        checkAddPage(page, size);
 
+    }
 
+
 
+    private void checkAddPage(int page, int size) {
 
+        if (curPage + 2 > page && size == FgtFriendExtractPage.per_page) {//已经到最后一页面,且数据是满的，可以添加一页面
 
+            int nextPage = page + 1;
 
+            if (mTestFragments.get(nextPage) == null) {
 
+//                if(BuildConfig.DEBUG) G.showToast("添加新的一页:" + nextPage);
 
+                mTestFragments.put(nextPage, FgtFriendExtractPage.newInstance(nextPage));
 
+                mPagerAdapter.notifyDataSetChanged();
 
+            } else {
 
+//                if(BuildConfig.DEBUG) G.showToast("不用添加新的一页:" + nextPage);
 
+            }
 
+        }
 
+        if (size > FgtFriendExtractPage.per_page) {
 
+            if (BuildConfig.DEBUG) G.showToast("页面" + page + "的数据为：" + size);
 
+        }
 
+    }
 
+    private int curPage = 1;
 
+    private PagerAdapter mPagerAdapter;
 
+    private void initFriendExtractList() {
 
+        mTestFragments = new SparseArray<>();
 
+        mTestFragments.put(1, FgtFriendExtractPage.newInstance(1));
 
+        mPagerAdapter = new PagerAdapter(getChildFragmentManager(), mTestFragments);
 
+        friend_extract_vp.setAdapter(mPagerAdapter);
 
+        friend_extract_vp.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
+            @Override
 
+            public void onPageScrolled(int i, float v, int i1) {
 
+
 
+            }
 
+
 
+            @Override
 
+            public void onPageSelected(int i) {
 
+                curPage = i + 1;
 
+                friend_extract_page_tv.setText(String.format(Locale.CHINA, "%d/%d", curPage, totalPage));
 
+                checkAddPage(curPage, mTestFragments.get(curPage).getList().size());
 
+            }
 
+
 
+            @Override
 
+            public void onPageScrollStateChanged(int i) {
 
+
 
+            }
 
+        });
 
+        friend_extract_last_page_tv.setOnClickListener(new View.OnClickListener() {
 
+            @Override
 
+            public void onClick(View view) {
 
+                friend_extract_vp.setCurrentItem(curPage - 2);
 
+            }
 
+        });
 
+        friend_extract_next_page_tv.setOnClickListener(new View.OnClickListener() {
 
+            @Override
 
+            public void onClick(View view) {
 
+                friend_extract_vp.setCurrentItem(curPage);
 
+            }
 
+        });
 
+    }
 
+
 
+}

+ 219 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java
Visa fil 

@@ -0,0 +1,219 @@
 
+package com.sheep.gamegroup.view.fragment;
 
+
 
+import android.app.Activity;
 
+import android.os.Bundle;
 
+import android.support.v7.widget.LinearLayoutManager;
 
+import android.support.v7.widget.RecyclerView;
 
+import android.text.TextUtils;
 
+import android.view.Gravity;
 
+import android.view.LayoutInflater;
 
+import android.view.View;
 
+import android.view.ViewGroup;
 
+import android.widget.ImageView;
 
+import android.widget.RelativeLayout;
 
+import android.widget.TextView;
 
+
 
+import com.sheep.gamegroup.model.entity.AskAward;
 
+import com.sheep.gamegroup.model.entity.AskTop;
 
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
+import com.sheep.gamegroup.model.entity.DialogConfig;
 
+import com.sheep.gamegroup.model.entity.UserEntity;
 
+import com.sheep.gamegroup.model.util.SheepSubscriber;
 
+import com.sheep.gamegroup.util.CommonUtil;
 
+import com.sheep.gamegroup.util.DataUtil;
 
+import com.sheep.gamegroup.util.Jump2View;
 
+import com.sheep.gamegroup.util.ListUtil;
 
+import com.sheep.gamegroup.util.TestUtil;
 
+import com.sheep.gamegroup.util.ViewHolder;
 
+import com.sheep.gamegroup.util.ViewUtil;
 
+import com.sheep.gamegroup.view.adapter.AdbCommonRecycler;
 
+import com.sheep.gamegroup.view.dialog.DialogNewbieTaskList;
 
+import com.sheep.jiuyan.samllsheep.R;
 
+import com.sheep.jiuyan.samllsheep.SheepApp;
 
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
+
 
+import java.util.List;
 
+import java.util.Locale;
 
+
 
+import butterknife.BindView;
 
+import butterknife.ButterKnife;
 
+import butterknife.OnClick;
 
+import butterknife.Unbinder;
 
+import rx.android.schedulers.AndroidSchedulers;
 
+import rx.functions.Action1;
 
+import rx.schedulers.Schedulers;
 
+
 
+import static com.sheep.gamegroup.util.UMConfigUtils.Event.NEWBIE_TASK;
 
+
 
+/**
 
+ * Created by ljy on 2018/8/17.
 
+ */
 
+
 
+public class FgtAskGetMoneyRank extends BaseFragment {
 
+    @BindView(R.id.ask_top5_title)
 
+    TextView askTop5Title;
 
+    @BindView(R.id.ask_top5_not_you)
 
+    TextView askTop5NotYou;
 
+    @BindView(R.id.ask_top3_tip)
 
+    ImageView askTop3Tip;
 
+    @BindView(R.id.empty_view_img)
 
+    ImageView emptyViewImg;
 
+    @BindView(R.id.empty_view_msg)
 
+    TextView emptyViewMsg;
 
+    @BindView(R.id.empty_view)
 
+    RelativeLayout emptyView;
 
+    @BindView(R.id.ask_top5_list)
 
+    RecyclerView askTop5List;
 
+
 
+    private Activity activity;
 
+    private List<AskTop> list = ListUtil.emptyList();
 
+    private AdbCommonRecycler<AskTop> adapter;
 
+    @Override
 
+    public int getLayoutId() {
 
+        return R.layout.fgt_askgetmoney_rank;
 
+    }
 
+
 
+    @Override
 
+    public void onViewCreated() {
 
+        ButterKnife.bind(this, mView);
 
+        activity = getActivity();
 
+
 
+        initView();
 
+    }
 
+
 
+    private void initView() {
 
+        initAskTop5View();
 
+        askTop5NotYou.setVisibility(View.INVISIBLE);
 
+        initData();
 
+    }
 
+    public void initData() {
 
+        showProgress();
 
+
 
+        initAskTop5();
 
+    }
 
+
 
+    private void initAskTop5View() {
 
+        list.clear();
 
+        list.add(null);
 
+        askTop5List.setLayoutManager(new LinearLayoutManager(activity));
 
+        //ask_top5_list 解决滑动不流畅问题
 
+        askTop5List.setHasFixedSize(true);
 
+        askTop5List.setNestedScrollingEnabled(false);
 
+        adapter = new AdbCommonRecycler<AskTop>(activity, list) {
 
+
 
+            @Override
 
+            public int getItemViewType(int position) {
 
+                return position;
 
+            }
 
+
 
+            @Override
 
+            public int getViewIdByType(int type) {
 
+                switch (type) {
 
+                    case 0:
 
+                        return R.layout.x_ask_top5_title;
 
+                    default:
 
+                        return R.layout.x_ask_top5_item;
 
+                }
 
+            }
 
+
 
+            @Override
 
+            public void convert(ViewHolder holder, final AskTop item) {
 
+                View itemView = holder.itemView;
 
+                int position = holder.getAdapterPosition();
 
+                if (position == 0) {
 
+                    return;
 
+                }
 
+                TextView x_ask_top5_item_user = itemView.findViewById(R.id.x_ask_top5_item_user);
 
+                TextView x_ask_top5_item_money = itemView.findViewById(R.id.x_ask_top5_item_money);
 
+                TextView x_ask_top5_item_award = itemView.findViewById(R.id.x_ask_top5_item_award);
 
+                ImageView ask_top5_item_iv = itemView.findViewById(R.id.ask_top5_item_iv);
 
+
 
+                if (item == null) {//空数据占位置
 
+                    itemView.setVisibility(View.INVISIBLE);
 
+                    return;
 
+                }
 
+                ViewUtil.setText(x_ask_top5_item_user, String.format(Locale.CHINA, "昵称\n%s", item.getNickname()));
 
+                ViewUtil.setText(x_ask_top5_item_money, String.format(Locale.CHINA, "%d", item.getSum_friend()));
 
+                ViewUtil.setText(x_ask_top5_item_award, item.getPrize());
 
+                switch (position) {
 
+                    case 1:
 
+                        ask_top5_item_iv.setImageResource(R.mipmap.ask_top_1);
 
+                        break;
 
+                    case 2:
 
+                        ask_top5_item_iv.setImageResource(R.mipmap.ask_top_2);
 
+                        break;
 
+                    case 3:
 
+                        ask_top5_item_iv.setImageResource(R.mipmap.ask_top_3);
 
+                        break;
 
+                }
 
+
 
+
 
+            }
 
+        };
 
+        askTop5List.setAdapter(adapter);
 
+    }
 
+    private void initAskTop5() {
 
+        SheepApp.getInstance().getNetComponent().getApiService().getInvitationTop(5)
 
+                .subscribeOn(Schedulers.io())
 
+                .observeOn(AndroidSchedulers.mainThread())
 
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
+                    @Override
 
+                    public void onNext(BaseMessage baseMessage) {
 
+                        List<AskTop> newList = baseMessage.getDataList(AskTop.class);
 
+                        if (ListUtil.isEmpty(newList)) {
 
+                            return;
 
+                        }
 
+                        list.addAll(newList);
 
+                        notifyDataSetChanged();
 
+                        String userId = DataUtil.getInstance().getUserId();
 
+                        boolean hasMe = false;
 
+                        for (AskTop item : newList) {
 
+                            if (TextUtils.equals(userId, item.getUser_id())) {
 
+                                hasMe = true;
 
+                                break;
 
+                            }
 
+                        }
 
+                        askTop5NotYou.setVisibility(hasMe ? View.INVISIBLE : View.VISIBLE);
 
+                    }
 
+
 
+                    @Override
 
+                    public void onError(BaseMessage baseMessage) {
 
+                        notifyDataSetChanged();
 
+                        askTop5NotYou.setVisibility(View.VISIBLE);
 
+                    }
 
+                });
 
+    }
 
+
 
+    private void notifyDataSetChanged() {
 
+        hideProgress();
 
+        CommonUtil.getInstance().updateEmptyView(emptyView, list.size() == 1, true);
 
+        while (list.size() < 5) {
 
+            list.add(null);
 
+        }
 
+        adapter.notifyDataSetChanged();
 
+    }
 
+
 
+    //显示邀请好友排行榜top5的规则的对话框
 
+    public void showAstTop5Tip() {
 
+        ViewUtil.showMsgDialog(activity, new DialogConfig().setTitle("活动说明")
 
+                .setMsg(".每天实时更新排行数据。\n" +
 
+                        ".根据当月已赚赏金（定向货币除外）和邀请人数进行排行\n" +
 
+                        ".每个月前5名可获取排行奖励。\n" +
 
+                        ".每个月月底最后一天24：00可公布结果，获奖的用户需通过“小绵羊领头羊”公众号发送获奖截图证明及收货信息，核对信息真实后，会第一时间发放！\n" +
 
+                        ".本活动最终解释权归成都橙风有量科技有限公司所有！")
 
+                .setMsgGravity(Gravity.START)
 
+                .setTheme(DialogConfig.THEME_PURPLE)
 
+                .setBtnLeftText("我知道了"));
 
+    }
 
+
 
+
 
+    @OnClick({R.id.ask_top3_tip
 
+    })
 
+    public void onViewClicked(View view) {
 
+        switch (view.getId()) {
 
+            case R.id.ask_top3_tip://提现
 
+                showAstTop5Tip();
 
+                break;
 
+        }
 
+    }
 
+}

+ 145 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAudit.java
Visa fil 

@@ -0,0 +1,145 @@
 
+package com.sheep.gamegroup.view.fragment;
 
+
 
+import android.app.Activity;
 
+import android.os.Bundle;
 
+import android.os.Handler;
 
+import android.support.annotation.Nullable;
 
+import android.view.View;
 
+import android.widget.ListView;
 
+
 
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
+import com.sheep.gamegroup.model.entity.TaskAcceptedEty;
 
+import com.sheep.gamegroup.util.CommonUtil;
 
+import com.sheep.gamegroup.util.ListUtil;
 
+import com.sheep.gamegroup.view.adapter.TaskListItemAdp;
 
+import com.sheep.gamegroup.view.customview.RefreshLayout;
 
+import com.sheep.jiuyan.samllsheep.R;
 
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
+
 
+import java.util.ArrayList;
 
+import java.util.List;
 
+
 
+import butterknife.BindView;
 
+import butterknife.ButterKnife;
 
+import rx.functions.Action1;
 
+
 
+/**
 
+ * 审核中心
 
+ * Created by ljy on 2018/8/16.
 
+ */
 
+
 
+public class FgtAudit 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;
 
+    @BindView(R.id.title)
 
+    View title;
 
+
 
+    private Activity activity;
 
+    private TaskListItemAdp adp;
 
+    private List<TaskAcceptedEty> etyList = new ArrayList<>();
 
+
 
+
 
+    private int page = 1;//页数
 
+    private int per_page = 10;
 
+    private int type;
 
+
 
+    public static FgtAudit newInstance(int type){
 
+        FgtAudit fgt = new FgtAudit();
 
+        Bundle bundle = new Bundle();
 
+        bundle.putInt("type", type);
 
+        fgt.setArguments(bundle);
 
+        return fgt;
 
+    }
 
+    @Override
 
+    public int getLayoutId() {
 
+        return R.layout.withdrawal_list;
 
+    }
 
+
 
+    @Override
 
+    public void onViewCreated() {
 
+        ButterKnife.bind(this, mView);
 
+        activity = getActivity();
 
+        initView();
 
+    }
 
+
 
+    private void initView() {
 
+        title.setVisibility(View.GONE);
 
+        swipe_container.setFooterView(activity, withdrawalListview, R.layout.listview_footer);
 
+        adp = new TaskListItemAdp(activity , etyList);
 
+        withdrawalListview.setAdapter(adp);
 
+        adp.notifyDataSetChanged();
 
+
 
+        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(etyList != null && etyList.size() >= per_page*page){
 
+                    page += 1;
 
+                    initData();
 
+                }else {
 
+
 
+                    new Handler().postDelayed(new Runnable() {
 
+                        @Override
 
+                        public void run() {
 
+                            swipe_container.setRefreshing(false);
 
+                        }
 
+                    },1000);
 
+                }
 
+
 
+            }
 
+        });
 
+        refreshData();
 
+    }
 
+    private void refreshData() {
 
+        etyList.clear();
 
+        adp.notifyDataSetChanged();
 
+        page = 1;
 
+        initData();
 
+    }
 
+    public void initData() {
 
+        empty_view.setVisibility(View.INVISIBLE);
 
+        try {
 
+            CommonUtil.getInstance().getAudit(new Action1<BaseMessage>() {
 
+                @Override
 
+                public void call(BaseMessage baseMessage) {
 
+                    if(baseMessage != null){
 
+                        List<TaskAcceptedEty> releaseEtyList = baseMessage.getDataList(TaskAcceptedEty.class);
 
+                        ListUtil.addAll(etyList, releaseEtyList);
 
+                    }
 
+                    notifyDataSetChanged();
 
+                }
 
+            }, page, per_page, type);
 
+        } catch (Exception e) {
 
+            e.printStackTrace();
 
+        }
 
+    }
 
+
 
+    private void notifyDataSetChanged(){
 
+        CommonUtil.getInstance().updateEmptyView(empty_view, etyList.isEmpty());
 
+        hideProgress();
 
+        swipe_container.setRefreshing(false);
 
+        adp.notifyDataSetChanged();
 
+    }
 
+
 
+    @Override
 
+    public void onCreate(@Nullable Bundle savedInstanceState) {
 
+        super.onCreate(savedInstanceState);
 
+
 
+        Bundle bundle = getArguments();
 
+        if(bundle != null){
 
+            type = bundle.getInt("type", 0);
 
+        }
 
+    }
 
+}

+ 124 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java
Visa fil 

@@ -0,0 +1,124 @@
 
+package com.sheep.gamegroup.view.fragment;
 
+
 
+import android.app.Activity;
 
+import android.os.Bundle;
 
+import android.support.design.widget.TabLayout;
 
+import android.support.v4.view.ViewPager;
 
+import android.widget.ImageView;
 
+import android.widget.TextView;
 
+
 
+import com.kfzs.duanduan.BaseCompatFragment;
 
+import com.kfzs.duanduan.mine.GiftpackListAdapter;
 
+import com.sheep.gamegroup.model.entity.BaseMessage;
 
+import com.sheep.gamegroup.model.entity.TaskAuditEntity;
 
+import com.sheep.gamegroup.util.CommonUtil;
 
+import com.sheep.jiuyan.samllsheep.R;
 
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
 
+
 
+import butterknife.BindView;
 
+import butterknife.ButterKnife;
 
+import butterknife.Unbinder;
 
+import rx.functions.Action1;
 
+
 
+/**
 
+ * Created by ljy on 2018/8/20.
 
+ */
 
+
 
+public class FgtMainAudit extends BaseCompatFragment {
 
+    @BindView(R.id.img_baseactivity_title)
 
+    ImageView imgBaseactivityTitle;
 
+    @BindView(R.id.txt_baseactivity_title)
 
+    TextView txtBaseactivityTitle;
 
+    @BindView(R.id.number_tv)
 
+    TextView numberTv;
 
+    @BindView(R.id.audit_total_complete_tv)
 
+    TextView auditTotalCompleteTv;
 
+    @BindView(R.id.audit_total_money_tv)
 
+    TextView auditTotalMoneyTv;
 
+    @BindView(R.id.audit_total_welfare_tv)
 
+    TextView auditTotalWelfareTv;
 
+    @BindView(R.id.indicator)
 
+    TabLayout indicator;
 
+    @BindView(R.id.pager)
 
+    ViewPager pager;
 
+    Unbinder unbinder;
 
+    private Activity activity;
 
+
 
+    public static final String[] tabNames = {"审核中", "审核成功", "审核失败"};
 
+    private GiftpackListAdapter mAdapter;
 
+    @Override
 
+    protected void initView(Bundle savedInstanceState) {
 
+        setContentView(R.layout.act_audit_layout);
 
+        activity = getActivity();
 
+
 
+        unbinder = ButterKnife.bind(this, mContentView);
 
+//        StatusBarUtils.setTranslucent(this);
 
+        TitleBarUtils.getInstance()
 
+                .setTitle(mContentView,"审核中心")
 
+                .setTitleListen(mContentView,0,null);
 
+
 
+        mAdapter = new GiftpackListAdapter(getChildFragmentManager(), activity.getApplicationContext());
 
+        mAdapter.add(FgtAudit.newInstance(1), tabNames[0]);
 
+        mAdapter.add(FgtAudit.newInstance(2), tabNames[1]);
 
+        mAdapter.add(FgtAudit.newInstance(3), tabNames[2]);
 
+        pager.setAdapter(mAdapter);
 
+        new_tab();
 
+        initData();
 
+
 
+    }
 
+
 
+    @Override
 
+    public void onDestroyView() {
 
+        super.onDestroyView();
 
+    }
 
+
 
+    public void initData() {
 
+
 
+        CommonUtil.getInstance().staticAudit(new Action1<BaseMessage>() {
 
+            @Override
 
+            public void call(BaseMessage o) {
 
+                try {
 
+                    TaskAuditEntity taskAuditEntity = o.getData(TaskAuditEntity.class);
 
+                    if(taskAuditEntity != null){
 
+                        String audit_total_audit = String.format(activity.getResources().getString(R.string.audit_total_audit), taskAuditEntity.getAudit_count());
 
+                        String audit_total_complete = String.format(activity.getResources().getString(R.string.audit_total_complete), taskAuditEntity.getFinish_count());
 
+                        String audit_total_money = String.format(activity.getResources().getString(R.string.audit_total_money), taskAuditEntity.getFinish_cash());
 
+                        String audit_total_welfare = String.format(activity.getResources().getString(R.string.audit_total_welfare), taskAuditEntity.getWelfare_award());
 
+
 
+                        numberTv.setText(audit_total_audit+"");
 
+                        auditTotalCompleteTv.setText(audit_total_complete+"");
 
+                        auditTotalMoneyTv.setText(audit_total_money+"");
 
+                        auditTotalWelfareTv.setText(audit_total_welfare+"");
 
+                    }
 
+                } catch (Exception e) {
 
+                    e.printStackTrace();
 
+                }
 
+            }
 
+        });
 
+    }
 
+
 
+    private void new_tab(){
 
+        pager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
 
+        indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
 
+        pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 
+            @Override
 
+            public void onPageScrolled(int i, float v, int i1) {
 
+
 
+            }
 
+
 
+            @Override
 
+            public void onPageSelected(int i) {
 
+//                MY_MONEY_TAB.onEvent("tab_name", tabNames[2]);
 
+            }
 
+
 
+            @Override
 
+            public void onPageScrollStateChanged(int i) {
 
+
 
+            }
 
+        });
 
+
 
+        indicator.setupWithViewPager(pager);
 
+        CommonUtil.getInstance().reflex(indicator, activity);
 
+    }
 
+}
 
+

+ 10 - 0
app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java
Visa fil 

@@ -102,6 +102,16 @@ public class TitleBarUtils {
 
                 });
 
                 });
 
         return mTitleBarUtils;
 
         return mTitleBarUtils;
 
     }
 
     }
 
+    public TitleBarUtils setTitleFinish(final View view, final Activity activity) {
 
+        view.findViewById(R.id.img_baseactivity_title)
 
+                .setOnClickListener(new View.OnClickListener() {
 
+                    @Override
 
+                    public void onClick(View view) {
 
+                        activity.finish();
 
+                    }
 
+                });
 
+        return mTitleBarUtils;
 
+    }
 
     public TitleBarUtils setTitleFinish(final Activity activity, View.OnClickListener listener) {
 
     public TitleBarUtils setTitleFinish(final Activity activity, View.OnClickListener listener) {
 
         activity.findViewById(R.id.img_baseactivity_title)
 
         activity.findViewById(R.id.img_baseactivity_title)
 
                 .setOnClickListener(listener);
 
                 .setOnClickListener(listener);

BIN
app/src/main/res/drawable-xhdpi/tab_click_shenhe.png
Visa fil


BIN
app/src/main/res/drawable-xhdpi/tab_click_yaoqing.png
Visa fil


BIN
app/src/main/res/drawable-xhdpi/tab_shenhe.png
Visa fil


BIN
app/src/main/res/drawable-xhdpi/tab_yaoqing.png
Visa fil


BIN
app/src/main/res/drawable-xxhdpi/tab_click_shenhe.png
Visa fil


BIN
app/src/main/res/drawable-xxhdpi/tab_click_yaoqing.png
Visa fil


BIN
app/src/main/res/drawable-xxhdpi/tab_shenhe.png
Visa fil


BIN
app/src/main/res/drawable-xxhdpi/tab_yaoqing.png
Visa fil


+ 7 - 0
app/src/main/res/drawable/button_full_nomal_yellow_click.xml
Visa fil 

@@ -0,0 +1,7 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
 
+    android:shape="rectangle">
 
+    <corners android:radius="30dp" />
 
+
 
+    <solid android:color="@color/yellow_FCF05B" />
 
+</shape>

+ 8 - 0
app/src/main/res/drawable/drawable_selector_askgetmoney.xml
Visa fil 

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

+ 8 - 0
app/src/main/res/drawable/drawable_selector_audit.xml
Visa fil 

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

+ 8 - 0
app/src/main/res/drawable/shape_green_stroke_rectangle.xml
Visa fil 

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

+ 8 - 0
app/src/main/res/drawable/shape_red_stroke_rectangle.xml
Visa fil 

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

+ 8 - 0
app/src/main/res/drawable/shape_yellow_stroke_rectangle.xml
Visa fil 

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

+ 111 - 0
app/src/main/res/layout/act_audit_layout.xml
Visa fil 

@@ -0,0 +1,111 @@
 
+<?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/white_light"
 
+    android:orientation="vertical">
 
+
 
+    <android.support.constraint.ConstraintLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:background="@mipmap/audit_top_bg"
 
+        android:paddingTop="@dimen/status_bar_height"
 
+        android:paddingBottom="@dimen/content_padding_15">
 
+
 
+
 
+        <ImageView
 
+            android:id="@+id/img_baseactivity_title"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="?attr/actionBarSize"
 
+            android:paddingStart="@dimen/content_padding_20"
 
+            android:paddingEnd="@dimen/content_padding_20"
 
+            android:gravity="center_vertical"
 
+            android:scaleType="centerInside"
 
+            android:src="@drawable/narrow_back_white"
 
+            app:layout_constraintStart_toStartOf="parent"
 
+            app:layout_constraintTop_toTopOf="parent" />
 
+
 
+        <TextView
 
+            android:id="@+id/txt_baseactivity_title"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="?attr/actionBarSize"
 
+            android:layout_centerInParent="true"
 
+            android:gravity="center"
 
+            android:text="@string/app_name"
 
+            android:textColor="@color/white"
 
+            android:textSize="@dimen/text_size_4"
 
+            app:layout_constraintBottom_toBottomOf="@+id/img_baseactivity_title"
 
+            app:layout_constraintEnd_toEndOf="parent"
 
+            app:layout_constraintStart_toStartOf="parent"
 
+            app:layout_constraintTop_toTopOf="@+id/img_baseactivity_title" />
 
+
 
+        <TextView
 
+            android:id="@+id/number_tv"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="wrap_content"
 
+            android:textSize="@dimen/text_size_25"
 
+            android:textColor="@color/white"
 
+            android:text=""
 
+            android:gravity="center"
 
+            app:layout_constraintTop_toBottomOf="@+id/txt_baseactivity_title"
 
+            app:layout_constraintEnd_toEndOf="parent"
 
+            app:layout_constraintStart_toStartOf="parent"/>
 
+
 
+        <LinearLayout
 
+            android:layout_below="@+id/number_tv"
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            app:layout_constraintTop_toBottomOf="@+id/number_tv"
 
+            app:layout_constraintBottom_toBottomOf="parent"
 
+            android:layout_marginTop="@dimen/content_padding_15">
 
+            <TextView
 
+                android:id="@+id/audit_total_complete_tv"
 
+                android:layout_width="0dp"
 
+                android:layout_weight="1"
 
+                android:layout_height="wrap_content"
 
+                android:gravity="center"
 
+                android:text=""
 
+                android:textColor="@color/white"
 
+                android:textSize="@dimen/text_size_13"/>
 
+            <View
 
+                android:layout_width="1dp"
 
+                android:layout_height="20dp"
 
+                android:layout_gravity="center"
 
+                android:background="@color/disenable_color"/>
 
+            <TextView
 
+                android:id="@+id/audit_total_money_tv"
 
+                android:layout_width="0dp"
 
+                android:layout_weight="1"
 
+                android:layout_height="wrap_content"
 
+                android:gravity="center"
 
+                android:text=""
 
+                android:textColor="@color/white"
 
+                android:textSize="@dimen/text_size_13"/>
 
+            <View
 
+                android:layout_width="1dp"
 
+                android:layout_height="20dp"
 
+                android:layout_gravity="center"
 
+                android:background="@color/disenable_color"/>
 
+            <TextView
 
+                android:id="@+id/audit_total_welfare_tv"
 
+                android:layout_width="0dp"
 
+                android:layout_weight="1"
 
+                android:layout_height="wrap_content"
 
+                android:gravity="center"
 
+                android:text=""
 
+                android:textColor="@color/white"
 
+                android:textSize="@dimen/text_size_13"/>
 
+        </LinearLayout>
 
+    </android.support.constraint.ConstraintLayout>
 
+
 
+    <android.support.design.widget.TabLayout
 
+        android:id="@+id/indicator"
 
+        style="@style/style_tab"/>
 
+
 
+    <android.support.v4.view.ViewPager
 
+        android:id="@+id/pager"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="0dip"
 
+        android:layout_weight="1" />
 
+</LinearLayout>

+ 12 - 0
app/src/main/res/layout/activity_main.xml
Visa fil 

@@ -90,6 +90,18 @@
 
                 android:gravity="center"
 
                 android:gravity="center"
 
                 android:textColor="@color/selector_color_main_tab"
 
                 android:textColor="@color/selector_color_main_tab"
 
                 android:text="@string/tab_viewpager_borrowplay"/>
 
                 android:text="@string/tab_viewpager_borrowplay"/>
 
+            <View android:layout_weight="2"
 
+                android:layout_width="0dp"
 
+                android:layout_height="@dimen/tab_height"/>
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:minWidth="@dimen/tab_width"
 
+                android:layout_height="@dimen/tab_height"
 
+                android:drawableTop="@drawable/drawable_selector_task"
 
+                android:textSize="10sp"
 
+                android:gravity="center"
 
+                android:textColor="@color/selector_color_main_tab"
 
+                android:text="@string/tab_viewpager_borrowplay"/>
 
             <View android:layout_weight="1"
 
             <View android:layout_weight="1"
 
                 android:layout_width="0dp"
 
                 android:layout_width="0dp"
 
                 android:layout_height="@dimen/tab_height"/>
 
                 android:layout_height="@dimen/tab_height"/>

+ 133 - 0
app/src/main/res/layout/ask_getmoney_act_item_three_notice_layout.xml
Visa fil 

@@ -0,0 +1,133 @@
 
+<?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:layout_marginTop="@dimen/content_padding_20"
 
+    android:orientation="vertical">
 
+
 
+
 
+    <TextView
 
+        android:layout_width="wrap_content"
 
+        android:layout_height="wrap_content"
 
+        android:layout_gravity="center_horizontal"
 
+        android:text="邀请小技巧"
 
+        android:textColor="@color/purple_BE0FFF"
 
+        android:textSize="15sp" />
 
+
 
+    <TextView
 
+        android:layout_width="wrap_content"
 
+        android:layout_height="wrap_content"
 
+        android:layout_gravity="center_horizontal"
 
+        android:layout_marginTop="@dimen/content_padding_9"
 
+        android:text="建议好友用手机登录"
 
+        android:textColor="@color/purple_996633"
 
+        android:textSize="11sp" />
 
+
 
+    <LinearLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:orientation="horizontal"
 
+        android:layout_marginTop="@dimen/content_padding_20">
 
+
 
+        <LinearLayout
 
+            android:layout_width="0dp"
 
+            android:layout_height="wrap_content"
 
+            android:layout_weight="1"
 
+            android:gravity="center"
 
+            android:orientation="vertical">
 
+
 
+            <ImageView
 
+                android:layout_width="41dp"
 
+                android:layout_height="41dp"
 
+                android:src="@mipmap/ask_getmoney_jiaren" />
 
+
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_gravity="center"
 
+                android:layout_margin="@dimen/content_padding_8"
 
+                android:gravity="center"
 
+                android:text="邀请家人、朋友提升成功率"
 
+                android:textColor="#996633"
 
+                android:textSize="11sp" />
 
+        </LinearLayout>
 
+
 
+        <LinearLayout
 
+            android:layout_width="0dp"
 
+            android:layout_height="wrap_content"
 
+            android:layout_weight="1"
 
+            android:gravity="center"
 
+            android:orientation="vertical">
 
+
 
+            <ImageView
 
+                android:layout_width="41dp"
 
+                android:layout_height="41dp"
 
+                android:src="@mipmap/ask_getmoney_qun" />
 
+
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_gravity="center"
 
+                android:layout_margin="@dimen/content_padding_8"
 
+                android:gravity="center"
 
+                android:text="分享到3个以上微信、QQ群"
 
+                android:textColor="#996633"
 
+                android:textSize="11sp" />
 
+        </LinearLayout>
 
+
 
+        <LinearLayout
 
+            android:layout_width="0dp"
 
+            android:layout_height="wrap_content"
 
+            android:layout_weight="1"
 
+            android:gravity="center"
 
+            android:orientation="vertical">
 
+
 
+            <ImageView
 
+                android:layout_width="41dp"
 
+                android:layout_height="41dp"
 
+                android:src="@mipmap/ask_getmoney_hongbao" />
 
+
 
+            <TextView
 
+                android:layout_width="wrap_content"
 
+                android:layout_height="wrap_content"
 
+                android:layout_gravity="center"
 
+                android:layout_margin="@dimen/content_padding_8"
 
+                android:gravity="center"
 
+                android:text="告知10元新人红包可直接提现"
 
+                android:textColor="#996633"
 
+                android:textSize="11sp" />
 
+        </LinearLayout>
 
+
 
+    </LinearLayout>
 
+
 
+    <LinearLayout
 
+        android:layout_marginTop="@dimen/content_padding_35"
 
+        android:layout_width="wrap_content"
 
+        android:layout_height="wrap_content"
 
+        android:orientation="horizontal"
 
+        android:gravity="center_vertical"
 
+        android:layout_gravity="center_horizontal"
 
+        android:background="@drawable/button_full_nomal_yellow_click"
 
+        android:padding="@dimen/dp_10">
 
+        <TextView
 
+            android:id="@+id/my_invitation_tv"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="wrap_content"
 
+            android:text="@string/my_invitation_str"
 
+            android:textColor="@color/purple_996633"
 
+            android:textSize="@dimen/text_size_12"
 
+            android:layout_marginLeft="@dimen/content_padding_15"/>
 
+
 
+        <TextView
 
+            android:id="@+id/copy_my_invitation_tv"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="wrap_content"
 
+            android:text="复制"
 
+            android:textColor="@color/purple_BE0FFF"
 
+            android:textSize="@dimen/text_size_12"
 
+            android:layout_marginLeft="@dimen/content_padding_15"
 
+            android:layout_marginRight="@dimen/content_padding_15"/>
 
+    </LinearLayout>
 
+
 
+
 
+</LinearLayout>

+ 78 - 0
app/src/main/res/layout/fgt_askgetmoney_friend.xml
Visa fil 

@@ -0,0 +1,78 @@
 
+<?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_marginEnd="@dimen/content_padding_10"
 
+    android:layout_marginStart="@dimen/content_padding_10"
 
+    android:layout_marginTop="@dimen/content_padding_10"
 
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
 
+    android:orientation="vertical"
 
+    android:paddingBottom="@dimen/content_padding_10"
 
+    android:paddingTop="@dimen/content_padding_10">
 
+
 
+    <TextView
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:layout_marginBottom="@dimen/content_padding_10"
 
+        android:layout_marginStart="@dimen/content_padding_10"
 
+        android:text="已邀请好友列表"
 
+        android:textColor="#ffffff"
 
+        android:textSize="@dimen/text_size_15" />
 
+
 
+    <include layout="@layout/x_ask_getmoney_act_layout_include" />
 
+
 
+    <com.kfzs.duanduan.view.ViewPagerPlus
 
+        android:id="@+id/friend_extract_vp"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="@dimen/ask_friend_list_h"
 
+        android:layout_marginTop="3dp" />
 
+
 
+    <LinearLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content"
 
+        android:layout_marginTop="@dimen/content_padding_10"
 
+        android:gravity="center"
 
+        android:orientation="horizontal">
 
+
 
+        <TextView
 
+            android:id="@+id/friend_extract_last_page_tv"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="wrap_content"
 
+            android:layout_marginStart="@dimen/content_padding_20"
 
+            android:background="@drawable/shape_page"
 
+            android:paddingBottom="2dp"
 
+            android:paddingEnd="17dp"
 
+            android:paddingStart="17dp"
 
+            android:paddingTop="2dp"
 
+            android:text="@string/last_page"
 
+            android:textColor="#ffffff"
 
+            android:textSize="12sp" />
 
+
 
+        <TextView
 
+            android:id="@+id/friend_extract_page_tv"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="wrap_content"
 
+            android:layout_marginStart="@dimen/content_padding_10"
 
+            android:paddingBottom="2dp"
 
+            android:paddingEnd="7dp"
 
+            android:paddingStart="7dp"
 
+            android:paddingTop="2dp"
 
+            android:text="1"
 
+            android:textColor="#ffffff"
 
+            android:textSize="12sp" />
 
+
 
+        <TextView
 
+            android:id="@+id/friend_extract_next_page_tv"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="wrap_content"
 
+            android:layout_marginStart="@dimen/content_padding_10"
 
+            android:background="@drawable/shape_page"
 
+            android:paddingBottom="2dp"
 
+            android:paddingEnd="17dp"
 
+            android:paddingStart="17dp"
 
+            android:paddingTop="2dp"
 
+            android:text="@string/next_page"
 
+            android:textColor="#ffffff"
 
+            android:textSize="12sp" />
 
+    </LinearLayout>
 
+</LinearLayout>

+ 84 - 0
app/src/main/res/layout/fgt_askgetmoney_rank.xml
Visa fil 

@@ -0,0 +1,84 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
+    android:layout_width="match_parent"
 
+    android:layout_height="wrap_content"
 
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
+    android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
 
+    android:paddingBottom="@dimen/content_padding_10"
 
+    android:paddingEnd="@dimen/content_padding_10"
 
+    android:paddingStart="@dimen/content_padding_10">
 
+
 
+    <TextView
 
+        android:id="@+id/ask_top5_title"
 
+        app:layout_constraintTop_toTopOf="parent"
 
+        android:layout_width="wrap_content"
 
+        android:layout_height="wrap_content"
 
+        android:paddingBottom="@dimen/content_padding_10"
 
+        android:paddingTop="@dimen/content_padding_10"
 
+        android:text="本月排行榜top5"
 
+        android:textColor="#ffffff"
 
+        android:textSize="14sp" />
 
+
 
+    <TextView
 
+        android:id="@+id/ask_top5_not_you"
 
+        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
 
+        app:layout_constraintEnd_toStartOf="@+id/ask_top3_tip"
 
+        app:layout_constraintTop_toTopOf="@+id/ask_top5_title"
 
+        android:layout_width="wrap_content"
 
+        android:layout_height="wrap_content"
 
+        android:gravity="center"
 
+        android:text="你还未上榜，再接再厉"
 
+        android:textColor="#ffffff"
 
+        android:textSize="10sp" />
 
+
 
+    <ImageView
 
+        android:id="@+id/ask_top3_tip"
 
+        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
 
+        app:layout_constraintEnd_toEndOf="parent"
 
+        app:layout_constraintTop_toTopOf="@+id/ask_top5_title"
 
+        android:layout_width="18dp"
 
+        android:layout_height="38dp"
 
+        android:paddingBottom="@dimen/content_padding_10"
 
+        android:paddingEnd="3dp"
 
+        android:paddingStart="3dp"
 
+        android:paddingTop="@dimen/content_padding_10"
 
+        android:src="@mipmap/ask_top5_tip" />
 
+
 
+    <RelativeLayout
 
+        android:id="@+id/empty_view"
 
+        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_list"
 
+        app:layout_constraintTop_toTopOf="@+id/ask_top5_list"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="0dp"
 
+        android:visibility="invisible">
 
+
 
+        <ImageView
 
+            android:id="@+id/empty_view_img"
 
+            android:layout_width="wrap_content"
 
+            android:layout_height="80dp"
 
+            android:layout_centerHorizontal="true"
 
+            android:layout_marginTop="140dp"
 
+            android:gravity="center"
 
+            android:scaleType="centerInside"
 
+            android:src="@mipmap/wushuju" />
 
+
 
+        <TextView
 
+            android:id="@+id/empty_view_msg"
 
+            android:layout_width="match_parent"
 
+            android:layout_height="wrap_content"
 
+            android:layout_below="@id/empty_view_img"
 
+            android:layout_centerHorizontal="true"
 
+            android:layout_marginTop="@dimen/content_padding_10"
 
+            android:gravity="center"
 
+            android:text="@string/wushuju"
 
+            android:textColor="#ffffff"
 
+            android:textSize="15sp" />
 
+    </RelativeLayout>
 
+
 
+    <android.support.v7.widget.RecyclerView
 
+        android:id="@+id/ask_top5_list"
 
+        app:layout_constraintTop_toBottomOf="@+id/ask_top5_title"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="wrap_content" />
 
+
 
+</android.support.constraint.ConstraintLayout>

+ 6 - 4
app/src/main/res/layout/fgt_personalcenter_item_center_one.xml
Visa fil 

@@ -26,7 +26,8 @@
 
 
 
     <LinearLayout
 
     <LinearLayout
 
         android:id="@+id/account_task_layout"
 
         android:id="@+id/account_task_layout"
 
-        style="@style/style_item_container">
 
+        style="@style/style_item_container"
 
+        android:visibility="gone">
 
 
 
         <ImageView
 
         <ImageView
 
             style="@style/style_item_img"
 
             style="@style/style_item_img"
 
@@ -34,13 +35,14 @@
 
 
 
         <TextView
 
         <TextView
 
             style="@style/style_item_label"
 
             style="@style/style_item_label"
 
-            android:text="任务记录" />
 
+            android:text="审核中心" />
 
 
 
         <TextView style="@style/style_item_end_next" />
 
         <TextView style="@style/style_item_end_next" />
 
 
 
     </LinearLayout>
 
     </LinearLayout>
 
 
 
-    <View style="@style/style_item_line_new" />
 
+    <View style="@style/style_item_line_new"
 
+        android:visibility="gone"/>
 
 
 
     <LinearLayout
 
     <LinearLayout
 
         android:id="@+id/order_layout"
 
         android:id="@+id/order_layout"
 
@@ -56,7 +58,7 @@
 
 
 
         <TextView
 
         <TextView
 
             style="@style/style_item_end_next"
 
             style="@style/style_item_end_next"
 
-            android:visibility="gone" />
 
+            android:visibility="visible" />
 
 
 
     </LinearLayout>
 
     </LinearLayout>

+ 41 - 13
app/src/main/res/layout/homepage_act_layout.xml
Visa fil 

@@ -2,18 +2,27 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
     android:layout_width="match_parent"
 
     android:layout_width="match_parent"
 
     android:layout_height="match_parent"
 
     android:layout_height="match_parent"
 
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
     android:clipChildren="true"
 
     android:clipChildren="true"
 
     android:background="@color/bg_gray">
 
     android:background="@color/bg_gray">
 
 
 
+    <!--<com.flipboard.bottomsheet.BottomSheetLayout-->
 
+        <!--android:layout_width="match_parent"-->
 
+        <!--android:layout_height="match_parent"-->
 
+        <!--android:fitsSystemWindows="true">-->
 
+
 
     <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
 
     <com.sheep.gamegroup.util.SheepSwipeRefreshLayout
 
         android:id="@+id/refresh"
 
         android:id="@+id/refresh"
 
         android:layout_width="match_parent"
 
         android:layout_width="match_parent"
 
         android:layout_height="wrap_content">
 
         android:layout_height="wrap_content">
 
-    <android.support.v4.widget.NestedScrollView
 
+    <com.sheep.gamegroup.util.NestedScrollView
 
         android:id="@+id/scrollView"
 
         android:id="@+id/scrollView"
 
         android:layout_width="match_parent"
 
         android:layout_width="match_parent"
 
-        android:layout_height="wrap_content"
 
-        android:scrollbars="none">
 
+        android:layout_height="match_parent"
 
+        android:fillViewport="true"
 
+        android:layout_gravity="fill_vertical"
 
+        android:scrollbars="none"
 
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
         <LinearLayout
 
         <LinearLayout
 
             android:layout_width="match_parent"
 
             android:layout_width="match_parent"
 
             android:layout_height="wrap_content"
 
             android:layout_height="wrap_content"
 
@@ -22,22 +31,35 @@
 
             android:orientation="vertical">
 
             android:orientation="vertical">
 
 
 
             <include
 
             <include
 
-                layout="@layout/homepage_item_top2"/>
 
+                layout="@layout/homepage_item_top2"
 
+                android:visibility="gone"/>
 
 
 
             <include
 
             <include
 
                 layout="@layout/check_net_view"/>
 
                 layout="@layout/check_net_view"/>
 
 
 
             <include
 
             <include
 
-                layout="@layout/homepage_item_notice"/>
 
+                layout="@layout/homepage_item_banner"/>
 
 
 
             <include
 
             <include
 
-                layout="@layout/homepage_item_banner"/>
 
+                layout="@layout/homepage_item_gridview_listview"
 
+                android:visibility="visible"/>
 
+
 
             <include
 
             <include
 
-                layout="@layout/homepage_item_4module"
 
+                layout="@layout/homepage_item_notice_and_currenttime"/>
 
+
 
+            <include
 
+                layout="@layout/homepage_item_get_award"/>
 
+
 
+            <include
 
+                layout="@layout/homepage_item_notice"
 
                 android:visibility="gone"/>
 
                 android:visibility="gone"/>
 
             <include
 
             <include
 
-                layout="@layout/homepage_item_gridview_listview"
 
-                android:visibility="visible"/>
 
+                layout="@layout/homepage_item_currenttime_reward"
 
+                android:visibility="gone"/>
 
+
 
+            <include
 
+                layout="@layout/homepage_item_4module"
 
+                android:visibility="gone"/>
 
 
 
             <include
 
             <include
 
                 layout="@layout/homepage_item_liy_q"
 
                 layout="@layout/homepage_item_liy_q"
 
@@ -45,8 +67,6 @@
 
             <include
 
             <include
 
                 layout="@layout/homepage_item_gridview_listview"
 
                 layout="@layout/homepage_item_gridview_listview"
 
                 android:visibility="gone"/>
 
                 android:visibility="gone"/>
 
-            <include
 
-                layout="@layout/homepage_item_currenttime_reward"/>
 
 
 
             <android.support.v7.widget.RecyclerView
 
             <android.support.v7.widget.RecyclerView
 
                 android:id="@+id/recyclerview"
 
                 android:id="@+id/recyclerview"
 
@@ -55,10 +75,18 @@
 
                 android:orientation="vertical"
 
                 android:orientation="vertical"
 
                 android:paddingLeft="@dimen/content_padding_10"
 
                 android:paddingLeft="@dimen/content_padding_10"
 
                 android:paddingRight="@dimen/content_padding_10"/>
 
                 android:paddingRight="@dimen/content_padding_10"/>
 
+
 
+            <!--选项卡-->
 
+            <include
 
+                layout="@layout/tablayout_viewpager_layout"/>
 
+
 
         </LinearLayout>
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
 
+
 
+    </com.sheep.gamegroup.util.NestedScrollView>
 
     </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
 
     </com.sheep.gamegroup.util.SheepSwipeRefreshLayout>
 
 
 
+    <!--</com.flipboard.bottomsheet.BottomSheetLayout>-->
 
+
 
     <com.kfzs.duanduan.view.DragRelativeLayout
 
     <com.kfzs.duanduan.view.DragRelativeLayout
 
         android:id="@+id/newbie_task"
 
         android:id="@+id/newbie_task"
 
         android:layout_width="40dp"
 
         android:layout_width="40dp"
 
@@ -102,7 +130,7 @@
 
         android:id="@+id/test_change_user"
 
         android:id="@+id/test_change_user"
 
         style="@style/style_button_small_yellow"
 
         style="@style/style_button_small_yellow"
 
         android:layout_width="wrap_content"
 
         android:layout_width="wrap_content"
 
-        android:layout_height="wrap_content"
 
+        android:layout_height="30dp"
 
         android:paddingStart="@dimen/content_padding_10"
 
         android:paddingStart="@dimen/content_padding_10"
 
         android:paddingEnd="@dimen/content_padding_10"
 
         android:paddingEnd="@dimen/content_padding_10"
 
         android:layout_margin="@dimen/content_padding_10"
 
         android:layout_margin="@dimen/content_padding_10"

+ 37 - 0
app/src/main/res/layout/tablayout_viewpager_layout.xml
Visa fil 

@@ -0,0 +1,37 @@
 
+<?xml version="1.0" encoding="utf-8"?>
 
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 
+    android:layout_width="match_parent"
 
+    android:layout_height="match_parent"
 
+    xmlns:app="http://schemas.android.com/apk/res-auto"
 
+    android:orientation="vertical">
 
+    <LinearLayout
 
+        android:layout_width="match_parent"
 
+        android:layout_height="48dp"
 
+        android:background="@color/white"
 
+        android:orientation="horizontal">
 
+
 
+        <android.support.design.widget.TabLayout
 
+            android:id="@+id/tabLayout"
 
+            android:layout_width="0dp"
 
+            android:layout_height="wrap_content"
 
+            android:layout_weight="2"
 
+            android:background="@color/white"
 
+            app:tabGravity="fill"
 
+            app:tabIndicatorColor="?attr/main_color"
 
+            app:tabIndicatorHeight="3dp"
 
+            app:tabMode="fixed"
 
+            app:tabSelectedTextColor="?attr/main_color"
 
+            app:tabTextAppearance="@style/TablLayoutTextStyle"
 
+            app:tabTextColor="@color/B" />
 
+    </LinearLayout>
 
+
 
+    <include layout="@layout/line_1px_hor" />
 
+
 
+    <!--app:layout_behavior="@string/appbar_scrolling_view_behavior"-->
 
+    <com.kfzs.duanduan.view.ViewPagerAutoHeigh
 
+        android:id="@+id/viewpager_act_game_details"
 
+        android:layout_width="match_parent"
 
+        android:layout_height="match_parent"
 
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
 
+        android:minHeight="@dimen/view_size_100" />
 
+</LinearLayout>

+ 27 - 162
app/src/main/res/layout/x_ask_getmoney_act_layout.xml
Visa fil 

@@ -13,7 +13,10 @@
 
         android:layout_marginBottom="60dp"
 
         android:layout_marginBottom="60dp"
 
         android:layout_marginTop="-13dp"
 
         android:layout_marginTop="-13dp"
 
         android:orientation="vertical"
 
         android:orientation="vertical"
 
-        android:scrollbars="none">
 
+        android:fillViewport="true"
 
+        android:layout_gravity="fill_vertical"
 
+        android:scrollbars="none"
 
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
 
 
         <RelativeLayout
 
         <RelativeLayout
 
             android:layout_width="match_parent"
 
             android:layout_width="match_parent"
 
@@ -52,7 +55,8 @@
 
                     android:id="@+id/ask_top_2"
 
                     android:id="@+id/ask_top_2"
 
                     android:layout_width="match_parent"
 
                     android:layout_width="match_parent"
 
                     android:layout_height="60dp"
 
                     android:layout_height="60dp"
 
-                    android:orientation="horizontal">
 
+                    android:orientation="horizontal"
 
+                    android:layout_marginBottom="@dimen/content_padding_20">
 
 
 
                     <RelativeLayout
 
                     <RelativeLayout
 
                         android:layout_width="0dp"
 
                         android:layout_width="0dp"
 
@@ -124,91 +128,24 @@
 
 
 
                 </LinearLayout>
 
                 </LinearLayout>
 
 
 
-                <!--本月排行榜top5-->
 
-                <android.support.constraint.ConstraintLayout
 
+                <android.support.design.widget.TabLayout
 
+                    android:id="@+id/indicator"
 
+                    style="@style/style_tab_askgetmoney"/>
 
+
 
+                <View
 
                     android:layout_width="match_parent"
 
                     android:layout_width="match_parent"
 
-                    android:layout_height="wrap_content"
 
-                    android:layout_marginTop="@dimen/content_padding_10"
 
+                    android:layout_height="1dp"
 
+                    android:background="@color/yellow_FFAD3C"/>
 
+
 
+                <com.kfzs.duanduan.view.ViewPagerAutoHeigh
 
+                    android:id="@+id/pager"
 
+                    android:layout_width="match_parent"
 
+                    android:layout_height="match_parent"
 
+                    android:minHeight="@dimen/ask_friend_list_h"
 
+                    app:layout_behavior="@string/appbar_scrolling_view_behavior"
 
                     android:layout_marginEnd="@dimen/content_padding_10"
 
                     android:layout_marginEnd="@dimen/content_padding_10"
 
                     android:layout_marginStart="@dimen/content_padding_10"
 
                     android:layout_marginStart="@dimen/content_padding_10"
 
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
 
-                    android:paddingStart="@dimen/content_padding_10"
 
-                    android:paddingEnd="@dimen/content_padding_10"
 
-                    android:paddingBottom="@dimen/content_padding_10">
 
-
 
-                    <TextView
 
-                        android:id="@+id/ask_top5_title"
 
-                        android:layout_width="wrap_content"
 
-                        android:layout_height="wrap_content"
 
-                        android:paddingBottom="@dimen/content_padding_10"
 
-                        android:paddingTop="@dimen/content_padding_10"
 
-                        android:text="本月排行榜top5"
 
-                        android:textColor="#ffffff"
 
-                        android:textSize="14sp"
 
-                        app:layout_constraintTop_toTopOf="parent" />
 
-
 
-                    <TextView
 
-                        android:id="@+id/ask_top5_not_you"
 
-                        android:layout_width="wrap_content"
 
-                        android:layout_height="wrap_content"
 
-                        android:gravity="center"
 
-                        android:text="你还未上榜，再接再厉"
 
-                        android:textColor="#ffffff"
 
-                        android:textSize="10sp"
 
-                        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
 
-                        app:layout_constraintEnd_toStartOf="@+id/ask_top3_tip"
 
-                        app:layout_constraintTop_toTopOf="@+id/ask_top5_title" />
 
-
 
-                    <ImageView
 
-                        android:id="@+id/ask_top3_tip"
 
-                        android:layout_width="18dp"
 
-                        android:layout_height="38dp"
 
-                        android:paddingBottom="@dimen/content_padding_10"
 
-                        android:paddingEnd="3dp"
 
-                        android:paddingStart="3dp"
 
-                        android:paddingTop="@dimen/content_padding_10"
 
-                        android:src="@mipmap/ask_top5_tip"
 
-                        android:onClick="showAstTop5Tip"
 
-                        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_title"
 
-                        app:layout_constraintEnd_toEndOf="parent"
 
-                        app:layout_constraintTop_toTopOf="@+id/ask_top5_title" />
 
-                    <RelativeLayout
 
-                        android:id="@+id/empty_view"
 
-                        android:layout_width="match_parent"
 
-                        android:layout_height="0dp"
 
-                        app:layout_constraintTop_toTopOf="@+id/ask_top5_list"
 
-                        app:layout_constraintBottom_toBottomOf="@+id/ask_top5_list"
 
-                        android:visibility="invisible">
 
-
 
-                        <ImageView
 
-                            android:id="@+id/empty_view_img"
 
-                            android:layout_width="wrap_content"
 
-                            android:layout_height="80dp"
 
-                            android:layout_marginTop="140dp"
 
-                            android:layout_centerHorizontal="true"
 
-                            android:gravity="center"
 
-                            android:scaleType="centerInside"
 
-                            android:src="@mipmap/wushuju"/>
 
-
 
-                        <TextView
 
-                            android:id="@+id/empty_view_msg"
 
-                            android:layout_width="match_parent"
 
-                            android:layout_height="wrap_content"
 
-                            android:gravity="center"
 
-                            android:layout_below="@id/empty_view_img"
 
-                            android:layout_centerHorizontal="true"
 
-                            android:layout_marginTop="@dimen/content_padding_10"
 
-                            android:text="@string/wushuju"
 
-                            android:textColor="#ffffff"
 
-                            android:textSize="15sp" />
 
-                    </RelativeLayout>
 
-                    <android.support.v7.widget.RecyclerView
 
-                        android:id="@+id/ask_top5_list"
 
-                        android:layout_width="match_parent"
 
-                        android:layout_height="wrap_content"
 
-                        app:layout_constraintTop_toBottomOf="@+id/ask_top5_title" />
 
-
 
-                </android.support.constraint.ConstraintLayout>
 
+                    android:layout_marginTop="@dimen/content_padding_10"/>
 
 
 
                 <!--发放情况-->
 
                 <!--发放情况-->
 
                 <LinearLayout
 
                 <LinearLayout
 
@@ -220,7 +157,8 @@
 
                     android:layout_marginTop="@dimen/content_padding_10"
 
                     android:layout_marginTop="@dimen/content_padding_10"
 
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_purple"
 
                     android:background="@drawable/x_shap_shadow_bg_rectgangle_purple"
 
                     android:orientation="horizontal"
 
                     android:orientation="horizontal"
 
-                    android:padding="@dimen/content_padding_10">
 
+                    android:padding="@dimen/content_padding_10"
 
+                    android:visibility="gone">
 
 
 
                     <TextView
 
                     <TextView
 
                         android:layout_width="wrap_content"
 
                         android:layout_width="wrap_content"
 
@@ -240,84 +178,11 @@
 
                         app:mvInterval="3000"
 
                         app:mvInterval="3000"
 
                         app:mvSingleLine="true" />
 
                         app:mvSingleLine="true" />
 
                 </LinearLayout>
 
                 </LinearLayout>
 
-                <!--已邀请好友列表-->
 
-                <LinearLayout
 
-                    android:layout_width="match_parent"
 
-                    android:layout_height="wrap_content"
 
-                    android:layout_marginEnd="@dimen/content_padding_10"
 
-                    android:layout_marginStart="@dimen/content_padding_10"
 
-                    android:layout_marginTop="@dimen/content_padding_10"
 
-                    android:background="@drawable/x_shap_shadow_bg_rectgangle_purple_red"
 
-                    android:orientation="vertical"
 
-                    android:paddingBottom="@dimen/content_padding_10"
 
-                    android:paddingTop="@dimen/content_padding_10">
 
-
 
-                    <TextView
 
-                        android:layout_width="match_parent"
 
-                        android:layout_height="wrap_content"
 
-                        android:layout_marginBottom="@dimen/content_padding_10"
 
-                        android:layout_marginStart="@dimen/content_padding_10"
 
-                        android:text="已邀请好友列表"
 
-                        android:textColor="#ffffff"
 
-                        android:textSize="@dimen/text_size_15" />
 
-
 
-                    <include layout="@layout/x_ask_getmoney_act_layout_include" />
 
 
 
-                    <com.kfzs.duanduan.view.ViewPagerPlus
 
-                        android:id="@+id/friend_extract_vp"
 
-                        android:layout_width="match_parent"
 
-                        android:layout_height="@dimen/ask_friend_list_h"
 
-                        android:layout_marginTop="3dp" />
 
-
 
-                    <LinearLayout
 
-                        android:layout_width="match_parent"
 
-                        android:layout_height="wrap_content"
 
-                        android:layout_marginTop="@dimen/content_padding_10"
 
-                        android:gravity="center"
 
-                        android:orientation="horizontal">
 
+                <!--邀请小技巧-->
 
 
 
-                        <TextView
 
-                            android:id="@+id/friend_extract_last_page_tv"
 
-                            android:layout_width="wrap_content"
 
-                            android:layout_height="wrap_content"
 
-                            android:layout_marginStart="@dimen/content_padding_20"
 
-                            android:background="@drawable/shape_page"
 
-                            android:paddingBottom="2dp"
 
-                            android:paddingEnd="17dp"
 
-                            android:paddingStart="17dp"
 
-                            android:paddingTop="2dp"
 
-                            android:text="@string/last_page"
 
-                            android:textColor="#ffffff"
 
-                            android:textSize="12sp" />
 
-
 
-                        <TextView
 
-                            android:id="@+id/friend_extract_page_tv"
 
-                            android:layout_width="wrap_content"
 
-                            android:layout_height="wrap_content"
 
-                            android:layout_marginStart="@dimen/content_padding_10"
 
-                            android:paddingBottom="2dp"
 
-                            android:paddingEnd="7dp"
 
-                            android:paddingStart="7dp"
 
-                            android:paddingTop="2dp"
 
-                            android:text="1"
 
-                            android:textColor="#ffffff"
 
-                            android:textSize="12sp" />
 
-
 
-                        <TextView
 
-                            android:id="@+id/friend_extract_next_page_tv"
 
-                            android:layout_width="wrap_content"
 
-                            android:layout_height="wrap_content"
 
-                            android:layout_marginStart="@dimen/content_padding_10"
 
-                            android:background="@drawable/shape_page"
 
-                            android:paddingBottom="2dp"
 
-                            android:paddingEnd="17dp"
 
-                            android:paddingStart="17dp"
 
-                            android:paddingTop="2dp"
 
-                            android:text="@string/next_page"
 
-                            android:textColor="#ffffff"
 
-                            android:textSize="12sp" />
 
-                    </LinearLayout>
 
-                </LinearLayout>
 
+                <include
 
+                    layout="@layout/ask_getmoney_act_item_three_notice_layout"/>
 
             </LinearLayout>
 
             </LinearLayout>
 
         </RelativeLayout>
 
         </RelativeLayout>
 
     </android.support.v4.widget.NestedScrollView>
 
     </android.support.v4.widget.NestedScrollView>
 
@@ -331,8 +196,8 @@
 
         android:background="#ffffff">
 
         android:background="#ffffff">
 
 
 
         <TextView
 
         <TextView
 
+            android:id="@+id/ask_invite_tv"
 
             style="@style/style_button_purple"
 
             style="@style/style_button_purple"
 
-            android:onClick="showShareView"
 
             android:text="立即邀请" />
 
             android:text="立即邀请" />
 
     </LinearLayout>
 
     </LinearLayout>
 
 </RelativeLayout>
 
 </RelativeLayout>

+ 7 - 7
app/src/main/res/layout/x_ask_getmoney_act_layout_include.xml
Visa fil 

@@ -13,33 +13,33 @@
 
         android:singleLine="true"
 
         android:singleLine="true"
 
         android:textSize="12sp"
 
         android:textSize="12sp"
 
         android:textColor="#ffffff"
 
         android:textColor="#ffffff"
 
-        android:text="绵羊ID"/>
 
+        android:text="绵羊号"/>
 
     <TextView
 
     <TextView
 
         android:layout_width="0dp"
 
         android:layout_width="0dp"
 
         android:layout_height="wrap_content"
 
         android:layout_height="wrap_content"
 
-        android:layout_weight="4"
 
+        android:layout_weight="6"
 
         android:gravity="center"
 
         android:gravity="center"
 
         android:singleLine="true"
 
         android:singleLine="true"
 
         android:textSize="12sp"
 
         android:textSize="12sp"
 
         android:textColor="#ffffff"
 
         android:textColor="#ffffff"
 
-        android:text="好友昵称"/>
 
+        android:text="注册时间"/>
 
     <TextView
 
     <TextView
 
         android:layout_width="0dp"
 
         android:layout_width="0dp"
 
         android:layout_height="wrap_content"
 
         android:layout_height="wrap_content"
 
-        android:layout_weight="2"
 
+        android:layout_weight="3"
 
         android:gravity="center"
 
         android:gravity="center"
 
         android:singleLine="true"
 
         android:singleLine="true"
 
         android:textSize="12sp"
 
         android:textSize="12sp"
 
         android:textColor="#ffffff"
 
         android:textColor="#ffffff"
 
-        android:text="提成"/>
 
+        android:text="来源页面"/>
 
     <TextView
 
     <TextView
 
         android:layout_width="0dp"
 
         android:layout_width="0dp"
 
         android:layout_height="wrap_content"
 
         android:layout_height="wrap_content"
 
-        android:layout_weight="5"
 
+        android:layout_weight="3"
 
         android:singleLine="true"
 
         android:singleLine="true"
 
         android:gravity="center"
 
         android:gravity="center"
 
         android:textSize="12sp"
 
         android:textSize="12sp"
 
         android:textColor="#ffffff"
 
         android:textColor="#ffffff"
 
-        android:text="注册时间"/>
 
+        android:text="好友贡献"/>
 
 
 
 </LinearLayout>
 
 </LinearLayout>

+ 3 - 3
app/src/main/res/layout/x_ask_getmoney_act_layout_item.xml
Visa fil 

@@ -17,7 +17,7 @@
 
     <TextView
 
     <TextView
 
         android:layout_width="0dp"
 
         android:layout_width="0dp"
 
         android:layout_height="26dp"
 
         android:layout_height="26dp"
 
-        android:layout_weight="4"
 
+        android:layout_weight="6"
 
         android:gravity="center"
 
         android:gravity="center"
 
         android:singleLine="true"
 
         android:singleLine="true"
 
         android:textSize="10sp"
 
         android:textSize="10sp"
 
@@ -26,7 +26,7 @@
 
     <TextView
 
     <TextView
 
         android:layout_width="0dp"
 
         android:layout_width="0dp"
 
         android:layout_height="26dp"
 
         android:layout_height="26dp"
 
-        android:layout_weight="2"
 
+        android:layout_weight="3"
 
         android:gravity="center"
 
         android:gravity="center"
 
         android:singleLine="true"
 
         android:singleLine="true"
 
         android:textSize="10sp"
 
         android:textSize="10sp"
 
@@ -35,7 +35,7 @@
 
     <TextView
 
     <TextView
 
         android:layout_width="0dp"
 
         android:layout_width="0dp"
 
         android:layout_height="26dp"
 
         android:layout_height="26dp"
 
-        android:layout_weight="5"
 
+        android:layout_weight="3"
 
         android:singleLine="true"
 
         android:singleLine="true"
 
         android:gravity="center"
 
         android:gravity="center"
 
         android:textSize="10sp"
 
         android:textSize="10sp"

+ 1 - 2
app/src/main/res/layout/x_item_view.xml
Visa fil 

@@ -25,7 +25,6 @@
 
     android:text="内容"
 
     android:text="内容"
 
     android:textSize="@dimen/text_size_12"
 
     android:textSize="@dimen/text_size_12"
 
     android:textColor="#7F7F7F"
 
     android:textColor="#7F7F7F"
 
-    android:padding="5dp"
 
     android:gravity="center_vertical"
 
     android:gravity="center_vertical"
 
     android:ellipsize="marquee"
 
     android:ellipsize="marquee"
 
-    android:lines="2"/>
 
+    android:singleLine="true" />

BIN
app/src/main/res/mipmap-xhdpi/ask_getmoney_hongbao.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/ask_getmoney_jiaren.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/ask_getmoney_qun.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/audit_top_bg.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/get_redpackage_success.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/get_redpackage_success.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/huanyige.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/huanyige.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/invition_redpackage.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/invition_redpackage.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/jijiangks.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/jijiangks.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/kejiequ.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/kejiequ.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/lijiq.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/lijiq.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/myprice_off.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/myprice_off.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/myprice_on.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/myprice_on.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/order_manager.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/order_manager.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/qiangrew_bg.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/qiangrew_bg.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/red_package_floatbtn.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/red_package_floatbtn.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/remenyx.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/remenyx.webp
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/xinjin_label.png
Visa fil


BIN
app/src/main/res/mipmap-xhdpi/xinjin_label.webp
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/ask_getmoney_hongbao.webp
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/ask_getmoney_jiaren.webp
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/ask_getmoney_qun.webp
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/ask_top5_tip.png
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/ask_top5_tip.webp
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/audit_top_bg.webp
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/setting.png
Visa fil


BIN
app/src/main/res/mipmap-xxhdpi/setting.webp
Visa fil


+ 16 - 0
app/src/main/res/values/dd_styles.xml
Visa fil 

@@ -332,6 +332,10 @@
 
         <item name="android:textSize">14sp</item>
 
         <item name="android:textSize">14sp</item>
 
         <item name="android:textColor">#000000</item>
 
         <item name="android:textColor">#000000</item>
 
     </style>
 
     </style>
 
+    <style name="SheepTabLayoutTextAppearanceAskmoney" parent="@android:style/TextAppearance.Holo.Large">
 
+        <item name="android:textSize">14sp</item>
 
+        <item name="android:textColor">#996633</item>
 
+    </style>
 
 
 
     <style name="style_item_container">
 
     <style name="style_item_container">
 
         <item name="android:layout_width">match_parent</item>
 
         <item name="android:layout_width">match_parent</item>
 
@@ -425,4 +429,16 @@
 
         <item name="tabSelectedTextColor">#2ebef2</item>
 
         <item name="tabSelectedTextColor">#2ebef2</item>
 
         <item name="tabTextAppearance">@style/SheepTabLayoutTextAppearance</item>
 
         <item name="tabTextAppearance">@style/SheepTabLayoutTextAppearance</item>
 
     </style>
 
     </style>
 
+
 
+    <style name="style_tab_askgetmoney">
 
+        <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">#791BE3</item>
 
+        <item name="tabMode">scrollable</item>
 
+        <item name="tabSelectedTextColor">#791BE3</item>
 
+        <item name="tabTextAppearance">@style/SheepTabLayoutTextAppearanceAskmoney</item>
 
+    </style>
 
 </resources>
 
 </resources>

+ 7 - 0
app/src/main/res/values/gamegroup_color.xml
Visa fil 

@@ -28,6 +28,7 @@
 
     <color name="yellow_start">#f4c76c</color>
 
     <color name="yellow_start">#f4c76c</color>
 
     <color name="yellow_end">#fd9c11</color>
 
     <color name="yellow_end">#fd9c11</color>
 
     <color name="yellow_FAF632">#FAF632</color>
 
     <color name="yellow_FAF632">#FAF632</color>
 
+    <color name="yellow_FCF05B">#FCF05B</color>
 
     <color name="blue_start">#80d2fe</color>
 
     <color name="blue_start">#80d2fe</color>
 
     <color name="blue_E2F4FE">#E2F4FE</color>
 
     <color name="blue_E2F4FE">#E2F4FE</color>
 
     <color name="blue_E9EFF2">#E9EFF2</color>
 
     <color name="blue_E9EFF2">#E9EFF2</color>
 
@@ -47,4 +48,10 @@
 
     <color name="float_bg">#33F9F9F9</color>
 
     <color name="float_bg">#33F9F9F9</color>
 
     <color name="gray_F5F5F5">#F5F5F5</color>
 
     <color name="gray_F5F5F5">#F5F5F5</color>
 
 
 
+    <color name="black_333333">#333333</color>
 
+    <color name="black_999999">#999999</color>
 
+    <color name="yellow_FFAD3C">#FFAD3C</color>
 
+    <color name="purple_BE0FFF">#BE0FFF</color>
 
+    <color name="purple_996633">#996633</color>
 
+
 
 </resources>
 
 </resources>

+ 2 - 0
app/src/main/res/values/str_appstore_strings.xml
Visa fil 

@@ -19,6 +19,8 @@
 
     <string name="mine_hoggerel">小绵羊</string>
 
     <string name="mine_hoggerel">小绵羊</string>
 
     <string name="personal_center">个人中心</string>
 
     <string name="personal_center">个人中心</string>
 
     <string name="main_tab_find">发现</string>
 
     <string name="main_tab_find">发现</string>
 
+    <string name="main_tab_audit">审核</string>
 
+    <string name="main_tab_invite">邀请</string>
 
 
 
     <string name="hot_person_game">人气游戏</string>
 
     <string name="hot_person_game">人气游戏</string>
 
     <string name="best_game">精品游戏</string>
 
     <string name="best_game">精品游戏</string>

+ 6 - 0
app/src/main/res/values/strings.xml
Visa fil 

@@ -80,4 +80,10 @@
 
     <string name="input_invitation_code">请输入邀请码</string>
 
     <string name="input_invitation_code">请输入邀请码</string>
 
     <string name="congratunation">恭喜你！</string>
 
     <string name="congratunation">恭喜你！</string>
 
     <string name="cancel">取消</string>
 
     <string name="cancel">取消</string>
 
+
 
+    <string name="audit_total_audit">%s\n审核中</string>
 
+    <string name="audit_total_complete">%s个\n累计完成</string>
 
+    <string name="audit_total_money">%s元\n累计现金</string>
 
+    <string name="audit_total_welfare">%s元\n累计完成</string>
 
+    <string name="my_invitation_str">我的邀请码:%s</string>
 
 </resources>
 
 </resources>