代码提交

简柏林
1 parent 0036f78b
Showing 8 changed files with 134 additions and 26 deletions
app/src/main/AndroidManifest.xml
app/src/main/java/com/studymachine/www/app/AppActivity.java
app/src/main/java/com/studymachine/www/app/AppApplication.java
app/src/main/java/com/studymachine/www/js/MainJavaScriptInterface.java
app/src/main/java/com/studymachine/www/manager/ActivityManager.java
app/src/main/java/com/studymachine/www/ui/activity/BrowserActivity.java
app/src/main/java/com/studymachine/www/ui/activity/RestartActivity.java
app/src/main/java/com/studymachine/www/ui/presentation/BrowserPresentation.java
--- a/app/src/main/AndroidManifest.xml
View file @465b73c
+++ b/app/src/main/AndroidManifest.xml
View file @465b73c
@@ -57,6 +57,12 @@
         <meta-data
             android:name="ScopedStorage"
             android:value="true" />
+        <meta-data
+            android:name="com.rokid.uxr.application.mode"
+            android:value="3d" />
+        <meta-data
+            android:name="com.rokid.uxr.sdk.version"
+            android:value="10900" />
         <!-- 适配 Android 7.0 文件意图 -->
         <provider
--- a/app/src/main/java/com/studymachine/www/app/AppActivity.java
View file @465b73c
+++ b/app/src/main/java/com/studymachine/www/app/AppActivity.java
View file @465b73c
 package com.studymachine.www.app;
+import android.app.Activity;
+import android.app.AppOpsManager;
 import android.content.Context;
 import android.content.Intent;
 import android.hardware.display.DisplayManager;
 import android.hardware.usb.UsbDevice;
+import android.net.Uri;
+import android.os.Binder;
 import android.os.Build;
 import android.os.Bundle;
+import android.provider.Settings;
 import android.view.Display;
 import android.view.View;
 import android.view.WindowManager;
@@ -40,6 +45,9 @@ import com.studymachine.www.ui.presentation.WebPresentation;
 import org.greenrobot.eventbus.EventBus;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+
 import okhttp3.Call;
 /**
@@ -71,7 +79,8 @@ public abstract class AppActivity extends BaseActivity
      */
     private int mDialogCount;
-    public GlassInfo deviceInfo = RKGlassDevice.getInstance().getGlassInfo();;
+    public GlassInfo deviceInfo = RKGlassDevice.getInstance().getGlassInfo();
+    ;
     MutableLiveData<Boolean> connectStatus = new MutableLiveData();
@@ -131,30 +140,69 @@ public abstract class AppActivity extends BaseActivity
         mDialog.dismiss();
     }
