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 0000000..56fbd6b Binary files /dev/null and b/app/src/main/res/drawable-hdpi/main_logo.png differ 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