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
a525d7b0
Commit
a525d7b0
authored
Feb 26, 2020
by
fallenstardust
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix启动决斗助手闪退&无法检测ydk文本
update en strings.conf
parent
10b3596c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
37 deletions
+6
-37
mobile/assets_en/data/conf/strings.conf
mobile/assets_en/data/conf/strings.conf
+1
-1
mobile/build.gradle
mobile/build.gradle
+1
-1
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
...c/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
+3
-24
mobile/src/main/java/com/ourygo/assistant/util/ClipManagement.java
...c/main/java/com/ourygo/assistant/util/ClipManagement.java
+0
-10
mobile/src/main/java/com/ourygo/assistant/util/DuelAssistantManagement.java
...va/com/ourygo/assistant/util/DuelAssistantManagement.java
+1
-1
No files found.
mobile/assets_en/data/conf/strings.conf
View file @
a525d7b0
...
@@ -1002,7 +1002,7 @@
...
@@ -1002,7 +1002,7 @@
!
setname
0
x134
Generaider
!
setname
0
x134
Generaider
!
setname
0
x135
@
Ignister
!
setname
0
x135
@
Ignister
!
setname
0
x136
A
.
I
.
!
setname
0
x136
A
.
I
.
!
setname
0
x137
Senka
!
setname
0
x137
Ancient
Warriors
!
setname
0
x138
Megalith
!
setname
0
x138
Megalith
!
setname
0
x139
Palladium
Oracle
!
setname
0
x139
Palladium
Oracle
!
setname
0
x13a
Onomato
!
setname
0
x13a
Onomato
...
...
mobile/build.gradle
View file @
a525d7b0
...
@@ -8,7 +8,7 @@ android {
...
@@ -8,7 +8,7 @@ android {
applicationId
"cn.garymb.ygomobile"
applicationId
"cn.garymb.ygomobile"
minSdkVersion
21
minSdkVersion
21
targetSdkVersion
28
targetSdkVersion
28
versionCode
36030022
4
versionCode
36030022
6
versionName
"3.6.3"
versionName
"3.6.3"
flavorDimensions
"versionCode"
flavorDimensions
"versionCode"
vectorDrawables
.
useSupportLibrary
=
true
vectorDrawables
.
useSupportLibrary
=
true
...
...
mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java
View file @
a525d7b0
package
cn.garymb.ygomobile.ui.home
;
package
cn.garymb.ygomobile.ui.home
;
import
android.content.ClipData
;
import
android.content.ClipboardManager
;
import
android.content.ComponentName
;
import
android.content.ComponentName
;
import
android.content.Context
;
import
android.content.Intent
;
import
android.content.Intent
;
import
android.graphics.Color
;
import
android.graphics.Color
;
import
android.net.Uri
;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.os.Bundle
;
import
android.os.Handler
;
import
android.os.Handler
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.util.Log
;
import
android.util.SparseArray
;
import
android.util.SparseArray
;
import
android.view.Gravity
;
import
android.view.Gravity
;
import
android.view.Menu
;
import
android.view.Menu
;
...
@@ -37,7 +32,6 @@ import com.nightonke.boommenu.BoomButtons.BoomButton;
...
@@ -37,7 +32,6 @@ import com.nightonke.boommenu.BoomButtons.BoomButton;
import
com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton
;
import
com.nightonke.boommenu.BoomButtons.TextOutsideCircleButton
;
import
com.nightonke.boommenu.BoomMenuButton
;
import
com.nightonke.boommenu.BoomMenuButton
;
import
com.ourygo.assistant.base.listener.OnDuelAssistantListener
;
import
com.ourygo.assistant.base.listener.OnDuelAssistantListener
;
import
com.ourygo.assistant.service.DuelAssistantService
;
import
com.ourygo.assistant.util.DuelAssistantManagement
;
import
com.ourygo.assistant.util.DuelAssistantManagement
;
import
com.ourygo.assistant.util.Util
;
import
com.ourygo.assistant.util.Util
;
import
com.tencent.bugly.beta.Beta
;
import
com.tencent.bugly.beta.Beta
;
...
@@ -182,11 +176,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
...
@@ -182,11 +176,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
@Override
@Override
public
void
onJoinRoom
(
String
password
,
int
id
)
{
public
void
onJoinRoom
(
String
password
,
int
id
)
{
if
(
id
==
ID_MAINACTIVITY
)
{
if
(
id
==
ID_MAINACTIVITY
)
{
try
{
FileLogUtil
.
writeAndTime
(
"主页加房触发"
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
QuickjoinRoom
(
password
);
QuickjoinRoom
(
password
);
}
}
}
}
...
@@ -194,11 +183,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
...
@@ -194,11 +183,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
@Override
@Override
public
void
onCardSearch
(
String
key
,
int
id
)
{
public
void
onCardSearch
(
String
key
,
int
id
)
{
if
(
id
==
ID_MAINACTIVITY
)
{
if
(
id
==
ID_MAINACTIVITY
)
{
try
{
FileLogUtil
.
writeAndTime
(
"主页卡查触发"
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
Intent
intent
=
new
Intent
(
this
,
CardSearchAcitivity
.
class
);
Intent
intent
=
new
Intent
(
this
,
CardSearchAcitivity
.
class
);
intent
.
putExtra
(
CardSearchAcitivity
.
SEARCH_MESSAGE
,
key
);
intent
.
putExtra
(
CardSearchAcitivity
.
SEARCH_MESSAGE
,
key
);
startActivity
(
intent
);
startActivity
(
intent
);
...
@@ -208,12 +192,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
...
@@ -208,12 +192,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
@Override
@Override
public
void
onSaveDeck
(
String
message
,
boolean
isUrl
,
int
id
)
{
public
void
onSaveDeck
(
String
message
,
boolean
isUrl
,
int
id
)
{
if
(
id
==
ID_MAINACTIVITY
)
{
if
(
id
==
ID_MAINACTIVITY
)
{
try
{
saveDeck
(
message
,
isUrl
);
FileLogUtil
.
writeAndTime
(
"主页保存卡组触发"
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
saveDeck
(
message
,
isUrl
);
}
}
}
}
...
...
mobile/src/main/java/com/ourygo/assistant/util/ClipManagement.java
View file @
a525d7b0
...
@@ -54,11 +54,6 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
...
@@ -54,11 +54,6 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
}
}
return
null
;
return
null
;
}
}
try
{
FileLogUtil
.
writeAndTime
(
"剪贴板内容获取:"
+
clipData
.
getItemAt
(
0
).
getText
().
toString
());
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
return
clipData
.
getItemAt
(
0
).
getText
().
toString
();
return
clipData
.
getItemAt
(
0
).
getText
().
toString
();
}
}
...
@@ -74,11 +69,6 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
...
@@ -74,11 +69,6 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
if
(
TextUtils
.
isEmpty
(
clipMessage
))
{
if
(
TextUtils
.
isEmpty
(
clipMessage
))
{
return
;
return
;
}
}
try
{
FileLogUtil
.
writeAndTime
(
"剪贴板监听触发:"
+
clipMessage
);
}
catch
(
IOException
e
)
{
e
.
printStackTrace
();
}
if
(
onClipChangedListener
!=
null
)
if
(
onClipChangedListener
!=
null
)
onClipChangedListener
.
onClipChanged
(
clipMessage
,
false
,
ID_CLIP_LISTENER
);
onClipChangedListener
.
onClipChanged
(
clipMessage
,
false
,
ID_CLIP_LISTENER
);
}
}
...
...
mobile/src/main/java/com/ourygo/assistant/util/DuelAssistantManagement.java
View file @
a525d7b0
...
@@ -68,7 +68,7 @@ public class DuelAssistantManagement implements OnClipChangedListener {
...
@@ -68,7 +68,7 @@ public class DuelAssistantManagement implements OnClipChangedListener {
public
boolean
deckCheck
(
String
message
,
int
id
)
{
public
boolean
deckCheck
(
String
message
,
int
id
)
{
//如果复制的内容是多行作为卡组去判断
//如果复制的内容是多行作为卡组去判断
if
(
message
.
contains
(
"\n"
))
{
if
(
message
.
contains
(
"\n"
))
{
for
(
String
s
:
Record
.
CARD_SEARCH_KEY
)
{
for
(
String
s
:
Record
.
DeckTextKey
)
{
//只要包含其中一个关键字就视为卡组
//只要包含其中一个关键字就视为卡组
if
(
message
.
contains
(
s
))
{
if
(
message
.
contains
(
s
))
{
onSaveDeck
(
message
,
false
,
id
);
onSaveDeck
(
message
,
false
,
id
);
...
...
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