tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: import file

Browse Source
This commit is contained in:
hyb1996
2017-12-10 18:40:22 +08:00
parent 0d8a3e41fb
commit 6e6cefbb24
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@@ -97,8 +97,7 @@
</activity> </activity>
<activity <activity
android:name="com.stardust.autojs.core.image.ScreenCaptureRequestActivity" 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 <activity
android:name=".ui.error.IssueReporterActivity" android:name=".ui.error.IssueReporterActivity"
android:theme="@style/IssueReporterTheme"/> android:theme="@style/IssueReporterTheme"/>

8
app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java
View File

@@ -43,6 +43,7 @@ import java.io.InputStream;
import io.reactivex.Observable; import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers; import io.reactivex.schedulers.Schedulers;
import io.reactivex.subjects.PublishSubject; import io.reactivex.subjects.PublishSubject;
@@ -118,9 +119,10 @@ public class ScriptOperations {
} else { } else {
showMessage(R.string.text_import_fail); showMessage(R.string.text_import_fail);
} }
mStorageFileProvider.notifyFileCreated(mCurrentDirectory, new ScriptFile(pathTo));
return pathTo; return pathTo;
}); })
.observeOn(AndroidSchedulers.mainThread())
.doOnNext(path -> mStorageFileProvider.notifyFileCreated(mCurrentDirectory, new ScriptFile(path)));
} }
public Observable<String> importFile(String prefix, final InputStream inputStream, final String ext) { public Observable<String> importFile(String prefix, final InputStream inputStream, final String ext) {
@@ -305,7 +307,7 @@ public class ScriptOperations {
new FileChooserDialogBuilder(mContext) new FileChooserDialogBuilder(mContext)
.dir(Environment.getExternalStorageDirectory().getPath()) .dir(Environment.getExternalStorageDirectory().getPath())
.justScriptFile() .justScriptFile()
.singleChoice(file -> importFile(file.getPath())) .singleChoice(file -> importFile(file.getPath()).subscribe())
.title(R.string.text_select_file_to_import) .title(R.string.text_select_file_to_import)
.positiveText(R.string.ok) .positiveText(R.string.ok)
.show(); .show();

2
app/src/main/java/com/stardust/scriptdroid/ui/main/FloatingActionMenu.java
View File

@@ -41,7 +41,7 @@ public class FloatingActionMenu extends FrameLayout implements View.OnClickListe
private View[] mFabContainers; private View[] mFabContainers;
private boolean mExpanded = false; private boolean mExpanded = false;
private int mInterval = 30; private int mInterval = 30;
private int mDuration = 300; private int mDuration = 250;
private final Interpolator mInterpolator = new FastOutSlowInInterpolator(); private final Interpolator mInterpolator = new FastOutSlowInInterpolator();
private final PublishSubject<Boolean> mState = PublishSubject.create(); private final PublishSubject<Boolean> mState = PublishSubject.create();
private OnFloatingActionButtonClickListener mOnFloatingActionButtonClickListener; private OnFloatingActionButtonClickListener mOnFloatingActionButtonClickListener;