决斗助手卡查问题修复

去除多于代码

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

@@ -62,17 +62,7 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        try {
-            FileLogUtil.writeAndTime("开始显示");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         if (Build.VERSION.SDK_INT<Build.VERSION_CODES.M|| !startPermissionsActivity()){
-            try {
-                FileLogUtil.writeAndTime("不申请权限");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
             onActivityResult(REQUEST_PERMISSIONS,PermissionsActivity.PERMISSIONS_GRANTED,null);
         }
     }
@@ -221,11 +211,6 @@ public class BaseActivity extends AppCompatActivity {
         String[] PERMISSIONS = getPermissions();
         if (PERMISSIONS == null || PERMISSIONS.length == 0)
             return false;
-        try {
-            FileLogUtil.writeAndTime("申请权限");
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         return PermissionsActivity.startActivityForResult(this, REQUEST_PERMISSIONS, PERMISSIONS);
     }
 

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

@@ -59,11 +59,6 @@ public class PermissionsActivity extends AppCompatActivity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if (getIntent() == null || !getIntent().hasExtra(EXTRA_PERMISSIONS)) {
-            try {
-                FileLogUtil.writeAndTime("所有权限已获取");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
             allPermissionsGranted();
         }else {
             mChecker = PermissionsChecker.getPermissionsChecker(this);
@@ -78,18 +73,9 @@ public class PermissionsActivity extends AppCompatActivity {
             String[] permissions = getPermissions();
             if (mChecker.lacksPermissions(permissions)) {
                 requestPermissions(permissions); // 请求权限
-                try {
-                    FileLogUtil.writeAndTime("onResume请求权限");
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
             } else {
                 allPermissionsGranted(); // 全部权限都已获取
-                try {
-                    FileLogUtil.writeAndTime("onResume所有权限已获取");
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+
             }
         } else {
             isRequireCheck = true;
@@ -124,19 +110,9 @@ public class PermissionsActivity extends AppCompatActivity {
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         if (requestCode == PERMISSION_REQUEST_CODE && hasAllPermissionsGranted(grantResults)) {
-            try {
-                FileLogUtil.writeAndTime("权限请求回调：所有权限已获取");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
             isRequireCheck = true;
             allPermissionsGranted();
         } else {
-            try {
-                FileLogUtil.writeAndTime("权限请求回调：权限未得到");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
             isRequireCheck = false;
             showMissingPermissionDialog(getNoPermission(permissions,grantResults));
         }

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

@@ -51,7 +51,7 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
     private ImageLoader mImageLoader;
 
     private String intentSearchMessage;
-    private boolean isFirstCardSearch = true;
+    private boolean isInitCdbOk = false;
     private String currentCardSearchMessage = "";
     private DuelAssistantManagement duelAssistantManagement;
     private CardDetail mCardDetail;
@@ -62,11 +62,7 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_search);
         duelAssistantManagement = DuelAssistantManagement.getInstance();
-        if (TextUtils.isEmpty(getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE))) {
-
-            currentCardSearchMessage = duelAssistantManagement.getCardSearchMessage();
-
-        }
+        intentSearchMessage = getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE);
         Toolbar toolbar = $(R.id.toolbar);
         setSupportActionBar(toolbar);
         enableBackHome();
@@ -102,25 +98,32 @@ class CardSearchActivityImpl extends BaseActivity implements CardLoader.CallBack
             isLoad = true;
             mCardLoader.loadData();
             mCardSelector.initItems();
-            intentSearch();
-            isFirstCardSearch = false;
+            //数据库初始化完毕后搜索被传入的关键字
+            intentSearch(intentSearchMessage);
+            isInitCdbOk = true;
         });
     }
 
     @Override
     protected void onRestart() {
         super.onRestart();
-        if (!isFirstCardSearch && !currentCardSearchMessage.equals(duelAssistantManagement.getCardSearchMessage())) {
-
-            currentCardSearchMessage = duelAssistantManagement.getCardSearchMessage();
-
-            intentSearch();
+        //数据库初始化完毕并且决斗助手的卡查关键字未被搜索过就卡查
+        if (isInitCdbOk && !currentCardSearchMessage.equals(duelAssistantManagement.getCardSearchMessage())) {
+            intentSearch(null);
         }
     }
 
-    private void intentSearch() {
-//        intentSearchMessage=getIntent().getStringExtra(CardSearchAcitivity.SEARCH_MESSAGE);
-        currentCardSearchMessage = duelAssistantManagement.getCardSearchMessage();
+    private void intentSearch(String searchMessage) {
+        //如果要求搜索的关键字为空，就搜索决斗助手保存的卡查关键字
+        if (TextUtils.isEmpty(searchMessage)){
+            currentCardSearchMessage = duelAssistantManagement.getCardSearchMessage();
+        }else {
+            currentCardSearchMessage=searchMessage;
+        }
+        //卡查关键字为空不卡查
+        if (TextUtils.isEmpty(currentCardSearchMessage))
+            return;
+        mCardSelector.search(currentCardSearchMessage);
     }
 
     protected void setListeners() {

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

@@ -11,6 +11,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
+import android.util.Log;
 import android.util.SparseArray;
 import android.view.Gravity;
 import android.view.Menu;
@@ -161,6 +162,11 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
             handler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
+                    try {
+                        FileLogUtil.writeAndTime("主页决斗助手检查");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                    }
                     duelAssistantManagement.checkClip(ID_MAINACTIVITY);
                 }
             }, 500);
@@ -176,6 +182,11 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     @Override
     public void onJoinRoom(String password, int id) {
         if (id == ID_MAINACTIVITY) {
+            try {
+                FileLogUtil.writeAndTime("主页加房触发");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
             QuickjoinRoom(password);
         }
     }
@@ -183,6 +194,11 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     @Override
     public void onCardSearch(String key, int id) {
         if (id == ID_MAINACTIVITY) {
+            try {
+                FileLogUtil.writeAndTime("主页卡查触发");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
             Intent intent = new Intent(this, CardSearchAcitivity.class);
             intent.putExtra(CardSearchAcitivity.SEARCH_MESSAGE, key);
             startActivity(intent);
@@ -192,6 +208,11 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
     @Override
     public void onSaveDeck(String message, boolean isUrl, int id) {
         if (id == ID_MAINACTIVITY) {
+            try {
+                FileLogUtil.writeAndTime("主页保存卡组触发");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
             saveDeck(message,isUrl);
         }
     }
@@ -214,11 +235,6 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
         ScreenUtil.findNotchInformation(HomeActivity.this, new ScreenUtil.FindNotchInformation() {
             @Override
             public void onNotchInformation(boolean isNotch, int notchHeight, int phoneType) {
-                try {
-                    FileLogUtil.writeAndTime("检查刘海" + isNotch + "   " + notchHeight);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
                 AppsSettings.get().setNotchHeight(notchHeight);
             }
         });

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/mcchat/management/ServiceManagement.java

@@ -125,24 +125,16 @@ public class ServiceManagement {
                 .setSecurityMode(ConnectionConfiguration.SecurityMode.disabled)
                 .setHost("chat.mycard.moe")
                 .build();
-        FileLogUtil.writeAndTime("初始化配置");
         con = new XMPPTCPConnection(config);
-        FileLogUtil.writeAndTime("建立新配置");
         return con;
     }
 
     public boolean login(String name, String password) throws IOException, SmackException, XMPPException, InterruptedException {
-
-        FileLogUtil.writeAndTime("获取配置之前");
         XMPPTCPConnection con = getConnextion(name, password);
-        FileLogUtil.writeAndTime("获取配置完毕");
         con.connect();
-        FileLogUtil.writeAndTime("连接完毕");
         if (con.isConnected()) {
             con.login();
-            FileLogUtil.writeAndTime("登陆完毕");
             con.addConnectionListener(new TaxiConnectionListener());
-            FileLogUtil.writeAndTime("设置监听完毕");
             setIsConnected(true);
             return true;
         }

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

@@ -7,6 +7,10 @@ import android.text.TextUtils;
 
 import com.ourygo.assistant.base.listener.OnClipChangedListener;
 
+import java.io.IOException;
+
+import cn.garymb.ygomobile.utils.FileLogUtil;
+
 public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedListener {
 
     public static final int ID_CLIP_LISTENER=-1;
@@ -59,6 +63,11 @@ public class ClipManagement implements ClipboardManager.OnPrimaryClipChangedList
         if (TextUtils.isEmpty(clipMessage)) {
             return;
         }
+        try {
+            FileLogUtil.writeAndTime("剪贴板监听触发："+clipMessage);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
         if (onClipChangedListener!=null)
             onClipChangedListener.onClipChanged(clipMessage,false,ID_CLIP_LISTENER);
     }