From 2340af523e1e03c361955492feca751c78754e90 Mon Sep 17 00:00:00 2001 From: Administrator <981964879@qq.com> Date: Mon, 31 Aug 2020 14:06:57 +0800 Subject: [PATCH] =?UTF-8?q?version:=20update:2020.08.31=20fix:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E8=AE=BE=E5=A4=87=E9=94=81=E5=9B=BE=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=93=E6=9D=9F=E8=BF=9B=E7=A8=8B=E5=92=8C?= =?UTF-8?q?=E6=89=93=E5=BC=80OTA=EF=BC=8C=E5=A2=9E=E5=8A=A0=E9=87=8D?= =?UTF-8?q?=E5=90=AF=E5=8A=9F=E8=83=BD=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 21 ++++++++++-- .../myappstore/activity/MainActivity.java | 27 +++++++++++----- .../myappstore/network/HTTPInterface.java | 2 +- .../myappstore/receiver/MyJPushReceiver.java | 30 ++++++++++-------- .../myappstore/server/StepService.java | 4 +++ .../com/mjsheng/myappstore/utils/Utils.java | 15 +++++++++ app/src/main/res/drawable-hdpi/locked.png | Bin 0 -> 2133 bytes .../main/res/layout-land/activity_main.xml | 13 ++++++++ .../main/res/layout-port/activity_main.xml | 12 +++++++ 9 files changed, 100 insertions(+), 24 deletions(-) create mode 100644 app/src/main/res/drawable-hdpi/locked.png diff --git a/app/build.gradle b/app/build.gradle index 974452c..20df86b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,9 +86,26 @@ android { buildConfigField "String", "ROOT_URL", '"https://jgy.jundunxueyuan.com/api/"' buildConfigField "String", "WebsocketURL", '"ws://39.98.59.202:2345"' } + newl { + flavorDimensions "default" + versionCode 150 + versionName "1.0.5" + /*********************************极光推送************************************/ + manifestPlaceholders = [ + JPUSH_PKGNAME: "com.jiaoguanyi.appstore", + JPUSH_APPKEY : "52d81643665bb2cadacf0e9e", //JPush上注册的包名对应的appkey. + JPUSH_CHANNEL: "developer-default", //暂时填写默认值即可. + ] + signingConfig signingConfigs.debug + /*********************************极光推送end************************************/ + buildConfigField "String", "ROOT_URL", '"http://name.uiuios.com/api/"' + buildConfigField "String", "WebsocketURL", '"ws://39.98.59.202:2345"' + } } sourceSets { beta.res.srcDirs = ['src/beta/res'] + newl.res.srcDirs = ['src/beta/res'] + } //签名 @@ -199,8 +216,8 @@ dependencies { implementation 'com.google.code.gson:gson:2.8.0' // implementation 'cn.jiguang:jpush:2.2.0' - implementation 'cn.jiguang.sdk:jpush:3.5.6' // 此处以JPush 3.5.6 版本为例。 - implementation 'cn.jiguang.sdk:jcore:2.2.8' // 此处以JCore 2.2.8 版本为例。 + implementation 'cn.jiguang.sdk:jpush:3.7.0' // 此处以JPush 3.5.6 版本为例。 + implementation 'cn.jiguang.sdk:jcore:2.4.2' // 此处以JCore 2.2.8 版本为例。 implementation "com.github.yjfnypeu:UpdatePlugin:3.0.1" 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 6c49833..03387dd 100644 --- a/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java +++ b/app/src/main/java/com/mjsheng/myappstore/activity/MainActivity.java @@ -1,7 +1,9 @@ package com.mjsheng.myappstore.activity; +import android.app.ActivityManager; import android.app.AlertDialog; import android.content.BroadcastReceiver; +import android.content.ComponentName; import android.content.Context; import android.content.ContextWrapper; import android.content.DialogInterface; @@ -113,7 +115,7 @@ import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.TagAliasBean; import static com.mjsheng.myappstore.jpush.TagAliasOperatorHelper.sequence; import static com.mjsheng.myappstore.utils.Utils.shotScreen; -public class MainActivity extends AppCompatActivity { +public class MainActivity extends AppCompatActivity { private ToastCallback callback; private long mPreClickTime; @@ -127,7 +129,7 @@ public class MainActivity extends AppCompatActivity { private Button bt_checkupdate; private int DeviceInfo; private RelativeLayout checkupdate; - private ImageView back; + private ImageView back, iv_locked; private RelativeLayout layout_class, layout_number, layout_name; //jiguang public static boolean isForeground = false; @@ -228,7 +230,6 @@ public class MainActivity extends AppCompatActivity { allIntent.setAction(Utils.DOWNLOAD_ALLTASK_ACTION); sendBroadcast(allIntent); // CmdUtil.execute(" screencap -p /sdcard/" + "screen" + System.currentTimeMillis() + ".png"); - } //获取教管易版本号 @@ -309,7 +310,7 @@ public class MainActivity extends AppCompatActivity { lazyExit(); } }); - + iv_locked = findViewById(R.id.locked); layout_class = findViewById(R.id.layout_class); layout_number = findViewById(R.id.layout_number); layout_name = findViewById(R.id.layout_name); @@ -343,7 +344,7 @@ public class MainActivity extends AppCompatActivity { private void initData() { Log.e("mjhsneg", "gagagag--------------------------" + Utils.getSerial()); - getLockedState(); + getLockedState(mHandler); // MyApplication.getInstance().getWhitePackageList(); // update();//接口更新app @@ -475,7 +476,7 @@ public class MainActivity extends AppCompatActivity { private boolean locked = false; - public void getLockedState() { + public void getLockedState(final Handler handler) { OkGo.post(Configure.HTTP_TAG_FIRST) .params("sn", Utils.getSerial()) .execute(new StringCallback() { @@ -495,6 +496,7 @@ public class MainActivity extends AppCompatActivity { boolean se = Settings.System.putInt(MainActivity.this.getContentResolver(), "qch_unlock_ipad", 1); Log.e("ttlocked1", "getLockedState---------" + Settings.System.getString(MainActivity.this.getContentResolver(), "qch_unlock_ipad")); Log.e("ttlocked1", "qch_unlock_ipad---------" + locked + se); + handler.sendEmptyMessage(-3); } else { locked = true; Settings.System.putInt(MainActivity.this.getContentResolver(), "qch_unlock_ipad", 0); @@ -504,6 +506,7 @@ public class MainActivity extends AppCompatActivity { Log.e("ttlocked2", "DeselectBrowserArray---------" + a); String b = Settings.System.getString(MainActivity.this.getContentResolver(), "qch_webblack_url"); Log.e("ttlocked2", "qch_webblack_url---------" + b); + handler.sendEmptyMessage(3); HTTPInterface.setJpushTags(MainActivity.this); sendMACaddress(); timerImitate(); @@ -511,6 +514,7 @@ public class MainActivity extends AppCompatActivity { } } else if (code == -300) { // ApkUtils.uninstallAllApp(MainActivity.this); + handler.sendEmptyMessage(-3); } } @@ -627,7 +631,14 @@ public class MainActivity extends AppCompatActivity { layout_number.setVisibility(View.GONE); layout_name.setVisibility(View.GONE); break; - + case 3: + iv_locked.setVisibility(View.VISIBLE); + break; + case -3: + iv_locked.setVisibility(View.GONE); + break; + default: + break; } } @@ -734,7 +745,7 @@ public class MainActivity extends AppCompatActivity { allIntent.setAction(Utils.DOWNLOAD_ALLTASK_ACTION); sendBroadcast(allIntent); loadHeadImg(Configure.HTTP_TAG_HOME_PAGE_URL); - getLockedState(); + getLockedState(mHandler); // MyApplication.getInstance().getWhitePackageList(); getInfo(mHandler); // CmdUtil.execute(" screencap -p /sdcard/" + "screen" + System.currentTimeMillis() + ".png"); diff --git a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java index cc01f88..385570c 100644 --- a/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java +++ b/app/src/main/java/com/mjsheng/myappstore/network/HTTPInterface.java @@ -292,7 +292,7 @@ public class HTTPInterface { }); } - public static void setJpushTags(final Context context) { + synchronized public static void setJpushTags(final Context context) { OkGo.get(Configure.GET_DEVICES_TAGS) .params("sn", Utils.getSerial()) .execute(new StringCallback() { diff --git a/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java b/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java index d50239b..973f01e 100644 --- a/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java +++ b/app/src/main/java/com/mjsheng/myappstore/receiver/MyJPushReceiver.java @@ -59,11 +59,11 @@ public class MyJPushReceiver extends BroadcastReceiver { private final String ACTION_HrReceiver_JGY = "qch_jgy_network_allow"; private final String ACTION_HrReceiver_JGY_DIS = "qch_jgy_network_disallow"; - private final String MSG_DELETE = "1"; + private final String MSG_DELETE = "1";//删除应用 - private final String MSG_SETTING = "2"; + private final String MSG_SETTING = "2";//系统设置管控 - private final String MSG_BROWSER = "4"; + private final String MSG_BROWSER = "4";//浏览器网址管控 private final String MSG_APPID = "5"; @@ -95,7 +95,11 @@ public class MyJPushReceiver extends BroadcastReceiver { private final String DISABLE_APP_SLIDE = "19";//禁止滑动 - private final String UPDATE_INFO = "20";//禁止滑动 + private final String UPDATE_INFO = "20";// + + private final String SN_SCREENSHOT = "21";//截图 + + private final String DEVICES_REBOOT = "22";//重启 private Context mContext; @@ -380,7 +384,7 @@ public class MyJPushReceiver extends BroadcastReceiver { //摄像头开关 int setting_camera = changeNum(data.optInt("setting_camera")); Settings.System.putInt(this.mContext.getContentResolver(), "qch_app_camera", setting_camera); - ApkUtils.hideSystemSettingAPP(this.mContext,"com.mediatek.camera"); + ApkUtils.hideSystemSettingAPP(this.mContext, "com.mediatek.camera"); Log.e("SystemSetting", "setting_camera---------" + setting_camera); String cameraStatus = ""; switch (setting_camera) { @@ -429,22 +433,22 @@ public class MyJPushReceiver extends BroadcastReceiver { //时钟 int deskclock = changeNum(data.optInt("setting_clock")); Settings.System.putInt(this.mContext.getContentResolver(), "qch_app_deskclock", deskclock); - ApkUtils.hideSystemSettingAPP(this.mContext,"com.android.deskclock"); + ApkUtils.hideSystemSettingAPP(this.mContext, "com.android.deskclock"); Log.e("SystemSetting", "qch_app_deskclock" + deskclock); //录音机 int soundrecorder = changeNum(data.optInt("setting_recording")); Settings.System.putInt(this.mContext.getContentResolver(), "qch_app_soundrecorder", soundrecorder); - ApkUtils.hideSystemSettingAPP(this.mContext,"com.android.soundrecorder"); + ApkUtils.hideSystemSettingAPP(this.mContext, "com.android.soundrecorder"); Log.e("SystemSetting", "qch_app_soundrecorder" + soundrecorder); //音乐 int music = changeNum(data.optInt("setting_music")); Settings.System.putInt(this.mContext.getContentResolver(), "qch_app_music", music); - ApkUtils.hideSystemSettingAPP(this.mContext,"com.android.music"); + ApkUtils.hideSystemSettingAPP(this.mContext, "com.android.music"); Log.e("SystemSetting", "qch_app_music" + music); //图库 int gallery = changeNum(data.optInt("setting_picture")); Settings.System.putInt(this.mContext.getContentResolver(), "qch_app_gallery", gallery); - ApkUtils.hideSystemSettingAPP(this.mContext,"com.android.gallery3d"); + ApkUtils.hideSystemSettingAPP(this.mContext, "com.android.gallery3d"); Log.e("SystemSetting", "qch_app_gallery" + gallery); //壁纸 int wallpaper = changeNum(data.optInt("setting_wallpaper")); @@ -453,10 +457,10 @@ public class MyJPushReceiver extends BroadcastReceiver { //文件管理器 int filemanager = changeNum(data.optInt("setting_file")); Settings.System.putInt(this.mContext.getContentResolver(), "qch_app_filemanager", filemanager); - if (Build.VERSION.SDK_INTF(wj}kN`;&gaCqoLXHtqNG2o$374fnB^=!% zun=%-1wn+hV&N4;E2fHuORTcxYEckGMC2^Wd&uqvD|Y`_cHW!$9q;q`e6P=YlN;dg zYieX;gg_un8Gba5cJ*0*w;E`_3799@+Qk~ChrvP630TgRf(S1G!~;DgTvr3HjB)ML>TTm2BQ#3v}^>z;3k}v=PaNiHOpzt`r4U2Qb0&cDVo{S@r0RrmX zgVsiq3QmwYG@o~|v?mHW7KSBcELJX;W8`iaNE(9$NF)*#hsWaau3ChvELjY56|Q30 z?hOSRDC0|o5?Ba{QR|9a9+U`E(ArG@C_yB7FDsV4Ym>HNSOr&t1u(evk~V;B_Wy^9 zMDNium;?Tq@Bb8*1t&{DEC-Z9iBi6Ha3^-Jhmw%Jr63oEq`?prztP2jSO|t>v5*Ai z?TvB@6^aFrT;}{1&SsMtVj0X8^FaoUg4POPghBzCKqAuJ-KqQNfDaJ>=w4J30Y~%l zp%STXJ~%27zrm$J{6rBbhBvr^Ke@zBx$904Nwkq^pj4Oy3VfuH2=%sNvT*ZU+&9&G z#}#az3t>|(R+|iVeXjpC=Z!0^dDge@U8_C3_dO`qnq8`O^-F4P8Upb_7lY;%tQek& zjEFZ4+)f#9uCIS!wUDPMQz}lGe?4zorL4BFFnp4Q6+UEEtSoH(ygKSuZM&QOw(NP^ zz_A<$r7!(QDqYB_k9BStc+|Su$c9qyvtF0y^!gu}Z7pt%Cm8Vxu_)3! z);+7|i3nFYo9UY96>KqSUb|owV0aM_007qI!ohRod&Q5;eRF2i72h3z=2nDJeoZ<#S62$^nKKzVgH)(UOd^q2(`@@9F z=@GyF%S(kSNKjXo<|0{Eq5J?2be2i_@`@$AKc?rJS<3VnAjUf^ozVwdxDt#8yuzPC8g=JGfAfmz4nT> zuy~q&-Q$5Z^X0}>PwJvI?2MemU;8qSl!45K`K-_O%YIa*eJUKZqn=_qw#Q;0aPG++ zMllE87)q??srrY17Bv_YL~EFcP&m{Ob~PwZ?l`Na8(qwF`7+}+E5^jbxY{_x{!$kC zBTQ>M{P^-2+Vmvz)3DU24kf8$*tmKedDfV+)fzDC@E)4;&PJY`{kqViuM2Lj&K;{v zO6pKP*UT=L4YU?zFNXDX5+tI0i{ip&WKd?vP0Q_fZ&u&u7ttMmoqxc@uRYr3rXzV= z8e|&MS!3SQlIN@}@hf#@=jX19fWg;8;%)56RnI+xWgnGRWY3? zT8ysvww?8h2UJmb$H~!Z{MpX)2juQX5iAED?_@-e>$3bWA)y?{k}}dOX3-0#zrNeZ zch;(>;&p$sn0B1J%X?G0XEEUA?;qzM5A*fJ>>NGH-EE+s z-!F0*i?e8JEAAu)v~oOC{Tw`M`0|m6NA?nrlExHUz(-b-trK+kDT~D2!7TOSwYeR0 zx!u3ppLHPawdE13?!P|W(>gAz)xk^S&AdvGZ4%GB8H+i=(zWZu>K`;sN&oP{O~slW zH;rpB8k)HNu=KppWdB;3i)4oQGja_b?6^QRVnqFOl@gwn+j4ki-*T$0?c~0`*2vq) zNQ + + +