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

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtPlayGameDetail.java

@@ -75,7 +75,7 @@ public class FgtPlayGameDetail extends BaseFragment {
         activity = getActivity();
         imageListHelper.initList(activity, find_game_list, pictureList);
 
-        if(gameEntity == null || gameEntity.getApp() == null || gameEntity.getRelease_task() == null)
+        if(gameEntity == null || gameEntity.getApp() == null )
             return;
 
         //游戏图片banner
@@ -91,7 +91,7 @@ public class FgtPlayGameDetail extends BaseFragment {
         ViewUtil.loadDataWithBaseURL(find_game_info_wv, gameEntity.getApp().getIntro());
 
         //奖励领取步骤
-        if(gameEntity.getRelease_task().getTask().getDescEntityList() != null && gameEntity.getRelease_task().getTask().getDescEntityList().size() > 0){
+        if(gameEntity.getRelease_task() != null && gameEntity.getRelease_task().getTask().getDescEntityList() != null && gameEntity.getRelease_task().getTask().getDescEntityList().size() > 0){
             receive_step_layout.setVisibility(View.VISIBLE);
             item_detail_listview.setAdapter(new ArrayAdapter<TaskDescEntity>(activity, R.layout.textview_layout, gameEntity.getRelease_task().getTask().getDescEntityList()){
                 @Override
@@ -115,16 +115,16 @@ public class FgtPlayGameDetail extends BaseFragment {
             receive_step_layout.setVisibility(View.GONE);
         }
         int progress;
-        if(Integer.valueOf(gameEntity.getRelease_task().getRelease_num()) != 0){
+        if(gameEntity.getRelease_task() != null && Integer.valueOf(gameEntity.getRelease_task().getRelease_num()) != 0){
             progress_title_layout.setVisibility(View.VISIBLE);
             progress = Integer.valueOf(gameEntity.getRelease_task().getLast_num()) / Integer.valueOf(gameEntity.getRelease_task().getRelease_num()) * 100;
+            //福利剩余数量
+            progressBarHorizontal.incrementProgressBy(progress);
+            last_num_tv.setText(gameEntity.getRelease_task().getLastNumText());
         }else {
             progress = 0;
             progress_title_layout.setVisibility(View.GONE);
         }
-        //福利剩余数量
-        progressBarHorizontal.incrementProgressBy(progress);
-        last_num_tv.setText(gameEntity.getRelease_task().getLastNumText());
     }
 
     @Override

app/src/main/java/com/sheep/gamegroup/view/fragment/FgtTryMakeMoney.java

@@ -80,6 +80,8 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private void checkAndInitView() {
         if (empty_view == null)
             empty_view = findViewById(R.id.empty_view);
+        if (recyclerview == null)
+            recyclerview = findViewById(R.id.recyclerview);
     }
 
     private static final int LIST_COUNT = 3;//tryMakeMoneyAdp 总共有3条数据