version:1.7.0

fix:0918
add:

app/src/main/java/com/info/sn/activity/main/MainActivity.java

@@ -167,6 +167,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
         ButterKnife.bind(this);
         mPresenter.setProvider(this);
         mPresenter.attachView(this);
+        NetworkUtils.registerNetworkStatusChangedListener(this);
 
         setOnClickListener();
         tv_devsn.setText(Utils.getSerial());
@@ -228,6 +229,7 @@ public class MainActivity extends BaseActivity implements MainContact.MainView,
     protected void onDestroy() {
         super.onDestroy();
         mPresenter.detachView();
+        NetworkUtils.unregisterNetworkStatusChangedListener(this);
         startService();
     }
 

app/src/main/java/com/info/sn/activity/main/MainPresenter.java

@@ -359,9 +359,7 @@ public class MainPresenter implements MainContact.Presenter {
                 });
     }
 
-    /**
+
-     * @param gankaoUID 发送赶考uid到后台
-     */
 //    private void sendUid(AvailableProduct product, String gankaoUID) {
 //        NetInterfaceManager.getInstance()
 //                .getSaveSnUidApiControl()

app/src/main/java/com/info/sn/bean/zuoye/SystemSettings.java

@@ -24,6 +24,7 @@ public class SystemSettings implements Serializable {
     int setting_picture;
     int setting_wallpaper;
     int setting_file;
+    int setting_browser;
     int setting_bhtvideo;
     String setting_context;
     int setting_bht;
@@ -193,6 +194,14 @@ public class SystemSettings implements Serializable {
         this.setting_file = setting_file;
     }
 
+    public int getSetting_browser() {
+        return setting_browser;
+    }
+
+    public void setSetting_browser(int setting_browser) {
+        this.setting_browser = setting_browser;
+    }
+
     public int getSetting_bhtvideo() {
         return setting_bhtvideo;
     }

app/src/main/java/com/info/sn/manager/ControlManager.java

@@ -477,6 +477,10 @@ public class ControlManager {
                 ApkUtils.hideSystemSettingAPP(mContext, "com.android.documentsui");
             }
             Log.e("SystemSetting", "qch_app_filemanager:" + filemanager);
+            //浏览器
+            int browser = changeNum(settings.getSetting_browser());
+            JGYUtils.putInt(mContext.getContentResolver(), "qch_app_browser", browser);
+            Log.e(TAG, "qch_app_browser" + browser);
         } catch (Exception e) {
             Log.e(TAG, "setIcon: " + e.getMessage());
         }
@@ -515,6 +519,9 @@ public class ControlManager {
                 ApkUtils.hideSystemSettingAPP(mContext, "com.android.documentsui");
             }
             Log.e(TAG, "qch_app_filemanager" + state);
+            //浏览器
+            Settings.System.putInt(mContext.getContentResolver(), "qch_app_browser", state);
+            Log.e(TAG, "qch_app_browser" + state);
         } catch (Exception e) {
             Log.e(TAG, "setIcon: " + e.getMessage());
         }

app/src/main/java/com/info/sn/receiver/MyJPushReceiver.java

