迁移按钮id功能

mobile/build.gradle

@@ -144,4 +144,5 @@ dependencies {
 
     implementation 'com.google.code.gson:gson:2.8.6'
     implementation "androidx.palette:palette:1.0.0"
+    implementation 'com.github.xiaohaibin:XBanner:androidx_v1.2.0'
 }

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

@@ -4,12 +4,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.View;
-import android.widget.Button;
 import android.widget.Toast;
 
 import androidx.annotation.Nullable;
@@ -33,21 +30,14 @@ import cn.garymb.ygomobile.Constants;
 import cn.garymb.ygomobile.bean.Deck;
 import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.loader.ImageLoader;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
-import cn.garymb.ygomobile.ui.activities.WebActivity;
-import cn.garymb.ygomobile.ui.cards.CardDetailRandom;
 import cn.garymb.ygomobile.ui.cards.CardSearchActivity;
 import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
 import cn.garymb.ygomobile.ui.cards.deck.DeckUtils;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
-import cn.garymb.ygomobile.ui.preference.SettingsActivity;
 import cn.garymb.ygomobile.utils.FileLogUtil;
 import cn.garymb.ygomobile.utils.ScreenUtil;
 import cn.garymb.ygomobile.utils.YGOUtil;
-import ocgcore.CardManager;
-import ocgcore.DataManager;
-import ocgcore.data.Card;
 
 public abstract class HomeActivity extends BaseActivity implements OnDuelAssistantListener {
 
@@ -56,11 +46,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
     long exitLasttime = 0;
 
     private DuelAssistantManagement duelAssistantManagement;
-    private CardManager mCardManager;
-    private CardDetailRandom mCardDetailRandom;
-    private ImageLoader mImageLoader;
-    private NavigationUI mNavigationUI;
-    private BottomNavigationView.OnNavigationItemSelectedListener mOnItemSelectedListener;
     private AppBarConfiguration appBarConfiguration;
 
     @Override
@@ -68,8 +53,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
         setExitAnimEnable(false);
-        mImageLoader = new ImageLoader(false);
-        mCardManager = DataManager.get().getCardManager();
 
         QbSdk.PreInitCallback cb = new QbSdk.PreInitCallback() {
             @Override
@@ -108,7 +91,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         // 配置navigation与底部菜单之间的联系
         // 底部菜单的样式里面的item里面的ID与navigation布局里面指定的ID必须相同，否则会出现绑定失败的情况
         appBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.home_fragment,R.id.mycard_fragment,R.id.setting_fragment).build();
+                R.id.home_fragment, R.id.mycard_fragment, R.id.setting_fragment).build();
         // 建立fragment容器的控制器，这个容器就是页面的上的fragment容器
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
         // 启动
@@ -121,7 +104,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
     protected void onResume() {
         super.onResume();
         duelAssistantCheck();
-
     }
 
     @Override
@@ -153,9 +135,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
 
     @Override
     public void onJoinRoom(String host, int port, String password, int id) {
-        if (id == ID_MAINACTIVITY) {
-            //quickjoinRoom(host, port, password);
-        }
     }
 
     @Override
@@ -211,10 +190,8 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        if (doMenu(item.getItemId())) {
-            return true;
-        }
         return super.onOptionsItemSelected(item);
+
     }
 
     @Override
@@ -227,81 +204,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         super.startActivity(intent);
     }
 
