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

Commit 351ce77

Browse files
awong1900awong1900
committed
Merge pull request #29 from awong1900/dev
Dev
2 parents 1bdb2bd + 7b3fee0 commit 351ce77

35 files changed

+396
-706
lines changed

‎android/app/app-release.apk‎

-30.8 KB
Binary file not shown.

‎android/app/app.iml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,22 +61,23 @@
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/test/res" type="java-test-resource" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
67-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
68-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
69-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7164
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7265
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
7366
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
7467
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
7568
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7669
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
7770
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8081
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8182
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8283
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -99,6 +100,7 @@
99100
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
100101
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
101102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
102104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
103105
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
104106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />

‎android/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.application'
22
android {
33
compileSdkVersion 23
4-
buildToolsVersion "23.0.1"
4+
buildToolsVersion "23.0.2"
55

66
defaultConfig {
77
applicationId "cc.seeed.iot.ap"
8-
minSdkVersion 16
8+
minSdkVersion 17
99
targetSdkVersion 23
10-
versionCode 15
11-
versionName "2.2.0"
10+
versionCode 16
11+
versionName "2.2.2"
1212
}
1313
buildTypes {
1414
release {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<meta-data
2121
android:name="AA_DB_NAME"
22-
android:value="WioLink.db" />
22+
android:value="Wio.db" />
2323
<meta-data
2424
android:name="AA_DB_VERSION"
2525
android:value="1" />

‎android/app/src/main/java/cc/seeed/iot/MyApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import android.content.Context;
44
import android.content.SharedPreferences;
55

6-
import cc.seeed.iot.datastruct.User;
6+
import cc.seeed.iot.util.User;
77
import cc.seeed.iot.util.Common;
88
import cc.seeed.iot.webapi.IotApi;
99

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

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
import cc.seeed.iot.MyApplication;
2929
import cc.seeed.iot.R;
30-
import cc.seeed.iot.datastruct.User;
30+
import cc.seeed.iot.util.User;
3131
import cc.seeed.iot.udp.ConfigUdpSocket;
3232
import cc.seeed.iot.ui_main.MainScreenActivity;
3333
import cc.seeed.iot.webapi.IotApi;
@@ -55,6 +55,7 @@ public class ApConnectActivity extends AppCompatActivity implements OnClickListe
5555
private String node_sn;
5656
private String node_key;
5757
private ConfigUdpSocket udpClient;
58+
private ProgressDialog mProgressDialog;
5859

5960
@Override
6061
protected void onCreate(Bundle savedInstanceState) {
@@ -74,6 +75,10 @@ protected void onCreate(Bundle savedInstanceState) {
7475
mConnectBtnView.setOnClickListener(this);
7576

7677
udpClient = new ConfigUdpSocket();
78+
79+
mProgressDialog = new ProgressDialog(ApConnectActivity.this);
80+
mProgressDialog.setCanceledOnTouchOutside(false);
81+
mProgressDialog.setCancelable(false);
7782
}
7883

7984
@Override
@@ -87,6 +92,12 @@ protected void onResume() {
8792
mSsidView.setText(ssid);
8893
}
8994

95+
@Override
96+
protected void onDestroy() {
97+
dismissProgressDialog();
98+
super.onDestroy();
99+
}
100+
90101
@Override
91102
public boolean onOptionsItemSelected(MenuItem item) {
92103
int id = item.getItemId();
@@ -112,19 +123,9 @@ public void onClick(View v) {
112123
mNodeNameView.setError("Node name is empty");
113124
return;
114125
}
115-
//APCFG: ssid\tpassword\tkey\tsn\t
116-
// String cmd_connect = "APCFG: " + ssid + "\t" + password + "\t" +
117-
// node_key + "\t" + node_sn + "\t";
118126
String ota_server_ip = ((MyApplication) getApplication()).getOtaServerIP();
119127
String exchange_server_ip = ota_server_ip;
120128

121-
// if (ota_server.equals(Common.OTA_CHINA_URL)) {
122-
// ota_server = Common.OTA_CHINA_IP;
123-
// exchange_server = Common.EXCHANGE_CHINA_IP;
124-
// } else if (ota_server.equals(Common.OTA_INTERNATIONAL_URL)) {
125-
// ota_server = Common.OTA_INTERNATIONAL_IP;
126-
// exchange_server = Common.EXCHANGE_INTERNATIONAL_IP;
127-
// }
128129
String cmd_connect = "APCFG: " + ssid + "\t" + password + "\t" +
129130
node_key + "\t" + node_sn + "\t" + exchange_server_ip + "\t"
130131
+ ota_server_ip + "\t";
@@ -140,10 +141,7 @@ private class SetNodeSn extends AsyncTask<String, Void, Boolean> {
140141

141142
@Override
142143
protected void onPreExecute() {
143-
mProgressDialog = new ProgressDialog(ApConnectActivity.this);
144-
mProgressDialog.setMessage("Sending wifi password to Wio...");
145-
mProgressDialog.setCanceledOnTouchOutside(false);
146-
mProgressDialog.show();
144+
showProgressDialog("Sending wifi password to Wio...");
147145
}
148146

149147
@Override
@@ -162,7 +160,7 @@ protected Boolean doInBackground(String... params) {
162160
} catch (SocketTimeoutException e) {
163161
udpClient.setSoTimeout(3000);
164162
udpClient.sendData(cmd, ipAddr);
165-
continue;
163+
166164
} catch (IOException e) {
167165
Log.e(TAG, "Error[SetNodeSn]:" + e);
168166
return false;
@@ -174,8 +172,6 @@ protected Boolean doInBackground(String... params) {
174172

175173
@Override
176174
protected void onPostExecute(Boolean b) {
177-
mProgressDialog.dismiss();
178-
179175
//remove Wio wifi config
180176
WifiManager wifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
181177
List<WifiConfiguration> wifiConfigurations = wifiManager.getConfiguredNetworks();
@@ -185,21 +181,16 @@ protected void onPostExecute(Boolean b) {
185181
wifiManager.saveConfiguration();
186182
}
187183
}
188-
189184
new checkNodeIsOnline().execute();
190185
}
191186
}
192187

193-
private class checkNodeIsOnline extends AsyncTask<Void, Void, Boolean> {
194-
private ProgressDialog mProgressDialog;
188+
private class checkNodeIsOnline extends AsyncTask<Void, Integer, Boolean> {
195189
private Boolean state_online = false;
196190

197191
@Override
198192
protected void onPreExecute() {
199-
mProgressDialog = new ProgressDialog(ApConnectActivity.this);
200-
mProgressDialog.setMessage("Waiting Wio get ip address...");
201-
mProgressDialog.setCanceledOnTouchOutside(false);
202-
mProgressDialog.show();
193+
showProgressDialog("Waiting Wio get ip address...");
203194
}
204195

205196
@Override
@@ -233,13 +224,23 @@ public void failure(RetrofitError error) {
233224
} catch (InterruptedException e) {
234225
e.printStackTrace();
235226
}
227+
publishProgress(30-i);
236228
}
237229
return state_online;
238230
}
239231

232+
@Override
233+
protected void onProgressUpdate(Integer... values) {
234+
int i = values[0];
235+
showProgressDialog("Waiting Wio get ip address...[" + i + "]");
236+
}
237+
240238
@Override
241239
protected void onPostExecute(Boolean state_online) {
242-
mProgressDialog.dismiss();
240+
if (ApConnectActivity.this.isFinishing()) { // or call isFinishing() if min sdk version < 17
241+
return;
242+
}
243+
dismissProgressDialog();
243244

244245
if (state_online) {
245246
attemptRename(node_name);
@@ -289,4 +290,18 @@ public void failure(RetrofitError error) {
289290
});
290291
}
291292
}
293+
294+
private void showProgressDialog(String message) {
295+
mProgressDialog.setMessage(message);
296+
// mProgressDialog.setIndeterminate(false);
297+
if (!mProgressDialog.isShowing()) {
298+
mProgressDialog.show();
299+
}
300+
}
301+
302+
private void dismissProgressDialog() {
303+
if (mProgressDialog != null && mProgressDialog.isShowing()) {
304+
mProgressDialog.dismiss();
305+
}
306+
}
292307
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
import cc.seeed.iot.MyApplication;
1717
import cc.seeed.iot.R;
18-
import cc.seeed.iot.datastruct.Constant;
19-
import cc.seeed.iot.datastruct.User;
18+
import cc.seeed.iot.util.Constant;
19+
import cc.seeed.iot.util.User;
2020
import cc.seeed.iot.webapi.IotApi;
2121
import cc.seeed.iot.webapi.IotService;
2222
import cc.seeed.iot.webapi.model.NodeResponse;

‎android/app/src/main/java/cc/seeed/iot/ui_login/LoginActivity.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import butterknife.InjectView;
1818
import cc.seeed.iot.MyApplication;
1919
import cc.seeed.iot.R;
20-
import cc.seeed.iot.datastruct.User;
20+
import cc.seeed.iot.util.User;
2121
import cc.seeed.iot.ui_main.MainScreenActivity;
2222
import cc.seeed.iot.util.Common;
2323
import cc.seeed.iot.webapi.IotApi;
@@ -97,13 +97,13 @@ protected void onResume() {
9797
}
9898

9999
private void refresh_layout() {
100-
String ota_server_ip = ((MyApplication) getApplication()).getOtaServerIP();
101-
if (ota_server_ip.equals(Common.OTA_INTERNATIONAL_IP)) {
100+
String ota_server_url = ((MyApplication) getApplication()).getOtaServerUrl();
101+
if (ota_server_url.equals(Common.OTA_INTERNATIONAL_URL)) {
102102
_serverLink.setText(getString(R.string.serverOn) + " International" + getString(R.string.change));
103-
} else if (ota_server_ip.equals(Common.OTA_CHINA_IP)) {
103+
} else if (ota_server_url.equals(Common.OTA_CHINA_URL)) {
104104
_serverLink.setText(getString(R.string.serverOn) + " China" + getString(R.string.change));
105105
} else {
106-
_serverLink.setText(getString(R.string.serverOn) + " " + ota_server_ip + getString(R.string.change));
106+
_serverLink.setText(getString(R.string.serverOn) + " " + ota_server_url + getString(R.string.change));
107107
}
108108
}
109109

@@ -124,7 +124,7 @@ public void login() {
124124
progressDialog.show();
125125

126126
//Implement your own authentication logic here.
127-
attemptLogin(progressDialog);
127+
attemptLogin(progressDialog);
128128

129129
}
130130

0 commit comments

Comments
 (0)