@@ -157,6 +157,7 @@ public class MyJPushReceiver extends BroadcastReceiver {
     private static final String JIGUANG_APP_FILE_MANAGER = "36";
     private static final String JIGUANG_APP_GALLERY = "37";
     private static final String JIGUANG_APP_MUSIC = "38";
+    private static final String JIGUANG_APP_BROWSER = "43";
     //搜题开关
     private static final String JIGUANG_SEARCH_TOPIC = "39";
     //电话白名单推送
@@ -166,7 +167,7 @@ public class MyJPushReceiver extends BroadcastReceiver {
     //取消所有套餐
     private static final String JIGUANG_CANCEL_COMBO = "42";
     //升级套餐
-    private static final String JIGUANG_UPGRADE_COMBO = "43";
+    private static final String JIGUANG_UPGRADE_COMBO = "44";
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -378,6 +379,10 @@ public class MyJPushReceiver extends BroadcastReceiver {
                 break;
             case JIGUANG_UPGRADE_COMBO:
                 upgradeCombo(context, extras);
+            case JIGUANG_APP_BROWSER:
+                ToastUtil.debugShow("收到推送消息: 系统APP管控");
+                Log.e(TAG, "processCustomMessage: " + extras);
+                hideDesktopIcon(context);
                 break;
             default:
                 break;
@@ -944,6 +949,7 @@ public class MyJPushReceiver extends BroadcastReceiver {
         JGYUtils.updateForbidList(context);
     }
 
+
     private void changeCombo(Context context, String jsonString) {
         Log.e(TAG, "changeCombo: " + jsonString);
         JSONObject jsonObject = JSON.parseObject(jsonString);
@@ -1330,6 +1336,7 @@ public class MyJPushReceiver extends BroadcastReceiver {
     }
 
     private void upgradeCombo(Context context, String jsonString) {
+        Log.e(TAG, "upgradeCombo: " + jsonString);
         JSONObject jsonObject = JSON.parseObject(jsonString);
         String appid = Scheme.partner_id;
         String timestamp = String.valueOf(System.currentTimeMillis());
@@ -1354,7 +1361,7 @@ public class MyJPushReceiver extends BroadcastReceiver {
 
                     @Override
                     public void onNext(GankaoBaseResponse gankaoBaseResponse) {
-                        Log.e("upgradeCombo", "onNext: ");
+                        Log.e("upgradeCombo", "onNext: " + JSONObject.toJSONString(gankaoBaseResponse));
                     }
 
                     @Override

app/src/main/java/com/info/sn/service/MainService.java

@@ -31,6 +31,8 @@ import com.trello.rxlifecycle2.RxLifecycle;
 import com.trello.rxlifecycle2.android.ActivityEvent;
 import com.trello.rxlifecycle2.android.RxLifecycleAndroid;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
@@ -52,7 +54,6 @@ import static com.info.sn.jpush.TagAliasOperatorHelper.sequence;
  */
 public class MainService extends Service implements MainContact.MainView, NetworkUtils.OnNetworkStatusChangedListener, LifecycleProvider<ActivityEvent> {
     private String TAG = MainService.class.getSimpleName();
-    private Start start;
     private MainPresenter mPresenter = new MainPresenter(this);
 
     //执行所有请求的时间
@@ -63,16 +64,19 @@ public class MainService extends Service implements MainContact.MainView, Networ
 
     private final BehaviorSubject<ActivityEvent> lifecycleSubject = BehaviorSubject.create();
 
+    @NotNull
     @Override
     public Observable<ActivityEvent> lifecycle() {
         return lifecycleSubject.hide();
     }
 
+    @NotNull
     @Override
-    public <T> LifecycleTransformer<T> bindUntilEvent(ActivityEvent event) {
+    public <T> LifecycleTransformer<T> bindUntilEvent(@NotNull ActivityEvent event) {
         return RxLifecycle.bindUntilEvent(lifecycleSubject, event);
     }
 
+    @NotNull
     @Override
     public <T> LifecycleTransformer<T> bindToLifecycle() {
         return RxLifecycleAndroid.bindActivity(lifecycleSubject);
@@ -81,8 +85,9 @@ public class MainService extends Service implements MainContact.MainView, Networ
     private interface Start {
         void onstar(long time);
     }
+    private Start start;
 
-    private ObservableOnSubscribe<Long> subscribe = new ObservableOnSubscribe<Long>() {
+    private final ObservableOnSubscribe<Long> subscribe = new ObservableOnSubscribe<Long>() {
         @Override
         public void subscribe(ObservableEmitter emitter) throws Exception {
             start = new Start() {

app/src/main/res/layout/activity_home.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+</FrameLayout>