+    //判断是否开启悬浮窗权限   context可以用你的Activity.或者tiis
+    public static boolean checkFloatPermission(Context context) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT)
+            return true;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            try {
+                Class cls = Class.forName("android.content.Context");
+                Field declaredField = cls.getDeclaredField("APP_OPS_SERVICE");
+                declaredField.setAccessible(true);
+                Object obj = declaredField.get(cls);
+                if (!(obj instanceof String)) {
+                    return false;
+                }
+                String str2 = (String) obj;
+                obj = cls.getMethod("getSystemService", String.class).invoke(context, str2);
+                cls = Class.forName("android.app.AppOpsManager");
+                Field declaredField2 = cls.getDeclaredField("MODE_ALLOWED");
+                declaredField2.setAccessible(true);
+                Method checkOp = cls.getMethod("checkOp", Integer.TYPE, Integer.TYPE, String.class);
+                int result = (Integer) checkOp.invoke(obj, 24, Binder.getCallingUid(), context.getPackageName());
+                return result == declaredField2.getInt(cls);
+            } catch (Exception e) {
+                return false;
+            }
+        } else {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                AppOpsManager appOpsMgr = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+                if (appOpsMgr == null)
+                    return false;
+                int mode = appOpsMgr.checkOpNoThrow("android:system_alert_window", android.os.Process.myUid(), context
+                        .getPackageName());
+                return mode == AppOpsManager.MODE_ALLOWED || mode == AppOpsManager.MODE_IGNORED;
+            } else {
+                return Settings.canDrawOverlays(context);
+            }
+        }
+    }
+
+    private void requestSettingCanDrawOverlays() {
+        int sdkInt = Build.VERSION.SDK_INT;
+        if (sdkInt >= Build.VERSION_CODES.O) {//8.0以上
+            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+            startActivity(intent);
+        } else if (sdkInt >= Build.VERSION_CODES.M) {//6.0-8.0
+            Intent intent = new Intent(Settings.ACTION_MANAGE_OVERLAY_PERMISSION);
+            intent.setData(Uri.parse("package:" + getPackageName()));
+            startActivity(intent);
+        } else {//4.4-6.0以下
+            //无需处理了
+        }
+    }
+
     @Override
     protected void initLayout() {
-        if(!RKGlassDevice.getInstance().requestUSBDevicePermission()){
+        if (!checkFloatPermission(this)) {
+            //权限请求方法
+            requestSettingCanDrawOverlays();
+        }
+        if (!RKGlassDevice.getInstance().requestUSBDevicePermission()) {
             toast("请到系统设置添加悬浮框权限");
             finish();
         }
-        RKGlassDevice.getInstance().init(new OnGlassDeviceConnectListener() {
-            @Override
-            public void onGlassDeviceConnected(UsbDevice usbDevice) {
-//                //Glass 设备连接成功
-//                addControllerView();
-                connectStatus.setValue(true);
-                openAppPresentation();
-            }
-
-            @Override
-            public void onGlassDeviceDisconnected() {
-                connectStatus.setValue(false);
-                ActivityManager.getInstance().finishAllActivities();
-//                mControllerBid.setVisibility(View.GONE);
-            }
-        });
-        deviceInfo = RKGlassDevice.getInstance().getGlassInfo();
         super.initLayout();
         if (getTitleBar() != null) {
             getTitleBar().setOnTitleBarListener(this);
@@ -172,6 +220,30 @@ public abstract class AppActivity extends BaseActivity
         //保持常亮
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
         EventBusManager.register(this);
+        RKGlassDevice.getInstance().init(new OnGlassDeviceConnectListener() {
+            @Override
+            public void onGlassDeviceConnected(UsbDevice usbDevice) {
+//                //Glass 设备连接成功
+//                addControllerView();
+                if (isDestroyed()){
+                    return;
+                }
+                connectStatus.setValue(true);
+                openAppPresentation();
+            }
+
+            @Override
+            public void onGlassDeviceDisconnected() {
+                if (isDestroyed()){
+                    return;
+                }
+
+                connectStatus.setValue(false);
+                ActivityManager.getInstance().finishAllActivities();
+//                mControllerBid.setVisibility(View.GONE);
+            }
+        });
+        deviceInfo = RKGlassDevice.getInstance().getGlassInfo();
     }
     /**
@@ -289,6 +361,12 @@ public abstract class AppActivity extends BaseActivity
     }
     @Override
+    protected void onResume() {
+        RKGlassDevice.getInstance().setDisplayMode(RKGlassDevice.GlassDisplayMode.MODE_2D);
+        super.onResume();
+    }
+
+    @Override
     protected void onDestroy() {
         super.onDestroy();
         if (isShowDialog()) {
--- a/app/src/main/java/com/studymachine/www/app/AppApplication.java
View file @465b73c
+++ b/app/src/main/java/com/studymachine/www/app/AppApplication.java
View file @465b73c
@@ -154,13 +154,13 @@ public final class AppApplication extends Application {
             @Override
             public void onGlassDeviceConnected(UsbDevice usbDevice) {
                 //Glass 设备连接成功
-                MutableLiveData<Boolean> connectStatus = new MutableLiveData();
-                connectStatus.setValue(true);
+//                MutableLiveData<Boolean> connectStatus = new MutableLiveData();
+//                connectStatus.setValue(true);
             }
             @Override
             public void onGlassDeviceDisconnected() {
-                ActivityManager.getInstance().finishAllActivities();
+//                ActivityManager.getInstance().finishAllActivities();
                 //Glass 设备断开连接
             }
         });
--- a/app/src/main/java/com/studymachine/www/js/MainJavaScriptInterface.java
View file @465b73c
+++ b/app/src/main/java/com/studymachine/www/js/MainJavaScriptInterface.java
View file @465b73c
@@ -2,9 +2,14 @@ package com.studymachine.www.js;
 import android.app.Activity;
+import android.content.Context;
 import android.graphics.drawable.Drawable;
+import android.hardware.display.DisplayManager;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
+import android.view.Display;
+import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
@@ -25,6 +30,7 @@ import com.studymachine.www.app.AppPresentation;
 import com.studymachine.www.app.ModeHandler;
 import com.studymachine.www.event.SwfEvent;
 import com.studymachine.www.http.glide.GlideApp;
+import com.studymachine.www.manager.ActivityManager;
 import com.studymachine.www.manager.GlobalParameterManager;
 import com.studymachine.www.manager.UserManager;
 import com.studymachine.www.other.AppConfig;
@@ -35,6 +41,7 @@ import com.studymachine.www.ui.activity.AiListActivity;
 import com.studymachine.www.ui.activity.BrowserActivity;
 import com.studymachine.www.ui.activity.SwfActivity;
 import com.studymachine.www.ui.dialog.WaitDialog;
+import com.studymachine.www.ui.presentation.BrowserPresentation;
 import com.studymachine.www.widget.X5WebView;
 import org.greenrobot.eventbus.EventBus;
@@ -246,8 +253,10 @@ public class MainJavaScriptInterface {
         }
         Tool.startOtherApp(mContext, packageName);
+        ActivityManager.getInstance().finishAllActivities();
         if (presentation != null) {
             presentation.dismiss();
+            presentation = null;
         }
     }
--- a/app/src/main/java/com/studymachine/www/manager/ActivityManager.java
View file @465b73c
+++ b/app/src/main/java/com/studymachine/www/manager/ActivityManager.java
View file @465b73c
@@ -8,6 +8,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.collection.ArrayMap;
+import com.rokid.axr.phone.glassdevice.RKGlassDevice;
+
 import java.util.ArrayList;
 import timber.log.Timber;
@@ -122,6 +124,7 @@ public final class ActivityManager implements Application.ActivityLifecycleCallb
      */
     public void finishAllActivities() {
         finishAllActivities((Class<? extends Activity>) null);
+        RKGlassDevice.getInstance().deInit();
     }
     /**
--- a/app/src/main/java/com/studymachine/www/ui/activity/BrowserActivity.java
View file @465b73c
+++ b/app/src/main/java/com/studymachine/www/ui/activity/BrowserActivity.java
View file @465b73c
@@ -109,10 +109,13 @@ public final class BrowserActivity extends AppActivity
     @Override
     protected void initData() {
-        if (deviceInfo != null && deviceInfo.getSn() != null) {
+        if (deviceInfo != null && deviceInfo.getSn() != null && deviceInfo.isvSyncStatus()) {
             mControlBack = findViewById(R.id.control_back);
             mControlChange = findViewById(R.id.control_change);
             mControlMode = findViewById(R.id.control_mode);
+            if (mControlBack == null){
+                return;
+            }
             mControlBack.setVisibility(View.VISIBLE);
             mControlChange.setVisibility(View.VISIBLE);
             mControlMode.setVisibility(View.GONE);
@@ -211,10 +214,17 @@ public final class BrowserActivity extends AppActivity
                 } else {
                     presentation.getWindow().setType(WindowManager.LayoutParams.TYPE_SYSTEM_OVERLAY);
                 }
+            } else {
+                return;
             }
         }
         presentation.setOwnerActivity(this);
-        presentation.show();
+        try {
+            presentation.show();
+        } catch (Exception e) {
+            presentation.dismiss();
+            presentation.show();
+        }
         presentation.setMode(0);
     }
--- a/app/src/main/java/com/studymachine/www/ui/activity/RestartActivity.java
View file @465b73c
+++ b/app/src/main/java/com/studymachine/www/ui/activity/RestartActivity.java
View file @465b73c
@@ -41,10 +41,10 @@ public final class RestartActivity extends AppActivity {
         Intent intent;
         if (UserManager.getInstance().getToken()==null) {
             // 如果是未登录的情况下跳转到闪屏页
-            intent = new Intent(context, LoginActivity.class);
+            intent = new Intent(context, SplashActivity.class);
         } else {
             // 如果是已登录的情况下跳转到首页
-            intent = new Intent(context, HomeActivity.class);
+            intent = new Intent(context, SplashActivity.class);
         }
         if (!(context instanceof Activity)) {
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
--- a/app/src/main/java/com/studymachine/www/ui/presentation/BrowserPresentation.java
View file @465b73c
+++ b/app/src/main/java/com/studymachine/www/ui/presentation/BrowserPresentation.java
View file @465b73c
@@ -2,9 +2,11 @@ package com.studymachine.www.ui.presentation;
 import static com.hjq.http.EasyUtils.post;
+import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.Build;
 import android.os.Message;
 import android.view.Display;
 import android.view.View;