-Get data gate and site

app/src/main/java/com/fusi24/rfid/adapter/SiteAdapter.java

@@ -0,0 +1,63 @@
+package com.fusi24.rfid.adapter;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.fusi24.rfid.data.entity.DataSite;
+import com.fusi24.rfid.databinding.RowSiteBinding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SiteAdapter extends RecyclerView.Adapter<SiteAdapter.ViewHolder>{
+
+    private Context context;
+    private List<DataSite> siteList;
+
+    public SiteAdapter(Context context) {
+        this.context = context;
+        this.siteList = new ArrayList<>();
+    }
+
+    private void setSiteList(List<DataSite> siteList) {
+        this.siteList = siteList;
+    }
+
+    public void updateSiteList(List<DataSite> siteList){
+        setSiteList(siteList);
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        private RowSiteBinding binding;
+
+        ViewHolder(RowSiteBinding itemBinding) {
+            super(itemBinding.getRoot());
+            this.binding = itemBinding;
+        }
+    }
+
+
+    @NonNull
+    @Override
+    public SiteAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        RowSiteBinding itemBinding = RowSiteBinding.inflate(LayoutInflater.from(context), parent, false);
+        return new ViewHolder(itemBinding);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull SiteAdapter.ViewHolder holder, int position) {
+
+        DataSite site = siteList.get(position);
+        holder.binding.tvCommon.setText(site.getName());
+
+    }
+
+    @Override
+    public int getItemCount() {
+        return siteList.size();
+    }
+}

app/src/main/java/com/fusi24/rfid/data/DataManager.java

@@ -3,6 +3,7 @@ package com.fusi24.rfid.data;
 import com.fusi24.rfid.data.api.RestService;
 import com.fusi24.rfid.data.entity.DataAuth;
 import com.fusi24.rfid.data.entity.DataDetail;
+import com.fusi24.rfid.data.entity.DataDevice;
 import com.fusi24.rfid.data.entity.DataEntryPermit;
 import com.fusi24.rfid.data.entity.DataResultRfid;
 import com.fusi24.rfid.data.entity.DataUser;
@@ -31,6 +32,10 @@ public class DataManager {
         return restService.getLookUp(code);
     }
 
+    public Observable<List<DataDevice>> getDataDevice(String deviceId, String[] expand) {
+        return restService.getDataDevice(deviceId, expand);
+    }
+
     public Observable<DataResultRfid> checkRfidCard(String numberRfid, Integer permitId, String rfidDeviceId, Integer checkTypeId, String longLat, String[] expand) {
         return restService.checkRfidCard(numberRfid, permitId, rfidDeviceId, checkTypeId, longLat, expand);
     }

app/src/main/java/com/fusi24/rfid/data/api/RestService.java

@@ -3,6 +3,7 @@ package com.fusi24.rfid.data.api;
 import com.fusi24.rfid.config.Constant;
 import com.fusi24.rfid.data.entity.DataAuth;
 import com.fusi24.rfid.data.entity.DataDetail;
+import com.fusi24.rfid.data.entity.DataDevice;
 import com.fusi24.rfid.data.entity.DataEntryPermit;
 import com.fusi24.rfid.data.entity.DataResultRfid;
 import com.fusi24.rfid.data.entity.DataSite;
