修复bug

app/src/main/java/com/sheep/gamegroup/model/api/ApiService.java

@@ -1647,8 +1647,8 @@ public interface ApiService {
      * 查询用户地址信息
      * 返回 UserAddressInfo
      */
-    @GET("app/user_address/apply")
-    Observable<BaseMessage> getUserAddressApply();
+    @GET("app/user_address")
+    Observable<BaseMessage> getUserAddress();
 //---------------------------end 小绵羊3.4.7新增 -- app/user_address 用户收货地址-------------------------------------
 
 }

app/src/main/java/com/sheep/gamegroup/util/CommonUtil.java

@@ -1767,7 +1767,7 @@ public class CommonUtil {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到TextView");
                 return;
             }
-            empty_view_img.setImageResource(R.drawable.loading_01);
+            GlideImageLoader.setImage(empty_view_img, R.drawable.gif_sheep_loading);
             empty_view_msg.setText(R.string.loading);
         }
     }
@@ -1810,19 +1810,17 @@ public class CommonUtil {
                 return;
             }
             if (NetUtil.isConnected(SheepApp.getInstance())) {
-                if (isNetImg) {
-                    GlideImageLoader.setImage(empty_view_img, ViewUtil.getNetImgByName("wushuju"));
-                } else {
-                    empty_view_img.setImageResource(R.mipmap.wushuju);
-                }
-                empty_view_msg.setText("加载中...");
                 empty_view_msg.postDelayed(new Runnable() {
                     @Override
                     public void run() {
-
-                        empty_view_msg.setText(R.string.wushuju);
+                        if (isNetImg) {
+                            ViewUtil.setImage(empty_view_img, ViewUtil.getNetImgByName("wushuju"));
+                        } else {
+                            empty_view_img.setImageResource(R.mipmap.wushuju);
+                        }
+                        ViewUtil.setText(empty_view_msg, SheepApp.getInstance().getResources().getString(R.string.wushuju));
                     }
-                }, 1000);
+                }, 100);
             } else {
                 if (isNetImg) {
                     GlideImageLoader.setImage(empty_view_img, ViewUtil.getNetImgByName("wushuju_net_error"));

app/src/main/java/com/sheep/gamegroup/util/Jump2View.java

@@ -1567,11 +1567,11 @@ public class Jump2View {
                     public void onNext(BaseMessage baseMessage) {
                         Mission mission = baseMessage.getData(Mission.class);
                         if(mission != null) {
-                            if(mission.getQuantity() == 10 && DataUtil.getAsBoolean("notShowYfShopAskDialog10", true)) {//邀请10个后有奖品
+                            if(mission.getQuantity() == 10 && DataUtil.getAsBoolean(DataUtil.getInstance().getUserId()+"notShowYfShopAskDialog10", true)) {//邀请10个后有奖品
                                  DataUtil.putAsBoolean("notShowYfShopAskDialog10", false);
                                 tryCheckUserAddress(activity, mission);
                                 return;
-                            } else if(mission.getQuantity() == 50 && DataUtil.getAsBoolean("notShowYfShopAskDialog50", true)) {//邀请50个时有奖品
+                            } else if(mission.getQuantity() == 50 && DataUtil.getAsBoolean(DataUtil.getInstance().getUserId()+"notShowYfShopAskDialog50", true)) {//邀请50个时有奖品
                                  DataUtil.putAsBoolean("notShowYfShopAskDialog50", false);
                                 tryCheckUserAddress(activity, mission);
                                 return;
@@ -1588,7 +1588,7 @@ public class Jump2View {
     }
     //尝试获取收货地址，来显示用户获取到礼品后，显示的状态
     public void tryCheckUserAddress(final Activity activity, Mission mission) {
-        SheepApp.getInstance().getNetComponent().getApiService().getUserAddressApply()
+        SheepApp.getInstance().getNetComponent().getApiService().getUserAddress()
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
                 .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
@@ -1598,18 +1598,18 @@ public class Jump2View {
                         if(IDBean.isNull(userAddressInfo)) {
                             onError(baseMessage);
                         } else {
-                            String content = activity.getString(R.string.yf_shop_ask_tip, mission.getExtra());
-                            ViewUtil.showYfShopAsk(activity, "前\t往", content, dialog -> {
-                                Jump2View.getInstance().goActUserAddrInfo(activity);
-                                USER_INFO_ADDR.onEvent();
-                            });
+                            String content = activity.getString(R.string.yf_shop_ask_tip_2, mission.getExtra());
+                            ViewUtil.showYfShopAsk(activity, "继续邀请", content, dialog -> Jump2View.getInstance().goActInvitation(activity));
                         }
                     }
 
                     @Override
                     public void onError(BaseMessage baseMessage) {
-                        String content = activity.getString(R.string.yf_shop_ask_tip_2, mission.getExtra());
-                        ViewUtil.showYfShopAsk(activity, "继续邀请", content, dialog -> Jump2View.getInstance().goActInvitation(activity));
+                        String content = activity.getString(R.string.yf_shop_ask_tip, mission.getExtra());
+                        ViewUtil.showYfShopAsk(activity, "前\t往", content, dialog -> {
+                            Jump2View.getInstance().goActUserAddrInfo(activity);
+                            USER_INFO_ADDR.onEvent();
+                        });
                     }
                 });
     }

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -875,7 +875,7 @@ public class TestUtil {
 
     //开启后可 测试充值与绑定微信和身份信息逻辑 等
     public static boolean isDev() {
-        return BuildConfig.DEBUG;
-//        return false;
+//        return BuildConfig.DEBUG;
+        return false;
     }
 }

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -1716,15 +1716,20 @@ public class ViewUtil {
         }
     }
 
-    public static void setImage(ImageView imageView, String pictures) {
+    public static void setImage(ImageView imageView, Object object) {
         if (imageView != null) {
-            if (TextUtils.isEmpty(pictures)) {
-                imageView.setImageResource(R.mipmap.icon);
-            } else {
-                if (pictures.contains(";")) {
-                    pictures = pictures.split(";")[0];
+            if(object instanceof String) {
+                String pictures = object.toString();
+                if (TextUtils.isEmpty(pictures)) {
+                    imageView.setImageResource(R.mipmap.icon);
+                } else {
+                    if (pictures.contains(";")) {
+                        pictures = pictures.split(";")[0];
+                    }
+                    GlideImageLoader.setImage(imageView, pictures);
                 }
-                GlideImageLoader.setImage(imageView, pictures);
+            } else {
+                GlideImageLoader.setImage(imageView, object);
             }
         }
     }

app/src/main/java/com/sheep/gamegroup/view/activity/ActGcGameAppDetail.java

@@ -247,6 +247,9 @@ public class ActGcGameAppDetail extends BaseActivity {
                         if (isNewData) {
                             GameEntity gameEntity = baseMessage.getData(GameEntity.class);
                             checkData(gameEntity);
+                        } else if(gameEntity != null){
+                            //更新下载按钮
+                            CommonUtil.getInstance().palyGameDetailBtnValue(ActGcGameAppDetail.this, gameEntity, gc_game_app_detail_bt2, 0);
                         }
                     }
 

app/src/main/java/com/sheep/gamegroup/view/activity/ActMyMoney.java

@@ -140,12 +140,12 @@ public class ActMyMoney extends BaseActivity {
             }
         });
         RefreshUtil.newInstance().publicParameterLoadMore(refresh, this);
-        viewPager.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
-            public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
-                LogUtil.println("ActMyMoney", "viewPager", "onLayoutChange", left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom);
-                LayoutParamsUtil.resetLayoutParams(act_my_money_bottom_v, new Lp().setHeight(G.HEIGHT - G.getRealPix(74) - img_baseactivity_title.getHeight() + top - bottom));
-            }
-        });
+//        viewPager.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+//            public void onLayoutChange(View view, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+//                LogUtil.println("ActMyMoney", "viewPager", "onLayoutChange", left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom);
+//                LayoutParamsUtil.resetLayoutParams(act_my_money_bottom_v, new Lp().setHeight(G.HEIGHT - G.getRealPix(74) - img_baseactivity_title.getHeight() + top - bottom));
+//            }
+//        });
     }
     private void new_tab(){
         indicator.addTab(indicator.newTab().setCustomView(tab_icon(tabNames[0], true)));
@@ -157,13 +157,13 @@ public class ActMyMoney extends BaseActivity {
             @Override
             public void onTabReselected(TabLayout.Tab tab) {
                 super.onTabReselected(tab);
-                scrollView.smoothScrollTo(0, indicator.getTop());
+                scrollView.smoothScrollTo(0, indicator.getTop() - G.getRealPix(80));
             }
 
             @Override
             public void onTabSelected(TabLayout.Tab tab) {
                 super.onTabSelected(tab);
-                scrollView.smoothScrollTo(0, indicator.getTop());
+                scrollView.smoothScrollTo(0, indicator.getTop() - G.getRealPix(80));
             }
         });
         viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {

app/src/main/java/com/sheep/gamegroup/view/activity/TryMakeMoneyact.java

@@ -92,7 +92,6 @@ public class TryMakeMoneyact extends BaseActivity {
 
     @Override
     public void initData() {
-        //真tm神经病 需求改了无数次
     }
 
     /**

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

@@ -313,7 +313,9 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     private int progress = 0;//数据加载进度
     public void mInitData() {
         progress = 0;
-        if (!acceptedEtyList.isEmpty()) {
+        if (acceptedEtyList.isEmpty()) {
+            progress++;
+        } else {
             acceptedEtyList.clear();
             notifyDataSetChanged();
         }