오윤석

원격 잠금해제 기록 API 연동2

...@@ -8,6 +8,7 @@ import com.google.gson.JsonElement; ...@@ -8,6 +8,7 @@ import com.google.gson.JsonElement;
8 import com.google.gson.JsonObject; 8 import com.google.gson.JsonObject;
9 import com.google.gson.JsonParser; 9 import com.google.gson.JsonParser;
10 import com.sunnni.smartdoorlock.data.Auth; 10 import com.sunnni.smartdoorlock.data.Auth;
11 +import com.sunnni.smartdoorlock.data.RemoteRecord;
11 import com.sunnni.smartdoorlock.data.Setting; 12 import com.sunnni.smartdoorlock.data.Setting;
12 13
13 import java.io.BufferedReader; 14 import java.io.BufferedReader;
...@@ -16,6 +17,7 @@ import java.io.InputStreamReader; ...@@ -16,6 +17,7 @@ import java.io.InputStreamReader;
16 import java.io.OutputStream; 17 import java.io.OutputStream;
17 import java.net.HttpURLConnection; 18 import java.net.HttpURLConnection;
18 import java.net.URL; 19 import java.net.URL;
20 +import java.util.ArrayList;
19 import java.util.Iterator; 21 import java.util.Iterator;
20 import java.util.Set; 22 import java.util.Set;
21 23
...@@ -174,4 +176,29 @@ public class Api { ...@@ -174,4 +176,29 @@ public class Api {
174 } 176 }
175 }); 177 });
176 } 178 }
179 +
180 + static public void getRemotes(final Callback callback) {
181 + callApi("GET", "/api/remote", null, new Callback() {
182 + @Override
183 + public void callbackMethod(Object obj) {
184 + ApiResult apiResult = (ApiResult) obj;
185 + if(apiResult.isSuccess()) {
186 + JsonObject resp = (JsonObject) apiResult.getData();
187 + if(resp.has("remoteHistoryList")) {
188 + ArrayList<RemoteRecord> remoteRecords = new ArrayList<RemoteRecord>();
189 + Iterator it = resp.getAsJsonArray("remoteHistoryList").iterator();
190 + while(it.hasNext()) {
191 + JsonObject jsonObject = (JsonObject) it.next();
192 + remoteRecords.add(new RemoteRecord(jsonObject.get("device_name").getAsString(), jsonObject.get("created").getAsString()));
193 + }
194 + callback.callbackMethod(remoteRecords);
195 + } else {
196 + callback.callbackMethod(null);
197 + }
198 + } else {
199 + callback.callbackMethod(null);
200 + }
201 + }
202 + });
203 + }
177 } 204 }
......
...@@ -37,7 +37,7 @@ public class RemoteControlRecordActivity extends AppCompatActivity { ...@@ -37,7 +37,7 @@ public class RemoteControlRecordActivity extends AppCompatActivity {
37 setToolbar(mToolbar); 37 setToolbar(mToolbar);
38 38
39 setRecyclerView(); 39 setRecyclerView();
40 - Api.getRemote(new Api.Callback() { 40 + Api.getRemotes(new Api.Callback() {
41 @Override 41 @Override
42 public void callbackMethod(Object obj) { 42 public void callbackMethod(Object obj) {
43 if(obj == null) { 43 if(obj == null) {
......