Browse Source

上一个记录为:发版本3.2.7
游戏中心添加到主页
审核放到个人中心

zengjiebin 7 years ago
parent
commit
c7e3d15587

+ 4 - 1
app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1651,8 +1651,11 @@ public class Jump2View {
     /**
      * 审核列表
      */
-    public void goAuditTastList(Activity activity, Object o) {
+    public void goAuditTastList(Activity activity, Object object) {
         Intent intent = new Intent(activity, ActAudit.class);
+        if(object instanceof Integer){
+            DataUtil.putObject(intent, object);
+        }
         activity.startActivity(intent);
         XIAOMI_GAME_LIST.onEvent();
     }

+ 15 - 3
app/src/main/java/com/sheep/gamegroup/util/MainTab.java

@@ -3,6 +3,7 @@ package com.sheep.gamegroup.util;
 import android.support.v4.app.Fragment;
 
 import com.sheep.gamegroup.view.fragment.FgtAskGetMoney;
+import com.sheep.gamegroup.view.fragment.FgtGameCenter;
 import com.sheep.gamegroup.view.fragment.FgtNull;
 import com.sheep.gamegroup.view.fragment.FgtPersonalCenter;
 import com.sheep.gamegroup.view.fragment.FgtSmallSheep;
@@ -25,15 +26,26 @@ public enum MainTab {
             return R.drawable.drawable_selector_task;
         }
     },
-    FgtMainAudit(R.string.main_tab_audit) {
+//    FgtMainAudit(R.string.main_tab_audit) {
+//        @Override
+//        public Fragment getFragment() {
+//            return new FgtMainAudit();
+//        }
+//
+//        @Override
+//        public int getDrawableId() {
+//            return R.drawable.drawable_selector_audit;
+//        }
+//    },
+    FgtGameCenter(R.string.tab_viewpager_gamestore) {
         @Override
         public Fragment getFragment() {
-            return new FgtMainAudit();
+            return new FgtGameCenter();
         }
 
         @Override
         public int getDrawableId() {
-            return R.drawable.drawable_selector_audit;
+            return R.drawable.drawable_selector_game_center;
         }
     },
     FgtMainAskGetMoney(R.string.main_tab_invite) {

+ 3 - 16
app/src/main/java/com/sheep/gamegroup/view/activity/ActAudit.java

@@ -6,6 +6,7 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 
 import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 import com.sheep.jiuyan.samllsheep.R;
 
@@ -25,30 +26,16 @@ public class ActAudit extends BaseActivity {
     public void initView() {
         activity = this;
 
+        int index = DataUtil.getObject(getIntent(), Integer.class);
         FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        Bundle bundle = new Bundle();
         Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
         if(fragment == null){
-            fragment = new FgtMainAudit();
-            fragment.setArguments(bundle);
+            fragment = FgtMainAudit.newInstance(index);
             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() {
-
     }
 }

+ 0 - 18
app/src/main/java/com/sheep/gamegroup/view/activity/ActMain.java

@@ -184,8 +184,6 @@ public class ActMain extends BaseActivity {
             UMConfigUtils.Event.TAB_FIND.onEvent();
         } else if (position == MainTab.FgtPersonnalCenter.ordinal()) {//个人中心
             UMConfigUtils.Event.TAB_USER.onEvent();
-        } else if (position == MainTab.FgtMainAudit.ordinal()) {//审核
-        } else if (position == MainTab.FgtMainAskGetMoney.ordinal()) {//邀请
         }
     }
 
@@ -273,22 +271,6 @@ public class ActMain extends BaseActivity {
         if (container != null && container.getT() != null)
             container.getT().call(1);
     }
-    @Override
-    public void doNextAction(Object action){
-        if(action instanceof SystemNotification){
-            int auditPosition = MainTab.FgtMainAudit.ordinal();
-            view_pager_container.setCurrentItem(auditPosition, false);
-            FgtMainAudit fragment = (FgtMainAudit) fragmentList.get(auditPosition);
-            switch (((SystemNotification) action).getType()){//5:任务成功 6:任务失败
-                case 5:
-                    fragment.setCurrentItem(1, false);//审核成功在位置1
-                    break;
-                case 6:
-                    fragment.setCurrentItem(2, false);//审核失败在位置2
-                    break;
-            }
-        }
-    }
 
     @Override
     protected void onPause() {

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ActMyWelfare.java

@@ -67,6 +67,7 @@ public class ActMyWelfare extends BaseActivity {
 
             }
         });
+        pager.setOffscreenPageLimit(3);
         CommonUtil.getInstance().reflex(indicator, activity);
     }
 

+ 99 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtGameCenter.java

@@ -0,0 +1,99 @@
+package com.sheep.gamegroup.view.fragment;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.widget.ImageButton;
+
+import com.sheep.gamegroup.absBase.BaseActivity;
+import com.sheep.gamegroup.util.Jump2View;
+import com.sheep.gamegroup.util.UMConfigUtils;
+import com.sheep.gamegroup.view.activity.ActDownloadMgr;
+import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
+import com.sheep.jiuyan.samllsheep.utils.TitleBarUtils;
+
+import butterknife.BindView;
+
+/**
+ * Created by realicing on 2018/8/29.
+ * realicing@sina.com
+ */
+public class FgtGameCenter extends BaseFragment {
+    @BindView(R.id.act_game_center_vp)
+    ViewPager act_game_center_vp;
+
+    @Override
+    public int getLayoutId() {
+        return R.layout.fgt_game_center;
+    }
+
+    @Override
+    public void onViewCreated() {
+        activity = getActivity();
+        TitleBarUtils.getInstance().setTitleListen(activity, -2, null);
+    }
+
+
+    private Activity activity;
+
+    @Override
+    protected void initViewOnVisibleToUser() {
+        final TitleBarUtils titleBarUtils = TitleBarUtils.getInstance();
+        titleBarUtils.addTabs(this, act_game_center_vp, "玩转游戏", new FgtPlayGame(), "福利中心", new FgtWelfareCenter(),
+                        new ViewPager.OnPageChangeListener() {
+                            @Override
+                            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+                            }
+
+                            @Override
+                            public void onPageSelected(int position) {
+                                FgtGameCenter.this.onPageSelected(titleBarUtils, position);
+
+                            }
+
+                            @Override
+                            public void onPageScrollStateChanged(int state) {
+
+                            }
+                        });
+        onPageSelected(titleBarUtils, 0);
+
+    }
+
+    private void onPageSelected(TitleBarUtils titleBarUtils, int position) {
+        switch (position) {
+            case 0:
+                titleBarUtils.setRightSecondBtn(mView, R.mipmap.search_black_img, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View view) {
+                        Jump2View.getInstance().goAppSearch(activity, null);
+                    }
+                })
+                        .setRightImgBotton(mView, R.drawable.index_download, new View.OnClickListener() {
+                            @Override
+                            public void onClick(View view) {
+                                TitleBarUtils.getInstance()
+                                        .setRightRedPoint(activity, View.GONE);
+                                startActivity(new Intent(activity, ActDownloadMgr.class));
+                                UMConfigUtils.onEvent(UMConfigUtils.Event.GAME_DOWNLOAD_MANAGER);
+                            }
+                        });
+                break;
+            case 1:
+                ImageButton secondImageButton = findViewById(R.id.ibtn_two_right);
+
+                secondImageButton.setVisibility(View.GONE);
+                titleBarUtils.setRightBtn(mView, "我的福利", 0, new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        // 进入我的福利界面
+                        Jump2View.getInstance().goMyWelfare(activity);
+                    }
+                });
+                break;
+        }
+    }
+}

