diff --git a/app/build.gradle b/app/build.gradle index 85d4bc2..b52eb08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,8 +16,8 @@ android { targetSdkVersion 26 // versionCode 85 // versionName "2.0.4.6"//正式jiaoguanyi.com - versionCode 117 - versionName "2.7.9"//测试jiaoguanyi.cn + versionCode 121 + versionName "2.8.1.2"//测试jiaoguanyi.cn multiDexEnabled true testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java index dc2b33a..cc49c79 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java @@ -515,7 +515,7 @@ public class MainActivity extends AppCompatActivity implements NetStateChangeObs getAppInfo();//上传APP信息 getSystemSetting();//设置系统管控 getNetAndLaunchSetting();//联网管控 - Aria.download(this).removeAllTask(true); +// Aria.download(this).removeAllTask(true); // getForceDownload();//强制下载apk resetDevice();//恢复出厂设置 // fromNetToUpdate(); diff --git a/app/src/main/java/com/mjsheng/myappstore/network/Network.java b/app/src/main/java/com/mjsheng/myappstore/network/Network.java index 20b7d0c..dc594e2 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/Network.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/Network.java @@ -37,9 +37,10 @@ import retrofit2.converter.gson.GsonConverterFactory; public class Network { - // public static final String ROOT_URL = "http://www.as.xueshibao.com.cn/api/"; -// public static final String ROOT_URL = "https://www.jiaoguanyi.com/api/";//正式 - public static final String ROOT_URL = "http://www.jiaoguanyi.cn/api/";//测试 + // public static final String ROOT_URL = "http://www.as.xueshibao.com.cn/api/"; 弃用 +// public static final String ROOT_URL = "https://www.jiaoguanyi.com/api/";//正式 弃用 + public static final String ROOT_URL = "http://partner.jiaoguanyi.com/api/";//正式 +// public static final String ROOT_URL = "http://www.jiaoguanyi.cn/api/";//测试 private static UploadAppInfoApi uploadAppInfoApi; diff --git a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java index b832894..b02ea3f 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java @@ -687,7 +687,7 @@ public class InitJpushServer extends Service { getDeselectID(); getDeselectBrowerID(); getNetAndLaunchSetting(); - Aria.download(this).removeAllTask(true); +// Aria.download(this).removeAllTask(true); // getForceDownload(); getSystemSetting();//从后台获取功能状态 resetDevice(); diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 132a9d5..4e2f0ae 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index 132a9d5..4e2f0ae 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 132a9d5..4e2f0ae 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 132a9d5..4e2f0ae 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 132a9d5..4e2f0ae 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