add: promise support; fix: dialogs and setClip ANR on ui thread;
This commit is contained in:
@@ -8,8 +8,8 @@ android {
|
||||
applicationId "com.stardust.scriptdroid"
|
||||
minSdkVersion 17
|
||||
targetSdkVersion 23
|
||||
versionCode 226
|
||||
versionName "3.0.0 Alpha26"
|
||||
versionCode 227
|
||||
versionName "3.0.0 Alpha27"
|
||||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
multiDexEnabled true
|
||||
ndk {
|
||||
@@ -115,8 +115,6 @@ dependencies {
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
|
||||
compile 'com.jakewharton.retrofit:retrofit2-rxjava2-adapter:1.0.0'
|
||||
//JDeferred
|
||||
compile 'org.jdeferred:jdeferred-android-aar:1.2.6'
|
||||
//Glide
|
||||
compile('com.github.bumptech.glide:glide:4.2.0', {
|
||||
exclude group: 'com.android.support'
|
||||
|
||||
70
app/src/main/assets/sample/对话框/UI模式下使用对话框.js
Normal file
70
app/src/main/assets/sample/对话框/UI模式下使用对话框.js
Normal file
@@ -0,0 +1,70 @@
|
||||
"ui";
|
||||
|
||||
ui.layout(
|
||||
<vertical>
|
||||
<button id="callback" align="center">回调形式</button>
|
||||
<button id="promise" align="center">Promise形式</button>
|
||||
<button id="calc" align="center">简单计算器</button>
|
||||
</vertical>
|
||||
);
|
||||
|
||||
ui.callback.click(()=>{
|
||||
dialogs.confirm("要弹出输入框吗?", "", function(b){
|
||||
if(b){
|
||||
dialogs.rawInput("输入", "", function(str){
|
||||
alert("您输入的是:" + str);
|
||||
});
|
||||
}else{
|
||||
ui.finish();
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
ui.promise.click(()=>{
|
||||
dialogs.confirm("要弹出输入框吗")
|
||||
.then(function(b){
|
||||
if(b){
|
||||
return dialogs.rawInput("输入");
|
||||
}else{
|
||||
ui.finish();
|
||||
}
|
||||
}).then(function(str){
|
||||
alert("您输入的是:" + str);
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
ui.calc.click(()=>{
|
||||
let num1, num2, op;
|
||||
dialogs.input("请输入第一个数字")
|
||||
.then(n => {
|
||||
num1 = n;
|
||||
return dialogs.singleChoice("请选择运算", ["加", "减", "乘", "除", "幂"]);
|
||||
})
|
||||
.then(o => {
|
||||
op = o;
|
||||
return dialogs.input("请输入第二个数字");
|
||||
})
|
||||
.then(n => {
|
||||
num2 = n;
|
||||
var result;
|
||||
switch(op){
|
||||
case 0:
|
||||
result = num1 + num2;
|
||||
break;
|
||||
case 1:
|
||||
result = num1 - num2;
|
||||
break;
|
||||
case 2:
|
||||
result = num1 * num2;
|
||||
break;
|
||||
case 3:
|
||||
result = num1 / num2;
|
||||
break;
|
||||
case 4:
|
||||
result = Math.pow(num1, num2);
|
||||
break;
|
||||
}
|
||||
alert("运算结果", result);
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user