2.3

更新TBS服务sdk
更新广点通sdk
更新友盟sdk
更新glide框架
修复mod页面低栏在全面屏异常显示问题
修复Android10闪退问题
允许在没有权限的情况下使用盒子
将jianRMG文件夹移至私有目录中

.idea/codeStyles/Project.xml

@@ -0,0 +1,116 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/misc.xml

@@ -25,7 +25,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

RefreshRecyclerView/build.gradle

@@ -19,7 +19,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:recyclerview-v7:25.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }
 
 ext {

RefreshRecyclerView/src/main/java/cn/lemon/view/RefreshRecyclerView.java

@@ -2,16 +2,17 @@ package cn.lemon.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
-import android.support.annotation.ColorRes;
+import androidx.annotation.ColorRes;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.TextView;
+
 import java.util.ArrayList;
 import java.util.List;
 import cn.lemon.view.adapter.Action;

RefreshRecyclerView/src/main/java/cn/lemon/view/SpaceItemDecoration.java

@@ -1,7 +1,7 @@
 package cn.lemon.view;
 
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 /**
  * Created by linlongxin on 2015/12/19.

RefreshRecyclerView/src/main/java/cn/lemon/view/adapter/BaseViewHolder.java

@@ -1,7 +1,7 @@
 package cn.lemon.view.adapter;
 
-import android.support.annotation.IdRes;
+import androidx.annotation.IdRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

RefreshRecyclerView/src/main/java/cn/lemon/view/adapter/RecyclerAdapter.java

@@ -2,8 +2,8 @@ package cn.lemon.view.adapter;
 
 import android.content.Context;
 import android.os.Message;
-import android.support.annotation.LayoutRes;
+import androidx.annotation.LayoutRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;

RefreshRecyclerView/src/main/res/layout/view_refresh_recycler.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/lemon_refresh_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
     <!-- 避免 id 命名冲突 -->
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/lemon_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-</android.support.v4.widget.SwipeRefreshLayout>
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

app/build.gradle

@@ -1,28 +1,28 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         //applicationId "com.yutou.jianrmg_v2"
         applicationId "com.yutou.jianr_mg"
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 2
-        versionName "2.2"
+        versionName "2.3"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         ndk {
             abiFilters "armeabi", "armeabi-v7a", "x86", "mips"
         }
     }
     signingConfigs {
         release {
-            storeFile file('D:\\AndroidKeys\\yutou.jks')
+            storeFile file('/media/yutou/_dde_data/AndroidKeys/yutou.jks')
             storePassword '34864394'
             keyAlias 'yutou'
             keyPassword '34864394'
         }
         debug {
-            storeFile file('D:\\AndroidKeys\\yutou.jks')
+            storeFile file('/media/yutou/_dde_data/AndroidKeys/yutou.jks')
             storePassword '34864394'
             keyAlias 'yutou'
             keyPassword '34864394'
@@ -55,16 +55,12 @@ configurations.all {
     }
 }
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
     //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
-    //implementation 'com.android.support:design:26.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
     //okhttp
     implementation 'com.squareup.okhttp3:okhttp:3.11.0'
@@ -125,16 +121,16 @@ dependencies {
     implementation 'com.github.arcadefire:nice-spinner:1.3.4'
 
     //glide
-    implementation 'com.github.bumptech.glide:glide:4.9.0'
+    implementation 'com.github.bumptech.glide:glide:4.10.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.10.0'
 
     //友盟
-    implementation 'com.umeng.umsdk:analytics:8.0.0'
+    implementation 'com.umeng.umsdk:analytics:8.1.3'
     implementation 'com.umeng.umsdk:common:2.0.0'
 
     //友盟推动
     implementation 'com.umeng.umsdk:utdid:1.1.5.3'
-    implementation 'com.umeng.umsdk:push:5.0.2'
+    implementation 'com.umeng.umsdk:push:6.0.1'
 
     /*   api project(path: ':BaseModel')
                     api project(path: ':GameDataModel')
@@ -142,11 +138,15 @@ dependencies {
                     api project(path: ':MgListModel')
                     api project(path: ':ResModl')
                     api project(path: ':UserModel')*/
-    implementation files('libs/tbs_sdk_thirdapp_v3.6.0.1371_43624_sharewithdownload_withoutGame_obfs_20181106_121046.jar')
+
     //七牛云
     implementation 'com.qiniu:qiniu-android-sdk:7.3.15'
+
     //zip4j
-    implementation group: 'net.lingala.zip4j', name: 'zip4j', version: '1.3.3'
+    implementation 'net.lingala.zip4j:zip4j:1.3.3'
+
     //卡顿检测
+
     // implementation 'com.github.markzhai:blockcanary-android:1.5.0'
+    implementation files('libs/tbs_sdk_thirdapp_v4.3.0.1148_43697_sharewithdownloadwithfile_withoutGame_obfs_20190805_175505.jar')
 }

app/src/main/java/Interfaces/BaseFragmeneInerface.java

@@ -2,7 +2,7 @@ package Interfaces;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/yutou/jianr_mg/Adapters/ModRecyclerAdapter.java

@@ -2,7 +2,7 @@ package com.yutou.jianr_mg.Adapters;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.v7.widget.PopupMenu;
+import androidx.appcompat.widget.PopupMenu;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,7 +16,6 @@ import com.yutou.jianr_mg.Data.TMod;
 import com.yutou.jianr_mg.Data.TModtype;
 import com.yutou.jianr_mg.Data.ZsShipType;
 import com.yutou.jianr_mg.Interfaces.HttpInterface;
-import com.yutou.jianr_mg.Interfaces.ModInterface;
 import com.yutou.jianr_mg.Network.HttpApi;
 import com.yutou.jianr_mg.Network.HttpUtils;
 import com.yutou.jianr_mg.R;
@@ -141,7 +140,12 @@ public class ModRecyclerAdapter extends RecyclerAdapter<TMod> {
         @Override
         public void setData(TMod data) {
             super.setData(data);
+            try {
                 imageLoader.displayImage(AppData.appConfig.getDownloadhome() + data.getIcon(), icon);
+            }catch (Exception e){
+                e.printStackTrace();
+            }
+
             title.setText(data.getTitle());
         }
 

app/src/main/java/com/yutou/jianr_mg/Adapters/ViewPagerAdapter.java

@@ -1,8 +1,8 @@
 package com.yutou.jianr_mg.Adapters;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.fragment.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.List;
 

app/src/main/java/com/yutou/jianr_mg/Application.java

@@ -110,7 +110,8 @@ public class Application extends android.app.Application {
                     Log.e("QDSDK", "加载内核是否成功:" + b);
                 }
             });
