bugly list

app/src/main/AndroidManifest.xml

@@ -896,12 +896,12 @@
             android:exported="true"
             android:configChanges="orientation|screenSize"
             android:launchMode="singleInstance"
-            android:screenOrientation="portrait"
+            android:screenOrientation="behind"
             android:theme="@style/AppTheme.translucent" />
         <activity
             android:name="com.sheep.gamegroup.view.activity.GameCertificationActivity"
             android:exported="true"
-            android:screenOrientation="portrait"
+            android:screenOrientation="behind"
             android:theme="@style/AppActionTheme" />
         <!-- end 小绵羊sdk相关 -->
 

app/src/main/java/com/sheep/gamegroup/module/game/util/FocusGameHelper.java

@@ -80,7 +80,7 @@ public class FocusGameHelper {
                                 int status = json.getInteger("status");
                                 if (status == 1) {
                                     noticeBar.setVisibility(View.VISIBLE);
-                                    Glide.with(rootView.getContext()).load(json.getString("img_url")).into(noticeBar);
+                                    Glide.with(SheepApp.getInstance()).load(json.getString("img_url")).into(noticeBar);
                                     if (json.containsKey("jump_url") && !TextUtils.isEmpty(json.getString("jump_url"))) {
                                         noticeBar.setOnClickListener(v -> {
                                             Jump2View.getInstance().goWeb(rootView.getContext(), json.getString("jump_url"));

app/src/main/java/com/sheep/gamegroup/module/home/fragment/FgtHome.java

@@ -15,6 +15,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.MessageUnReadEntity;
 import com.sheep.gamegroup.model.entity.UserEntity;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
+import com.sheep.gamegroup.util.CommonUtil;
 import com.sheep.gamegroup.util.DataUtil;
 import com.sheep.gamegroup.util.GlideImageLoader;
 import com.sheep.gamegroup.util.Jump2View;
@@ -40,6 +41,7 @@ import butterknife.ButterKnife;
 import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
+import rx.functions.Action1;
 
 public class FgtHome extends BaseFragment {
 
@@ -96,6 +98,17 @@ public class FgtHome extends BaseFragment {
         super.onViewCreated(view, savedInstanceState);
         configFragments(savedInstanceState);
         user = DataUtil.getInstance().getUserEntity();
+        if (user != null) {
+            showUserProfile();
+        } else {
+            CommonUtil.getInstance().getUserInfo(false, (userEntity) -> {
+                user = userEntity;
+                showUserProfile();
+            });
+        }
+    }
+
+    private void showUserProfile() {
         GlideImageLoader.setAvatar(iv_user_face, user.getAvatar(), Color.argb(128, 255, 255, 255));
         ViewUtil.setVisibility(iv_flag_vip, user.isVIP());
         tv_user_asset.setText(String.format(Locale.CHINA, "%s\u0020元", NumberFormatUtils.retainMost2W(user.getBalance())));

app/src/main/java/com/sheep/gamegroup/module/pay/fragment/SetPasswordFragment.java

@@ -68,7 +68,7 @@ public class SetPasswordFragment extends AbsConfirmFragment {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         DataUtil.getInstance().getUserEntity().setHas_pay_pwd(1);
-                        CommonUtil.getInstance().getUserInfo(getContext());
+                        CommonUtil.getInstance().getUserInfo();
                         G.showToast("设置成功");
                         getActivity().finish();
                     }

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWeb.java

@@ -172,9 +172,9 @@ public class FgtWeb extends BaseFgtWeb {
     }
 
     public static void initWebViewSettings(WebView webView) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            WebView.setWebContentsDebuggingEnabled(true);
-        }
+//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+//            WebView.setWebContentsDebuggingEnabled(true);
+//        }
         webView.setClickable(true);
         WebSettings webSetting = webView.getSettings();
         webSetting.setJavaScriptEnabled(true);

app/src/main/java/com/sheep/gamegroup/module/webview/fragment/FgtWebX5.java

@@ -160,7 +160,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
     }
 
     public static void initWebViewSettings(WebView webView) {
-        WebView.setWebContentsDebuggingEnabled(true);
+//        WebView.setWebContentsDebuggingEnabled(true);
         webView.setClickable(true);
         WebSettings webSetting = webView.getSettings();
         webSetting.setJavaScriptEnabled(true);

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

@@ -733,7 +733,11 @@ public class CommonUtil {
     /**
      * 更新用户信息
      */
-    public void getUserInfo(Context context) {
+    public void getUserInfo() {
+        getUserInfo(true, null);
+    }
+
+    public void getUserInfo(boolean force, Action1<UserEntity> callback) {
         SheepApp.getInstance()
                 .getNetComponent()
                 .getApiService()
@@ -754,6 +758,9 @@ public class CommonUtil {
                             return;
                         }
                         DataUtil.getInstance().setUserEntity(userEntity);
+                        if (callback != null) {
+                            callback.call(userEntity);
+                        }
                     }
                 });
     }
@@ -1297,7 +1304,7 @@ public class CommonUtil {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         Release_task taskReleaseEty = baseMessage.getData(Release_task.class);
-                        if(taskReleaseEty!=null) {
+                        if (taskReleaseEty != null) {
                             action.call(taskReleaseEty);
                         }
 
@@ -1990,8 +1997,8 @@ public class CommonUtil {
             String appId = "40";
             String cUId = String.valueOf(id);
             String appKey = "ad9a30556666207";
-            if(SheepApp.getInstance().getCurrentActivity()!=null)
-            AdManager.getInstance(SheepApp.getInstance()).init(SheepApp.getInstance().getCurrentActivity(), appId, cUId, appKey);
+            if (SheepApp.getInstance().getCurrentActivity() != null)
+                AdManager.getInstance(SheepApp.getInstance()).init(SheepApp.getInstance().getCurrentActivity(), appId, cUId, appKey);
             SheepApp.getInstance().setInitMidong(true);
             return true;
         }

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

@@ -397,7 +397,7 @@ public class Jump2View {
      * @param object
      */
     public void goHomePageView(final Activity context, Object object) {
-        final Intent intent = new Intent(context, ActTest.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        final Intent intent = new Intent(context, ActMain.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
         if (object instanceof String) {
             //统计用户登录信息
             UMConfigUtils.onProfileSignIn();

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

@@ -56,7 +56,7 @@ public class ActSetting extends BaseActivity {
 
     public void onResume() {
         super.onResume();
-        payPwdFlag.setText(DataUtil.getInstance().getUserEntity().hasPayPwd() ? "已设置" : "未设置");
+        CommonUtil.getInstance().getUserInfo(false, (user) -> payPwdFlag.setText(user.hasPayPwd() ? "已设置" : "未设置"));
     }
 
     @Override

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

@@ -137,7 +137,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         if (baseMessage != null) {
-                            CommonUtil.getInstance().getUserInfo(SheepApp.getInstance());
+                            CommonUtil.getInstance().getUserInfo();
                             popupWindow.dismiss();
                             tvSex.setText(sex == 1 ? "男" : "女");
                             G.showToast("修改成功！");
@@ -164,7 +164,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
                     @Override
                     public void onNext(BaseMessage baseMessage) {
                         if (baseMessage != null) {
-                            CommonUtil.getInstance().getUserInfo(SheepApp.getInstance());
+                            CommonUtil.getInstance().getUserInfo();
                             G.showToast("修改成功！");
                         } else {
                             G.showToast("修改失败！");

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

@@ -1147,6 +1147,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void successSlideshow(BaseMessage baseMessage) {
+        if (this.getActivity().isDestroyed() || this.isDetached()) return;
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.slideshow);
         if (isNewData) {
             List<SlideshowEty> slideshowEtyList = baseMessage.getDataList(SlideshowEty.class);
@@ -1171,6 +1172,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void successbulletin(BaseMessage baseMessage) {
+        if (this.getActivity().isDestroyed() || this.isDetached()) return;
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.bulletin);
         if (isNewData) {
             List<BulletinEnty> bulletinEntyList = JSONArray.parseArray(JSONArray.toJSONString(baseMessage.getData()), BulletinEnty.class);
@@ -1186,6 +1188,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void successhomeList(BaseMessage baseMessage) {
+        if (this.getActivity().isDestroyed() || this.isDetached()) return;
         boolean isNewData = DataUtil.getInstance().isNewData(ApiKey.home_list);
         if (isNewData) {
             List<HomeListEntity> homeListEntityList = baseMessage.getDataList(HomeListEntity.class);
@@ -1195,6 +1198,7 @@ public class FgtSmallSheep extends BaseFragment implements SmallSheepContract.Vi
 
     @Override
     public void failhomeList(BaseMessage baseMessage) {
+        if (this.getActivity().isDestroyed() || this.isDetached()) return;
         ViewUtil.setVisibility(home_list_rv, !homeListList.isEmpty());
         ViewUtil.setVisibility(full_home_list_rv, !fullHomeList.isEmpty());
     }