Commit 19b96ccc authored by feihuaduo's avatar feihuaduo

修复第二次才能从外部打开卡组文件的问题

卡查不区分大小写
parent 4b28dcdc
...@@ -39,7 +39,7 @@ android { ...@@ -39,7 +39,7 @@ android {
} }
buildTypes { buildTypes {
debug { debug {
debuggable false debuggable true
buildConfigField 'boolean', 'DEBUG_MODE', 'true' buildConfigField 'boolean', 'DEBUG_MODE', 'true'
} }
release { release {
......
...@@ -113,7 +113,8 @@ public class GameUriManager { ...@@ -113,7 +113,8 @@ public class GameUriManager {
} }
return new File(dir, "tmp_" + System.currentTimeMillis() + ".ydk"); return new File(dir, "tmp_" + System.currentTimeMillis() + ".ydk");
} else { } else {
IOUtils.createFolder(dir); IOUtils.createFolder(dir);
file=new File(dir,name+".ydk");
} }
return file; return file;
} }
...@@ -196,6 +197,7 @@ public class GameUriManager { ...@@ -196,6 +197,7 @@ public class GameUriManager {
} }
private void doUri(Uri uri) { private void doUri(Uri uri) {
Intent startSeting = new Intent(activity, SettingsActivity.class); Intent startSeting = new Intent(activity, SettingsActivity.class);
if ("file".equals(uri.getScheme()) || "content".equals(uri.getScheme())) { if ("file".equals(uri.getScheme()) || "content".equals(uri.getScheme())) {
File file = toLocalFile(uri); File file = toLocalFile(uri);
......
...@@ -7,6 +7,8 @@ import android.text.TextUtils; ...@@ -7,6 +7,8 @@ import android.text.TextUtils;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import java.util.Locale;
import ocgcore.enums.CardType; import ocgcore.enums.CardType;
public class Card extends CardData implements Parcelable { public class Card extends CardData implements Parcelable {
...@@ -153,11 +155,11 @@ public class Card extends CardData implements Parcelable { ...@@ -153,11 +155,11 @@ public class Card extends CardData implements Parcelable {
} }
public boolean containsName(String key){ public boolean containsName(String key){
return Name != null && Name.contains(key); return Name != null && Name.toLowerCase(Locale.US).contains(key.toLowerCase(Locale.US));
} }
public boolean containsDesc(String key){ public boolean containsDesc(String key){
return Desc != null && Desc.contains(key); return Desc != null && Desc.toLowerCase(Locale.US).contains(key.toLowerCase(Locale.US));
} }
/** /**
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<intent <intent
android:action="android.intent.action.VIEW" android:action="android.intent.action.VIEW"
android:targetClass="cn.garymb.ygomobile.ui.cards.CardSearchAcitivity" android:targetClass="cn.garymb.ygomobile.ui.cards.CardSearchActivity"
android:targetPackage="cn.garymb.ygomobile" /> android:targetPackage="cn.garymb.ygomobile" />
<categories android:name="android.shortcut.conversation" /> <categories android:name="android.shortcut.conversation" />
</shortcut> </shortcut>
......
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