Showing
3 changed files
with
29 additions
and
25 deletions
1 | package com.sunnni.smartdoorlock.data; | 1 | package com.sunnni.smartdoorlock.data; |
2 | 2 | ||
3 | public class RemoteRecord { | 3 | public class RemoteRecord { |
4 | - public String deviceName; | 4 | + private String deviceName; |
5 | - public String remoteDate; | 5 | + private String remoteDate; |
6 | 6 | ||
7 | public RemoteRecord(String name, String date){ | 7 | public RemoteRecord(String name, String date){ |
8 | this.deviceName = name; | 8 | this.deviceName = name; |
9 | this.remoteDate = date; | 9 | this.remoteDate = date; |
10 | } | 10 | } |
11 | + | ||
12 | + public String getDeviceName() { | ||
13 | + return deviceName; | ||
14 | + } | ||
15 | + | ||
16 | + public String getRemoteDate() { | ||
17 | + return remoteDate; | ||
18 | + } | ||
11 | } | 19 | } | ... | ... |
... | @@ -7,12 +7,15 @@ import androidx.core.widget.NestedScrollView; | ... | @@ -7,12 +7,15 @@ import androidx.core.widget.NestedScrollView; |
7 | import androidx.recyclerview.widget.LinearLayoutManager; | 7 | import androidx.recyclerview.widget.LinearLayoutManager; |
8 | import androidx.recyclerview.widget.RecyclerView; | 8 | import androidx.recyclerview.widget.RecyclerView; |
9 | 9 | ||
10 | +import android.content.Intent; | ||
10 | import android.os.Bundle; | 11 | import android.os.Bundle; |
12 | +import android.telecom.Call; | ||
11 | import android.view.View; | 13 | import android.view.View; |
12 | import android.widget.LinearLayout; | 14 | import android.widget.LinearLayout; |
13 | import android.widget.Toast; | 15 | import android.widget.Toast; |
14 | 16 | ||
15 | import com.sunnni.smartdoorlock.R; | 17 | import com.sunnni.smartdoorlock.R; |
18 | +import com.sunnni.smartdoorlock.api.Api; | ||
16 | import com.sunnni.smartdoorlock.data.Device; | 19 | import com.sunnni.smartdoorlock.data.Device; |
17 | import com.sunnni.smartdoorlock.data.RemoteRecord; | 20 | import com.sunnni.smartdoorlock.data.RemoteRecord; |
18 | 21 | ||
... | @@ -34,7 +37,20 @@ public class RemoteControlRecordActivity extends AppCompatActivity { | ... | @@ -34,7 +37,20 @@ public class RemoteControlRecordActivity extends AppCompatActivity { |
34 | setToolbar(mToolbar); | 37 | setToolbar(mToolbar); |
35 | 38 | ||
36 | setRecyclerView(); | 39 | setRecyclerView(); |
37 | - setRecordList(); | 40 | + Api.getRemote(new Api.Callback() { |
41 | + @Override | ||
42 | + public void callbackMethod(Object obj) { | ||
43 | + if(obj == null) { | ||
44 | + Toast.makeText(getApplicationContext(), "연결 상태가 불안정합니다.", Toast.LENGTH_SHORT).show(); | ||
45 | + startActivity(new Intent(RemoteControlRecordActivity.this, MainActivity.class)); | ||
46 | + return; | ||
47 | + } else { | ||
48 | + mRecordList.clear(); | ||
49 | + mRecordList.addAll(0, (ArrayList<RemoteRecord>) obj); | ||
50 | + mAdapter.notifyDataSetChanged(); | ||
51 | + } | ||
52 | + } | ||
53 | + }); | ||
38 | 54 | ||
39 | init(); | 55 | init(); |
40 | } | 56 | } |
... | @@ -66,24 +82,4 @@ public class RemoteControlRecordActivity extends AppCompatActivity { | ... | @@ -66,24 +82,4 @@ public class RemoteControlRecordActivity extends AppCompatActivity { |
66 | mRecyclerView.setLayoutManager(manager); | 82 | mRecyclerView.setLayoutManager(manager); |
67 | mRecyclerView.setAdapter(mAdapter); | 83 | mRecyclerView.setAdapter(mAdapter); |
68 | } | 84 | } |
69 | - | ||
70 | - private void setRecordList(){ | ||
71 | - RemoteRecord temp; | ||
72 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
73 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
74 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
75 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
76 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
77 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
78 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
79 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
80 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
81 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
82 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
83 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
84 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
85 | - mRecordList.add(temp = new RemoteRecord("Galaxy Note 10", "2020.10.07(수) 17:50:00")); | ||
86 | - | ||
87 | - mAdapter.notifyDataSetChanged(); | ||
88 | - } | ||
89 | } | 85 | } | ... | ... |
... | @@ -29,8 +29,8 @@ public class RemoteRecordRvAdapter extends RecyclerView.Adapter<RemoteRecordRvAd | ... | @@ -29,8 +29,8 @@ public class RemoteRecordRvAdapter extends RecyclerView.Adapter<RemoteRecordRvAd |
29 | } | 29 | } |
30 | 30 | ||
31 | void bind(RemoteRecord record){ | 31 | void bind(RemoteRecord record){ |
32 | - mTvDeviceName.setText(record.deviceName); | 32 | + mTvDeviceName.setText(record.getDeviceName()); |
33 | - mTvRemoteDate.setText(record.remoteDate); | 33 | + mTvRemoteDate.setText(record.getRemoteDate()); |
34 | } | 34 | } |
35 | } | 35 | } |
36 | 36 | ... | ... |
-
Please register or login to post a comment