-    private boolean doMenu(int id) {
-        switch (id) {
-            case R.id.nav_webpage: {
-                Intent intent = new Intent(Intent.ACTION_VIEW);
-                intent.setData(Uri.parse(BuildConfig.URL_DONATE));
-                startActivity(intent);
-            }
-            break;
-            case R.id.action_game:
-                setRandomCardDetail();
-                if (mCardDetailRandom != null) {
-                    mCardDetailRandom.show();
-                }
-                //openGame();
-                break;
-            case R.id.action_settings: {
-                Intent intent = new Intent(this, SettingsActivity.class);
-                startActivity(intent);
-            }
-            break;
-            case R.id.action_quit: {
-//                AlertDialog.Builder builder = new AlertDialog.Builder(this);
-                DialogPlus builder = new DialogPlus(this);
-                builder.setTitle(R.string.question);
-                builder.setMessage(R.string.quit_tip);
-                builder.setMessageGravity(Gravity.CENTER_HORIZONTAL);
-                builder.setLeftButtonListener((dlg, s) -> {
-                    dlg.dismiss();
-                    finish();
-                });
-                builder.show();
-            }
-            break;
-            case R.id.action_download_ex:
-                WebActivity.open(this, getString(R.string.action_download_expansions), Constants.URL_YGO233_ADVANCE);
-                break;
-            case R.id.action_card_search:
-                startActivity(new Intent(this, CardSearchActivity.class));
-                break;
-            case R.id.action_deck_manager:
-                DeckManagerActivity.start(this, null);
-                break;
-            case R.id.action_join_qq_group:
-                String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";
-                joinQQGroup(key);
-                break;
-            case R.id.action_help: {
-                final DialogPlus dialog = new DialogPlus(getContext());
-                dialog.setContentView(R.layout.dialog_help);
-                dialog.setTitle(R.string.question);
-                dialog.show();
-                View viewDialog = dialog.getContentView();
-                Button btnMasterRule = viewDialog.findViewById(R.id.masterrule);
-                Button btnTutorial = viewDialog.findViewById(R.id.tutorial);
-
-                btnMasterRule.setOnClickListener((v) -> {
-                    WebActivity.open(this, getString(R.string.masterrule), Constants.URL_MASTER_RULE_CN);
-                    dialog.dismiss();
-                });
-                btnTutorial.setOnClickListener((v) -> {
-                    WebActivity.open(this, getString(R.string.help), Constants.URL_HELP);
-                    dialog.dismiss();
-                });
-
-            }
-            break;
-            case R.id.action_reset_game_res:
-                updateImages();
-                break;
-            default:
-                return false;
-        }
-        return true;
-    }
-
     @Override
     public void onBackPressed() {
         if (System.currentTimeMillis() - exitLasttime <= 3000) {
@@ -313,7 +215,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
     }
 
 
-
     protected abstract void checkResourceDownload(ResCheckTask.ResCheckListener listener);
 
     protected abstract void openGame();
@@ -327,19 +228,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         }
     */
 
-    public boolean joinQQGroup(String key) {
-        Intent intent = new Intent();
-        intent.setData(Uri.parse("mqqopensdkapi://bizAgent/qm/qr?url=http%3A%2F%2Fqm.qq.com%2Fcgi-bin%2Fqm%2Fqr%3Ffrom%3Dapp%26p%3Dandroid%26k%3D" + key));
-        // 此Flag可根据具体产品需要自定义，如设置，则在加群界面按返回，返回手Q主界面，不设置，按返回会返回到呼起产品界面    //intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-        try {
-            startActivity(intent);
-            return true;
-        } catch (Exception e) {
-            // 未安装手Q或安装的版本不支持
-            return false;
-        }
-    }
-
     private void saveDeck(String deckMessage, boolean isUrl) {
         DialogPlus dialog = new DialogPlus(this);
         dialog.setTitle(R.string.question);
@@ -375,18 +263,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         });
     }
 
