zengjiebin 7 vuotta sitten
vanhempi
commit
2ec30686ef

+ 31 - 4
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyNewYear.java

@@ -18,7 +18,9 @@ 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.LogUtil;
 import com.sheep.gamegroup.util.StringUtils;
+import com.sheep.gamegroup.util.TestUtil;
 import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.gamegroup.util.viewHelper.LayoutParamsUtil;
 import com.sheep.gamegroup.view.activity.AskGetMoneyAct;
@@ -62,6 +64,10 @@ public class FgtAskGetMoneyNewYear extends BaseFragment {
     View new_year_ask_start_view;
     @BindView(R.id.new_year_ask_end_view)
     View new_year_ask_end_view;
+    @BindView(R.id.new_year_ask_tv1)
+    View new_year_ask_tv1;
+    @BindView(R.id.new_year_ask_tv2)
+    View new_year_ask_tv2;
     @BindView(R.id.ask_scroll_view)
     NestedScrollView scrollView;
     @BindView(R.id.pager)
@@ -84,13 +90,33 @@ public class FgtAskGetMoneyNewYear extends BaseFragment {
 
     //在viewPager的第一个位置或者在activity中通过transaction.replace(R.id.frame_container, fragment);方式加载的话,需要设置为true
     private boolean isFirstFgt;
+    private int start = 44;
+    private int end = 40;
     @Override
     public void onViewCreated() {
         activity = getActivity();
         isFirstFgt = activity instanceof AskGetMoneyAct;
         float n = G.WIDTH / 1088.0f;
-        LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(55));
-        LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(54));
+        LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(start));
+        LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(end));
+        if(TestUtil.isDev()){
+            new_year_ask_start_view.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(++start));
+                LogUtil.println(String.format(Locale.CHINA, "test start %d", start));
+            });
+            new_year_ask_end_view.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(++end));
+                LogUtil.println(String.format(Locale.CHINA, "test end %d", end));
+            });
+            new_year_ask_tv1.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_start_view, new Lp(n).setWidth(--start));
+                LogUtil.println(String.format(Locale.CHINA, "test start %d", start));
+            });
+            new_year_ask_tv2.setOnClickListener(view -> {
+                LayoutParamsUtil.resetLayoutParams(new_year_ask_end_view, new Lp(n).setWidth(--end));
+                LogUtil.println(String.format(Locale.CHINA, "test end %d", end));
+            });
+        }
         ViewUtil.setDefaultText(tvSize);
         ViewUtil.setDefaultText(tvMoney);
         ViewUtil.setDefaultText(my_invitation_tv);
@@ -166,10 +192,11 @@ public class FgtAskGetMoneyNewYear extends BaseFragment {
                                 mEntity = baseMessage.getData(FriendAndAwardEntity.class);
                                 if (mEntity != null) {
                                     int friendCount = mEntity.getFriend_count();
-                                    ViewUtil.setText(tvSize, String.valueOf(friendCount));
+                                    ViewUtil.setText(tvSize, TestUtil.isDev() ? "0000" : String.valueOf(friendCount));
                                     if(friendCount > 0)
                                         ViewUtil.setText(new_year_tab_2, String.format(Locale.CHINA, "好友列表 (%d)", friendCount));
-                                    ViewUtil.setText(tvMoney, String.valueOf(mEntity.getAward()));
+                                    else
+                                    ViewUtil.setText(tvMoney, TestUtil.isDev() ? "0000" : String.valueOf(mEntity.getAward()));
                                 }
                             }
                         }

+ 4 - 4
app/src/main/res/layout/fgt_find.xml

@@ -31,14 +31,14 @@
 
         <ImageView
             android:id="@+id/add_article_iv"
-            android:layout_width="120dp"
-            android:layout_height="120dp"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:src="@drawable/icon" />
 
         <ImageView
             android:id="@+id/add_article_expand"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:layout_alignTop="@id/add_article_iv"
             android:layout_alignEnd="@id/add_article_iv"
             android:src="@drawable/icon" />

+ 12 - 6
app/src/main/res/layout/fgt_personalcenter_item_audit.xml

@@ -22,8 +22,9 @@
             android:gravity="center"
             android:lineSpacingExtra="7dp"
             android:text="@string/audit_activity"
