Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit 1bdb2bd

Browse files
awong1900awong1900
committed
Merge pull request #28 from awong1900/dev
Dev
2 parents dbc7275 + 32014c4 commit 1bdb2bd

Some content is hidden

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

62 files changed

+1748
-680
lines changed

‎.gitignore‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,4 @@
1-
android/.idea/*
2-
3-
android/.idea/gradle.xml
4-
5-
android/.idea/gradle.xml
6-
7-
android/.idea/misc.xml
8-
9-
android/app/app.iml
10-
11-
android/app/build.gradle
12-
13-
android/.idea/gradle.xml
14-
15-
android/.idea/misc.xml
1+
*.idea
2+
*.iml
163

174
android/app/app.iml

‎android/.idea/misc.xml‎

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

android/app/wio_link_2.1.1.apk renamed to android/app/app-release.apk

4.54 MB
Binary file not shown.

android/app/app-release_2.1.2.apk renamed to android/app/app-release_2.1.3.apk

4.53 MB
Binary file not shown.

‎android/app/app.iml‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,33 +61,33 @@
6161
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
6262
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6363
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7164
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8181
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
83-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
84-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.0/jars" />
86-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
87-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
88-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/23.1.0/jars" />
89-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
83+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.1/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/23.1.1/jars" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
9089
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.daimajia.swipelayout/library/1.1.8/jars" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.getbase/floatingactionbutton/1.10.1/jars" />
9191
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.ikimuhendis/ldrawer/0.1/jars" />
9292
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/de.hdodenhof/circleimageview/2.0.0/jars" />
9393
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/fr.avianey.com.viewpagerindicator/library/2.4.1/jars" />
@@ -98,15 +98,11 @@
9898
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
9999
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
100100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
101-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-23.jar" />
102101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
103-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
104102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
105-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
106103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
107104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
108105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
109-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
110106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
111107
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
112108
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
@@ -116,23 +112,25 @@
116112
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
117113
<orderEntry type="library" exported="" name="library-2.4.1" level="project" />
118114
<orderEntry type="library" exported="" name="android-integration-3.2.0" level="project" />
119-
<orderEntry type="library" exported="" name="cardview-v7-23.1.0" level="project" />
115+
<orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
120116
<orderEntry type="library" exported="" name="activeandroid-3.1.0-SNAPSHOT" level="project" />
121117
<orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
122-
<orderEntry type="library" exported="" name="design-23.1.0" level="project" />
123118
<orderEntry type="library" exported="" name="urlimageviewhelper-1.0.4" level="project" />
124119
<orderEntry type="library" exported="" name="circleimageview-2.0.0" level="project" />
120+
<orderEntry type="library" exported="" name="design-23.1.1" level="project" />
125121
<orderEntry type="library" exported="" name="library-1.1.8" level="project" />
126-
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
122+
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.1" level="project" />
127123
<orderEntry type="library" exported="" name="ldrawer-0.1" level="project" />
128124
<orderEntry type="library" exported="" name="yamlbeans-1.09" level="project" />
125+
<orderEntry type="library" exported="" name="support-v13-23.1.1" level="project" />
126+
<orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
129127
<orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
128+
<orderEntry type="library" exported="" name="badgeview" level="project" />
130129
<orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
131130
<orderEntry type="library" exported="" name="core-3.2.0" level="project" />
132-
<orderEntry type="library" exported="" name="support-v13-23.1.0" level="project" />
133-
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
134-
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
131+
<orderEntry type="library" exported="" name="floatingactionbutton-1.10.1" level="project" />
132+
<orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
133+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
135134
<orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
136-
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
137135
</component>
138136
</module>

‎android/app/build.gradle‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ android {
77
applicationId "cc.seeed.iot.ap"
88
minSdkVersion 16
99
targetSdkVersion 23
10-
versionCode 13
11-
versionName "2.1.2"
10+
versionCode 15
11+
versionName "2.2.0"
1212
}
1313
buildTypes {
1414
release {
@@ -25,14 +25,14 @@ repositories {
2525

2626
dependencies {
2727
compile fileTree(dir: 'libs', include: ['*.jar'])
28-
compile 'com.android.support:support-v13:23.1.0'
28+
compile 'com.android.support:support-v13:23.1.1'
2929
compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
30-
compile 'com.android.support:design:23.1.0'
31-
compile 'com.android.support:appcompat-v7:23.1.0'
32-
compile 'com.android.support:cardview-v7:23.1.0'
30+
compile 'com.android.support:design:23.1.1'
31+
compile 'com.android.support:appcompat-v7:23.1.1'
32+
compile 'com.android.support:cardview-v7:23.1.1'
3333
compile 'com.squareup.retrofit:retrofit:1.9.0'
3434
compile 'com.squareup.okhttp:okhttp:2.2.0'
35-
compile 'com.android.support:recyclerview-v7:23.1.0'
35+
compile 'com.android.support:recyclerview-v7:23.1.1'
3636
compile 'com.ikimuhendis:ldrawer:0.1'
3737
compile 'com.esotericsoftware.yamlbeans:yamlbeans:1.09'
3838
compile "com.google.zxing:android-integration:3.2.0"
@@ -41,5 +41,6 @@ dependencies {
4141
compile 'de.hdodenhof:circleimageview:2.0.0'
4242
compile 'com.michaelpardo:activeandroid:3.1.0-SNAPSHOT'
4343
compile 'com.jakewharton:butterknife:6.1.0'
44+
compile 'com.getbase:floatingactionbutton:1.10.1'
4445

4546
}

‎android/app/libs/badgeview.jar‎

3.61 KB
Binary file not shown.

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
<activity
3535
android:name="cc.seeed.iot.ui_main.MainScreenActivity"
3636
android:theme="@style/DrawTheme" />
37-
<activity android:name="cc.seeed.iot.ui_setnode.SetupIotNodeActivity" />
37+
<activity android:name=".ui_setnode.SetupIotLinkActivity" />
38+
<activity android:name=".ui_setnode.SetupIotNodeActivity" />
3839
<activity android:name="cc.seeed.iot.ui_login.SetupActivity" />
3940
<activity
4041
android:name="cc.seeed.iot.ui_login.LoginActivity"

‎android/app/src/main/java/cc/seeed/iot/datastruct/Constant.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@ public class Constant {
1616
"EVENT",
1717
};
1818

19-
19+
public final static String WIO_LINK_V1_0 = "Wio Link v1.0";
20+
public final static String WIO_NODE_V1_0 = "Wio Node v1.0";
2021
}

‎android/app/src/main/java/cc/seeed/iot/ui_ap_config/ApConnectActivity.java‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,15 @@ public class ApConnectActivity extends AppCompatActivity implements OnClickListe
4343
private static final String TAG = "ApConnectActivity";
4444
private static final String AP_IP = "192.168.4.1";
4545
private final static String PION_WIFI_PREFIX = "PionOne_";
46-
private final static String WIO_WIFI_PREFIX = "WioLink_";
46+
private final static String WIO_WIFI_PREFIX = "Wio";
4747
private TextView mSsidView;
4848
private EditText mPasswordView;
4949
private EditText mNodeNameView;
5050
private Button mConnectBtnView;
5151

5252
private String ssid;
5353
private String node_name;
54+
private String board;
5455
private String node_sn;
5556
private String node_key;
5657
private ConfigUdpSocket udpClient;
@@ -82,6 +83,7 @@ protected void onResume() {
8283
ssid = intent.getStringExtra("ssid");
8384
node_sn = intent.getStringExtra("node_sn");
8485
node_key = intent.getStringExtra("node_key");
86+
board = intent.getStringExtra("board");
8587
mSsidView.setText(ssid);
8688
}
8789

@@ -139,7 +141,7 @@ private class SetNodeSn extends AsyncTask<String, Void, Boolean> {
139141
@Override
140142
protected void onPreExecute() {
141143
mProgressDialog = new ProgressDialog(ApConnectActivity.this);
142-
mProgressDialog.setMessage("Sending wifi password to Wio Link...");
144+
mProgressDialog.setMessage("Sending wifi password to Wio...");
143145
mProgressDialog.setCanceledOnTouchOutside(false);
144146
mProgressDialog.show();
145147
}
@@ -174,7 +176,7 @@ protected Boolean doInBackground(String... params) {
174176
protected void onPostExecute(Boolean b) {
175177
mProgressDialog.dismiss();
176178

177-
//remove Wio Link wifi config
179+
//remove Wio wifi config
178180
WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
179181
List<WifiConfiguration> wifiConfigurations = wifiManager.getConfiguredNetworks();
180182
for (WifiConfiguration c : wifiConfigurations) {
@@ -195,7 +197,7 @@ private class checkNodeIsOnline extends AsyncTask<Void, Void, Boolean> {
195197
@Override
196198
protected void onPreExecute() {
197199
mProgressDialog = new ProgressDialog(ApConnectActivity.this);
198-
mProgressDialog.setMessage("Waiting Wio Link get ip address...");
200+
mProgressDialog.setMessage("Waiting Wio get ip address...");
199201
mProgressDialog.setCanceledOnTouchOutside(false);
200202
mProgressDialog.show();
201203
}
@@ -244,14 +246,15 @@ protected void onPostExecute(Boolean state_online) {
244246
} else {
245247
AlertDialog.Builder builder = new AlertDialog.Builder(ApConnectActivity.this);
246248
builder.setTitle("Error");
247-
builder.setMessage("Wio Link can not connect to the router.\n" +
248-
"Maybe AP password is wrong or AP connect timeout\n" +
249-
"Please reset Wio Link to config mode and try again.");
249+
builder.setMessage("Wio can not connect to your AP.\n" +
250+
"Please check AP password or closer with AP.\n" +
251+
"Please reset Wio to configure mode and try again.");
250252
builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
251253
@Override
252254
public void onClick(DialogInterface dialog, int which) {
253255
Intent intent = new Intent(ApConnectActivity.this, GoReadyActivity.class);
254256
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
257+
intent.putExtra("board", board);
255258
startActivity(intent);
256259
}
257260
});
@@ -263,7 +266,7 @@ public void onClick(DialogInterface dialog, int which) {
263266
private void attemptRename(final String node_name) {
264267
final ProgressDialog mProgressBar = new ProgressDialog(ApConnectActivity.this);
265268

266-
mProgressBar.setMessage("Setting Wio Link name...");
269+
mProgressBar.setMessage("Setting Wio name...");
267270
mProgressBar.show();
268271
IotApi api = new IotApi();
269272
User user = ((MyApplication) getApplication()).getUser();

0 commit comments

Comments
 (0)