-    public void setRandomCardDetail() {
-        //加载数据库中所有卡片卡片
-        mCardManager.loadCards();
-        //mCardManager = DataManager.get().getCardManager();
-        SparseArray<Card> cards = mCardManager.getAllCards();
-        int y = (int) (Math.random() * cards.size());
-        Card cardInfo = cards.valueAt(y);
-        if (cardInfo == null)
-            return;
-        mCardDetailRandom = CardDetailRandom.genRandomCardDetail(this, mImageLoader, cardInfo);
-    }
-
 /*
     //https://www.jianshu.com/p/99649af3b191
     public void showNewbieGuide(String scene) {

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

 package cn.garymb.ygomobile.ui.home;
 
+import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
+import static cn.garymb.ygomobile.Constants.NETWORK_IMAGE;
+import static cn.garymb.ygomobile.Constants.ORI_DECK;
+import static cn.garymb.ygomobile.ui.home.ResCheckTask.ResCheckListener;
+
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
@@ -16,7 +19,6 @@ import android.widget.Toast;
 import androidx.annotation.NonNull;
 
 import java.io.File;
-import java.io.IOException;
 
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.Constants;
@@ -28,18 +30,7 @@ import cn.garymb.ygomobile.ui.cards.CardFavorites;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
 import cn.garymb.ygomobile.utils.FileUtils;
-import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.NetUtils;
-import cn.garymb.ygomobile.utils.YGOUtil;
-import ocgcore.DataManager;
-
-import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
-import static cn.garymb.ygomobile.Constants.NETWORK_IMAGE;
-import static cn.garymb.ygomobile.Constants.ORI_DECK;
-import static cn.garymb.ygomobile.Constants.ORI_PICS;
-import static cn.garymb.ygomobile.Constants.ORI_REPLAY;
-import static cn.garymb.ygomobile.ui.home.ResCheckTask.ResCheckListener;
-import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
 
 public class MainActivity extends HomeActivity {
     private final String[] PERMISSIONS = {
@@ -239,61 +230,7 @@ public class MainActivity extends HomeActivity {
     }
 
     @Override
-    public void updateImages() {
-        Log.e("MainActivity", "重置资源");
-        DialogPlus dialog = DialogPlus.show(this, null, getString(R.string.message));
-        dialog.show();
-        VUiKit.defer().when(() -> {
-            Log.e("MainActivity", "开始复制");
-            try {
-                IOUtils.createNoMedia(AppsSettings.get().getResourcePath());
-
-                FileUtils.delFile(AppsSettings.get().getResourcePath() + "/" + Constants.CORE_SCRIPT_PATH);
-
-                if (IOUtils.hasAssets(this, getDatapath(Constants.CORE_PICS_ZIP))) {
-                    IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_PICS_ZIP),
-                            AppsSettings.get().getResourcePath(), true);
-                }
-                if (IOUtils.hasAssets(this, getDatapath(Constants.CORE_SCRIPTS_ZIP))) {
-                    IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_SCRIPTS_ZIP),
-                            AppsSettings.get().getResourcePath(), true);
-                }
-                IOUtils.copyFilesFromAssets(this, getDatapath(Constants.DATABASE_NAME),
-                        AppsSettings.get().getResourcePath(), true);
-
-                IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_STRING_PATH),
-                        AppsSettings.get().getResourcePath(), true);
-
-                IOUtils.copyFilesFromAssets(this, getDatapath(Constants.WINDBOT_PATH),
-                        AppsSettings.get().getResourcePath(), true);
-
-                IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_SKIN_PATH),
-                        AppsSettings.get().getCoreSkinPath(), false);
-                String fonts = AppsSettings.get().getResourcePath() + "/" + Constants.FONT_DIRECTORY;
-                if (new File(fonts).list() != null)
-                    FileUtils.delFile(fonts);
-                IOUtils.copyFilesFromAssets(this, getDatapath(Constants.FONT_DIRECTORY),
-                        AppsSettings.get().getFontDirPath(), true);
-                /*
-                IOUtils.copyFilesFromAssets(this, getDatapath(Constants.CORE_SOUND_PATH),
-                        AppsSettings.get().getSoundPath(), false);*/
-
-                //复制原目录文件
-                if (new File(ORI_DECK).list() != null)
-                    FileUtils.copyDir(ORI_DECK, AppsSettings.get().getDeckDir(), false);
-                if (new File(ORI_REPLAY).list() != null)
-                    FileUtils.copyDir(ORI_REPLAY, AppsSettings.get().getResourcePath() + "/" + Constants.CORE_REPLAY_PATH, false);
-                if (new File(ORI_PICS).list() != null)
-                    FileUtils.copyDir(ORI_PICS, AppsSettings.get().getCardImagePath(), false);
-            } catch (IOException e) {
-                e.printStackTrace();
-                Log.e("MainActivity", "错误" + e);
-            }
-        }).done((rs) -> {
-            Log.e("MainActivity", "复制完毕");
-            dialog.dismiss();
-        });
-    }
+    public void updateImages() {}
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {