fix cardcode & cardalias

移除无用activity注册

mobile/src/main/AndroidManifest.xml

@@ -87,14 +87,6 @@
             android:name="cn.garymb.ygomobile.YGOMobileActivity"
             android:theme="@style/AppTheme.Game"
             tools:replace="android:theme" />
-        <activity
-            android:name="cn.garymb.ygomobile.ui.activities.AboutActivity"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:label="@string/settings_about"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
         <activity
             android:name="cn.garymb.ygomobile.ui.preference.SettingsActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
@@ -148,11 +140,6 @@
             android:launchMode="singleTop"
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
-        <activity
-            android:name="cn.garymb.ygomobile.ui.activities.PhotoViewActivity"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme" />
         <activity
             android:name="cn.garymb.ygomobile.ui.mycard.MyCardActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"

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

@@ -68,8 +68,8 @@ public class GameUriManager {
 
     private String getDeckName(Uri uri) {
         String path = uri.getPath();
-        Log.i("kk", "path="+path);
-        if(path != null) {
+        Log.i("kk", "path=" + path);
+        if (path != null) {
             int index = path.lastIndexOf("/");
             if (index > 0) {
                 String name = path.substring(index + 1);
@@ -126,7 +126,7 @@ public class GameUriManager {
             activity.startActivity(startdeck);
         } else if ("content".equals(uri.getScheme())) {
             try {
-                File dir = Constants.COPY_YDK_FILE?new File(AppsSettings.get().getDeckDir()):new File(getActivity().getApplicationInfo().dataDir, "cache");
+                File dir = Constants.COPY_YDK_FILE ? new File(AppsSettings.get().getDeckDir()) : new File(getActivity().getApplicationInfo().dataDir, "cache");
                 File ydk = getDeckFile(dir, getDeckName(uri));
                 ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(uri, "r");
                 if (pfd == null) {

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

@@ -163,10 +163,11 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
         //卡片类型
         holder.cardType.setText(CardUtils.getAllTypeString(item, mStringManager));
         if (holder.codeView != null) {
-            if(item.Alias != 0) {
-                holder.codeView.setText(String.format("%08d", item.Alias));
-            } else {
+            int t = item.Alias - item.Code;
+            if (t > 10 || t < -10) {
                 holder.codeView.setText(String.format("%08d", item.Code));
+            } else {
+                holder.codeView.setText(String.format("%08d", item.Alias));
             }
         }
         bindMenu(holder, position);

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

@@ -242,10 +242,11 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         });
         name.setText(cardInfo.Name);
         desc.setText(cardInfo.Desc);
-        if (cardInfo.Alias != 0) {
-            cardcode.setText(String.format("%08d", cardInfo.Alias));
-        } else {
+        int t = cardInfo.Alias - cardInfo.Code;
+        if (t > 10 || t < -10) {
             cardcode.setText(String.format("%08d", cardInfo.Code));
+        } else {
+            cardcode.setText(String.format("%08d", cardInfo.Alias));
         }
         type.setText(CardUtils.getAllTypeString(cardInfo, mStringManager).replace("/", "|"));
         attrView.setText(mStringManager.getAttributeString(cardInfo.Attribute));

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

@@ -277,10 +277,11 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
                     @Override
                     public void onOpenUrl(Card cardInfo) {
                         String uri;
-                        if (cardInfo.Alias != 0) {
-                            uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Alias);
-                        } else {
+                        int t = cardInfo.Alias - cardInfo.Code;
+                        if (t > 10 || t < -10) {
                             uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Code);
+                        } else {
+                            uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Alias);
                         }
                         WebActivity.open(getContext(), cardInfo.Name, uri);
                     }

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

@@ -403,10 +403,11 @@ class DeckManagerActivityImpl extends BaseCardsAcitivity implements RecyclerView
                     @Override
                     public void onOpenUrl(Card cardInfo) {
                         String uri;
-                        if (cardInfo.Alias != 0) {
-                            uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Alias);
-                        } else {
+                        int t = cardInfo.Alias - cardInfo.Code;
+                        if (t > 10 || t < -10) {
                             uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Code);
+                        } else {
+                            uri = Constants.WIKI_SEARCH_URL + String.format("%08d", cardInfo.Alias);
                         }
                         WebActivity.open(getContext(), cardInfo.Name, uri);
                     }

mobile/src/main/java/com/ourygo/assistant/util/ClipManagement.java

@@ -13,7 +13,7 @@ import cn.garymb.ygomobile.utils.FileLogUtil;
 
 public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedListener {
 
-    public static final int ID_CLIP_LISTENER=-1;
+    public static final int ID_CLIP_LISTENER = -1;
     private static final ClipManagement ourInstance = new ClipManagement();
     private ClipboardManager clipboardManager;
     private OnClipChangedListener onClipChangedListener;
@@ -54,15 +54,15 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
             }
             return null;
         }
-        CharSequence charSequence=clipData.getItemAt(0).getText();
-        if (charSequence!=null)
+        CharSequence charSequence = clipData.getItemAt(0).getText();
+        if (charSequence != null)
             return charSequence.toString();
         return null;
     }
 
-    public void clear(){
+    public void clear() {
         removeClipboardListener();
-        onClipChangedListener=null;
+        onClipChangedListener = null;
     }
 
     @Override
@@ -72,17 +72,17 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
         if (TextUtils.isEmpty(clipMessage)) {
             return;
         }
-        if (onClipChangedListener!=null)
-            onClipChangedListener.onClipChanged(clipMessage,false,ID_CLIP_LISTENER);
+        if (onClipChangedListener != null)
+            onClipChangedListener.onClipChanged(clipMessage, false, ID_CLIP_LISTENER);
     }
 
-    public void onPrimaryClipChanged(boolean isCheck,int id) {
+    public void onPrimaryClipChanged(boolean isCheck, int id) {
         final String clipMessage = getClipMessage();
         //如果复制的内容为空则不执行下面的代码
         if (TextUtils.isEmpty(clipMessage)) {
             return;
         }
-        if (onClipChangedListener!=null)
-            onClipChangedListener.onClipChanged(clipMessage,isCheck,id);
+        if (onClipChangedListener != null)
+            onClipChangedListener.onClipChanged(clipMessage, isCheck, id);
     }
 }