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

try fixing hyb1996-guest/AutoJsIssueReport#4720

Browse Source
This commit is contained in:
hyb1996
2017-07-05 19:13:00 +08:00
parent d72d9c0413
commit 775d6eca81
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,7 +35,6 @@ import android.widget.Toast;
import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog; import com.afollestad.materialdialogs.MaterialDialog;
import com.github.aakira.expandablelayout.BuildConfig;
import com.github.aakira.expandablelayout.ExpandableRelativeLayout; import com.github.aakira.expandablelayout.ExpandableRelativeLayout;
import com.heinrichreimersoftware.androidissuereporter.model.DeviceInfo; import com.heinrichreimersoftware.androidissuereporter.model.DeviceInfo;
import com.heinrichreimersoftware.androidissuereporter.model.Report; import com.heinrichreimersoftware.androidissuereporter.model.Report;
@@ -58,6 +57,7 @@ import java.lang.ref.WeakReference;
import static android.util.Patterns.EMAIL_ADDRESS; import static android.util.Patterns.EMAIL_ADDRESS;
import com.heinrichreimersoftware.androidissuereporter.R; import com.heinrichreimersoftware.androidissuereporter.R;
import com.stardust.scriptdroid.BuildConfig;
import com.stardust.theme.ThemeColorManager; import com.stardust.theme.ThemeColorManager;
/** /**

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

@@ -118,7 +118,7 @@ public class ErrorReportActivity extends BaseActivity {
} }
private String getDeviceMessage() { private String getDeviceMessage() {
return String.format(Locale.getDefault(), "Version: %s\nAndroid: %d", BuildConfig.VERSION_CODE, Build.VERSION.SDK_INT); return String.format(Locale.getDefault(), "Version: %s\nAndroid: %d\n", BuildConfig.VERSION_CODE, Build.VERSION.SDK_INT);
} }
private void exitAfter(long millis) { private void exitAfter(long millis) {

9
autojs/src/main/java/com/stardust/autojs/runtime/console/ConsoleFloaty.java
View File

@@ -35,14 +35,7 @@ public class ConsoleFloaty extends ResizableExpandableFloaty.AbstractResizableEx
@Override @Override
public View inflateCollapsedView(FloatyService service, final ResizableExpandableFloatyWindow window) { public View inflateCollapsedView(FloatyService service, final ResizableExpandableFloatyWindow window) {
ensureContextWrapper(service); ensureContextWrapper(service);
View view = View.inflate(mContextWrapper, R.layout.floating_window_collapse, null); return View.inflate(mContextWrapper, R.layout.floating_window_collapse, null);
view.post(new Runnable() {
@Override
public void run() {
window.expand();
}
});
return view;
} }
private void ensureContextWrapper(Context context) { private void ensureContextWrapper(Context context) {

8
autojs/src/main/java/com/stardust/autojs/runtime/console/StardustConsole.java
View File

@@ -61,8 +61,14 @@ public class StardustConsole extends AbstractConsole {
public StardustConsole(UiHandler uiHandler, Console globalConsole) { public StardustConsole(UiHandler uiHandler, Console globalConsole) {
mUiHandler = uiHandler; mUiHandler = uiHandler;
mConsoleFloaty = new ConsoleFloaty(this); mConsoleFloaty = new ConsoleFloaty(this);
mFloatyWindow = new ResizableExpandableFloatyWindow(mConsoleFloaty);
mGlobalConsole = globalConsole; mGlobalConsole = globalConsole;
mFloatyWindow = new ResizableExpandableFloatyWindow(mConsoleFloaty) {
@Override
public void onCreate(FloatyService service, WindowManager manager) {
super.onCreate(service, manager);
expand();
}
};
} }
public void setConsoleView(ConsoleView consoleView) { public void setConsoleView(ConsoleView consoleView) {