-            android:textColor="#333333"
-            android:textSize="15sp"
+            android:textColor="@color/black_444444"
+            android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -33,6 +34,7 @@
             android:layout_height="8dp"
             android:background="@drawable/shape_oval_red"
             android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/audit_activity" />
     </android.support.constraint.ConstraintLayout>
 
@@ -56,8 +58,9 @@
             android:gravity="center"
             android:lineSpacingExtra="7dp"
             android:text="@string/audit_success"
-            android:textColor="#333333"
-            android:textSize="15sp"
+            android:textColor="@color/black_444444"
+            android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -66,6 +69,7 @@
             android:layout_width="8dp"
             android:layout_height="8dp"
             android:background="@drawable/shape_oval_red"
+            app:layout_constraintTop_toTopOf="parent"
             android:visibility="gone"
             app:layout_constraintStart_toEndOf="@+id/audit_success" />
     </android.support.constraint.ConstraintLayout>
@@ -90,8 +94,9 @@
             android:gravity="center"
             android:lineSpacingExtra="7dp"
             android:text="@string/audit_failed"
-            android:textColor="#333333"
-            android:textSize="15sp"
+            android:textColor="@color/black_444444"
+            android:textSize="14sp"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
@@ -101,6 +106,7 @@
             android:layout_height="8dp"
             android:background="@drawable/shape_oval_red"
             android:visibility="gone"
+            app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@+id/audit_failed" />
     </android.support.constraint.ConstraintLayout>
 </LinearLayout>

+ 2 - 2
app/src/main/res/layout/new_year_x_ask_getmoney_act_layout.xml

@@ -136,7 +136,7 @@
                     android:layout_marginTop="30dp"
                     android:background="@drawable/new_year_drawable_selector_ask_tab_bg"
                     android:gravity="center"
-                    android:paddingBottom="4dp"
+                    android:paddingBottom="5dp"
                     android:text="邀请好友"
                     android:textColor="@color/new_year_selector_color_main_tab"
                     android:textSize="15sp"
@@ -152,7 +152,7 @@
                     android:layout_marginTop="30dp"
                     android:background="@drawable/new_year_drawable_selector_ask_tab_bg"
                     android:gravity="center"
-                    android:paddingBottom="4dp"
+                    android:paddingBottom="5dp"
                     android:text="好友列表"
                     android:textColor="@color/new_year_selector_color_main_tab"
                     android:textSize="15sp"

+ 1 - 1
app/src/main/res/layout/x_ask_top5_item.xml

@@ -58,7 +58,7 @@
             android:gravity="start"
             android:singleLine="true"
             android:text="排行奖励"
-            android:textColor="#ffffff"
+            android:textColor="#80ffffff"
             android:textSize="12sp" />
 
     </LinearLayout>

+ 5 - 5
app/src/main/res/values/dd_styles.xml

@@ -235,7 +235,7 @@
 
     <style name="style_ash_line_tv">
         <item name="android:layout_width">18dp</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:background">@color/txt_gray_e6e4e4</item>
         <item name="android:layout_gravity">center_vertical</item>
     </style>
@@ -340,7 +340,7 @@
 
     <style name="style_item_line">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:layout_marginEnd">@dimen/content_padding</item>
         <item name="android:layout_marginStart">@dimen/content_padding</item>
         <item name="android:background">@color/white_bg_line</item>
@@ -348,14 +348,14 @@
 
     <style name="style_item_line_3_0">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:layout_marginStart">20dp</item>
         <item name="android:background">@color/white_bg_line</item>
     </style>
 
     <style name="style_item_line_new">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:layout_marginEnd">@dimen/content_padding</item>
         <item name="android:layout_marginStart">@dimen/content_padding_left_new</item>
         <item name="android:background">@color/white_bg_line</item>
@@ -363,7 +363,7 @@
 
     <style name="style_item_line_full">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
+        <item name="android:layout_height">1px</item>
         <item name="android:background">@color/white_bg_line</item>
     </style>
 

+ 1 - 1
app/src/main/res/values/gamegroup_color.xml

@@ -8,7 +8,7 @@
     <color name="black_191919">#191919</color>
     <color name="black_444444">#444444</color>
     <color name="black_666666">#666666</color>
-    <color name="white_bg_line">#dfdfdf</color>
+    <color name="white_bg_line">#e5e5e5</color>
     <color name="txt_red">#ff2d4b</color>
     <color name="txt_bule">#4889ff</color>
     <color name="bg_gray">#F9F9F9</color>