更新gradle版本到3.4.0

修复无法关闭决斗助手的问题

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         //classpath 'me.tatarka:gradle-retrolambda:3.2.5'
     }
 }

gradle/wrapper/gradle-wrapper.properties

-#Tue Jan 15 19:19:32 CST 2019
+#Mon Apr 29 12:47:40 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

mobile/build.gradle

@@ -101,7 +101,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     //
     implementation(name: 'paysdk-release-1.2.4', ext: 'aar')
-    implementation 'com.pgyersdk:sdk:3.0.4'
+    implementation "com.pgyersdk:sdk:3.0.4"
 
 
 }

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

@@ -220,12 +220,12 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
         };
         //x5内核初始化接口
         QbSdk.initX5Environment(this, cb);
-
         //trpay
         TrPay.getInstance(HomeActivity.this).initPaySdk("e1014da420ea4405898c01273d6731b6", "YGOMobile");
         //autoupadte checking
         checkPgyerUpdateSilent(getContext(), false, false, false);
         //ServiceDuelAssistant
+        if(AppsSettings.get().isServiceDuelAssistant()) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 DialogPlus dialogPlus = PermissionUtil.isNotificationPermission(this);
                 if (dialogPlus == null)
@@ -235,7 +235,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
             } else {
                 startService(new Intent(this, ServiceDuelAssistant.class));
             }
-
+        }
         //萌卡
         StartMycard();
         checkNotch();

mobile/src/main/java/cn/garymb/ygomobile/ui/plus/ServiceDuelAssistant.java

@@ -90,6 +90,7 @@ public class ServiceDuelAssistant extends Service {
 
     private WindowManager.LayoutParams wmParams;
     private WindowManager mWindowManager;
+    private ClipboardManager cm;
 
     @Override
     public IBinder onBind(Intent p1) {
@@ -112,15 +113,20 @@ public class ServiceDuelAssistant extends Service {
     @Override
     public void onDestroy() {
         super.onDestroy();
+        //移除剪贴板监听
+        cm.removePrimaryClipChangedListener(onPrimaryClipChangedListener);
         //关闭悬浮窗时的声明
         stopForeground(true);
     }
 
     private void startClipboardListener() {
-        final ClipboardManager cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+        cm = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
         if (cm == null)
             return;
-        cm.addPrimaryClipChangedListener(new ClipboardManager.OnPrimaryClipChangedListener() {
+        cm.addPrimaryClipChangedListener(onPrimaryClipChangedListener);
+    }
+
+   ClipboardManager.OnPrimaryClipChangedListener onPrimaryClipChangedListener= new ClipboardManager.OnPrimaryClipChangedListener() {
 
         @Override
         public void onPrimaryClipChanged() {
@@ -189,8 +195,7 @@ public class ServiceDuelAssistant extends Service {
                 }
             }
         }
-        });
-    }
+    };
 
     private void startForeground() {
 

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

@@ -181,16 +181,17 @@ public class SettingFragment extends PreferenceFragmentPlus {
             if (preference instanceof CheckBoxPreference) {
                 CheckBoxPreference checkBoxPreference = (CheckBoxPreference) preference;
                 mSharedPreferences.edit().putBoolean(preference.getKey(), checkBoxPreference.isChecked()).apply();
-                //如果事设置额外卡库的选项
+                //如果是设置额外卡库的选项
                 if (preference.getKey().equals(PREF_READ_EX)) {
                     //设置使用额外卡库后重新加载卡片数据
                     DataManager.get().load(true);
                 }
                 //开关决斗助手
                 if (preference.getKey().equals(PREF_START_SERVICEDUELASSISTANT)) {
-                    getActivity().startService(new Intent(getContext(), ServiceDuelAssistant.class));
-                    if (!checkBoxPreference.isChecked()) {
-                        getActivity().stopService(new Intent(getContext(), ServiceDuelAssistant.class));
+                    if (checkBoxPreference.isChecked()) {
+                        getActivity().startService(new Intent(getActivity(), ServiceDuelAssistant.class));
+                    } else {
+                        getActivity().stopService(new Intent(getActivity(), ServiceDuelAssistant.class));
                     }
                 }
                 //如果是音效开关