Browse Source

Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

zengjiebin 7 years ago
parent
commit
fee0aecdab

+ 1 - 1
app/src/main/java/com/sheep/gamegroup/view/fragment/FgtAskGetMoneyRank.java

@@ -87,7 +87,7 @@ public class FgtAskGetMoneyRank extends BaseFragment {
         initData();
         initData();
     }
     }
     public void initData() {
     public void initData() {
-        showProgress();
+//        showProgress();
 
 
         initAskTop5();
         initAskTop5();
     }
     }

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

@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
         android:layout_marginStart="5dp"
-        android:paddingTop="@dimen/content_padding_2"
         android:src="@mipmap/homepage_jianglilq" />
         android:src="@mipmap/homepage_jianglilq" />
 
 
     <TextView
     <TextView