bugly handle

app/src/main/java/com/sheep/gamegroup/module/login/LoginAct.java

@@ -138,7 +138,9 @@ public class LoginAct extends BaseUMActivity implements LoginController {
         }
         if (!titleStack.empty()) {
             titleStack.pop();
-            TitleBarUtils.getInstance().setTitle(this, titleStack.peek());
+            if (!titleStack.empty()) {
+                TitleBarUtils.getInstance().setTitle(this, titleStack.peek());
+            }
         }
     }
 

app/src/main/java/com/sheep/gamegroup/module/pay/activity/SheepWXPayEntryActivity.java

@@ -34,6 +34,10 @@ public abstract class SheepWXPayEntryActivity extends Activity implements IWXAPI
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        if (SheepApp.getInstance().getWxApi() == null) {
+            finish();
+            return;
+        }
         if (!SheepApp.getInstance().getWxApi().handleIntent(getIntent(), this)) {
             finish();
         }
@@ -44,6 +48,10 @@ public abstract class SheepWXPayEntryActivity extends Activity implements IWXAPI
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         setIntent(intent);
+        if (SheepApp.getInstance().getWxApi() == null) {
+            finish();
+            return;
+        }
         if (!SheepApp.getInstance().getWxApi().handleIntent(intent, this)) {
             finish();
         }
@@ -85,7 +93,9 @@ public abstract class SheepWXPayEntryActivity extends Activity implements IWXAPI
 
     @Override
     public void onDestroy() {
-        SheepApp.getInstance().getWxApi().detach();
+        if (SheepApp.getInstance().getWxApi() != null) {
+            SheepApp.getInstance().getWxApi().detach();
+        }
         super.onDestroy();
     }
 }

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

@@ -508,6 +508,10 @@ public class FgtWeb extends BaseFgtWeb {
 
     @Override
     public boolean onBackPressed() {
+        if (TextUtils.isEmpty(mWebView.getUrl())) {
+            if (getActivity() != null) getActivity().finish();
+            return true;
+        }
         if (responseBack && !mWebView.getUrl().contains(Config.PATH_DIRECTIONAL_PAY)) {
             if (mWebView != null && mWebView.canGoBack()) {
                 mWebView.goBack();

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

@@ -88,7 +88,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
     private String finallyUrl;
 
-    public String getFirstUrl(){
+    public String getFirstUrl() {
         return finallyUrl;
     }
 
@@ -337,7 +337,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                     });
                     act_web_loading_iv.startAnimation(animation);
                 }
-                if(webParams.isShowProgress()) {
+                if (webParams.isShowProgress()) {
                     ViewUtil.setVisibility(act_web_loading_pb, newProgress != 100);
                 }
                 if (act_web_loading_pb != null)
@@ -471,7 +471,7 @@ public class FgtWebX5 extends BaseFgtWebX5 {
                         || url.startsWith(Config.YF_SHOP_HOME)
                         || url.startsWith("http://t.shop.17xmy.com/")
                         || url.startsWith("http://10.8"))
-                        &&(!url.contains(webParams.getTokenKey()))) {
+                        && (!url.contains(webParams.getTokenKey()))) {
                     loadUrl = StringUtils.addUrlQuery(url, webParams.getTokenKey(), SpUtils.getToken(SheepApp.getInstance()));
                 }
                 loadUrl = StringUtils.addUrlQuery(loadUrl, "pf", Config.YF_SHOP_PLATFORM);
@@ -512,6 +512,10 @@ public class FgtWebX5 extends BaseFgtWebX5 {
 
     @Override
     public boolean onBackPressed() {
+        if (TextUtils.isEmpty(mWebView.getUrl())) {
+            if (getActivity() != null) getActivity().finish();
+            return true;
+        }
         if (responseBack && !mWebView.getUrl().contains(Config.PATH_DIRECTIONAL_PAY)) {
             if (mWebView != null && mWebView.canGoBack()) {
                 mWebView.goBack();

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

@@ -87,8 +87,8 @@ public class ActWebX5 extends BaseContainerActivity implements UMShareListener {
                 if (fragment instanceof IWeb && (orientPara == ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE || orientPara == ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE)) {
                     IWeb webFragment = (IWeb) fragment;
                     String url = webFragment.getWebUrl();
-                    if (url.contains(Config.PATH_DIRECTIONAL_RECHARGE)
-                            || url.contains(Config.PATH_DIRECTIONAL_MAKEGOLD)) {
+                    if (!TextUtils.isEmpty(url) && (url.contains(Config.PATH_DIRECTIONAL_RECHARGE)
+                            || url.contains(Config.PATH_DIRECTIONAL_MAKEGOLD))) {
                         Log.e("WebRecharge", "execute orient ");
                         setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
                     }

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

@@ -101,6 +101,9 @@ public class GameCertificationActivity extends BaseActivity {
         });
         progress.setVisibility(View.VISIBLE);
         mainLayout.setVisibility(View.GONE);
+
+        ViewUtil.setVisibility(progress, View.VISIBLE);
+        ViewUtil.setVisibility(mainLayout, View.GONE);
     }
 
     public void initData() {
@@ -174,10 +177,10 @@ public class GameCertificationActivity extends BaseActivity {
 
     private void hasToken() {
         if (progress != null) {
-            progress.setVisibility(View.GONE);
+            ViewUtil.setVisibility(progress, View.GONE);
         }
         if (mainLayout != null) {
-            mainLayout.setVisibility(View.VISIBLE);
+            ViewUtil.setVisibility(mainLayout, View.VISIBLE);
         }
         if (userList.isEmpty()) {
             Jump2View.getInstance().goLoginViewWithoutFinish(this, SheepApp.getInstance().getGameCode());

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

@@ -120,14 +120,14 @@ public class MiddleSchemeAct extends Activity {
                         new WebParams(
                                 Config.getUrlByPath(Config.PATH_MY_GAME_COUPON, "authorization", json),
                                 "代金券中心"),
-                        false, 1);
+                        true, 1);
                 break;
             case "game_role_mall":
                 Jump2View.getInstance().goWebSingle(
                         context,
                         new WebParams(Config.getUrlByPath(Config.PATH_GAME_SHOP_HOME, "authorization", json),
                                 "游戏交易商城"),
-                        false, 1);
+                        true, 1);
                 break;
             case "yy_shop":
                 Jump2View.getInstance().goWebSingle(
@@ -135,7 +135,7 @@ public class MiddleSchemeAct extends Activity {
                         new WebParams(
                                 Config.getUrlByPath(Config.PATH_YY_SHOP_INDEX, "authorization", json),
                                 "代金券中心"),
-                        false, 1);
+                        true, 1);
                 break;
             case "my_gift":
                 Jump2View.getInstance().goMyWelfare(context, json, true);

app/src/main/java/com/sheep/jiuyan/samllsheep/SheepApp.java

@@ -350,13 +350,22 @@ public class SheepApp extends MultiDexApplication {
     private IWXAPI wxApi;
 
     public IWXAPI getWxApi() {
-        return wxApi;
+        if (wxApi != null) {
+            return wxApi;
+        } else {
+            String wxAppId = DataUtil.getAsString("previous_wxappid", "");
+            if (TextUtils.isEmpty(wxAppId)) {
+                return null;
+            }
+            return getWxApi(this, wxAppId);
+        }
     }
 
     public IWXAPI getWxApi(Context context, String wxAppId) {
         wxApi = WXAPIFactory.createWXAPI(context, null);
         // 将该app注册到微信
         wxApi.registerApp(wxAppId);
+        DataUtil.putAsString("previous_wxappid", wxAppId);
         return wxApi;
     }