From 85505851abc8a368cf58d6a325f85f17e3686ada Mon Sep 17 00:00:00 2001 From: Administrator <981964879@qq.com> Date: Sat, 26 Dec 2020 18:17:32 +0800 Subject: [PATCH] =?UTF-8?q?version:=20update:2020.12.26=20fix:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=90=AF=E5=8A=A8=E9=A1=B5=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 6 ++-- app/src/main/AndroidManifest.xml | 8 +++-- .../myappstore/activity/HomeActivity.java | 25 ++++++++++++++ .../myappstore/activity/MainActivity.java | 22 +----------- .../myappstore/server/GuardService.java | 2 +- .../myappstore/server/InitJpushServer.java | 3 +- .../mjsheng/myappstore/utils/Configure.java | 2 +- app/src/main/res/drawable-hdpi/main_logo.png | Bin 0 -> 24172 bytes .../main/res/layout-land/activity_home.xml | 32 ++++++++++++++++++ .../main/res/layout-port/activity_home.xml | 32 ++++++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 3 +- 11 files changed, 102 insertions(+), 33 deletions(-) create mode 100644 app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java create mode 100644 app/src/main/res/drawable-hdpi/main_logo.png create mode 100644 app/src/main/res/layout-land/activity_home.xml create mode 100644 app/src/main/res/layout-port/activity_home.xml diff --git a/app/build.gradle b/app/build.gradle index 33f3d0f..1641bf8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -89,9 +89,9 @@ android { } newl { flavorDimensions "default" -// versionCode 162 - versionCode 1030 - versionName "1.2.2" + versionCode 163 +// versionCode 1031 + versionName "1.2.3" /*********************************极光推送************************************/ manifestPlaceholders = [ JPUSH_PKGNAME: "com.jiaoguanyi.appstore", diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4dcef92..808fd7d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -87,15 +87,17 @@ android:enabled="true" android:exported="true" /> - + + diff --git a/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java new file mode 100644 index 0000000..8bf3bb8 --- /dev/null +++ b/app/src/main/java/com/mjsheng/myappstore/activity/HomeActivity.java @@ -0,0 +1,25 @@ +package com.mjsheng.myappstore.activity; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.support.v7.app.AppCompatActivity; + +import com.mjsheng.myappstore.R; + +public class HomeActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_home); + new Handler().postDelayed(new Runnable() { + @Override + public void run() { + startActivity(new Intent(HomeActivity.this, MainActivity.class)); + finish(); + } + }, 3000); + } + +} 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 09b053c..75e9fe8 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java @@ -1,21 +1,16 @@ package com.mjsheng.myappstore.activity; -import android.app.ActivityManager; import android.app.AlertDialog; import android.bluetooth.BluetoothAdapter; import android.content.BroadcastReceiver; -import android.content.ComponentName; import android.content.Context; import android.content.ContextWrapper; import android.content.DialogInterface; import android.content.Intent; import android.content.IntentFilter; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; -import android.net.ConnectivityManager; -import android.net.wifi.WifiManager; import android.os.BatteryManager; import android.os.Build; import android.os.Bundle; @@ -36,12 +31,9 @@ import android.widget.Button; import android.widget.ImageView; import android.widget.RelativeLayout; import android.widget.TextView; -import android.widget.Toast; import com.alibaba.fastjson.JSON; import com.amap.api.location.AMapLocation; -import com.amap.api.location.AMapLocationClient; -import com.amap.api.location.AMapLocationClientOption; import com.amap.api.location.AMapLocationListener; import com.amap.api.location.AMapLocationQualityReport; import com.arialyy.aria.core.Aria; @@ -50,7 +42,6 @@ import com.blankj.utilcode.util.EncryptUtils; import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.PathUtils; import com.blankj.utilcode.util.ToastUtils; -import com.google.gson.Gson; import com.hjq.permissions.OnPermission; import com.hjq.permissions.Permission; import com.hjq.permissions.XXPermissions; @@ -61,31 +52,24 @@ import com.lzy.okserver.download.DownloadService; import com.mjsheng.myappstore.BuildConfig; import com.mjsheng.myappstore.MyApplication; import com.mjsheng.myappstore.R; -import com.mjsheng.myappstore.bean.CommonPicBean; -import com.mjsheng.myappstore.bean.CommonPicData; import com.mjsheng.myappstore.bean.ForceDownloadBean; import com.mjsheng.myappstore.bean.ForceDownloadData; import com.mjsheng.myappstore.bean.LzyResponse; import com.mjsheng.myappstore.bean.NetAndLaunchBean; import com.mjsheng.myappstore.bean.NetAndLaunchData; import com.mjsheng.myappstore.bean.StudentsInfo; -import com.mjsheng.myappstore.bean.UploadAppInfo; import com.mjsheng.myappstore.comm.CommonDatas; import com.mjsheng.myappstore.jpush.TagAliasOperatorHelper; import com.mjsheng.myappstore.network.HTTPInterface; import com.mjsheng.myappstore.network.Network; import com.mjsheng.myappstore.network.api.AppLimitApi; -import com.mjsheng.myappstore.network.api.BrankPicApi; import com.mjsheng.myappstore.network.api.DeselectBrowserIDApi; import com.mjsheng.myappstore.network.api.DeselectIDApi; import com.mjsheng.myappstore.network.api.ForceDownloadApi; import com.mjsheng.myappstore.network.api.NetAndLaunchApi; import com.mjsheng.myappstore.network.api.SystemSettingApi; -import com.mjsheng.myappstore.network.api.UploadAppInfoApi; -import com.mjsheng.myappstore.server.InitJpushServer; import com.mjsheng.myappstore.server.MyDownloadService; import com.mjsheng.myappstore.utils.ApkUtils; -import com.mjsheng.myappstore.utils.CmdUtil; import com.mjsheng.myappstore.utils.Configure; import com.mjsheng.myappstore.utils.ExampleUtil; import com.mjsheng.myappstore.utils.MySQLData; @@ -105,9 +89,6 @@ import org.lzh.framework.updatepluginlib.UpdateBuilder; import java.io.File; import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -121,7 +102,6 @@ import io.reactivex.schedulers.Schedulers; import okhttp3.Call; import okhttp3.Response; import okhttp3.ResponseBody; -import okhttp3.internal.Util; import rx.Observable; import rx.functions.Action1; @@ -194,7 +174,7 @@ public class MainActivity extends AppCompatActivity implements AMapLocationListe // Utils.queryStorage(); // Utils.shotScreen(this); HTTPInterface.updateDeviceInfo(this); - testFilepath(); +// testFilepath(); } private void testFilepath() { diff --git a/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java b/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java index e19aa56..f2508ac 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/GuardService.java @@ -229,7 +229,7 @@ public class GuardService extends Service { OkGo.post(Configure.HTTP_TAG_DOWNLOAD_URL) .params("key", Configure.HTTP_KEY) .params("sn", Utils.getSerial()) - .params("package", packageName) + .params("package", app_package) .tag(this) .execute(new StringCallback() { @Override 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 cf4f8f9..4ad2421 100644 --- a/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java +++ b/app/src/main/java/com/mjsheng/myappstore/server/InitJpushServer.java @@ -317,7 +317,6 @@ public class InitJpushServer extends Service { @Override public void call(Long aLong) { checkUpdate(); - getDefaultDesktop(); getLockedState();// } }); @@ -1105,7 +1104,7 @@ public class InitJpushServer extends Service { HTTPInterface.setHomepagtag(InitJpushServer.this);//设置主页和标签 HTTPInterface.setHideDesktopIcon(InitJpushServer.this);//设置桌面图标隐藏 // MyApplication.getInstance().getWhitePackageList(); - + getDefaultDesktop(); } } else if (code == -300) { // ApkUtils.uninstallAllApp(InitJpushServer.this); diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/Configure.java b/app/src/main/java/com/mjsheng/myappstore/utils/Configure.java index 336b9a9..c7007c9 100644 --- a/app/src/main/java/com/mjsheng/myappstore/utils/Configure.java +++ b/app/src/main/java/com/mjsheng/myappstore/utils/Configure.java @@ -209,7 +209,7 @@ public class Configure { //通过sn获取信息 public static final String SEND_SCREENSHOT = HTTP_TAG_HEAD_NEW + "Screenshot/addImg"; //上传截图 - public static final String UPDATE_DEVICEINFO = HTTP_TAG_HEAD_NEW + "Mac/getInfo"; +// public static final String UPDATE_DEVICEINFO = HTTP_TAG_HEAD_NEW + "Mac/getInfo"; //上传我的设备 public final static String GET_LOCK_SCREEN_STATE = HTTP_TAG_HEAD_NEW + "Sn/getSnScreen"; //获取霸屏状态 diff --git a/app/src/main/res/drawable-hdpi/main_logo.png b/app/src/main/res/drawable-hdpi/main_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..56fbd6b4328bbd57ab2a1311cf515d990f8d19f2 GIT binary patch literal 24172 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout-land/activity_home.xml b/app/src/main/res/layout-land/activity_home.xml new file mode 100644 index 0000000..4b4978a --- /dev/null +++ b/app/src/main/res/layout-land/activity_home.xml @@ -0,0 +1,32 @@ + + + + + + + + + diff --git a/app/src/main/res/layout-port/activity_home.xml b/app/src/main/res/layout-port/activity_home.xml new file mode 100644 index 0000000..7dac040 --- /dev/null +++ b/app/src/main/res/layout-port/activity_home.xml @@ -0,0 +1,32 @@ + + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 53a7e9d8..2d80b69 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Jul 05 09:38:39 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip