for h5 game

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -196,7 +196,7 @@ public class SignInFgt extends AbsLoginFgt {
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-                        if (loginEty != null) {
+                        if (loginEty != null && getActivity() != null) {
                             if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
                                 SpUtils.saveToken(getActivity(), loginEty.getToken());
                                 DataUtil.getInstance().initUserEntity(loginEty.getUser());
@@ -280,7 +280,7 @@ public class SignInFgt extends AbsLoginFgt {
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
-                        if (loginEty != null) {
+                        if (loginEty != null && getActivity() != null) {
                             if (TextUtils.isEmpty(SheepApp.getInstance().getGameCode())) {
                                 SpUtils.saveToken(getActivity(), loginEty.getToken());
                                 DataUtil.getInstance().initUserEntity(loginEty.getUser());

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -233,7 +233,7 @@ public class SignUpFgt extends BaseFragment {
     private void registerAccount() {
         if (checkAgreement()) return;
         if (!validateAccount()) return;
-        JSONObject jsonObject = new JSONObject();
+        final JSONObject jsonObject = new JSONObject();
         jsonObject.put("user_name", userNameBox.getText().toString().trim());
         jsonObject.put("password", passwordBox.getText().toString().trim());
         jsonObject.put("invitation_code", ChannelContent.getInstance().getChannel_name());
@@ -265,7 +265,7 @@ public class SignUpFgt extends BaseFragment {
                                 SpUtils.saveToken(SheepApp.getInstance(), loginEty.getToken());
                                 DataUtil.getInstance().initUserEntity(loginEty.getUser());
                             }
-                            SpUtils.saveUp(getContext(),loginEty.getUser().getId(), passwordBox.getText().toString().trim());
+                            SpUtils.saveUp(getContext(),loginEty.getUser().getId(), jsonObject.getString("password"));
                             mController.whenLoginSuccess(LoginController.PLATFORM_ACCOUNT, loginEty);
                         }
                     }

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/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, ActMain.class).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        final Intent intent = new Intent(context, ActTest.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/util/ViewUtil.java

@@ -2393,7 +2393,11 @@ public class ViewUtil {
     public void hideProgress(Activity activity) {
         activity.runOnUiThread(() -> {
             if (mPd != null && mPd.get() != null && mPd.get().isShowing()) {
-                mPd.get().dismiss();
+                try {
+                    mPd.get().dismiss();
+                }catch (IllegalArgumentException iae){
+                    iae.printStackTrace();
+                }
             }
         });
     }

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

@@ -243,7 +243,7 @@ public class WithdrawalAct extends BaseActivity implements WithdrawalContract.Vi
     //显示可以提现金额
     private void setBalanceAmount() {
         String sr = "可提现金额 <font color='#ff2d4b'><big>" + NumberFormatUtils.retainMost2(balanceAmount) + "</big></font> 元";
-        withdrawal_click_bindname_tv.setText(Html.fromHtml(sr));
+        ViewUtil.setText(withdrawal_click_bindname_tv, Html.fromHtml(sr));
     }
 
     @Override

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

@@ -32,6 +32,7 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
     RefreshLayout swipe_container;
     @BindView(R.id.empty_view)
     View empty_view;
+
     @Override
     public int getLayoutId() {
         return R.layout.fgt_credit_card_task_list;
@@ -40,6 +41,7 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
     private List<CreditCardProgressQuery> list = new ArrayList<>();
     private CreditCardProgressQueryAdp adapter;
     private Activity activity;
+
     @Override
     public void onViewCreated() {
         activity = getActivity();
@@ -80,6 +82,8 @@ public class FgtCreditCardProgressQuery extends BaseFragment {
     private void notifyDataSetChanged() {
         CommonUtil.getInstance().updateEmptyView(empty_view, list.isEmpty());
         adapter.notifyDataSetChanged();
-        swipe_container.setRefreshing(false);
+        if (swipe_container != null) {
+            swipe_container.setRefreshing(false);
+        }
     }
 }