布局规范化

mobile/build.gradle

@@ -8,7 +8,7 @@ android {
         applicationId "cn.garymb.ygomobile"
         minSdkVersion 16
         targetSdkVersion 26
-        versionCode 330701024
+        versionCode 330701025
         versionName "3.3.7"
         flavorDimensions "versionCode"
         vectorDrawables.useSupportLibrary = true

mobile/src/main/java/android/support/v7/widget/RecyclerViewItemListener.java

 package android.support.v7.widget;
 
 import android.support.v4.view.GestureDetectorCompat;
-import android.support.v7.widget.RecyclerView;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.View;

mobile/src/main/java/cn/garymb/ygomobile/loader/ImageLoader.java

@@ -25,13 +25,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.AppsSettings;
+import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.core.IrrlichtBridge;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.utils.BitmapUtil;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearchActivityImpl.java

 package cn.garymb.ygomobile.ui.cards;
 
-import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.widget.DrawerLayout;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardSearcher.java

@@ -4,15 +4,14 @@ package cn.garymb.ygomobile.ui.cards;
 import android.content.Context;
 import android.graphics.Color;
 import android.text.TextUtils;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.KeyEvent;
-import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.TextView.OnEditorActionListener;
@@ -21,15 +20,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 import cn.garymb.ygomobile.AppsSettings;
-import cn.garymb.ygomobile.loader.ICardLoader;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.loader.ICardLoader;
 import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerAdapter;
 import cn.garymb.ygomobile.ui.adapters.SimpleSpinnerItem;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
-import ocgcore.data.CardSet;
-import ocgcore.data.LimitList;
 import ocgcore.LimitManager;
 import ocgcore.StringManager;
+import ocgcore.data.CardSet;
+import ocgcore.data.LimitList;
 import ocgcore.enums.CardAttribute;
 import ocgcore.enums.CardCategory;
 import ocgcore.enums.CardOt;

mobile/src/main/java/cn/garymb/ygomobile/ui/file/FileActivity.java

@@ -16,11 +16,10 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-
 import java.io.File;
 
-import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.activities.BaseActivity;
 
 
 public class FileActivity extends BaseActivity implements AdapterView.OnItemClickListener, AdapterView.OnItemLongClickListener

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -11,7 +11,6 @@ import android.support.design.widget.NavigationView;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.text.TextUtils;
-import android.util.Log;
 import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.Menu;
@@ -23,7 +22,6 @@ import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ListView;
-import android.widget.ProgressBar;
 import android.widget.Toast;
 
 import com.base.bj.trpayjar.utils.TrPay;

mobile/src/main/java/cn/garymb/ygomobile/ui/home/MainActivity.java

@@ -10,7 +10,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
-import android.view.WindowManager;
 
 import java.io.IOException;
 
@@ -29,7 +28,8 @@ import cn.garymb.ygomobile.utils.NetUtils;
 
 import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
 import static cn.garymb.ygomobile.Constants.NETWORK_IMAGE;
-import static cn.garymb.ygomobile.ui.home.ResCheckTask.*;
+import static cn.garymb.ygomobile.ui.home.ResCheckTask.ResCheckListener;
+import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
 
 public class MainActivity extends HomeActivity{
     private GameUriManager mGameUriManager;

mobile/src/main/java/cn/garymb/ygomobile/utils/IOUtils.java

@@ -4,8 +4,8 @@ package cn.garymb.ygomobile.utils;
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.os.Build;
-import android.util.Log;
 import android.text.TextUtils;
+import android.util.Log;
 
 import java.io.Closeable;
 import java.io.File;
@@ -22,6 +22,7 @@ public class IOUtils {
     private static final String TAG = "ioUtils";
 
     public static void close(Closeable closeable) {
+        Log.i("关了没","closeable的值"+ closeable);
         if (closeable != null) {
             try {
                 closeable.close();

mobile/src/main/java/net/kk/xml/Reflect.java

 package net.kk.xml;
 
 import net.kk.xml.annotations.XmlAttribute;
-import net.kk.xml.annotations.XmlIgnore;
-import net.kk.xml.annotations.XmlElementText;
 import net.kk.xml.annotations.XmlElement;
+import net.kk.xml.annotations.XmlElementText;
+import net.kk.xml.annotations.XmlIgnore;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;

mobile/src/main/java/net/kk/xml/XmlCore.java

@@ -3,9 +3,9 @@ package net.kk.xml;
 import net.kk.xml.adapter.XmlConstructorAdapter;
 import net.kk.xml.adapter.XmlTextAdapter;
 import net.kk.xml.annotations.XmlAttribute;
+import net.kk.xml.annotations.XmlElement;
 import net.kk.xml.annotations.XmlElementText;
 import net.kk.xml.bean.TagObject;
-import net.kk.xml.annotations.XmlElement;
 
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;

mobile/src/main/java/net/kk/xml/XmlReader.java

 package net.kk.xml;
 
-import net.kk.xml.bean.AttributeObject;
 import net.kk.xml.adapter.XmlTextAdapter;
 import net.kk.xml.annotations.XmlElement;
+import net.kk.xml.bean.AttributeObject;
 import net.kk.xml.bean.TagObject;
 
 import org.xmlpull.v1.XmlPullParser;

mobile/src/main/java/ocgcore/LimitManager.java

 package ocgcore;
 
-import android.text.TextUtils;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -12,11 +11,10 @@ import java.util.List;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.utils.IOUtils;
-import cn.garymb.ygomobile.utils.MD5Util;
 import ocgcore.data.LimitList;
 
-import static cn.garymb.ygomobile.Constants.CORE_LIMIT_PATH;
 import static cn.garymb.ygomobile.Constants.CORE_CUSTOM_LIMIT_PATH;
+import static cn.garymb.ygomobile.Constants.CORE_LIMIT_PATH;
 
 public class LimitManager {
     private static LimitManager sManager = new LimitManager();

mobile/src/main/java/ocgcore/handler/CardManager.java

@@ -56,6 +56,7 @@ public class CardManager {
                 });
                 //读取全部卡片
                 if (files != null) {
+                    Log.i("数量","数量" + files.length);
                     for (File file : files) {
                         final String path = file.getAbsolutePath();
                         String md5 = MD5Util.getFileMD5(path);

mobile/src/main/res/layout/activity_deck_cards2.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

mobile/src/main/res/layout/activity_deck_cards3.xml

 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 

mobile/src/main/res/layout/dialog_room_name.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">

mobile/src/main/res/layout/dialog_server_edit.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">

mobile/src/main/res/layout/item_deck_card2.xml

 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">

mobile/src/main/res/layout/item_search_card.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

mobile/src/main/res/layout/item_search_card2.xml

 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

mobile/src/main/res/menu/deck_menu.xml

 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/action_search"

mobile/src/test/java/tests/A.java

 package tests;
 
-import org.junit.Test;
-
-import java.util.Locale;
-
 public class A {
 
     /*@Test