春节皮肤：审核中心

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

@@ -1,11 +1,8 @@
 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.absBase.BaseContainerActivity;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.view.fragment.FgtMainAudit;
 import com.sheep.jiuyan.samllsheep.R;
@@ -14,28 +11,16 @@ import com.sheep.jiuyan.samllsheep.R;
  * Created by ljy on 2018/8/16.
  */
 
-public class ActAudit extends BaseActivity {
-    Activity activity;
+public class ActAudit extends BaseContainerActivity {
 
     @Override
     protected int getLayoutId() {
-        return R.layout.common_container;
+        return R.layout.common_container_nofit;
     }
 
     @Override
-    public void initView() {
-        activity = this;
-
+    protected Fragment initFragment() {
         int index = DataUtil.getObject(getIntent(), Integer.class);
-        FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag("tag");
-        if(fragment == null){
-            fragment = FgtMainAudit.newInstance(index);
-            transaction.add(R.id.frame_container, fragment, "tag");
-            transaction.commitAllowingStateLoss();
-        }else {
-            transaction.replace(R.id.frame_container, fragment);
-            transaction.commitAllowingStateLoss();
-        }
+        return FgtMainAudit.newInstance(index);
     }
 }

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

@@ -418,7 +418,7 @@ public class FgtPersonalCenter extends BaseFragment {
             R.id.version_layout, R.id.order_layout, R.id.proxy_game_account_layout,
             R.id.audit_activity_cl, R.id.audit_success_cl, R.id.audit_failed_cl,
             R.id.iv_redpackage, R.id.fgt_person_center_my_focus, R.id.fgt_pc_item_vip_ll,
-            R.id.voucher_layout
+            R.id.voucher_layout, R.id.my_pet_layout
     })
     public void onViewClicked(View view) {
         switch (view.getId()) {

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

@@ -5,42 +5,43 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <LinearLayout
+    <android.support.constraint.ConstraintLayout
         android:id="@+id/root_1"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@mipmap/audit_top_bg"
-        android:orientation="vertical">
+        android:layout_height="wrap_content">
 
-        <LinearLayout
+        <ImageView
+            android:id="@+id/act_audit_bg_iv"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="true"
-            android:gravity="center_horizontal"
-            android:orientation="horizontal">
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@mipmap/audit_top_bg"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/img_baseactivity_title"
+            android:layout_width="wrap_content"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginTop="10dp"
+            android:gravity="center_vertical"
+            android:paddingStart="@dimen/content_padding_20"
+            android:paddingEnd="@dimen/content_padding_20"
+            android:scaleType="centerInside"
+            android:src="@drawable/narrow_back_white"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/img_baseactivity_title"
-                android:layout_width="wrap_content"
-                android:layout_height="?attr/actionBarSize"
-                android:gravity="center_vertical"
-                android:paddingEnd="@dimen/content_padding_20"
-                android:paddingStart="@dimen/content_padding_20"
-                android:scaleType="centerInside"
-                android:src="@drawable/narrow_back_white" />
-
-            <TextView
-                android:id="@+id/txt_baseactivity_title"
-                android:layout_width="wrap_content"
-                android:layout_height="?attr/actionBarSize"
-                android:layout_weight="1"
-                android:layout_marginRight="?attr/actionBarSize"
-                android:gravity="center"
-                android:text="@string/app_name"
-                android:textColor="@color/white"
-                android:textSize="@dimen/text_size_5" />
-
-        </LinearLayout>
+        <TextView
+            android:id="@+id/txt_baseactivity_title"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:layout_marginTop="10dp"
+            android:gravity="center"
+            android:text="@string/app_name"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_5"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/number_tv"
@@ -49,73 +50,82 @@
             android:gravity="center"
             android:text="111"
             android:textColor="@color/white"
-            android:textSize="@dimen/text_size_3" />
+            android:textSize="@dimen/text_size_3"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
+        <TextView
+            android:id="@+id/audit_total_complete_tv"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/number_tv"
-            android:layout_marginTop="@dimen/content_padding_15">
-
-            <TextView
-                android:id="@+id/audit_total_complete_tv"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android: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_height="wrap_content"
-                android:layout_weight="1"
-                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" />
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:orientation="horizontal">
+            android:layout_marginBottom="26dp"
+            android:gravity="center"
+            android:text="累计完成"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_13"
+            app:layout_constraintBottom_toBottomOf="@id/act_audit_bg_iv"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/act_audit_line_1"/>
+
+        <View
+            android:id="@+id/act_audit_line_1"
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:background="@color/disenable_color"
+            app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"
+            app:layout_constraintStart_toEndOf="@id/audit_total_complete_tv"
+            app:layout_constraintEnd_toStartOf="@id/audit_total_money_tv"
+            app:layout_constraintTop_toTopOf="@id/audit_total_complete_tv" />
 
-                <TextView
-                    android:id="@+id/audit_total_welfare_tv"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:text=""
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_size_13" />
+        <TextView
+            android:id="@+id/audit_total_money_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="累计现金"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_13"
+            app:layout_constraintStart_toEndOf="@id/act_audit_line_1"
+            app:layout_constraintEnd_toStartOf="@id/act_audit_line_2"
+            app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"/>
+
+        <View
+            android:id="@+id/act_audit_line_2"
+            android:layout_width="1dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:background="@color/disenable_color"
+            app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"
+            app:layout_constraintStart_toEndOf="@id/audit_total_money_tv"
+            app:layout_constraintEnd_toStartOf="@id/audit_total_welfare_tv"
+            app:layout_constraintTop_toTopOf="@id/audit_total_complete_tv" />
 
-                <ImageView
-                    android:id="@+id/my_money_dingxiang_amount_iv"
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:layout_gravity="right"
-                    android:padding="10dp"
-                    android:src="@mipmap/question_mark" />
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
+        <TextView
+            android:id="@+id/audit_total_welfare_tv"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="累计福利"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_size_13"
+            app:layout_constraintStart_toEndOf="@id/act_audit_line_2"
+            app:layout_constraintEnd_toStartOf="@id/my_money_dingxiang_amount_iv"
+            app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"/>
+
+        <ImageView
+            android:id="@+id/my_money_dingxiang_amount_iv"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_gravity="end"
+            android:padding="10dp"
+            android:src="@mipmap/question_mark"
+            android:layout_marginStart="-10dp"
+            app:layout_constraintBottom_toBottomOf="@id/audit_total_complete_tv"
+            app:layout_constraintStart_toEndOf="@id/audit_total_welfare_tv"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@id/audit_total_complete_tv" />
+    </android.support.constraint.ConstraintLayout>
 
     <android.support.design.widget.TabLayout
         android:id="@+id/indicator"

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

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