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

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

@@ -1861,7 +1861,7 @@ public class CommonUtil {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到ImageView");
                 return;
             }
-            TextView empty_view_msg = empty_view.findViewById(R.id.empty_view_msg);
+            final TextView empty_view_msg = empty_view.findViewById(R.id.empty_view_msg);
             if (empty_view_msg == null) {
                 if (BuildConfig.DEBUG) G.showToast("无数据layout中找不到TextView");
                 return;
@@ -1872,7 +1872,14 @@ public class CommonUtil {
                 } else {
                     empty_view_img.setImageResource(R.mipmap.wushuju);
                 }
-                empty_view_msg.setText(R.string.wushuju);
+                empty_view_msg.setText("加载中...");
+                empty_view_msg.postDelayed(new Runnable() {
+                    @Override
+                    public void run() {
+
+                        empty_view_msg.setText(R.string.wushuju);
+                    }
+                },1000);
             } else {
                 if (isNetImg) {
                     GlideImageLoader.setImage(empty_view_img, ViewUtil.getNetImgByName("wushuju_net_error"));

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

@@ -498,7 +498,7 @@ public class FgtTryMakeMoney extends BaseFragment implements TryMakeMoneyContrac
     @Override
     public void onResume() {
         super.onResume();
-        if (onResumeCount > 0 && presenter != null) {//直接全部刷新
+        if (!isFromHome && onResumeCount > 0 && presenter != null) {//直接全部刷新
             refreshData();
         }
         onResumeCount++;