Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
YGOMobile
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fallenstardust
YGOMobile
Commits
0851460e
Commit
0851460e
authored
Sep 15, 2022
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复未有萌卡登录记录时点击聊天室崩溃的问题
parent
f6e13d4c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
8 deletions
+10
-8
mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MycardFragment.java
...in/java/cn/garymb/ygomobile/ui/mycard/MycardFragment.java
+8
-2
mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/management/ServiceManagement.java
...mobile/ui/mycard/mcchat/management/ServiceManagement.java
+2
-6
No files found.
mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MycardFragment.java
View file @
0851460e
...
...
@@ -63,6 +63,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
//萌卡webview
public
MyCardWebView
mWebViewPlus
;
private
MyCard
mMyCard
;
private
McUser
mMcUser
;
//聊天室
public
RelativeLayout
rl_chat
;
private
TextView
tv_message
;
...
...
@@ -107,6 +108,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
public
void
initView
(
View
view
)
{
YGOStarter
.
onCreated
(
getActivity
());
mMyCard
=
new
MyCard
(
getActivity
());
mMcUser
=
new
McUser
();
mWebViewPlus
=
view
.
findViewById
(
R
.
id
.
webbrowser
);
mProgressBar
=
view
.
findViewById
(
R
.
id
.
progressBar
);
mProgressBar
.
setMax
(
100
);
...
...
@@ -307,6 +309,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
if
(
homeActivity
.
fragment_mycard_chatting_room
.
isVisible
())
{
getChildFragmentManager
().
beginTransaction
().
hide
(
homeActivity
.
fragment_mycard_chatting_room
).
commit
();
mWebViewPlus
.
setVisibility
(
View
.
VISIBLE
);
rl_chat
.
setVisibility
(
View
.
VISIBLE
);
}
mWebViewPlus
.
loadUrl
(
MyCard
.
getMCLogoutUrl
());
break
;
...
...
@@ -333,8 +336,11 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
}
}
else
{
//点击重新登录
if
(
mMcUser
.
getUsername
()
!=
null
&&
mMcUser
.
getPassword
()
!=
null
)
{
serviceManagement
.
start
();
}
else
{
Toast
.
makeText
(
getActivity
(),
R
.
string
.
login_mycard
,
Toast
.
LENGTH_SHORT
).
show
();
}
}
break
;
}
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/management/ServiceManagement.java
View file @
0851460e
package
cn.garymb.ygomobile.ui.mycard.mcchat.management
;
import
android.annotation.SuppressLint
;
import
android.content.Context
;
import
android.content.SharedPreferences
;
import
android.os.Handler
;
import
android.text.TextUtils
;
import
android.util.Log
;
...
...
@@ -24,8 +22,6 @@ import java.net.InetAddress;
import
java.util.ArrayList
;
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.bean.McUser
;
import
cn.garymb.ygomobile.ui.mycard.mcchat.ChatListener
;
...
...
@@ -311,13 +307,13 @@ public class ServiceManagement {
name
=
mcUser
.
getUsername
();
password
=
mcUser
.
getPassword
();
if
(
TextUtils
.
isEmpty
(
name
)
||
TextUtils
.
isEmpty
(
password
))
{
isStartLoading
=
false
;
isStartLoading
=
false
;
han
.
sendEmptyMessage
(
CHAT_USER_NULL
);
return
;
}
if
(
su
.
isListener
())
{
isStartLoading
=
false
;
isStartLoading
=
false
;
han
.
sendEmptyMessage
(
CHAT_LOGIN_OK
);
return
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment