diff --git a/app/build.gradle b/app/build.gradle index c797cbc..c12dc43 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,8 +15,8 @@ android { applicationId "com.info.sn" minSdkVersion 23 targetSdkVersion 28 - versionCode 24 - versionName "1.2.4" + versionCode 25 + versionName "1.2.5" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9530d49..280528e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -61,7 +61,8 @@ android:enabled="true" android:exported="true"> - + diff --git a/app/src/main/java/com/info/sn/MainActivity.java b/app/src/main/java/com/info/sn/MainActivity.java index f381727..b890679 100644 --- a/app/src/main/java/com/info/sn/MainActivity.java +++ b/app/src/main/java/com/info/sn/MainActivity.java @@ -11,6 +11,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.pm.ActivityInfo; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; @@ -96,9 +97,9 @@ public class MainActivity extends CheckPermissionsActivity implements AMapLocati //设置定位监听 locationClient.setLocationListener(this); locationClient.startLocation(); - if (getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); - } +// if (getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) { +// setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); +// } PackageManager pm = getPackageManager(); //后台为0可能传过来null @@ -124,6 +125,16 @@ public class MainActivity extends CheckPermissionsActivity implements AMapLocati HTTPInterface.setBrowser(MainActivity.this); } + @Override + public void onConfigurationChanged(Configuration newConfig) { + super.onConfigurationChanged(newConfig); + } + + @Override + protected void onSaveInstanceState(Bundle outState) { + super.onSaveInstanceState(outState); + } + public void registerRefreshReceiver() { mRefreshReceiver = new RefreshReceiver(); IntentFilter filter = new IntentFilter(); diff --git a/app/src/main/java/com/info/sn/jpush/MyReceiver.java b/app/src/main/java/com/info/sn/jpush/MyReceiver.java index c4db4fd..bdb56a0 100644 --- a/app/src/main/java/com/info/sn/jpush/MyReceiver.java +++ b/app/src/main/java/com/info/sn/jpush/MyReceiver.java @@ -410,6 +410,20 @@ public class MyReceiver extends BroadcastReceiver { boolean qch_usb_choose = Settings.System.putString(context.getContentResolver(), "qch_usb_choose", "usb_mtp"); LogUtils.e("setUsbState:", Settings.System.getString(context.getContentResolver(), "qch_usb_choose")); } + String usbStatus = ""; + switch (is_dataline) { + case 1: + usbStatus = "qch_action_usb_usb_charge"; + break; + case 0: + usbStatus = "qch_action_usb_usb_mtp"; + break; +// case "usb_midi": +// usbStatus = "qch_action_usb_usb_midi"; +// break; + } + Intent usbIntent = new Intent(usbStatus).setPackage("com.android.settings"); + context.sendBroadcast(usbIntent); } catch (JSONException e) { e.printStackTrace(); LogUtils.e("setUsbState", e.getMessage()); diff --git a/app/src/main/java/com/info/sn/network/api/HTTPInterface.java b/app/src/main/java/com/info/sn/network/api/HTTPInterface.java index cde3f4d..28f284a 100644 --- a/app/src/main/java/com/info/sn/network/api/HTTPInterface.java +++ b/app/src/main/java/com/info/sn/network/api/HTTPInterface.java @@ -368,6 +368,7 @@ public class HTTPInterface { }); } + synchronized public static void getAllAppPackageName(final Context context) { OkGo.post(UrlPath.GET_ALL_PACKAGENAME) .params("sn", Utils.getSerial()) @@ -387,10 +388,13 @@ public class HTTPInterface { for (com.alibaba.fastjson.JSONObject jsonObject : jsonArray) { packageList += jsonObject.getString("app_package") + ","; } - packageList = packageList + "com.info.sn,com.android.uiuios,com.appstore.uiui,com.uiuios.updatetools"; + packageList = packageList + "com.info.sn,com.android.uiuios,com.appstore.uiui,com.uiuios.updatetools,com.jiaoguanyi.pager2,com.android.uiuios"; Log.e("packageList now", packageList); Log.e("packageList", Settings.System.getString(context.getContentResolver(), "qch_app_forbid")); Settings.System.putString(context.getContentResolver(), "qch_app_forbid", packageList); + }else { + Settings.System.putString(context.getContentResolver(), "qch_app_forbid", "com.info.sn,com.android.uiuios,com.appstore.uiui,com.uiuios.updatetools,com.jiaoguanyi.pager2,com.android.uiuios"); + } } catch (Exception e) { Log.e("getAllAppPackageName", e.getMessage()); @@ -405,6 +409,7 @@ public class HTTPInterface { }); } + public static void setBrowser(final Context context) { OkGo.post(UrlPath.SET_BROWSER_URL) .params("sn", Utils.getSerial()) diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 0000000..73dbb3f --- /dev/null +++ b/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,325 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/custom_dialog.xml b/app/src/main/res/layout-land/custom_dialog.xml similarity index 100% rename from app/src/main/res/layout/custom_dialog.xml rename to app/src/main/res/layout-land/custom_dialog.xml diff --git a/app/src/main/res/layout/dialog.xml b/app/src/main/res/layout-land/dialog.xml similarity index 100% rename from app/src/main/res/layout/dialog.xml rename to app/src/main/res/layout-land/dialog.xml diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml similarity index 100% rename from app/src/main/res/layout/activity_main.xml rename to app/src/main/res/layout-port/activity_main.xml diff --git a/app/src/main/res/layout-port/custom_dialog.xml b/app/src/main/res/layout-port/custom_dialog.xml new file mode 100644 index 0000000..eee5b3a --- /dev/null +++ b/app/src/main/res/layout-port/custom_dialog.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file