Commit 0851460e authored by fallenstardust's avatar fallenstardust

修复未有萌卡登录记录时点击聊天室崩溃的问题

parent f6e13d4c
...@@ -63,6 +63,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener ...@@ -63,6 +63,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
//萌卡webview //萌卡webview
public MyCardWebView mWebViewPlus; public MyCardWebView mWebViewPlus;
private MyCard mMyCard; private MyCard mMyCard;
private McUser mMcUser;
//聊天室 //聊天室
public RelativeLayout rl_chat; public RelativeLayout rl_chat;
private TextView tv_message; private TextView tv_message;
...@@ -107,6 +108,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener ...@@ -107,6 +108,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
public void initView(View view) { public void initView(View view) {
YGOStarter.onCreated(getActivity()); YGOStarter.onCreated(getActivity());
mMyCard = new MyCard(getActivity()); mMyCard = new MyCard(getActivity());
mMcUser = new McUser();
mWebViewPlus = view.findViewById(R.id.webbrowser); mWebViewPlus = view.findViewById(R.id.webbrowser);
mProgressBar = view.findViewById(R.id.progressBar); mProgressBar = view.findViewById(R.id.progressBar);
mProgressBar.setMax(100); mProgressBar.setMax(100);
...@@ -307,6 +309,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener ...@@ -307,6 +309,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
if (homeActivity.fragment_mycard_chatting_room.isVisible()) { if (homeActivity.fragment_mycard_chatting_room.isVisible()) {
getChildFragmentManager().beginTransaction().hide(homeActivity.fragment_mycard_chatting_room).commit(); getChildFragmentManager().beginTransaction().hide(homeActivity.fragment_mycard_chatting_room).commit();
mWebViewPlus.setVisibility(View.VISIBLE); mWebViewPlus.setVisibility(View.VISIBLE);
rl_chat.setVisibility(View.VISIBLE);
} }
mWebViewPlus.loadUrl(MyCard.getMCLogoutUrl()); mWebViewPlus.loadUrl(MyCard.getMCLogoutUrl());
break; break;
...@@ -333,8 +336,11 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener ...@@ -333,8 +336,11 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
} }
} else { } else {
//点击重新登录 if (mMcUser.getUsername() != null && mMcUser.getPassword() != null) {
serviceManagement.start(); serviceManagement.start();
} else {
Toast.makeText(getActivity(), R.string.login_mycard, Toast.LENGTH_SHORT).show();
}
} }
break; break;
} }
......
package cn.garymb.ygomobile.ui.mycard.mcchat.management; package cn.garymb.ygomobile.ui.mycard.mcchat.management;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context;
import android.content.SharedPreferences;
import android.os.Handler; import android.os.Handler;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
...@@ -24,8 +22,6 @@ import java.net.InetAddress; ...@@ -24,8 +22,6 @@ import java.net.InetAddress;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import cn.garymb.ygomobile.App;
import cn.garymb.ygomobile.lite.BuildConfig;
import cn.garymb.ygomobile.ui.mycard.base.OnJoinChatListener; import cn.garymb.ygomobile.ui.mycard.base.OnJoinChatListener;
import cn.garymb.ygomobile.ui.mycard.bean.McUser; import cn.garymb.ygomobile.ui.mycard.bean.McUser;
import cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener; import cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener;
...@@ -311,13 +307,13 @@ public class ServiceManagement { ...@@ -311,13 +307,13 @@ public class ServiceManagement {
name=mcUser.getUsername(); name=mcUser.getUsername();
password=mcUser.getPassword(); password=mcUser.getPassword();
if (TextUtils.isEmpty(name) || TextUtils.isEmpty(password)) { if (TextUtils.isEmpty(name) || TextUtils.isEmpty(password)) {
isStartLoading=false; isStartLoading = false;
han.sendEmptyMessage(CHAT_USER_NULL); han.sendEmptyMessage(CHAT_USER_NULL);
return; return;
} }
if (su.isListener()) { if (su.isListener()) {
isStartLoading=false; isStartLoading = false;
han.sendEmptyMessage(CHAT_LOGIN_OK); han.sendEmptyMessage(CHAT_LOGIN_OK);
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment