Просмотр исходного кода

view 有可能有null、标签为null 判断

liujiangyao лет назад: 7
Родитель
Сommit
16cfac6568

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -2140,7 +2140,9 @@ public class CommonUtil {
                             drawable = R.drawable.shape_yellow_stroke_rectangle_no_lb;
                             break;
                     }
-                    ll_game_tag.addView(ViewUtil.newInstance().paintView(activity, tag, color, drawable));
+                    if (!TextUtils.isEmpty(tag)) {
+                        ll_game_tag.addView(ViewUtil.newInstance().paintView(activity, tag, color, drawable));
+                    }
                 } else {
                     return;
                 }

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

@@ -369,7 +369,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
     //在这里处理任务执行中的状态,如进度进度条的刷新
     @Download.onTaskRunning
     protected void running(DownloadTask task) {
-        if(TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
+        if(gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
             return;
         }
         if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getKey())) {
@@ -379,7 +379,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
 
     @Download.onTaskStop
     void taskStop(DownloadTask task) {
-        if(TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
+        if(gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
             return;
         }
         if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getKey())) {
@@ -393,7 +393,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
 
     @Download.onTaskCancel
     void taskCancel(DownloadTask task) {
-        if(TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
+        if(gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
             return;
         }
         if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getKey())) {
@@ -403,7 +403,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
 
     @Download.onTaskFail
     void taskFail(DownloadTask task) {
-        if(TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
+        if(gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
             return;
         }
         if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getKey())) {
@@ -413,7 +413,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
 
     @Download.onTaskComplete
     void taskComplete(DownloadTask task) {
-        if(TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
+        if(gameEntity == null || TextUtils.isEmpty(gameEntity.downLinks())) {//游戏任务
             return;
         }
         if (find_game_down_tv != null && gameEntity.downLinks().equals(task.getKey())) {
@@ -429,7 +429,7 @@ public class ActPlayGameDetail extends BaseActivity implements Action1<Integer>
     public void onEventMainThread(Intent intent) {
         if (intent != null && intent.getAction() != null && intent.getDataString() != null && intent.getDataString().contains("package:")) {
             String packageName = intent.getDataString().replace("package:", "");
-            if (!TextUtils.equals(packageName, playGameEntity.getPackage_names())) {
+            if (playGameEntity == null || !TextUtils.equals(packageName, playGameEntity.getPackage_names())) {
                 return;
             }
 

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

@@ -159,6 +159,13 @@ public abstract class BaseListActivity<T> extends BaseActivity {
         notifyDataSetChanged();
     }
     protected void notifyDataSetChanged(){
+
+        if(view_list == null)
+            view_list = findViewById(R.id.view_list);
+        if(empty_view == null)
+            empty_view = findViewById(R.id.empty_view);
+        if(empty_view == null)
+            empty_view = findViewById(R.id.empty_view);
         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty());
         bottomLine.setVisibility(list.isEmpty() ? View.INVISIBLE : View.VISIBLE);
         if(page == 1){

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

@@ -212,6 +212,11 @@ public abstract class BaseListFragment<T> extends BaseFragment {
         notifyDataSetChanged();
     }
     public void notifyDataSetChanged(){
+
+        if(view_list == null)
+            view_list = findViewById(R.id.view_list);
+        if(empty_view == null)
+            empty_view = findViewById(R.id.empty_view);
         loadMore = false;
         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty());
         if(page == 1){

+ 6 - 0
app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment2.java

@@ -260,6 +260,12 @@ public abstract class BaseListFragment2<T> extends BaseFragment {
         notifyDataSetChanged();
     }
     public void notifyDataSetChanged(){
+        if(refreshLayout == null)
+            refreshLayout = findViewById(R.id.refreshLayout);
+        if(click_tv == null)
+            click_tv = findViewById(R.id.click_tv);
+        if(empty_view == null)
+            empty_view = findViewById(R.id.empty_view);
         loadMore = false;
         if(list.isEmpty()){
             refreshLayout.setVisibility(View.GONE);