fix some bugs

This commit is contained in:
hyb1996
2018-10-11 12:00:50 +08:00
parent f757083657
commit e56682162e
25 changed files with 168 additions and 52 deletions

View File

@@ -12,17 +12,16 @@ import android.support.annotation.Nullable;
import android.support.annotation.RequiresApi;
import android.support.v7.app.AppCompatActivity;
import android.widget.TextView;
import android.widget.Toast;
import com.stardust.auojs.inrt.launch.AssetsProjectLauncher;
import com.stardust.auojs.inrt.autojs.AutoJs;
import com.stardust.auojs.inrt.launch.GlobalProjectLauncher;
import com.stardust.autojs.core.image.OpenCVHelper;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static android.content.pm.PackageManager.PERMISSION_DENIED;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
/**
* Created by Stardust on 2018/2/2.
@@ -58,7 +57,18 @@ public class SplashActivity extends AppCompatActivity {
private void runScript() {
new Thread(() -> GlobalProjectLauncher.getInstance().launch(this)).start();
new Thread(() -> {
try {
GlobalProjectLauncher.getInstance().launch(this);
} catch (Exception e) {
e.printStackTrace();
runOnUiThread(() -> {
Toast.makeText(SplashActivity.this, e.getMessage(), Toast.LENGTH_LONG).show();
startActivity(new Intent(SplashActivity.this, LogActivity.class));
AutoJs.getInstance().getGlobalConsole().printStackTrace(e);
});
}
}).start();
}
@Override

View File

@@ -17,8 +17,10 @@ import com.stardust.autojs.execution.ScriptExecution;
import com.stardust.autojs.project.ProjectConfig;
import com.stardust.autojs.script.JavaScriptFileSource;
import com.stardust.pio.PFiles;
import com.stardust.pio.UncheckedIOException;
import java.io.File;
import java.io.IOException;
/**
* Created by Stardust on 2018/1/24.
@@ -86,8 +88,12 @@ public class AssetsProjectLauncher {
TextUtils.equals(projectConfig.getBuildInfo().getBuildId(), mProjectConfig.getBuildInfo().getBuildId())) {
return;
}
PFiles.deleteRecursively(new File(mAssetsProjectDir));
PFiles.copyAssetDir(mActivity, mAssetsProjectDir, mProjectDir);
PFiles.deleteRecursively(new File(mProjectDir));
try {
PFiles.copyAssetDir(mActivity, mAssetsProjectDir, mProjectDir, null);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
}
}