@@ -23,15 +24,19 @@ public interface RestService {
     @POST(Constant.BEATS_ENDPOINT + "/api/mobile/login/rfid")
     Observable<DataUser> userLogin(@Body DataAuth dataAuth);
 
-    @GET(Constant.SID2_ENDPOINT + "/api/entryPermit")
-    Observable<List<DataEntryPermit>> getEntryPermit();
-
     @GET(Constant.BEATS2_ENDPOINT + "/api/lookup")
     Observable<List<DataDetail>> getLookUp(@Query("filter[parent.code]") String code);
 
     @GET(Constant.BEATS2_ENDPOINT + "/api/location")
     Call<List<DataSite>> getDataSite(@Query("filter[type.id]") Integer typeId);
 
+    @GET(Constant.SID2_ENDPOINT + "/api/entryPermit")
+    Observable<List<DataEntryPermit>> getEntryPermit();
+
+    @GET(Constant.SID2_ENDPOINT + "/api/entryRfid")
+    Observable<List<DataDevice>> getDataDevice(@Query("filter[deviceId]") String deviceId,
+                                               @Query("expand") String[] expand);
+
     @GET(Constant.SID2_ENDPOINT + Constant.RFID_ENDPOINT + "/permit/check/{number_rfid}")
     Observable<DataResultRfid> checkRfidCard(@Path("number_rfid") String numberRfid,
                                              @Query("entryPermitId") Integer permitId,

app/src/main/java/com/fusi24/rfid/data/entity/DataDevice.java

@@ -0,0 +1,41 @@
+package com.fusi24.rfid.data.entity;
+
+public class DataDevice {
+
+    private Integer id;
+    private String deviceId;
+    private DataGate gate;
+    private boolean isActive;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public DataGate getGate() {
+        return gate;
+    }
+
+    public void setGate(DataGate gate) {
+        this.gate = gate;
+    }
+
+    public boolean isActive() {
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        isActive = active;
+    }
+}

app/src/main/java/com/fusi24/rfid/data/entity/DataGate.java

@@ -0,0 +1,52 @@
+package com.fusi24.rfid.data.entity;
+
+import java.util.List;
+
+public class DataGate {
+
+    private Integer id;
+    private String name;
+    private String description;
+    private boolean isActive;
+    private List<DataSite> sites;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public boolean isActive() {
+        return isActive;
+    }
+
+    public void setActive(boolean active) {
+        isActive = active;
+    }
+
+    public List<DataSite> getSites() {
+        return sites;
+    }
+
+    public void setSites(List<DataSite> sites) {
+        this.sites = sites;
+    }
+}

app/src/main/java/com/fusi24/rfid/ui/home/HomeActivity.java

@@ -21,10 +21,12 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import com.fusi24.rfid.BuildConfig;
 import com.fusi24.rfid.R;
 import com.fusi24.rfid.SplashScreenActivity;
+import com.fusi24.rfid.adapter.SiteAdapter;
 import com.fusi24.rfid.adapter.StatusScanAdapter;
 import com.fusi24.rfid.base.BaseActivity;
 import com.fusi24.rfid.config.Constant;
 import com.fusi24.rfid.data.entity.DataDetail;
+import com.fusi24.rfid.data.entity.DataDevice;
 import com.fusi24.rfid.data.entity.DataEntryPermit;
 import com.fusi24.rfid.databinding.ActivityHomeBinding;
 import com.fusi24.rfid.ui.ScanActivity;
@@ -41,7 +43,8 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
     private List<DataDetail> statusScanList;
     private ActivityHomeBinding binding;
     private HomePresenter presenter;
-    private StatusScanAdapter adapter;
+    private StatusScanAdapter scanAdapter;
+    private SiteAdapter siteAdapter;
     private Integer idCheckType = null;
     private String idDevice, checkTypeName;
 
@@ -109,10 +112,15 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
         entryPermitList = new ArrayList<>();
         statusScanList = new ArrayList<>();
 
-        adapter = new StatusScanAdapter(this, this);
+        scanAdapter = new StatusScanAdapter(this, this);
         binding.rvStatusScan.setLayoutManager(new LinearLayoutManager(this));
         binding.rvStatusScan.setItemAnimator(new DefaultItemAnimator());
-        binding.rvStatusScan.setAdapter(adapter);
+        binding.rvStatusScan.setAdapter(scanAdapter);
+
+        siteAdapter = new SiteAdapter(this);
+        binding.rvSite.setLayoutManager(new LinearLayoutManager(this));
+        binding.rvSite.setItemAnimator(new DefaultItemAnimator());
+        binding.rvSite.setAdapter(siteAdapter);
     }
 
     @SuppressLint("SetTextI18n")
@@ -121,12 +129,10 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
         binding.tvRfidGunId.setText(idDevice);
         binding.tvRfidCardNumber.setText(getSessionManager().getUserRfidNumber());
         binding.tvEmployeeName.setText(getSessionManager().getEmployeeName());
-        //TODO STILL HARDCODE
-        binding.tvGateName.setText("Suzuran");
-        binding.tvSiteName.setText("BMO 1");
 
         presenter.getEntryPermit();
         presenter.getStatusScan();
+        presenter.getDataDevice(idDevice);
     }
 
     private void initEvent(){
@@ -180,8 +186,15 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
     @Override
     public void showDataStatusScan(List<DataDetail> dataStatusScanList) {
         statusScanList.addAll(dataStatusScanList);
-        adapter.updateDetailList(statusScanList);
-        adapter.notifyDataSetChanged();
+        scanAdapter.updateDetailList(statusScanList);
+        scanAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public void showDataDevice(List<DataDevice> dataDevices) {
+        binding.tvGateName.setText(dataDevices.get(0).getGate().getName());
+        siteAdapter.updateSiteList(dataDevices.get(0).getGate().getSites());
+        siteAdapter.notifyDataSetChanged();
     }
 
     private void setDataPermit(){

app/src/main/java/com/fusi24/rfid/ui/home/HomePresenter.java

@@ -47,4 +47,20 @@ class HomePresenter extends BasePresenter<HomeView> {
                 }));
     }
 
+    void getDataDevice(String deviceId) {
+        String[] expand = {"gate.sites"};
+        disposable.add(manager.getDataDevice(deviceId, expand)
+                .observeOn(androidScheduler)
+                .subscribeOn(processScheduler)
+                .subscribe(result -> {
+                    if (isViewAttached()) {
+                        getView().showDataDevice(result);
+                    }
+                }, throwable -> {
+                    if (isViewAttached()) {
+                        getView().showError(throwable);
+                    }
+                }));
+    }
+
 }

app/src/main/java/com/fusi24/rfid/ui/home/HomeView.java

@@ -2,8 +2,8 @@ package com.fusi24.rfid.ui.home;
 
 import com.fusi24.rfid.base.BaseView;
 import com.fusi24.rfid.data.entity.DataDetail;
+import com.fusi24.rfid.data.entity.DataDevice;
 import com.fusi24.rfid.data.entity.DataEntryPermit;
-import com.fusi24.rfid.data.entity.DataResultRfid;
 
 import java.util.List;
 
@@ -11,5 +11,6 @@ public interface HomeView extends BaseView {
 
     void showDataPermit(List<DataEntryPermit> dataEntryPermitList);
     void showDataStatusScan(List<DataDetail> dataStatusScanList);
+    void showDataDevice(List<DataDevice> dataDevices);
 
 }

app/src/main/res/layout/activity_home.xml

@@ -156,15 +156,16 @@
                 android:textStyle="bold"
                 android:text="@string/label_site" />
 
-            <TextView
-                android:id="@+id/tv_site_name"
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/rv_site"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:layout_marginStart="12dp"
                 android:textSize="14sp"
                 android:textColor="@color/colorBlack"
-                tools:text="BMO 1" />
+                tools:listitem="@layout/row_site"
+                tools:itemCount="3"/>
         </LinearLayout>
 
         <LinearLayout

app/src/main/res/layout/row_site.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tv_common"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:text="BMO 1" />