From d3ef346f624b13697978c0bb95008b590462b5ff Mon Sep 17 00:00:00 2001
From: hyb1996 <946994919@qq.com>
Date: Tue, 18 Dec 2018 16:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=BA24=E5=B0=8F=E6=97=B6=E5=88=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=20=E4=BF=AE=E5=A4=8D=20app.getUriForFile?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20Media.isMusicPlaying()=E4=B8=8D=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/org/autojs/autojs/ui/main/task/Task.java   | 2 +-
 .../autojs/autojs/ui/timing/TimedTaskSettingActivity.java    | 5 +++++
 autojs/src/main/assets/modules/__app__.js                    | 4 ++--
 .../src/main/java/com/stardust/autojs/runtime/api/Media.java | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/autojs/autojs/ui/main/task/Task.java b/app/src/main/java/org/autojs/autojs/ui/main/task/Task.java
index 3ad1ec0a..b44d72c1 100644
--- a/app/src/main/java/org/autojs/autojs/ui/main/task/Task.java
+++ b/app/src/main/java/org/autojs/autojs/ui/main/task/Task.java
@@ -74,7 +74,7 @@ public abstract class Task {
             if (mTimedTask != null) {
                 long nextTime = mTimedTask.getNextTime();
                 return GlobalAppContext.getString(R.string.text_next_run_time) + ": " +
-                        DateTimeFormat.shortDateTime().print(nextTime);
+                        DateTimeFormat.forPattern("yyyy/MM/dd HH:mm").print(nextTime);
             } else {
                 assert mIntentTask != null;
                 Integer desc = ACTION_DESC_MAP.get(mIntentTask.getAction());
diff --git a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java
index 529ee36c..35bdb4ae 100644
--- a/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java
+++ b/app/src/main/java/org/autojs/autojs/ui/timing/TimedTaskSettingActivity.java
@@ -11,8 +11,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.provider.Settings;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.FileProvider;
+
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -192,6 +195,8 @@ public class TimedTaskSettingActivity extends BaseActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             mToolbar.setSubtitle(mScriptFile.getName());
         }
+        mDailyTaskTimePicker.setIs24HourView(true);
+        mWeeklyTaskTimePicker.setIs24HourView(true);
         findDayOfWeekCheckBoxes(mWeeklyTaskContainer);
         setUpTaskSettings();
     }
diff --git a/autojs/src/main/assets/modules/__app__.js b/autojs/src/main/assets/modules/__app__.js
index 9d0573a5..02f461e7 100644
--- a/autojs/src/main/assets/modules/__app__.js
+++ b/autojs/src/main/assets/modules/__app__.js
@@ -146,7 +146,7 @@ module.exports = function (runtime, global) {
         if (app.fileProviderAuthority == null) {
             return android.net.Uri.fromFile(file);
         }
-        return android.support.v4.content.FileProvider.getUriForFile(context,
+        return androidx.core.content.FileProvider.getUriForFile(context,
             app.fileProviderAuthority, file);
     };
 
@@ -166,7 +166,7 @@ module.exports = function (runtime, global) {
             return "'" + str.replace("'", "\\'") + "'";
         }
         function isInt(value) {
-            return Bumber.isInteger(value) && value <= java.lang.Integer.MAX_VALUE && value >= java.lang.Integer.MIN_VALUE;
+            return Number.isInteger(value) && value <= java.lang.Integer.MAX_VALUE && value >= java.lang.Integer.MIN_VALUE;
         }
         function typeChar(value){
             if(typeof(value) == 'boolean'){
diff --git a/autojs/src/main/java/com/stardust/autojs/runtime/api/Media.java b/autojs/src/main/java/com/stardust/autojs/runtime/api/Media.java
index b1008920..76622a7a 100644
--- a/autojs/src/main/java/com/stardust/autojs/runtime/api/Media.java
+++ b/autojs/src/main/java/com/stardust/autojs/runtime/api/Media.java
@@ -68,7 +68,7 @@ public class Media implements MediaScannerConnection.MediaScannerConnectionClien
         mMediaPlayer.seekTo(m);
     }
 
-    public boolean isMuiscPlaying() {
+    public boolean isMusicPlaying() {
         return mMediaPlayer != null && mMediaPlayer.isPlaying();
     }