merge commits

app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":228},"path":"release-3.0.0 Alpha28.apk","properties":{"packageId":"com.stardust.scriptdroid","split":"","minSdkVersion":"17"}}]

app/src/main/AndroidManifest.xml

@@ -98,7 +98,7 @@
         <activity
             android:name="com.stardust.autojs.core.image.ScreenCaptureRequestActivity"
             android:taskAffinity="com.stardust.autojs.runtime.api.image.ScreenCaptureRequestActivity"
-            android:theme="@style/AppTheme.Transparent"/>
+            android:theme="@android:style/Theme.NoDisplay"/>
         <activity
             android:name=".ui.error.IssueReporterActivity"
             android:theme="@style/IssueReporterTheme"/>

app/src/main/assets/sample/设备与设备信息/获取设备信息.js

@@ -0,0 +1,21 @@
+
+console.show();
+
+var str = "";
+str += "屏幕宽度:" + device.width;
+str += "\n屏幕高度:" + device.height;
+str += "\nbuildId:" + device.buildId;
+str += "\n主板:" + device.board;
+str += "\n制造商:" + device.brand;
+str += "\n型号:" + device.model;
+str += "\n产品名称:" + device.product;
+str += "\nbootloader版本:" + device.bootloader;
+str += "\n硬件名称:" + device.hardware;
+str += "\n唯一标识码:" + device.fingerprint;
+str += "\nIMEI: " + device.getIMEI();
+str += "\nAndroidId: " + device.getAndroidId();
+str += "\nMac: " + device.getMacAddress();
+str += "\nAPI: " + device.sdkInt;
+str += "\n电量: " + device.getBattery();
+
+log(str);

app/src/main/assets/sample/设备与设备信息/调整设备亮度.js

@@ -0,0 +1,24 @@
+"ui";
+
+ui.layout(
+    <vertical padding="16">
+        <checkbox id="auto" text="自动亮度"/>
+        <text textColor="black" textSize="16sp" margin="8">亮度</text>
+        <seekbar id="brightness" max="100"/>
+    </vertical>
+);
+
+//getBrightnessMode()返回亮度模式，1为自动亮度
+ui.auto.setChecked(device.getBrightnessMode());
+ui.auto.setOnCheckedChangeListener(function(v, checked){
+    device.setBrightnessMode(checked ? 1: 0);
+});
+
+ui.brightness.setProgress(device.getBrightness());
+ui.brightness.setOnSeekBarChangeListener({
+    onProgressChanged: function(seekbar, p, fromUser){
+        if(fromUser){
+            device.setBrightness(p);
+        }
+    }
+});

app/src/main/assets/sample/设备与设备信息/调整设备音量.js

@@ -0,0 +1,44 @@
+"ui";
+
+ui.layout(
+    <vertical padding="16">
+        <text textColor="black" textSize="16sp">媒体音量</text>
+        <seekbar id="music"/>
+
+        <text textColor="black" textSize="16sp">通知音量</text>
+        <seekbar id="notification"/>
+
+        <text textColor="black" textSize="16sp">闹钟音量</text>
+        <seekbar id="alarm"/>
+    </vertical>
+);
+
+ui.music.setMax(device.getMusicMaxVolume());
+ui.music.setProgress(device.getMusicVolume());
+ui.music.setOnSeekBarChangeListener({
+    onProgressChanged: function(seekbar, p, fromUser){
+        if(fromUser){
+            device.setMusicVolume(p);
+        }
+    }
+});
+
+ui.notification.setMax(device.getNotificationMaxVolume());
+ui.notification.setProgress(device.getAlarmVolume());
+ui.notification.setOnSeekBarChangeListener({
+    onProgressChanged: function(seekbar, p, fromUser){
+        if(fromUser){
+            device.setNotificationVolume(p);
+        }
+    }
+});
+
+ui.alarm.setMax(device.getAlarmMaxVolume());
+ui.alarm.setProgress(device.getAlarmVolume());
+ui.alarm.setOnSeekBarChangeListener({
+    onProgressChanged: function(seekbar, p, fromUser){
+        if(fromUser){
+            device.setAlarmVolume(p);
+        }
+    }
+});

app/src/main/java/com/stardust/scriptdroid/ui/BaseActivity.java

@@ -9,6 +9,7 @@ import android.support.annotation.RequiresApi;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.widget.SeekBar;
 
 import com.stardust.scriptdroid.R;
 import com.stardust.scriptdroid.network.VersionService;
@@ -26,7 +27,7 @@ import static android.content.pm.PackageManager.PERMISSION_GRANTED;
  * Created by Stardust on 2017/1/23.
  */
 
-public abstract class BaseActivity extends AppCompatActivity  {
+public abstract class BaseActivity extends AppCompatActivity {
 
 
     protected static final int PERMISSION_REQUEST_CODE = 11186;