liujiangyao 7 gadi atpakaļ
vecāks
revīzija
1f985cc2e0

+ 2 - 2
app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -1527,11 +1527,11 @@ public class ViewUtil {
      */
     public View paintView(Context context, String text, int color, int drawable){
 
-        View view = View.inflate(context, R.layout.game_tag_textview, null);
+        View view = LayoutInflater.from(context).inflate(R.layout.game_tag_textview, null, false);
         TextView textView = view.findViewById(R.id.user_label_tv);
 
         textView.setText(text);
-        textView.setTextColor(color);
+        textView.setTextColor(context.getResources().getColor(color));
         textView.setBackgroundResource(drawable);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 10);
         int padding = textView.getContext().getResources().getDimensionPixelSize(R.dimen.content_padding_2);

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

@@ -243,8 +243,11 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
     private void loadData(GameEntity gameEntity) {
         this.gameEntity = gameEntity;
         playGameEntity = gameEntity.getApp();
+        if(gameEntity == null ||playGameEntity == null){
+            return;
+        }
         //游戏简介与下载
-        GlideImageLoader.setGameImage(find_game_iv, gameEntity.getApp().getIcon());
+        GlideImageLoader.setGameImage(find_game_iv, gameEntity.getApp().getIcon()+"");
         ViewUtil.setText(find_game_name_tv, gameEntity.getApp().getName());
         isNeedReservation = !gameEntity.getApp().isCanDonload();//这里认为只有两种状态:可下载与预约下载
 //        if (isNeedReservation)

+ 0 - 2
app/src/main/java/com/sheep/gamegroup/view/activity/BaseListActivity.java

@@ -138,8 +138,6 @@ public abstract class BaseListActivity<T> extends BaseActivity {
         initData();
     }
     private void loadList(List<T> newList){
-        if(page == 1)
-            list.clear();
         ListUtil.addAll(list, newList);
         notifyDataSetChanged();
     }

+ 4 - 3
app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment.java

@@ -130,7 +130,7 @@ public abstract class BaseListFragment<T> extends BaseFragment {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         boolean isNewData = DataUtil.getInstance().isNewData(urlKey);
-                        if(isNewData) {
+                        if(isNewData || !isFirstGetACache()) {
                             List<T> newList = baseMessage.getDatas(getTClass());
                             loadList(newList);
                         }else {
@@ -153,8 +153,6 @@ public abstract class BaseListFragment<T> extends BaseFragment {
         initData();
     }
     private void loadList(List<T> newList){
-        if(page == 1)
-            list.clear();
         ListUtil.addAll(list, newList);
         notifyDataSetChanged();
     }
@@ -169,6 +167,9 @@ public abstract class BaseListFragment<T> extends BaseFragment {
         notifyData();
         view_list.getFootView().setVisibility(view_list.getAdapter().getItemCount() == 0?View.GONE : View.VISIBLE);
     }
+    private void loadComplete(){
+
+    }
     Unbinder unbinder;
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {