Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
XuXiangJun committed Sep 16, 2019
1 parent d8c7380 commit 3c8c6b1
Show file tree
Hide file tree
Showing 24 changed files with 253 additions and 280 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# EspTouch for Android
This APP is used to configure ESP devices to connect target AP, the devices need run smart config.
This APP is used to configure ESP devices to connect target AP, the devices need run [smart config](https://github.com/espressif/esp-idf/tree/master/examples/wifi/smart_config).

## Licence
- See [Licence](ESPRESSIF_MIT_LICENSE)

## Version Log
- See [Log](log)
- See [Log](log/log-en.md)

## Releases
- See [releases](https://github.com/EspressifApp/EspRelease/tree/master/EspTouch), contain APK and Jar
- For developer, if you don't want use [esptouch](esptouch) module, download the jar into your own project.
- For programmer, if you don't want use [esptouch](esptouch) module, download the jar into your own project.
32 changes: 24 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,44 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
buildToolsVersion '28.0.3'
compileSdkVersion 29

defaultConfig {
applicationId "com.espressif.iot_esptouch_demo"
minSdkVersion 14
targetSdkVersion 27
versionCode 21
versionName "v1.0.0"
targetSdkVersion 29
versionCode 22
versionName "v1.1.0"
}

signingConfigs {
debug {
storeFile file('signature/espdebug')
storePassword 'espdebug'
keyAlias 'esp_debug'
keyPassword 'espdebug'
}
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
debug {
signingConfig signingConfigs.debug
}
}

compileOptions {
sourceCompatibility 1.8
targetCompatibility 1.8
}
}

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.google.android.material:material:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation project(':esptouch')
}
Binary file added app/signature/espdebug
Binary file not shown.
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.espressif.iot_esptouch_demo" >

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

<application
android:allowBackup="true"
android:icon="@drawable/app_icon"
android:label="@string/app_name"
android:theme="@style/AppTheme">
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity
android:name="com.espressif.iot.esptouch.demo_activity.EsptouchDemoActivity"
android:label="@string/app_name"
Expand Down
Loading

0 comments on commit 3c8c6b1

Please sign in to comment.