Commit 96a79072 authored by feihuaduo's avatar feihuaduo

修复收起键盘时可能崩溃的问题

修复卡组排序可能崩溃的问题
parent 9a6c142a
...@@ -9,7 +9,7 @@ buildscript { ...@@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.5.3' classpath 'com.android.tools.build:gradle:3.5.3'
//classpath 'me.tatarka:gradle-retrolambda:3.2.5' //classpath 'me.tatarka:gradle-retrolambda:3.2.5'
} }d
} }
ext { ext {
...@@ -23,7 +23,6 @@ allprojects { ...@@ -23,7 +23,6 @@ allprojects {
jcenter() jcenter()
google() google()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url "https://raw.githubusercontent.com/Pgyer/mvn_repo_pgyer/master" }
} }
} }
......
...@@ -884,18 +884,18 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView ...@@ -884,18 +884,18 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
List<File> files = getYdkFiles(); List<File> files = getYdkFiles();
List<SimpleSpinnerItem> items = new ArrayList<>(); List<SimpleSpinnerItem> items = new ArrayList<>();
String name = curYdk != null ? curYdk.getName() : null; String name = curYdk != null ? curYdk.getName() : null;
Collections.sort(files, new Comparator<File>() {
@Override
public int compare(File ydk1, File ydk2) {
if (ydk1.isDirectory() && ydk2.isFile())
return -1;
if (ydk1.isFile() && ydk2.isDirectory())
return 1;
return ydk1.getName().compareTo(ydk2.getName());
}
});
int index = -1; int index = -1;
if (files != null) { if (files != null) {
Collections.sort(files, new Comparator<File>() {
@Override
public int compare(File ydk1, File ydk2) {
if (ydk1.isDirectory() && ydk2.isFile())
return -1;
if (ydk1.isFile() && ydk2.isDirectory())
return 1;
return ydk1.getName().compareTo(ydk2.getName());
}
});
int i = 0; int i = 0;
for (File file : files) { for (File file : files) {
if (name != null && TextUtils.equals(name, file.getName())) { if (name != null && TextUtils.equals(name, file.getName())) {
......
package cn.garymb.ygomobile.ui.mycard.mcchat.util; package cn.garymb.ygomobile.ui.mycard.mcchat.util;
import android.app.Activity; import android.app.Activity;
import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Build; import android.os.Build;
import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.Toast; import android.widget.Toast;
...@@ -22,7 +24,12 @@ public class Util { ...@@ -22,7 +24,12 @@ public class Util {
//关闭输入法 //关闭输入法
public static void closeKeyboard(Activity activity) { public static void closeKeyboard(Activity activity) {
InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE); InputMethodManager inputMethodManager = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
inputMethodManager.hideSoftInputFromWindow((activity).getCurrentFocus().getWindowToken() if (inputMethodManager == null)
return;
View view = activity.getCurrentFocus();
if (view == null)
return;
inputMethodManager.hideSoftInputFromWindow(view.getWindowToken()
, InputMethodManager.HIDE_NOT_ALWAYS); , InputMethodManager.HIDE_NOT_ALWAYS);
} }
...@@ -30,7 +37,7 @@ public class Util { ...@@ -30,7 +37,7 @@ public class Util {
//复制字符串到剪贴板 //复制字符串到剪贴板
public static void fzMessage(Context context, String message) { public static void fzMessage(Context context, String message) {
ClipboardManager cmb = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); ClipboardManager cmb = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
cmb.setText(message);//复制命令 cmb.setPrimaryClip(ClipData.newPlainText(null, message));//复制命令
} }
public static void startDuelService(Context context) { public static void startDuelService(Context context) {
......
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