arrange import

mobile/assets/changelog.html

@@ -28,6 +28,10 @@
     1.新版本更新提示对话框；
     2.连锁数字显示；
     3.墓地卡显示状态标签；
+    4.更新安卓系统适配；
+    修复：
+    1.检查更新失败跳转错误的问题；
+    2.若干卡图错误；
 </pre>
 </body>
 </html>
\ No newline at end of file

mobile/build.gradle

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

mobile/src/main/java/cn/garymb/ygomobile/App.java

@@ -5,8 +5,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.support.v7.app.AppCompatDelegate;
 
-import ocgcore.DataManager;
-
 public class App extends GameApplication {
 
     @Override

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/LogoActivity.java

@@ -9,8 +9,8 @@ import android.widget.Toast;
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.lite.BuildConfig;
-import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.home.MainActivity;
 
 public class LogoActivity extends Activity {
     Handler handler;

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/PhotoViewActivity.java

@@ -8,8 +8,8 @@ import android.text.TextUtils;
 
 import java.io.IOException;
 
-import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.loader.ImageLoader;
 import uk.co.senab.photoview.PhotoView;
 
 

mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java

@@ -10,11 +10,11 @@ import com.tubb.smrv.SwipeHorizontalMenuLayout;
 
 import org.greenrobot.eventbus.EventBus;
 
+import cn.garymb.ygomobile.bean.events.CardInfoEvent;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.ui.cards.CardListProvider;
 import cn.garymb.ygomobile.ui.cards.deck.ImageTop;
-import cn.garymb.ygomobile.bean.events.CardInfoEvent;
 import cn.garymb.ygomobile.utils.CardUtils;
 import ocgcore.DataManager;
 import ocgcore.StringManager;

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

@@ -18,7 +18,6 @@ import android.widget.TextView.OnEditorActionListener;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.lite.R;
@@ -26,8 +25,8 @@ 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.LimitManager;
 import ocgcore.DataManager;
+import ocgcore.LimitManager;
 import ocgcore.StringManager;
 import ocgcore.data.CardSet;
 import ocgcore.data.LimitList;

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

@@ -60,8 +60,6 @@ import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.ShareUtil;
 import ocgcore.DataManager;
-import ocgcore.LimitManager;
-import ocgcore.StringManager;
 import ocgcore.data.Card;
 import ocgcore.data.LimitList;
 import ocgcore.enums.LimitType;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckAdapater2.java

@@ -2,7 +2,6 @@ package cn.garymb.ygomobile.ui.cards.deck;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck/DeckViewHolder.java

@@ -7,8 +7,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.loader.ImageLoader;
 
 class DeckViewHolder extends RecyclerView.ViewHolder {
     private long mCardType;

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/deck2/DeckViewHolder.java

@@ -8,7 +8,6 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.loader.ImageLoader;
 import ocgcore.data.Card;
 
 

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

@@ -21,7 +21,6 @@ import java.util.zip.ZipFile;
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.loader.CardLoader;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;

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

@@ -165,6 +165,12 @@ public class MainActivity extends HomeActivity{
                 try {
                     IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_PICS_ZIP),
                             AppsSettings.get().getResourcePath(), true);
+                    IOUtils.copyFilesFromAssets(this, getDatapath(Constants.DATABASE_NAME),
+                            AppsSettings.get().getResourcePath(), true);
+                    IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_SCRIPTS_ZIP),
+                            AppsSettings.get().getResourcePath(), true);
+                    IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_STRING_PATH),
+                            AppsSettings.get().getResourcePath(), true);
                 } catch (IOException e) {
                     e.printStackTrace();
                 }

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

@@ -25,8 +25,8 @@ import cn.garymb.ygomobile.utils.FileUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.SystemUtils;
 import libwindbot.windbot.WindBot;
-import ocgcore.ConfigManager;
 import ocgcore.CardManager;
+import ocgcore.ConfigManager;
 import ocgcore.DataManager;
 
 import static cn.garymb.ygomobile.Constants.ASSETS_PATH;

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/util/ImageUtil.java

 package cn.garymb.ygomobile.ui.mycard.mcchat.util;
+
+import android.content.Context;
 import android.net.Uri;
-import android.widget.*;
-import com.bumptech.glide.*;
-import android.content.*;
-import com.bumptech.glide.load.engine.*;
+import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import cn.garymb.ygomobile.lite.R;
 

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/SettingsActivity.java

@@ -4,8 +4,8 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.Toolbar;
 
-import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.lite.R;
+import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.preference.fragments.SettingFragment;
 
 public class SettingsActivity extends BaseActivity {

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/fragments/AboutFragment.java

 package cn.garymb.ygomobile.ui.preference.fragments;
 
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.net.Uri;
 import android.os.Bundle;
 import android.preference.Preference;
 
 import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.preference.PreferenceFragmentPlus;
 import cn.garymb.ygomobile.utils.AlipayPayUtils;
 import cn.garymb.ygomobile.utils.SystemUtils;

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/DeckGroupView.java

 package cn.garymb.ygomobile.ui.widget;
 
 import android.content.Context;
-import android.content.res.TypedArray;
 import android.support.annotation.AttrRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v4.widget.ViewDragHelper;
 import android.util.AttributeSet;
 import android.util.SparseArray;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;

mobile/src/main/java/cn/garymb/ygomobile/ui/widget/DeckView.java

@@ -3,7 +3,6 @@ package cn.garymb.ygomobile.ui.widget;
 import android.content.Context;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.widget.LinearLayout;
 
 import cn.garymb.ygomobile.bean.DeckInfo;

mobile/src/main/java/ocgcore/ConfigManager.java

@@ -6,7 +6,6 @@ import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;

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

@@ -7,7 +7,6 @@ import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.HashMap;

mobile/src/main/java/ocgcore/StringManager.java

@@ -7,7 +7,6 @@ import java.io.BufferedReader;
 import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collections;