+ 39 - 42
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMainAudit.java

@@ -3,7 +3,9 @@ package com.sheep.gamegroup.view.fragment;
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.design.widget.TabLayout;
+import android.support.v4.app.Fragment;
 import android.support.v4.view.ViewPager;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,6 +16,7 @@ import com.sheep.gamegroup.event.BigEvent;
 import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.TaskAuditEntity;
 import com.sheep.gamegroup.util.CommonUtil;
+import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.jiuyan.samllsheep.R;
@@ -55,6 +58,30 @@ public class FgtMainAudit extends BaseFragment {
     public static final String[] tabNames = {"审核中", "任务成功", "任务失败"};
     private TitleFragmentListAdapter mAdapter;
 
+    public static FgtMainAudit newInstance(int index) {
+        FgtMainAudit fgtMainAudit = new FgtMainAudit();
+        Bundle bundle = new Bundle();
+        DataUtil.putObject(bundle, index);
+        fgtMainAudit.setArguments(bundle);
+        return fgtMainAudit;
+    }
+
+    public FgtMainAudit() {
+    }
+    private Integer curPosition = 0;
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View rootView = super.onCreateView(inflater, container, savedInstanceState);
+        Bundle bundle = getArguments();
+        if (bundle != null) {
+            Integer position = DataUtil.getObject(bundle, Integer.class);
+            if(position != null){
+                curPosition = position;
+            }
+        }
+        return rootView;
+    }
+
     @Override
     public int getLayoutId() {
         return R.layout.act_audit_layout;
@@ -75,6 +102,7 @@ public class FgtMainAudit extends BaseFragment {
                 ViewUtil.showOrienteeringDetails(activity);
             }
         });
