Skip to content

Commit 259d002

Browse files
KhushbuShah25KhushbuShah25
committed
Merge branch 'feature/avs-ble-manage-device-features' into 'versions/avs-ble'
Mange device features and support for 128 bit UUID device provisioning See merge request idf/esp-idf-provisioning-android!19
2 parents 003c3bd + 2ac8112 commit 259d002

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+4088
-771
lines changed

‎app/build.gradle

+4-14
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ android {
1515
defaultConfig {
1616
applicationId "com.espressif.provbleavs"
1717
minSdkVersion 21
18-
targetSdkVersion 27
19-
versionCode 8
20-
versionName "1.3.3"
18+
targetSdkVersion 28
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/AndroidManifest.xml

+29-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
package="com.espressif.provision">
45

56
<uses-permission android:name="android.permission.INTERNET" />
@@ -13,12 +14,12 @@
1314

1415
<application
1516
android:allowBackup="true"
16-
android:icon="@mipmap/ic_launcher"
17+
android:icon="@mipmap/ic_esp_alexa_launcher"
1718
android:label="@string/app_name"
18-
android:roundIcon="@mipmap/ic_launcher_round"
1919
android:supportsRtl="true"
2020
android:theme="@style/AppTheme"
21-
android:usesCleartextTraffic="true">
21+
android:usesCleartextTraffic="true"
22+
tools:replace="android:icon">
2223
<activity
2324
android:name="com.espressif.ui.activities.EspMainActivity"
2425
android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
@@ -98,7 +99,31 @@
9899
android:label="@string/title_activity_pop"
99100
android:screenOrientation="portrait"
100101
android:theme="@style/AppTheme.NoActionBar" />
102+
<activity
103+
android:name="com.espressif.ui.activities.DeviceActivity"
104+
android:label="@string/title_activity_device"
105+
android:screenOrientation="portrait"
106+
android:theme="@style/AppTheme.NoActionBar" />
107+
<activity
108+
android:name="com.espressif.ui.activities.LanguageListActivity"
109+
android:screenOrientation="portrait"
110+
android:theme="@style/AppTheme.NoActionBar" />
111+
<activity
112+
android:name="com.espressif.ui.activities.DeviceInfoActivity"
113+
android:label="@string/title_activity_device_info"
114+
android:screenOrientation="portrait"
115+
android:theme="@style/AppTheme.NoActionBar" />
116+
<activity
117+
android:name="com.espressif.ui.activities.SoundActivity"
118+
android:label="@string/title_activity_sound"
119+
android:screenOrientation="portrait"
120+
android:theme="@style/AppTheme.NoActionBar" />
121+
<activity
122+
android:name="com.espressif.ui.activities.AppInfoActivity"
123+
android:label="@string/title_activity_app_info"
124+
android:screenOrientation="portrait"
125+
android:theme="@style/AppTheme.NoActionBar" />
101126

102127
</application>
103128

104-
</manifest>
129+
</manifest>

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

+15-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,22 @@ 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_PROV_SESSION = "prov-session";
16+
public static final String HANDLER_PROV_CONFIG = "prov-config";
17+
public static final String HANDLER_PROTO_VER = "proto-ver";
18+
public static final String HANDLER_AVS_CONFIG = "avsconfig";
19+
1320
// 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";
1521
public static final String KEY_WIFI_SECURITY_TYPE = "wifi_security";
22+
public static final String KEY_PROOF_OF_POSSESSION = "proof_of_possession";
23+
public static final String KEY_WIFI_NETWORK_NAME_PREFIX = "wifi_network_name_prefix";
24+
public static final String KEY_BLE_DEVICE_NAME_PREFIX = "ble_device_name_prefix";
25+
public static final String KEY_DEVICE_NAME = "device_name";
1626
public static final String KEY_STATUS_MSG = "status_msg";
27+
public static final String KEY_DEVICE_INFO = "device_info";
28+
public static final String KEY_DEVICE_LANGUAGE = "device_language";
29+
30+
public static final String ESP_PREFERENCES = "Esp_Preferences";
1731
}

0 commit comments

Comments
 (0)