整理导包清除无用活动

mobile/assets/changelog.html

@@ -17,22 +17,12 @@
     特别感谢： 菜菜,尸体,废话多,大毛,龙道香姐,晓L,幻兽L 的支持与努力.
 </pre>
 <ul>
-    <li style="color:#ffff00">3.3.10</li>
+    <li style="color:#ffff00">3.3.11</li>
 </ul>
 <pre>
     更新：
     1.更新ygo内核；
-    2.新卡SD35+18SP；
-    3.额外卡库脚本可开启优先使用；
-    4.2019.1禁卡表（OCG）；
-    5.2018.12禁卡表（TCG）；
-    优化：
-    1.完善机型适配；
-    2.完善权限申请提示；
-    3.改进屏幕校准；
-    新增：
-    1.崩溃产生日志在ygocore/log；
-    2.长按萌卡平台按钮可看到调试日志；
+    2.新卡20TH+19PP+JF19+VJ；
 </pre>
 </body>
 </html>
\ No newline at end of file

mobile/src/main/AndroidManifest.xml

@@ -178,44 +178,25 @@
     <!-- 为防止Service被系统回收，可以尝试通过提高服务的优先级解决，1000是最高优先级，数字越小，优先级越低 -->
     <!--android:priority="1000"-->
         <activity
-            android:name="com.base.bj.trpayjar.TrPayAcitivity"
+            android:name="com.base.bj.paysdk.TrPayAcitivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:exported="false"
+            android:exported="true"
             android:launchMode="singleTask"
             android:screenOrientation="behind"
             android:windowSoftInputMode="adjustResize|stateHidden" >
         </activity>
         <activity
-            android:name="com.base.bj.trpayjar.TrPayUnionAcitivity"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:exported="false"
-            android:windowSoftInputMode="adjustResize|stateHidden" >
-        </activity>
-        <activity
-            android:name="com.base.bj.trpayjar.TrSelectListActivity"
+            android:name="com.base.bj.paysdk.TrPayUnionAcitivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:exported="false"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize|stateHidden" >
         </activity>
-        <!-- alipay sdk begin -->
         <activity
-            android:name="com.alipay.sdk.app.H5PayActivity"
+            android:name="com.base.bj.paysdk.TrSelectListActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:exported="false"
-            android:screenOrientation="behind"
-            android:windowSoftInputMode="adjustResize|stateHidden" >
-        </activity>
-        <activity
-            android:name="com.alipay.sdk.app.H5AuthActivity"
-            android:configChanges="orientation|keyboardHidden|navigation"
-            android:exported="false"
-            android:screenOrientation="behind"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize|stateHidden" >
         </activity>
-        <provider
-            android:name="com.pgyersdk.PgyerProvider"
-            android:authorities="${applicationId}.com.pgyer.provider"
-            android:exported="false"/>
         <meta-data
             android:name="PGYER_APPID"
             android:value="${PGYER_APPID}" >

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

@@ -2,12 +2,9 @@ package cn.garymb.ygomobile.ui.preference.fragments;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.graphics.Color;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -19,7 +16,6 @@ import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.Toast;
@@ -27,16 +23,10 @@ import android.widget.Toast;
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.signature.StringSignature;
-import com.pgyersdk.update.DownloadFileListener;
-import com.pgyersdk.update.PgyUpdateManager;
-import com.pgyersdk.update.UpdateManagerListener;
-import com.pgyersdk.update.javabean.AppBean;
-
 
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 
@@ -58,6 +48,7 @@ import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
 import static cn.garymb.ygomobile.Constants.CORE_SKIN_AVATAR_SIZE;
 import static cn.garymb.ygomobile.Constants.CORE_SKIN_BG_SIZE;
 import static cn.garymb.ygomobile.Constants.CORE_SKIN_CARD_COVER_SIZE;