+        initView();
 
     }
 
@@ -106,7 +134,6 @@ public class FgtMainAudit extends BaseFragment {
     }
 
     private void new_tab() {
-//        indicator.newTab();
         pager.addOnPageChangeListener(new TabLayout.TabLayoutOnPageChangeListener(indicator));
         indicator.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(pager));
         pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@@ -117,17 +144,7 @@ public class FgtMainAudit extends BaseFragment {
 
             @Override
             public void onPageSelected(int i) {
-//                MY_MONEY_TAB.onEvent("tab_name", tabNames[2]);
-//                for(int d=0;d<indicator.getTabCount();d++){
-//                    TabLayout.Tab tab=indicator.getTabAt(i);
-//                    if(i == d){
-//
-//                        ((TextView) tab.getCustomView().findViewById(R.id.tv_text)).setTextColor(Color.parseColor("#34a6e7"));
-//                    }else {
-//
-//                        ((TextView) tab.getCustomView().findViewById(R.id.tv_text)).setTextColor(Color.parseColor("#333333"));
-//                    }
-//                }
+                curPosition = i;
 
             }
 
@@ -139,28 +156,23 @@ public class FgtMainAudit extends BaseFragment {
 
         indicator.setupWithViewPager(pager);
         CommonUtil.getInstance().reflex(indicator, activity);
-//        for (int i = 0; i < indicator.getTabCount(); i++) {
-//            indicator.getTabAt(i).setCustomView(mAdapter.getTabView(i));
-//        }
-
-     /*   TabLayout.Tab tab=indicator.getTabAt(2);
-
-            tab.getCustomView().findViewById(R.id.iv_img).setVisibility(View.VISIBLE);*/
-
+        pager.setCurrentItem(curPosition);
     }
-
-    @Override
-    protected void initViewOnVisibleToUser() {
+    public static final int POSITION_ING = 0;
+    public static final int POSITION_SUCCESS = 1;
+    public static final int POSITION_FAIL = 2;
+    protected void initView() {
         mAdapter = new TitleFragmentListAdapter(getChildFragmentManager());
-        mAdapter.add(FgtAudit.newInstance(1), tabNames[0]);
-        mAdapter.add(FgtAudit.newInstance(2), tabNames[1]);
-        mAdapter.add(FgtAudit.newInstance(3), tabNames[2]);
+        mAdapter.add(FgtAudit.newInstance(POSITION_ING + 1), tabNames[POSITION_ING]);
+        mAdapter.add(FgtAudit.newInstance(POSITION_SUCCESS + 1), tabNames[POSITION_SUCCESS]);
+        mAdapter.add(FgtAudit.newInstance(POSITION_FAIL + 1), tabNames[POSITION_FAIL]);
         pager.setAdapter(mAdapter);
         new_tab();
     }
 
     @Override
-    public void initDataOnVisibleToUser() {
+    public void onResume() {
+        super.onResume();
         try {
             initData();
         } catch (Exception e) {
@@ -169,21 +181,6 @@ public class FgtMainAudit extends BaseFragment {
         }
     }
 
-    private boolean isFirstOnResume = true;//第一次onResume
-    @Override
-    public void onResume() {
-        super.onResume();
-        if(!isFirstOnResume) {
-            try {
-                initData();
-            } catch (Exception e) {
-                e.printStackTrace();
-                G.showToast(e.getMessage());
-            }
-        }
-        isFirstOnResume = false;
-    }
-
     public void setCurrentItem(int item, boolean smoothScroll) {
         if(pager != null)
             pager.setCurrentItem(item, smoothScroll);

+ 3 - 2
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtMsgCenter.java

@@ -101,9 +101,10 @@ public class FgtMsgCenter extends BaseListFragment2<SystemNotification> implemen
                 Jump2View.getInstance().goTaskDetailView(activity, item.getRelation_id());
                 break;
             case 5:
+                Jump2View.getInstance().goAuditTastList(activity, FgtMainAudit.POSITION_SUCCESS);
+                break;
             case 6:
-                activity.finish();
-                DataUtil.getInstance().addNextAction(ActMain.class.getSimpleName(), item);
+                Jump2View.getInstance().goAuditTastList(activity, FgtMainAudit.POSITION_FAIL);
                 break;
             case 1:
             case 2:

+ 8 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPersonalCenter.java

@@ -312,10 +312,18 @@ public class FgtPersonalCenter extends BaseFragment {
             R.id.account_task_layout, R.id.proxy_service_layout, R.id.feedbook_layout,
             R.id.recommend_friend_layout, R.id.faq_layout, R.id.reservation_layout,
             R.id.version_layout, R.id.order_layout, R.id.proxy_game_account_layout,
+            R.id.audit_ing_cl, R.id.audit_success_cl, R.id.audit_fail_cl,
             R.id.iv_redpackage, R.id.ibtn_baseactivity_message
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {
+            case R.id.audit_ing_cl://审核中心
+
+                break;
+            case R.id.audit_success_cl://审核中心--审核成功
+                break;
+            case R.id.audit_fail_cl://审核中心--审核失败
+                break;
             case R.id.ibtn_baseactivity_message://消息
                 startActivity(new Intent(activity, ActMsg.class));
                 break;

+ 80 - 8
app/src/main/java/com/sheep/jiuyan/samllsheep/utils/TitleBarUtils.java

@@ -17,6 +17,7 @@ import android.widget.TextView;
 import com.sheep.gamegroup.view.adapter.TitleFragmentListAdapter;
 import com.sheep.gamegroup.absBase.BaseActivity;
 import com.sheep.jiuyan.samllsheep.R;
+import com.sheep.jiuyan.samllsheep.base.BaseFragment;
 
 
 /**
@@ -135,7 +136,8 @@ public class TitleBarUtils {
         return mTitleBarUtils;
     }
 
-
+    public static final int GONE = -2;
+    public static final int INVISIBLE = 0;
     /**
      * 设置最左边的Title监听
      *
@@ -145,13 +147,18 @@ public class TitleBarUtils {
      */
     public TitleBarUtils setTitleListen(Activity activity, int drawableID, View.OnClickListener onClickListener) {
         ImageView imageView = activity.findViewById(R.id.img_baseactivity_title);
-        if (drawableID == 0) {
-            imageView.setVisibility(View.INVISIBLE);
-        } else if (drawableID == -2) {
-            imageView.setVisibility(View.GONE);
-            return this;
-        } else if (drawableID != -1) {
-            imageView.setImageResource(drawableID);
+        switch (drawableID) {
+            case INVISIBLE:
+                imageView.setVisibility(View.INVISIBLE);
+                break;
+            case GONE:
+                imageView.setVisibility(View.GONE);
+                return this;
+            default:
+                if (drawableID != -1) {
+                    imageView.setImageResource(drawableID);
+                }
+                break;
         }
 
         if (onClickListener != null) {
@@ -216,6 +223,38 @@ public class TitleBarUtils {
         }
         return this;
     }
+    /**
+     * 设置最右边的普通按钮状态
+     *
+     * @param view
+     * @param btnText              设置文本
+     * @param backgroundColorResId 设置背景,0为透明,-1不变,-2为Gone,其它为ResID
+     * @param onClickListener      点击时的操作。
+     */
+    public TitleBarUtils setRightBtn(View view, String btnText, int backgroundColorResId,
+                                     View.OnClickListener onClickListener) {
+        Button button = view.findViewById(R.id.btn_baseactivity_right);
+        ImageButton imageButton = view.findViewById(R.id.ibtn_baseactivity_right);
+        button.setVisibility(View.VISIBLE);
+        imageButton.setVisibility(View.GONE);
+        if (backgroundColorResId == 0) {
+            button.setBackgroundColor(0x00000000);
+        } else if (backgroundColorResId == -2) {
+            button.setVisibility(View.GONE);
+            return this;
+        } else if (backgroundColorResId != -1) {
+            button.setBackgroundColor(backgroundColorResId);
+        }
+
+        if (btnText != null) {
+            button.setText(btnText);
+        }
+        //执行回调
+        if (onClickListener != null) {
+            button.setOnClickListener(onClickListener);
+        }
+        return this;
+    }
 
 
     /**
@@ -399,6 +438,39 @@ public class TitleBarUtils {
 //        CommonUtil.getInstance().reflex(tabLayout, activity);
         return this;
     }
+    /**
+     * 设置 从右边数,第两个按钮
+     */
+    public TitleBarUtils setRightSecondBtn(View view, @DrawableRes int secondRes, View.OnClickListener secondOnclick){
+        ImageButton secondImageButton = view.findViewById(R.id.ibtn_two_right);
+
+        secondImageButton.setVisibility(View.VISIBLE);
+        secondImageButton.setImageResource(secondRes);
+
+        secondImageButton.setOnClickListener(secondOnclick);
+        return this;
+    }
+    public TitleBarUtils addTabs(final BaseFragment baseFragment, ViewPager viewPager, String tab1, Fragment fragment1, String tab2, Fragment fragment2, ViewPager.OnPageChangeListener listener) {
+        //设置标题不可见
+        TextView titleView = baseFragment.findViewById(R.id.txt_baseactivity_title);
+        titleView.setVisibility(View.GONE);
+        //设置tab可见
+        TabLayout tabLayout = baseFragment.findViewById(R.id.title_tab);
+        tabLayout.setVisibility(View.VISIBLE);
+
+        TitleFragmentListAdapter adapter = new TitleFragmentListAdapter(baseFragment.getChildFragmentManager());
+        adapter.add(fragment1, tab1);
+        adapter.add(fragment2, tab2);
+
+//        viewPager.setOffscreenPageLimit(2);
+        viewPager.setAdapter(adapter);
+
+        tabLayout.addOnTabSelectedListener(new TabLayout.ViewPagerOnTabSelectedListener(viewPager));
+        tabLayout.setupWithViewPager(viewPager);
+        viewPager.addOnPageChangeListener(listener);
+//        CommonUtil.getInstance().reflex(tabLayout, activity);
+        return this;
+    }
 
     public TitleBarUtils addMsgTab(final BaseActivity activity, final ViewPager viewPager) {
         //设置标题不可见

BIN
app/src/main/res/drawable-xxhdpi/tab_game.webp


BIN
app/src/main/res/drawable-xxhdpi/tab_game_blue.webp


+ 8 - 0
app/src/main/res/drawable/drawable_selector_game_center.xml

@@ -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_game_blue" android:state_activated="true"/>
+    <item android:drawable="@drawable/tab_game_blue" android:state_pressed="true"/>
+    <item android:drawable="@drawable/tab_game"/>
+
+</selector>

+ 16 - 0
app/src/main/res/layout/fgt_game_center.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.sheep.gamegroup.view.activity.ActGameCenter">
+
+    <include layout="@layout/title" />
+
+    <android.support.v4.view.ViewPager
+        android:id="@+id/act_game_center_vp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

+ 106 - 0
app/src/main/res/layout/fgt_personalcenter_item_audit.xml

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/white"
+    android:orientation="horizontal">
+
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/audit_ing_cl"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp">
+
+        <TextView
+            android:id="@+id/audit_ing"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:lineSpacingExtra="7dp"
+            android:text="@string/audit_ing"
+            android:textColor="#333333"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <View
+            android:id="@+id/audit_ing_oval"
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            android:background="@drawable/shape_oval_red"
+            android:visibility="gone"
+            app:layout_constraintStart_toEndOf="@+id/audit_ing" />
+    </android.support.constraint.ConstraintLayout>
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="22dp"
+        android:layout_gravity="center_vertical" />
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/audit_success_cl"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp">
+
+        <TextView
+            android:id="@+id/audit_success"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:lineSpacingExtra="7dp"
+            android:text="@string/audit_success"
+            android:textColor="#333333"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <View
+            android:id="@+id/audit_success_oval"
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            android:background="@drawable/shape_oval_red"
+            android:visibility="gone"
+            app:layout_constraintStart_toEndOf="@+id/audit_success" />
+    </android.support.constraint.ConstraintLayout>
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="22dp"
+        android:layout_gravity="center_vertical" />
+
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/audit_fail_cl"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp">
+
+        <TextView
+            android:id="@+id/audit_fail"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:lineSpacingExtra="7dp"
+            android:text="@string/audit_fail"
+            android:textColor="#333333"
+            android:textSize="15sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
+
+        <View
+            android:id="@+id/audit_fail_oval"
+            android:layout_width="8dp"
+            android:layout_height="8dp"
+            android:background="@drawable/shape_oval_red"
+            android:visibility="gone"
+            app:layout_constraintStart_toEndOf="@+id/audit_fail" />
+    </android.support.constraint.ConstraintLayout>
+</LinearLayout>

+ 0 - 1
app/src/main/res/layout/fgt_personalcenter_item_center_one.xml

@@ -2,7 +2,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/content_padding_15"
     android:background="@color/white"
     android:orientation="vertical">
 

+ 7 - 0
app/src/main/res/layout/fgt_personalcenter_layout.xml

@@ -11,7 +11,14 @@
         android:orientation="vertical">
 
         <include layout="@layout/fgt_personacenter_item_top" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="13dp" />
 
+        <include layout="@layout/fgt_personalcenter_item_audit" />
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="11dp" />
         <include layout="@layout/fgt_personalcenter_item_center_one" />
 
         <include

+ 3 - 0
app/src/main/res/values/strings.xml

@@ -77,6 +77,9 @@
     <string name="audit_total_money">%s元\n累计现金</string>
     <string name="audit_total_welfare">%s元\n累计福利</string>
     <string name="my_invitation_str">我的邀请码:%s</string>
+    <string name="audit_ing">审核中\n%s</string>
+    <string name="audit_success">任务成功\n%s</string>
+    <string name="audit_fail">任务失败\n%s</string>
 
     <string name="homepage_award">你还有%s元的奖励未领取</string>
     <string name="homepage_cash">现金任务:%s元</string>