Selaa lähdekoodia

修复消息中心不能翻页的bug

zengjiebin 7 vuotta sitten
vanhempi
commit
a86bbc9507

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

@@ -184,7 +184,7 @@ public class ActMain extends BaseActYmPermissionCheck {
             View view = tab_container.getChildAt(index * 2 + 1);
             if (view instanceof TextView) {
                 ((TextView) view).setText(mainTab.getStringId());
-                new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId()).commit();
+//                new DrawablesHelper((TextView) view).direction(DrawablesHelper.TOP).drawable(mainTab.getDrawableId()).commit();
             }
             tabs.add(view);
             final int position = index;

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

@@ -7,13 +7,11 @@ import android.view.View;
 import com.sheep.gamegroup.model.api.ApiService;
 import com.sheep.gamegroup.model.api.OnItemClickListener;
 import com.sheep.gamegroup.model.entity.BaseMessage;
-import com.sheep.gamegroup.model.entity.HomeListEntity;
 import com.sheep.gamegroup.model.entity.SystemNotification;
-import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.util.ApiJSONUtil;
-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.view.activity.ActMsg;
 import com.sheep.gamegroup.view.adapter.MessageLeftAdapter;
 import com.sheep.jiuyan.samllsheep.SheepApp;
@@ -23,8 +21,6 @@ import org.afinal.simplecache.ApiKey;
 import java.util.Locale;
 
 import io.reactivex.Observable;
-import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created by realicing on 2018/9/7.
@@ -63,6 +59,10 @@ public class FgtMsgCenter extends BaseListFragment2<SystemNotification> implemen
     }
 
 
+    //还有数据没有获取
+    protected boolean hasMore() {
+        return ListUtil.size(list) >= per_page * page;
+    }
     @Override
     public void notifyData() {
         if(activity instanceof ActMsg) {

BIN
app/src/main/res/drawable-xhdpi/homepage_faxian.png


BIN
app/src/main/res/drawable-xhdpi/homepage_faxian_click.png


BIN
app/src/main/res/drawable-xhdpi/homepage_wode.png


BIN
app/src/main/res/drawable-xhdpi/homepage_wode_click.png


BIN
app/src/main/res/drawable-xhdpi/homepage_zhuanqian.png


BIN
app/src/main/res/drawable-xhdpi/homepage_zhuanqian_click.png


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

@@ -42,7 +42,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="@dimen/tab_height"
-            android:drawableTop="@drawable/drawable_selector_task"
+            android:drawableTop="@drawable/drawable_selector_game_center"
             android:gravity="center"
             android:minWidth="@dimen/tab_width"
             android:text="@string/tab_viewpager_classification"
@@ -57,7 +57,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="@dimen/tab_height"
-            android:drawableTop="@drawable/drawable_selector_task"
+            android:drawableTop="@drawable/drawable_selector_askgetmoney"
             android:gravity="center"
             android:minWidth="@dimen/tab_width"
             android:text="@string/mine_hoggerel"
@@ -72,7 +72,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="@dimen/tab_height"
-            android:drawableTop="@drawable/drawable_selector_task"
+            android:drawableTop="@drawable/drawable_selector_find"
             android:gravity="center"
             android:minWidth="@dimen/tab_width"
             android:text="@string/tab_viewpager_borrowplay"
@@ -87,7 +87,7 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="@dimen/tab_height"
-            android:drawableTop="@drawable/drawable_selector_task"
+            android:drawableTop="@drawable/drawable_selector_personalcenter"
             android:gravity="center"
             android:minWidth="@dimen/tab_width"
             android:text="@string/tab_viewpager_borrowplay"

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

@@ -8,7 +8,7 @@
         android:layout_width="344dp"
         android:layout_height="418dp"
         android:layout_centerInParent="true"
-        android:background="@mipmap/qiangrew_bg"
+        android:background="@mipmap/bg_qiangrew"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 

app/src/main/res/mipmap-xhdpi/qiangrew_bg.webp → app/src/main/res/mipmap-xhdpi/bg_qiangrew.webp