+import static cn.garymb.ygomobile.Constants.PERF_TEST_REPLACE_KERNEL;
 import static cn.garymb.ygomobile.Constants.PREF_CHANGE_LOG;
 import static cn.garymb.ygomobile.Constants.PREF_CHECK_UPDATE;
 import static cn.garymb.ygomobile.Constants.PREF_DECK_DELETE_DILAOG;
@@ -79,7 +70,6 @@ import static cn.garymb.ygomobile.Constants.PREF_USE_EXTRA_CARD_CARDS;
 import static cn.garymb.ygomobile.Constants.SETTINGS_AVATAR;
 import static cn.garymb.ygomobile.Constants.SETTINGS_CARD_BG;
 import static cn.garymb.ygomobile.Constants.SETTINGS_COVER;
-import static cn.garymb.ygomobile.Constants.PERF_TEST_REPLACE_KERNEL;
 import static cn.garymb.ygomobile.ui.home.ResCheckTask.getDatapath;
 
 public class SettingFragment extends PreferenceFragmentPlus {
@@ -87,7 +77,26 @@ public class SettingFragment extends PreferenceFragmentPlus {
     private static final int COPY_SO_OK = 0;
     private static final int COPY_SO_EXCEPTION = 1;
     private static final int COPY_SO_NO_ROOT = 2;
-
+    @SuppressLint("HandlerLeak")
+    Handler handler = new Handler() {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            switch (msg.what) {
+                case COPY_SO_OK:
+                    Toast.makeText(getActivity(), "替换成功", Toast.LENGTH_SHORT).show();
+                    break;
+                case COPY_SO_EXCEPTION:
+                    Toast.makeText(getActivity(), "替换失败，原因为" + msg.obj, Toast.LENGTH_SHORT).show();
+                    break;
+                case COPY_SO_NO_ROOT:
+                    Toast.makeText(getActivity(), "没有root权限", Toast.LENGTH_SHORT).show();
+                    break;
+            }
+        }
+    };
+    private AppsSettings mSettings;
+    private boolean isInit = true;
     public SettingFragment() {
 
     }
@@ -97,9 +106,6 @@ public class SettingFragment extends PreferenceFragmentPlus {
         return AppsSettings.get().getSharedPreferences();
     }
 
-    private AppsSettings mSettings;
-    private boolean isInit = true;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -372,8 +378,8 @@ public class SettingFragment extends PreferenceFragmentPlus {
                     try {
                         String cmd = "chmod -R 777 " + soFile.getAbsolutePath();
                         process = Runtime.getRuntime().exec("su"); //切换到root帐号
-                        if (process==null){
-                            me.what=COPY_SO_NO_ROOT;
+                        if (process == null) {
+                            me.what = COPY_SO_NO_ROOT;
                             handler.sendMessage(me);
                             return;
                         }
@@ -399,7 +405,7 @@ public class SettingFragment extends PreferenceFragmentPlus {
                                 e.printStackTrace();
                             }
                         }
-                        if (process!=null)
+                        if (process != null)
                             process.destroy();
 
                     }
@@ -412,25 +418,6 @@ public class SettingFragment extends PreferenceFragmentPlus {
         }
     }
 
-    @SuppressLint("HandlerLeak")
-    Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            super.handleMessage(msg);
-            switch (msg.what) {
-                case COPY_SO_OK:
-                    Toast.makeText(getActivity(), "替换成功", Toast.LENGTH_SHORT).show();
-                    break;
-                case COPY_SO_EXCEPTION:
-                    Toast.makeText(getActivity(), "替换失败，原因为" + msg.obj, Toast.LENGTH_SHORT).show();
-                    break;
-                case COPY_SO_NO_ROOT:
-                    Toast.makeText(getActivity(),"没有root权限",Toast.LENGTH_SHORT).show();
-                    break;
-            }
-        }
-    };
-
     private void showImageDialog(Preference preference, String title, String outFile, boolean isJpeg, int outWidth, int outHeight) {
         int width = getResources().getDisplayMetrics().widthPixels;
         //DialogPlus builder = new DialogPlus(getActivity());