From de4f08641581649c01ff26069cc6031b14866bae Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Fri, 29 Dec 2017 14:09:27 +0800 Subject: [PATCH] api: device.keepScreenOn(), device.keepScreenDim(), device.wakeUp(), device.vibrate(); fix: crash when rotating editor --- app/src/main/AndroidManifest.xml | 3 + .../scriptdroid/ui/edit/EditorView.java | 2 +- app/src/main/res/layout/editor_view.xml | 4 +- autojs/src/main/AndroidManifest.xml | 2 + .../stardust/autojs/runtime/api/Device.java | 57 ++++++++++++++++++- .../stardust/autojs/runtime/api/Timers.java | 4 +- 6 files changed, 65 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e3dd3772..5d7514d1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -97,7 +97,10 @@ + diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java index 591874b0..56e89d0e 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorView.java @@ -84,7 +84,7 @@ public class EditorView extends FrameLayout implements CodeCompletionBar.OnHintC @ViewById(R.id.symbol_bar) CodeCompletionBar mSymbolBar; - @ViewById(R.id.properties) + @ViewById(R.id.functions) ImageView mShowFunctionsButton; @ViewById(R.id.functions_keyboard) diff --git a/app/src/main/res/layout/editor_view.xml b/app/src/main/res/layout/editor_view.xml index c81c7570..3f0aa445 100644 --- a/app/src/main/res/layout/editor_view.xml +++ b/app/src/main/res/layout/editor_view.xml @@ -139,7 +139,7 @@ android:layout_alignParentBottom="true"/> + android:layout_toRightOf="@+id/functions"/> diff --git a/autojs/src/main/AndroidManifest.xml b/autojs/src/main/AndroidManifest.xml index aaf9e857..96162dd3 100644 --- a/autojs/src/main/AndroidManifest.xml +++ b/autojs/src/main/AndroidManifest.xml @@ -5,6 +5,8 @@ + + getMaxCallbackUptimeMillisForAllThreads() { + VolatileBox getMaxCallbackUptimeMillisForAllThreads() { return mMaxCallbackUptimeMillisForAllThreads; } @@ -81,8 +81,6 @@ public class Timers { public boolean hasPendingCallbacks() { //如果是脚本主线程,则检查所有子线程中的定时回调。mFutureCallbackUptimeMillis用来记录所有子线程中定时最久的一个。 if (mThreads.getMainThread() == Thread.currentThread()) { - Log.d(LOG_TAG, "[main thread]hasPendingCallbacks:" + (mMaxCallbackUptimeMillisForAllThreads.get() > SystemClock.uptimeMillis())); - Log.d(LOG_TAG, "mMaxCallbackUptimeMillisForAllThreads:" + mMaxCallbackUptimeMillisForAllThreads.get()); return mMaxCallbackUptimeMillisForAllThreads.get() > SystemClock.uptimeMillis(); } //否则检查当前线程的定时回调