rusefi
/
rusefi-full
mirror of https://github.com/rusefi/rusefi-full.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android progress

This commit is contained in:
rusefi 2020-08-15 22:42:58 -04:00
parent 592c226655
commit 4f1aaa6aea
3 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/app/build.gradle
View File

@ -34,6 +34,7 @@ android {
dependencies { dependencies {
implementation project(':ecu_io') implementation project(':ecu_io')
implementation project(':autoupdate')
implementation project(':logging-api') implementation project(':logging-api')
implementation project(':shared_io') implementation project(':shared_io')
implementation project(':models') implementation project(':models')

28
android/app/src/main/java/com/rusefi/app/rusEFI.java
View File

@ -23,10 +23,12 @@ import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.hardware.usb.UsbDevice; import android.hardware.usb.UsbDevice;
import android.hardware.usb.UsbManager; import android.hardware.usb.UsbManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.View; import android.view.View;
@ -50,6 +52,10 @@ import com.rusefi.io.DfuHelper;
import com.rusefi.io.IoStream; import com.rusefi.io.IoStream;
import com.rusefi.io.LinkManager; import com.rusefi.io.LinkManager;
import com.rusefi.io.serial.StreamConnector; import com.rusefi.io.serial.StreamConnector;
import com.rusefi.proxy.NetworkConnector;
import com.rusefi.proxy.NetworkConnectorContext;
import static com.rusefi.ui.storage.PersistentConfiguration.getConfig;
public class rusEFI extends Activity { public class rusEFI extends Activity {
private static final String ACTION_USB_PERMISSION = "com.android.example.USB_PERMISSION"; private static final String ACTION_USB_PERMISSION = "com.android.example.USB_PERMISSION";
@ -99,7 +105,10 @@ public class rusEFI extends Activity {
public void afterTextChanged(Editable editable) { public void afterTextChanged(Editable editable) {
String text = authToken.getText().toString(); String text = authToken.getText().toString();
if (AutoTokenUtil.isToken(text)) { if (AutoTokenUtil.isToken(text)) {
AutoTokenUtil.setAuthToken(text); SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(rusEFI.this);
SharedPreferences.Editor editor = preferences.edit();
editor.putString(AutoTokenUtil.AUTH_TOKEN, text);
editor.commit();
} }
} }
}); });
@ -112,13 +121,18 @@ public class rusEFI extends Activity {
dfuUpload = new DfuUpload(this); dfuUpload = new DfuUpload(this);
dfuUpload.fileOperation(mResultView); dfuUpload.fileOperation(mResultView);
authToken.setText(AutoTokenUtil.getAuthToken()); authToken.setText(getAuthToken());
switchOrProgramDfu(); switchOrProgramDfu();
SoundBroadcast.checkOrRequestPermission(this); SoundBroadcast.checkOrRequestPermission(this);
} }
private String getAuthToken() {
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(rusEFI.this);
return preferences.getString(AutoTokenUtil.AUTH_TOKEN, AutoTokenUtil.TOKEN_WARNING);
}
@Override @Override
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
@ -238,9 +252,17 @@ public class rusEFI extends Activity {
} }
}); });
Snackbar mySnackbar = Snackbar.make(view, "Broadcasting with " + AutoTokenUtil.getAuthToken(), BaseTransientBottomBar.LENGTH_LONG); Snackbar mySnackbar = Snackbar.make(view, "Broadcasting with " + getAuthToken(), BaseTransientBottomBar.LENGTH_LONG);
mySnackbar.show(); mySnackbar.show();
NetworkConnectorContext context = new NetworkConnectorContext();
new NetworkConnector().start(getAuthToken(), context, new NetworkConnector.ReconnectListener() {
@Override
public void onReconnect() {
}
}, linkManager);
} }
} }

1
java_console/inifile/src/main/java/com/rusefi/config/Field.java
View File

@ -208,6 +208,7 @@ public class Field {
} }
public String getStringValue(ConfigurationImage image) { public String getStringValue(ConfigurationImage image) {
Objects.requireNonNull(image, "image");
if (type != STRING) if (type != STRING)
throw new IllegalStateException("Not a string parameter " + name); throw new IllegalStateException("Not a string parameter " + name);
ByteBuffer bb = image.getByteBuffer(offset, stringSize); ByteBuffer bb = image.getByteBuffer(offset, stringSize);