Skip to content

Commit f9a9148

Browse files
committed
1. Changed BLE transport implementation for new provisioning method.
2. Local device features added.
1 parent 7d8cb1e commit f9a9148

36 files changed

+2893
-360
lines changed

app/build.gradle

+3-13
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616
applicationId "com.espressif.provbleavs"
1717
minSdkVersion 21
1818
targetSdkVersion 27
19-
versionCode 8
20-
versionName "1.3.3"
19+
versionCode 10
20+
versionName "2.0"
2121
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2222
signingConfig signingConfigs.config
2323
}
@@ -29,11 +29,6 @@ android {
2929
resValue "string", "proof_of_possesion", "abcd1234"
3030
resValue "string", "wifi_base_url", "192.168.4.1:80"
3131
resValue "string", "wifi_network_name_prefix", "ESP-Alexa-"
32-
resValue "string", "ble_service_uuid", "0000ffff-0000-1000-8000-00805f9b34fb"
33-
resValue "string", "ble_session_uuid", "0000ff51-0000-1000-8000-00805f9b34fb"
34-
resValue "string", "ble_config_uuid", "0000ff52-0000-1000-8000-00805f9b34fb"
35-
resValue "string", "ble_avsconfig_uuid", "0000ff54-0000-1000-8000-00805f9b34fb"
36-
resValue "string", "ble_scanconfig_uuid", "0000ff50-0000-1000-8000-00805f9b34fb"
3732
resValue "string", "ble_device_name_prefix", "ESP-Alexa-"
3833
signingConfig signingConfigs.config
3934
}
@@ -44,12 +39,6 @@ android {
4439
resValue "string", "proof_of_possesion", "abcd1234"
4540
resValue "string", "wifi_base_url", "192.168.4.1:80"
4641
resValue "string", "wifi_network_name_prefix", "ESP-Alexa-"
47-
resValue "string", "ble_service_uuid", "0000ffff-0000-1000-8000-00805f9b34fb"
48-
resValue "string", "ble_session_uuid", "0000ff51-0000-1000-8000-00805f9b34fb"
49-
resValue "string", "ble_config_uuid", "0000ff52-0000-1000-8000-00805f9b34fb"
50-
resValue "string", "ble_avsconfig_uuid", "0000ff54-0000-1000-8000-00805f9b34fb"
51-
resValue "string", "ble_scanconfig_uuid", "0000ff50-0000-1000-8000-00805f9b34fb"
52-
5342
resValue "string", "ble_device_name_prefix", "ESP-Alexa-"
5443
signingConfig signingConfigs.config
5544
}
@@ -113,4 +102,5 @@ dependencies {
113102
implementation files('../login-with-amazon-sdk.jar')
114103
implementation 'com.google.crypto.tink:tink-android:1.1.0'
115104
implementation 'com.github.custanator:upnpdiscovery:1.0.1'
105+
implementation 'com.github.f0ris.sweetalert:library:1.5.1'
116106
}

app/src/main/java/com/espressif/AppConstants.java

+12-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,19 @@ public class AppConstants {
1010
public static final short WIFI_WPA_WPA2_PSK = 4;
1111
public static final short WIFI_WPA2_ENTERPRISE = 5;
1212

13+
// End point names
14+
public static final String HANDLER_PROV_SCAN = "prov-scan";
15+
public static final String HANDLER_PROTO_VER = "proto-ver";
16+
public static final String HANDLER_PROV_SESSION = "prov-session";
17+
public static final String HANDLER_AVS_CONFIG = "avsconfig";
18+
1319
// Keys used to pass data between activities and to store data in SharedPreference.
14-
public static final String KEY_PROOF_OF_POSSESSION = "proof_of_possession";
1520
public static final String KEY_WIFI_SECURITY_TYPE = "wifi_security";
21+
public static final String KEY_PROOF_OF_POSSESSION = "proof_of_possession";
22+
public static final String KEY_WIFI_NETWORK_NAME_PREFIX = "wifi_network_name_prefix";
23+
public static final String KEY_BLE_DEVICE_NAME_PREFIX = "ble_device_name_prefix";
24+
public static final String KEY_DEVICE_NAME = "device_name";
1625
public static final String KEY_STATUS_MSG = "status_msg";
26+
public static final String KEY_DEVICE_INFO = "device_info";
27+
public static final String KEY_DEVICE_LANGUAGE = "device_language";
1728
}

0 commit comments

Comments
 (0)