-        } catch (Exception ignored) {
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
     }

app/src/main/java/com/yutou/jianr_mg/Data/SystemData.java

@@ -4,7 +4,7 @@ import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 
 import com.yutou.jianr_mg.Application;
@@ -25,7 +25,7 @@ public class SystemData {
 
     public SystemData() {
         if (Utils.getApplicationPackName(Application.application, AppData.magicPackageName)
-                || new File(Utils.getSDCardPath() + "Android/data/com.huanmeng.zhanjian2/files/MagicBox/").exists()) {
+                || new File( "/sdcard/Android/data/com.huanmeng.zhanjian2/files/MagicBox/").exists()) {
             isInstallClient = true;
         } else {
             isInstallClient = false;

app/src/main/java/com/yutou/jianr_mg/Data/TMod.java

@@ -1,6 +1,6 @@
 package com.yutou.jianr_mg.Data;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class TMod implements  Comparable<TMod>{
 

app/src/main/java/com/yutou/jianr_mg/Fragments/GameData.java

@@ -2,19 +2,14 @@ package com.yutou.jianr_mg.Fragments;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.LinearLayout;
 
 
-import com.github.mikephil.charting.charts.PieChart;
-import com.github.mikephil.charting.data.PieData;
-import com.github.mikephil.charting.data.PieDataSet;
-import com.github.mikephil.charting.data.PieEntry;
 import com.yutou.jianr_mg.Adapters.ViewPagerAdapter;
 import com.yutou.jianr_mg.Fragments.GameDataFragments.DropFragment;
 import com.yutou.jianr_mg.Fragments.GameDataFragments.WarFragment;
@@ -23,7 +18,6 @@ import com.yutou.jianr_mg.R;
 import java.util.ArrayList;
 import java.util.List;
 
-import Interfaces.BaseFragmeneInerface;
 import me.majiajie.pagerbottomtabstrip.NavigationController;
 import me.majiajie.pagerbottomtabstrip.PageNavigationView;
 import me.majiajie.pagerbottomtabstrip.listener.OnTabItemSelectedListener;

app/src/main/java/com/yutou/jianr_mg/Fragments/GameDataFragments/DropFragment.java

@@ -2,10 +2,10 @@ package com.yutou.jianr_mg.Fragments.GameDataFragments;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.util.ArrayMap;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -28,12 +28,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
-import java.util.Timer;
 
 import cn.lemon.view.RefreshRecyclerView;
-import cn.lemon.view.adapter.Action;
 
 public class DropFragment extends Fragment {
     private static DropFragment fragment;

app/src/main/java/com/yutou/jianr_mg/Fragments/GameDataFragments/WarFragment.java

@@ -1,23 +1,21 @@
 package com.yutou.jianr_mg.Fragments.GameDataFragments;
 
 import android.os.Bundle;
-import android.os.Handler;
+
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 
-import com.yutou.jianr_mg.Adapters.GameDataAdapters.DropAdapter;
 import com.yutou.jianr_mg.Adapters.GameDataAdapters.WarAdapter;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Databases.JianRDataDataBase;
 import com.yutou.jianr_mg.R;
-import com.yutou.jianr_mg.Tools.Utils;
 
 import org.angmarch.views.NiceSpinner;
 import org.json.JSONObject;

app/src/main/java/com/yutou/jianr_mg/Fragments/GameDataFragments/WarLogFragments/DaytimeFragment.java

@@ -1,9 +1,9 @@
 package com.yutou.jianr_mg.Fragments.GameDataFragments.WarLogFragments;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/yutou/jianr_mg/Fragments/GameDataFragments/WarLogFragments/NightFragment.java

@@ -1,6 +1,6 @@
 package com.yutou.jianr_mg.Fragments.GameDataFragments.WarLogFragments;
 
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 
 public class NightFragment extends Fragment {
 }

app/src/main/java/com/yutou/jianr_mg/Fragments/Home.java

@@ -2,10 +2,10 @@ package com.yutou.jianr_mg.Fragments;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.LinearLayoutCompat;
+import androidx.appcompat.widget.LinearLayoutCompat;
-import android.support.v7.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/yutou/jianr_mg/Fragments/MGList.java

@@ -2,10 +2,10 @@ package com.yutou.jianr_mg.Fragments;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutCompat;
+import androidx.appcompat.widget.LinearLayoutCompat;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/yutou/jianr_mg/Fragments/ModListFragmentData.java

@@ -3,8 +3,8 @@ package com.yutou.jianr_mg.Fragments;
 import android.app.Activity;
 import android.content.Context;
 import android.os.Handler;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
-import android.support.v7.widget.LinearLayoutCompat;
+import androidx.appcompat.widget.LinearLayoutCompat;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/com/yutou/jianr_mg/Fragments/ModListFragment_0.java

@@ -1,8 +1,8 @@
 package com.yutou.jianr_mg.Fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/yutou/jianr_mg/Fragments/ModListFragment_1.java

@@ -1,8 +1,8 @@
 package com.yutou.jianr_mg.Fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/yutou/jianr_mg/Fragments/ModListFragment_2.java

@@ -1,8 +1,8 @@
 package com.yutou.jianr_mg.Fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/yutou/jianr_mg/Fragments/My.java

@@ -1,12 +1,10 @@
 package com.yutou.jianr_mg.Fragments;
 
-import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.view.Gravity;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -14,7 +12,6 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.bumptech.glide.Glide;
 import com.nostra13.universalimageloader.core.ImageLoader;
@@ -22,9 +19,7 @@ import com.yutou.jianr_mg.Adapters.MyItemGridViewAdapter;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Data.UUserdata;
 import com.yutou.jianr_mg.Data.User;
-import com.yutou.jianr_mg.Network.HttpApi;
 import com.yutou.jianr_mg.R;
-import com.yutou.jianr_mg.Tools.Log;
 import com.yutou.jianr_mg.Tools.Utils;
 import com.yutou.jianr_mg.views.UserDataActivity;
 
@@ -32,7 +27,6 @@ import com.yutou.jianr_mg.views.UserDataActivity;
 import java.util.ArrayList;
 import java.util.List;
 
-import Interfaces.BaseFragmeneInerface;
 import jp.wasabeef.glide.transformations.BlurTransformation;
 
 import static com.bumptech.glide.request.RequestOptions.bitmapTransform;

app/src/main/java/com/yutou/jianr_mg/Fragments/Test.java

@@ -1,23 +1,18 @@
 package com.yutou.jianr_mg.Fragments;
 
 import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
 import android.os.Bundle;
-import android.os.IBinder;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.PopupMenu;
+import androidx.appcompat.widget.PopupMenu;
 import android.view.Gravity;
 import android.view.LayoutInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.yutou.jianr_mg.R;
 import com.yutou.jianr_mg.services.DownloadService;
 
 /**

app/src/main/java/com/yutou/jianr_mg/Fragments/UtilsFragments.java

@@ -3,10 +3,10 @@ package com.yutou.jianr_mg.Fragments;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -88,6 +88,7 @@ public class UtilsFragments extends Fragment {
                         JSONObject json=new JSONObject(string);
                         datas= JSON.parseArray(json.getJSONArray("data").toString(),MAppTools.class);
                         setLocalData();
+                        debug();
                         handler.post(()->setData());
                     }catch (Exception e){
                         e.printStackTrace();
@@ -101,6 +102,10 @@ public class UtilsFragments extends Fragment {
         }catch (Exception e){
             e.printStackTrace();
         }
+    }
+    private void debug(){
+
+
     }
     private Map<String, DexClassLoader> map;
     private void setLocalData(){

app/src/main/java/com/yutou/jianr_mg/LoadingActivity.java

@@ -9,11 +9,11 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
@@ -29,7 +29,6 @@ import com.qq.e.ads.splash.SplashAD;
 import com.qq.e.ads.splash.SplashADListener;
 import com.qq.e.comm.util.AdError;
 import com.umeng.analytics.MobclickAgent;
-import com.umeng.message.UmengMessageHandler;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Data.MAdConfig;
 import com.yutou.jianr_mg.Data.MGamePackname;
@@ -338,7 +337,6 @@ public class LoadingActivity extends AppCompatActivity {
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
-
         if (AppData.appConfig != null && !AppData.appConfig.getApkVersion().equals(code)) {
             MaterialDialog dialog = new MaterialDialog(this);
             dialog.setTitle("检测到更新");
@@ -443,11 +441,13 @@ public class LoadingActivity extends AppCompatActivity {
                 dialog.setTitle(">__<");
                 dialog.setMessage("缺少起床的必要权限哦！");
                 dialog.setNegativeButton("不给", view -> {
-                    Utils.toast(LoadingActivity.this, "哼，小气");
+                    Utils.toast(LoadingActivity.this, "哼，小气(可能会发生意外闪退问题）");
-                    handler.postDelayed(() -> {
+                   /* handler.postDelayed(() -> {
                         ActivitysManager.AppExit(LoadingActivity.this);
                         dialog.dismiss();
-                    }, 300);
+                    }, 300);*/
+                   dialog.dismiss();
+                    ready(1);
                 });
                 dialog.setPositiveButton("拿去吧", view -> {
                     ActivityCompat.requestPermissions(LoadingActivity.this, AppPermissions.permissions, AppPermissions.REQUEST_CODE);
@@ -455,6 +455,7 @@ public class LoadingActivity extends AppCompatActivity {
                 });
                 dialog.show();
             } else {
+                Utils.isPermissions=true;
                 ready(1);
             }
         }
@@ -466,7 +467,7 @@ public class LoadingActivity extends AppCompatActivity {
             return;
         }
         AdTools.upload(AdTools.Open,AdTools.req);
-        new SplashAD(this, adLayout, ad.getAppid(), ad.getPosid(), new SplashADListener() {
+       SplashAD splashAD= new SplashAD(this, ad.getAppid(), ad.getPosid(), new SplashADListener() {
             @Override
             public void onADDismissed() {
                 start();
@@ -497,6 +498,7 @@ public class LoadingActivity extends AppCompatActivity {
                 AdTools.upload(AdTools.Open,AdTools.show);
             }
         });
+        splashAD.fetchAndShowIn(adLayout);
 
     }
 

app/src/main/java/com/yutou/jianr_mg/MainActivity.java

@@ -2,9 +2,9 @@ package com.yutou.jianr_mg;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.widget.Toast;
 

app/src/main/java/com/yutou/jianr_mg/Network/HttpApi.java

@@ -5,11 +5,11 @@ package com.yutou.jianr_mg.Network;
  */
 
 public class HttpApi {
-  // public static final String HOME="http://jianr.jianrmod.cn/";
+  public static final String HOME="http://jianr.jianrmod.cn/";
     //public static final String HOME = "http://192.168.31.240:8088/"; //zzz_gz wifi
   //  public static final String HOME = "http://192.168.43.68:8088/"; //zzz_gz wifi
    //public static final String HOME = "http://192.168.137.1:8088/"; //笔记本本身WIFI
-  public static final String HOME = "http://192.168.1.84:8088/"; //公司
+  //public static final String HOME = "http://192.168.1.84:8088/"; //公司
        public static final String HOME_URL=HOME+"android/"; //服务器
 
     public static final String MOD_ALL = "mod/all.do";

app/src/main/java/com/yutou/jianr_mg/Network/HttpUtils.java

@@ -1,6 +1,7 @@
 package com.yutou.jianr_mg.Network;
 
 
+import com.yutou.jianr_mg.Application;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Interfaces.DownloadFileInerface;
 import com.yutou.jianr_mg.Interfaces.HttpInterface;
@@ -155,6 +156,7 @@ public class HttpUtils {
                 } catch (Exception e) {
                     e.printStackTrace();
                     AppData.handler.post(() -> downloadFileInerface.over(false));
+                    Utils.toast(Application.application,"下载文件发生错误！");
                 }
             }
         });

app/src/main/java/com/yutou/jianr_mg/Tools/ModUtils.java

@@ -13,6 +13,7 @@ import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
 import com.kaopiz.kprogresshud.KProgressHUD;
+import com.yutou.jianr_mg.Application;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Data.MGamePackname;
 import com.yutou.jianr_mg.Data.TMod;
@@ -261,7 +262,13 @@ public class ModUtils {
             }else{
                 order.put("args",new String[]{srcs.get(i).getAbsolutePath(),"files:" + paths.get(i).replace("/files/","")+srcs.get(i).getName()});
             }
-            MagicBoxService.init().setOrder(order, data -> { //先备份
+           MagicBoxService service= MagicBoxService.init();
+            if(service==null){
+                Utils.toast(Application.application,"没有安装专用客户端");
+                modInterface.onAction(false,0);
+                return;
+            }
+            service.setOrder(order, data -> { //先备份
                 try {
                     if(!isBackup){//如果不需要备份则按照安装逻辑进行
                         i++;

app/src/main/java/com/yutou/jianr_mg/Tools/MyFileProvider.java

@@ -1,6 +1,6 @@
 package com.yutou.jianr_mg.Tools;
 
-import android.support.v4.content.FileProvider;
+import androidx.core.content.FileProvider;
 
 public class MyFileProvider extends FileProvider {
 }

app/src/main/java/com/yutou/jianr_mg/Tools/Utils.java

@@ -7,8 +7,9 @@ import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Environment;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 import android.util.Base64;
 import android.util.DisplayMetrics;
@@ -18,10 +19,10 @@ import android.widget.Toast;
 import com.alibaba.fastjson.JSON;
 import com.kaopiz.kprogresshud.KProgressHUD;
 import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
+import com.nostra13.universalimageloader.cache.memory.impl.WeakMemoryCache;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
-import com.nostra13.universalimageloader.core.assist.QueueProcessingType;
 import com.yutou.jianr_mg.Application;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Data.MGamePackname;
@@ -56,6 +57,7 @@ import java.util.List;
 
 public class Utils {
     private static final String TAG = "Utils";
+    public static boolean isPermissions=false;
 
     public static int getPixelsFromDp(Activity activity, int size) {
         DisplayMetrics metrics = new DisplayMetrics();
@@ -82,12 +84,12 @@ public class Utils {
     }
 
     public static String getSDCardPath() {
-        String path = Environment.getExternalStorageDirectory().getPath() + "/";
+        String path = Application.application.getFilesDir() + "/";
         return path;
     }
 
     public static String getAppPath() {
-        String path = Environment.getExternalStorageDirectory().getPath() + "/jianRMG";
+        String path = Application.application.getFilesDir() + "/jianRMG";
         return path;
     }
 
@@ -107,7 +109,6 @@ public class Utils {
         if (!cachePath.exists()) {
             cachePath.exists();
         }
-        //builder.memoryCache(new WeakMemoryCache());
         builder.diskCache(new UnlimitedDiskCache(cachePath));
         builder.defaultDisplayImageOptions(initDisplayOptions());
 
@@ -216,7 +217,7 @@ public class Utils {
         }
     }
 
-    public static boolean writerFile(String srcFile, String data) {
+    static boolean writerFile(String srcFile, String data) {
         File file = new File(srcFile);
         File path = new File(file.getAbsolutePath().split(file.getName())[0]);
         if (!path.exists()) {
@@ -234,7 +235,7 @@ public class Utils {
         return false;
     }
 
-    public static String readFile(String srcFile) {
+    static String readFile(String srcFile) {
         File file = new File(srcFile);
         if (!file.exists()) {
             return null;
@@ -394,6 +395,9 @@ public class Utils {
     }
 
     public static String getIMEI() {
+        if( Build.VERSION.SDK_INT>=29){
+            return "android10";
+        }
         String imei = "-1";
         TelephonyManager telephonyManager = (TelephonyManager) Application.application.getSystemService(Context.TELEPHONY_SERVICE);
         if (telephonyManager != null && ActivityCompat.checkSelfPermission(Application.application, Manifest.permission.READ_PHONE_STATE) == PackageManager.PERMISSION_GRANTED) {

app/src/main/java/com/yutou/jianr_mg/services/WindowsService.java

@@ -13,9 +13,9 @@ import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.provider.Settings;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
-import android.support.constraint.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
 import android.view.KeyEvent;
@@ -32,14 +32,10 @@ import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.SeekBar;
-import android.widget.Toast;
 
-import com.tencent.smtt.sdk.TbsReaderView;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.R;
 import com.yutou.jianr_mg.Tools.ExcelUtils;
-import com.yutou.jianr_mg.Tools.Log;
-import com.yutou.jianr_mg.Tools.RootUtils;
 import com.yutou.jianr_mg.Tools.Utils;
 import com.yutou.jianr_mg.views.ExcelActivity;
 import com.yutou.jianr_mg.views.WarView;
@@ -47,16 +43,11 @@ import com.yutou.jianr_mg.views.WarView;
 import org.json.JSONObject;
 
 import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import Interfaces.MagicBoxInterface;
-
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 
 public class WindowsService extends Service {

app/src/main/java/com/yutou/jianr_mg/views/BaseActivity.java

@@ -3,7 +3,7 @@ package com.yutou.jianr_mg.views;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.widget.LinearLayout;

app/src/main/java/com/yutou/jianr_mg/views/ConfigActivity.java

@@ -1,16 +1,14 @@
 package com.yutou.jianr_mg.views;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
 import com.yutou.jianr_mg.Application;
-import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Network.HttpApi;
 import com.yutou.jianr_mg.R;
 import com.yutou.jianr_mg.Tools.JianRUtils;
@@ -65,6 +63,10 @@ public class ConfigActivity extends AppCompatActivity {
                         Utils.toast(Application.application,"已切换至共存版兼容模式");
                     }
                     break;
+                case 6:
+                    intent=new Intent(this,WebActivity.class);
+                    intent.putExtra("url","http://debugtbs.qq.com");
+                    break;
             }
             if (intent != null) {
                 startActivity(intent);
@@ -80,5 +82,6 @@ public class ConfigActivity extends AppCompatActivity {
         config.add("关于我们");
         config.add("开源项目协议");
         config.add("切换专用客户端版本");
+        config.add("设置TBS内核");
     }
 }

app/src/main/java/com/yutou/jianr_mg/views/DownloadListActivity.java

@@ -3,8 +3,8 @@ package com.yutou.jianr_mg.views;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.ListView;
 
 import com.alibaba.fastjson.JSON;

app/src/main/java/com/yutou/jianr_mg/views/ExcelActivity.java

@@ -1,14 +1,17 @@
 package com.yutou.jianr_mg.views;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import android.view.View;
-import android.support.constraint.ConstraintLayout;
+
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.kaopiz.kprogresshud.KProgressHUD;
-import com.tencent.smtt.sdk.TbsReaderView;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Interfaces.DownloadFileInerface;
 import com.yutou.jianr_mg.Network.HttpUtils;
@@ -56,6 +59,18 @@ public class ExcelActivity extends AppCompatActivity {
         ConstraintLayout layout = findViewById(R.id.layout);
         layout.addView(excel.getReader(), ConstraintLayout.LayoutParams.MATCH_PARENT, ConstraintLayout.LayoutParams.MATCH_PARENT);
         initData();
+        SharedPreferences preferences=getSharedPreferences("config", Context.MODE_PRIVATE);
+        if(Build.VERSION.SDK_INT>=29&&!preferences.getBoolean("exceldialog",false)){
+            MaterialDialog dialog=new MaterialDialog(this);
+            dialog.setTitle("看不到攻略？");
+            dialog.setMessage("如果本页面内容是空的，请前往 个人中心-设置-设置TBS内核-安装线上内核\n成功后手动重启下盒子应该就行了，如果还是没有请再试一次");
+            dialog.setPositiveButton("已经正常", view -> {
+                preferences.edit().putBoolean("exceldialog",true).apply();
+                dialog.dismiss();
+            });
+            dialog.setNegativeButton("下次再说", view -> dialog.dismiss());
+            dialog.show();
+        }
     }
     SharedPreferences sp;
     private void initData() {
@@ -149,6 +164,7 @@ public class ExcelActivity extends AppCompatActivity {
             System.out.println(file.getAbsolutePath()+" "+file.exists());
             excel.start(file);
             setTitle(parame.getString("name")+"  by-"+parame.getString("by"));
+            System.out.println("------->"+excel.getReader().getHeight());
         }catch (Exception e){
             e.printStackTrace();
             finish();

app/src/main/java/com/yutou/jianr_mg/views/FavoritesActivity.java

@@ -2,9 +2,9 @@ package com.yutou.jianr_mg.views;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
+import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.alibaba.fastjson.JSON;
 import com.umeng.analytics.MobclickAgent;

app/src/main/java/com/yutou/jianr_mg/views/GameDataActivity.java

@@ -1,39 +1,32 @@
 package com.yutou.jianr_mg.views;
 
-import android.content.Intent;
 import android.os.Bundle;
-import android.os.Environment;
+
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.kaopiz.kprogresshud.KProgressHUD;
-import com.leon.lfilepickerlibrary.LFilePicker;
 import com.qq.e.comm.util.StringUtil;
 import com.yutou.jianr_mg.Data.AppData;
-import com.yutou.jianr_mg.Fragments.GameData;
 import com.yutou.jianr_mg.Interfaces.DownloadFileInerface;
 import com.yutou.jianr_mg.Interfaces.HttpInterface;
 import com.yutou.jianr_mg.Network.HttpApi;
 import com.yutou.jianr_mg.Network.HttpUtils;
 import com.yutou.jianr_mg.Tools.CDNTools;
-import com.yutou.jianr_mg.Tools.RootUtils;
 import com.yutou.jianr_mg.Tools.SocketTools;
 import com.yutou.jianr_mg.Tools.Utils;
 
-import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 import me.drakeet.materialdialog.MaterialDialog;
 

app/src/main/java/com/yutou/jianr_mg/views/HomeHeader.java

@@ -174,12 +174,13 @@ public class HomeHeader {
         bannerView=new UnifiedBannerView((Activity) context, APPID, POSID, new UnifiedBannerADListener() {
             @Override
             public void onNoAD(AdError adError) {
-                Utils.toast(getContext(),adError.getErrorMsg());
+              //  Utils.toast(getContext(),adError.getErrorMsg());
+              Log.e("Banner错误：",adError.getErrorMsg());
             }
 
             @Override
             public void onADReceive() {
-
+                System.out.println("测试Receive");
             }
 
             @Override
@@ -324,11 +325,14 @@ public class HomeHeader {
         public View createView(Context context) {
             imageView = new ImageView(context);
             imageView.setScaleType(ImageView.ScaleType.FIT_XY);
+            LinearLayout.LayoutParams params=new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            imageView.setLayoutParams(params);
             return imageView;
         }
 
         @Override
         public void UpdateUI(Context context, int position, final MBanner data) {
+            try {
                 imageLoader.displayImage(data.getUrl(), imageView);
                 imageView.setOnClickListener(view -> {
                     Intent intent;
@@ -342,6 +346,10 @@ public class HomeHeader {
                     }
                     context.startActivity(intent);
                 });
+            }catch (Exception ignored){
+
+            }
+
         }
     }
 }

app/src/main/java/com/yutou/jianr_mg/views/LicenseActivity.java

@@ -3,10 +3,9 @@ package com.yutou.jianr_mg.views;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.view.View;
+
-import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 

app/src/main/java/com/yutou/jianr_mg/views/ModActivity.java

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Button;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -143,6 +143,7 @@ public class ModActivity extends AppCompatActivity {
     }
 
     private void initData(final TMod tMod) {
+        try {
             Log.i(TAG,"---------->" + AppData.appConfig.getDownloadhome() + tMod.getImage());
             Log.i(TAG,"---------->" + AppData.appConfig.getDownloadhome() + tMod.getIcon());
             if(StringUtil.isEmpty(tMod.getImage())){
@@ -151,6 +152,10 @@ public class ModActivity extends AppCompatActivity {
                 imageLoader.displayImage(AppData.appConfig.getDownloadhome() + tMod.getImage(), modImage);
             }
             imageLoader.displayImage(AppData.appConfig.getDownloadhome() + tMod.getIcon(), icon);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
         title.setText(tMod.getTitle());
         by.setText("@" + tMod.getByuser());
         by.setOnClickListener(v -> {
@@ -161,10 +166,15 @@ public class ModActivity extends AppCompatActivity {
                 //.type(RichType.html)
                 .into(richText);
         downloadText.setTag(0);
+        try {
             if (ModUtils.getModPath(tMod,"",true).listFiles().length > 0) {
                 downloadText.setText("安装");
                 downloadText.setTag(2);
             }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
         download.setOnClickListener(view -> downloadButtonClick());
         collection.setOnClickListener(view -> {
             if (Utils.testStringIsNull(AppData.Token)) {

app/src/main/java/com/yutou/jianr_mg/views/ModListActivity.java

@@ -3,10 +3,10 @@ package com.yutou.jianr_mg.views;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.alibaba.fastjson.JSON;
 import com.umeng.analytics.MobclickAgent;

app/src/main/java/com/yutou/jianr_mg/views/NativeAdActivity.java

@@ -2,8 +2,8 @@ package com.yutou.jianr_mg.views;
 
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;

app/src/main/java/com/yutou/jianr_mg/views/RegisterActivity.java

@@ -2,8 +2,8 @@ package com.yutou.jianr_mg.views;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;

app/src/main/java/com/yutou/jianr_mg/views/TestActivity.java

@@ -1,8 +1,8 @@
 package com.yutou.jianr_mg.views;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
 
 public class TestActivity extends AppCompatActivity {

app/src/main/java/com/yutou/jianr_mg/views/UpFeedBack.java

@@ -1,12 +1,10 @@
 package com.yutou.jianr_mg.views;
 
-import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.view.View;
+
 import android.widget.Button;
-import android.widget.CompoundButton;
 import android.widget.Switch;
 import android.widget.TextView;
 

app/src/main/java/com/yutou/jianr_mg/views/UserDataActivity.java

@@ -4,17 +4,16 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.text.InputType;
 import android.widget.ArrayAdapter;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ListView;
-import android.widget.Toast;
 
 import com.leon.lfilepickerlibrary.LFilePicker;
-import com.nostra13.universalimageloader.core.ImageLoader;
+import com.yutou.jianr_mg.Application;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Interfaces.HttpInterface;
 import com.yutou.jianr_mg.Network.HttpApi;
@@ -138,7 +137,7 @@ public class UserDataActivity extends AppCompatActivity {
                             new LFilePicker()
                                     .withActivity(UserDataActivity.this)
                                     .withRequestCode(100)
-                                    .withStartPath(Environment.getExternalStorageDirectory().getPath()+"/jianRMG")//指定初始显示路径
+                                    .withStartPath(Application.application.getFilesDir()+"/jianRMG")//指定初始显示路径
                                     .withIsGreater(false)//过滤文件大小 小于指定大小的文件
                                     .withMutilyMode(false)
                                     .withFileSize(5*1024*1024)//指定文件大小为500K

app/src/main/java/com/yutou/jianr_mg/views/UserDefinedActivity.java

@@ -4,8 +4,8 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
@@ -15,10 +15,9 @@ import android.widget.Toast;
 
 import com.leon.lfilepickerlibrary.LFilePicker;
 import com.umeng.analytics.MobclickAgent;
+import com.yutou.jianr_mg.Application;
 import com.yutou.jianr_mg.Data.AppData;
 import com.yutou.jianr_mg.Data.MGamePackname;
-import com.yutou.jianr_mg.Data.TMod;
-import com.yutou.jianr_mg.Data.TModfile;
 import com.yutou.jianr_mg.Data.TModfilePath;
 import com.yutou.jianr_mg.Interfaces.ModInterface;
 import com.yutou.jianr_mg.R;
@@ -32,8 +31,6 @@ import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import me.drakeet.materialdialog.MaterialDialog;
-
 public class UserDefinedActivity extends AppCompatActivity implements View.OnClickListener {
     private Button srcFile;
     private Spinner outPath;
@@ -105,7 +102,7 @@ public class UserDefinedActivity extends AppCompatActivity implements View.OnCli
                 new LFilePicker()
                         .withActivity(this)
                         .withRequestCode(100)
-                        .withStartPath(Environment.getExternalStorageDirectory().getPath()+"/jianRMG")//指定初始显示路径
+                        .withStartPath(Application.application.getFilesDir()+"/jianRMG")//指定初始显示路径
                         .withIsGreater(false)//过滤文件大小 小于指定大小的文件
                         .withMutilyMode(true)
                         .withFileSize(5*1024*1024)//指定文件大小为500K

app/src/main/java/com/yutou/jianr_mg/views/WarLogActivity.java

@@ -1,12 +1,11 @@
 package com.yutou.jianr_mg.views;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.fragment.app.Fragment;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
-import com.alibaba.fastjson.JSON;
 import com.yutou.jianr_mg.Adapters.ViewPagerAdapter;
 import com.yutou.jianr_mg.Data.ShipEquipmnt;
 import com.yutou.jianr_mg.Data.TeamData;
@@ -21,9 +20,7 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 
 import me.majiajie.pagerbottomtabstrip.NavigationController;
 import me.majiajie.pagerbottomtabstrip.PageNavigationView;

app/src/main/java/com/yutou/jianr_mg/views/WebActivity.java

@@ -1,15 +1,16 @@
 package com.yutou.jianr_mg.views;
 
-import android.net.http.SslError;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
-import android.webkit.SslErrorHandler;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebSettings;
-import android.webkit.WebView;
-import android.webkit.WebViewClient;
 
+
+import com.alibaba.fastjson.JSONObject;
+import com.tencent.smtt.export.external.interfaces.SslErrorHandler;
+import com.tencent.smtt.export.external.interfaces.WebResourceRequest;
+import com.tencent.smtt.sdk.WebSettings;
+import com.tencent.smtt.sdk.WebView;
+import com.tencent.smtt.sdk.WebViewClient;
 import com.umeng.analytics.MobclickAgent;
 import com.yutou.jianr_mg.R;
 import com.yutou.jianr_mg.Tools.Log;
@@ -28,10 +29,21 @@ public class WebActivity extends AppCompatActivity{
         initView();
        initWeb();
         String url=getIntent().getStringExtra("url");
-        if(url==null)
+        if(url==null) {
-            url="http://www.jianrmod.cn";
+            if(getIntent().getStringExtra("parameter")==null) {
+                url = "http://www.jianrmod.cn";
+            }else{
+                url= JSONObject.parseObject(getIntent().getStringExtra("parameter")).getString("url");
+            }
+        }
         Log.i("网页URL",url);
+        try {
             webView.loadUrl(url);
+        }catch (Exception e){
+            e.printStackTrace();
+           finish();
+        }
+
     }
     private void initView(){
         webView=findViewById(R.id.webView);
@@ -50,9 +62,9 @@ public class WebActivity extends AppCompatActivity{
             }
 
             @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler, SslError error) {
+            public void onReceivedSslError(WebView webView, SslErrorHandler sslErrorHandler, com.tencent.smtt.export.external.interfaces.SslError sslError) {
-                super.onReceivedSslError(view, handler, error);
+                super.onReceivedSslError(webView, sslErrorHandler, sslError);
-                handler.proceed();
+                sslErrorHandler.proceed();
             }
 
             @Override

app/src/main/java/com/yutou/jianr_mg/views/WindowsStartActivity.java

@@ -2,8 +2,8 @@ package com.yutou.jianr_mg.views;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;

app/src/main/res/layout/activity_excel.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     android:id="@+id/layout"
     android:layout_height="match_parent">
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_loading.xml

@@ -17,7 +17,7 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:visibility="visible" />
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_weight="5">
@@ -96,5 +96,5 @@
                 android:textColor="@color/lite_blue"
                 android:visibility="invisible" />
         </LinearLayout>
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>

app/src/main/res/layout/activity_main.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -23,4 +23,4 @@
         android:background="#FFF"
         android:elevation="8dp"
         app:layout_constraintBottom_toBottomOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_mod.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -8,24 +8,29 @@
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <android.support.constraint.ConstraintLayout
+
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
+
                 <ImageView
                     android:id="@+id/ModImage"
                     android:layout_width="0dp"
                     android:layout_height="120dp"
-                    android:layout_marginEnd="8dp"
                     android:layout_marginStart="8dp"
-                    android:scaleType="fitXY"
+                    android:layout_marginEnd="8dp"
+                    android:scaleType="fitCenter"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
                     app:srcCompat="@drawable/ic_launcher_background"
                     tools:ignore="VectorDrawableCompat" />
 
@@ -66,23 +71,23 @@
                     android:id="@+id/tags"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"
-                    android:layout_marginEnd="8dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginEnd="8dp"
+                    android:layout_marginBottom="8dp"
                     android:orientation="horizontal"
                     app:layout_constraintBottom_toTopOf="@+id/richText"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@+id/by"
-                    app:layout_constraintTop_toBottomOf="@+id/title"/>
+                    app:layout_constraintTop_toBottomOf="@+id/title" />
 
                 <TextView
                     android:id="@+id/richText"
                     android:layout_width="0dp"
                     android:layout_height="200dp"
-                    android:layout_marginEnd="8dp"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginEnd="8dp"
                     android:padding="16dp"
                     android:text="Info"
                     app:layout_constraintEnd_toEndOf="parent"
@@ -93,9 +98,9 @@
                     android:id="@+id/textView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="16dp"
                     android:layout_marginStart="8dp"
                     android:layout_marginTop="16dp"
+                    android:layout_marginBottom="16dp"
                     android:text="相关内容"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/richText" />
@@ -107,21 +112,21 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHorizontal_bias="1.0"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/textView"
+                    app:layout_constraintTop_toBottomOf="@+id/textView" />
-                   />
 
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
+    </ScrollView>
     <include
         android:id="@+id/include"
         layout="@layout/layout_mod_bottom"
         android:layout_width="0dp"
         android:layout_height="50dp"
-                    app:layout_constraintTop_toBottomOf="@+id/quote"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        />
 
-            </android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
-        </LinearLayout>
-    </ScrollView>
-
-
-</android.support.constraint.ConstraintLayout>

app/src/main/res/layout/activity_mod_list.xml

@@ -12,7 +12,7 @@
         android:elevation="8dp"
        />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />

app/src/main/res/layout/activity_register.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -186,4 +186,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/buttons" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_suspend.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -38,7 +38,7 @@
                 android:layout_height="20dp"
                 android:src="@drawable/item_fg" />
 
-            <android.support.v4.widget.NestedScrollView
+            <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:fillViewport="true">
@@ -48,7 +48,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="vertical" />
-            </android.support.v4.widget.NestedScrollView>
+            </androidx.core.widget.NestedScrollView>
 
 
         </LinearLayout>
@@ -75,4 +75,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/contextLayout"
         app:layout_constraintTop_toTopOf="parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_user_defined.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -66,4 +66,4 @@
                 android:text="操作日志:" />
         </LinearLayout>
     </ScrollView>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_userdata.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -7,4 +7,4 @@
         android:id="@+id/list"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/activity_web.xml

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-    <WebView
+    <com.tencent.smtt.sdk.WebView
         android:id="@+id/webView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/activity_windows_start.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -132,4 +132,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/start"
         app:layout_constraintTop_toBottomOf="@+id/help" />
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_drop.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -42,4 +42,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/linearLayout6"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_game_data.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -16,7 +16,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
@@ -26,4 +26,4 @@
         app:layout_constraintTop_toBottomOf="@+id/tab" />
 
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/fragment_my.xml

@@ -12,7 +12,7 @@
         android:scaleType="centerCrop"
         app:srcCompat="@mipmap/ic_launcher_round" />
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -54,7 +54,7 @@
             app:layout_constraintStart_toEndOf="@+id/icon"
             app:layout_constraintTop_toBottomOf="@+id/uname" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
     <ListView
         android:id="@+id/_my_items"
         android:layout_width="match_parent"

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         maven { url 'https://dl.bintray.com/umsdk/release' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1"
 

gradle.properties

@@ -9,7 +9,10 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
+Android.useDeprecatedNdk=true;
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Apr 27 15:44:25 CST 2019
+#Tue Nov 05 15:03:29 CST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

harmony/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -26,14 +26,14 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     //文件选择器
     implementation 'com.leon:lfilepickerlibrary:1.8.0'
     //载入界面
     implementation 'com.kaopiz:kprogresshud:1.1.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
 }

harmony/src/androidTest/java/com/jianrmod/plugins/harmony/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.jianrmod.plugins.harmony;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

harmony/src/main/java/com/jianrmod/plugins/harmony/Activitys/MainActivity.java

@@ -15,8 +15,11 @@ import android.widget.CompoundButton;
 import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.jianrmod.plugins.harmony.Tools.ClientUttls;
+import com.jianrmod.plugins.harmony.Tools.HttpInterface;
+import com.jianrmod.plugins.harmony.Tools.HttpTools;
 import com.jianrmod.plugins.harmony.Tools.Utils;
 import com.jianrmod.plugins.harmony.Tools.ZipUtils;
 import com.kaopiz.kprogresshud.KProgressHUD;
@@ -32,6 +35,7 @@ public class MainActivity implements BaseActivityInterface {
 
     private Context context;
     private KProgressHUD hud;
+    private String httpData;
 
     public MainActivity() {
     }
@@ -101,7 +105,7 @@ public class MainActivity implements BaseActivityInterface {
         Button button3=new Button(context);
         final Switch siwtch = new Switch(context);
         siwtch.setText("共存版");
-        text1.setText("更新说明：" +
+        text1.setText("更新说明(v3)：" +
                 "\n1、已支持覆盖版" +
                 "\n2、已安装压缩包时下次点击不再解压(如需覆盖解压请删除后缀.unzip)" +
                 "\n使用说明：请将proj.manifest、Cocos2dxPrefsFile.xml和压缩包放到jianRMG/harmony/文件夹中" +
@@ -154,6 +158,11 @@ public class MainActivity implements BaseActivityInterface {
         button2.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
+                if(httpData==null){
+                    Toast.makeText(context,"网络请求失败，1秒钟后再试试",Toast.LENGTH_LONG).show();
+                    return;
+                }
+                System.out.println("httpData:"+httpData);
                 hud.show();
                 final File file = new File(Utils.getAppPath() + "/harmony/");
                 if(!file.exists()){
@@ -178,10 +187,10 @@ public class MainActivity implements BaseActivityInterface {
                                     if (listFile.getName().endsWith(".zip")) {
                                         File path;
                                         if (siwtch.isChecked()) {
-                                            path = new File(Utils.getSDCardPath() + "/Android/data/com.huanmeng.zhanjian2/files/res_default/10/");
+                                            path = new File(Utils.getSDCardPath() + "/Android/data/com.huanmeng.zhanjian2/"+httpData);
                                             System.out.println("操作对象：覆盖版");
                                         } else {
-                                            path = new File(Utils.getSDCardPath() + "/Android/data/com.bigzhao.jianrmagicbox/files/res_default/10/");
+                                            path = new File(Utils.getSDCardPath() + "/Android/data/com.bigzhao.jianrmagicbox/"+httpData);
                                             System.out.println("操作对象：共存版");
                                         }
                                         if (!path.exists()) {
@@ -221,6 +230,17 @@ public class MainActivity implements BaseActivityInterface {
                 context.startActivity(intent);
             }
         });
+        new HttpTools().httpGet("http://jianr.jianrmod.cn/admin/data.do?data=harmony", new HttpInterface() {
+            @Override
+            public void httpGetData(Object data, int state) {
+                httpData= (String) data;
+            }
+
+            @Override
+            public void httpError(Exception e) {
+                e.printStackTrace();
+            }
+        });
         return linearLayout;
     }
 

harmony/src/main/java/com/jianrmod/plugins/harmony/Tools/HttpInterface.java

@@ -0,0 +1,19 @@
+package com.jianrmod.plugins.harmony.Tools;
+
+/**
+ * 协议接口
+ */
+public interface HttpInterface {
+    /**
+     * 请求成功
+     * @param data 请求参数
+     * @param state http状态
+     */
+    void httpGetData(Object data, int state);
+
+    /**
+     * 请求异常
+     * @param e 异常
+     */
+    void httpError(Exception e);
+}

harmony/src/main/java/com/jianrmod/plugins/harmony/Tools/HttpTools.java

@@ -0,0 +1,31 @@
+package com.jianrmod.plugins.harmony.Tools;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+public class HttpTools {
+    public void httpGet(final String url, final HttpInterface networkInterface) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection();
+                    BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+                    connection.connect();
+                    String tmp, str = "";
+                    while ((tmp = reader.readLine()) != null) {
+                        str += tmp;
+                    }
+                    reader.close();
+                    networkInterface.httpGetData(str, connection.getResponseCode());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    networkInterface.httpError(e);
+                }
+            }
+        }).start();
+
+    }
+}

harmony/src/main/java/com/jianrmod/plugins/harmony/Tools/Utils.java

@@ -65,12 +65,12 @@ public class Utils {
     }
 
     public static String getSDCardPath() {
-        String path = Environment.getExternalStorageDirectory().getPath() + "/";
+        String path = Application.application.getFilesDir() + "/";
         return path;
     }
 
     public static String getAppPath() {
-        String path = Environment.getExternalStorageDirectory().getPath() + "/jianRMG";
+        String path = Application.application.getFilesDir() + "/jianRMG";
         return path;
     }
 

harmony/src/main/java/com/yutou/jianr_mg/plugins/Data.java

@@ -8,5 +8,5 @@ public class Data {
     public static String image="https://i.loli.net/2019/06/10/5cfe1f8f725b430506.png";
     public static String mainFunction="com.jianrmod.plugins.harmony.Activitys.MainActivity#localActivity";
     public static Integer permission=0;
-    public static String version="2.0";
+    public static String version="2.1";
 }

mylibrary/build.gradle

@@ -10,7 +10,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -25,10 +25,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     //载入界面
     implementation 'com.kaopiz:kprogresshud:1.1.0'
     implementation files('libs/GDTUnionSDK.4.28.902.min.jar')

mylibrary/src/androidTest/java/com/yutou/jianr_mg/plugs/test/app1/ExampleInstrumentedTest.java

@@ -1,8 +1,8 @@
 package com.yutou.jianr_mg.plugs.test.app1;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
+import androidx.test.platform.app.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

mylibrary/src/main/java/com/yutou/jianr_mg/plugins/Activitys/MainActivity.java

@@ -3,6 +3,7 @@ package com.yutou.jianr_mg.plugins.Activitys;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.widget.LinearLayout;
@@ -17,6 +18,8 @@ public class MainActivity implements BaseActivityInterface {
     public static String image="#";
     public static String mainFunction="com.yutou.jianr_mg.plugs.test.app1.MainActivity#localActivity";
     public static Integer permission=0;
+    public static String homeurl="";
+    public static Handler handler;
 
     public MainActivity() {
     }

mylibrary/src/main/java/com/yutou/jianr_mg/plugins/Activitys/Utils/PlugsAdTools.java

@@ -4,7 +4,7 @@ import android.Manifest;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.support.v4.app.ActivityCompat;
+import androidx.core.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 import android.widget.Toast;