-Add config dynamic for serial port

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="UNCHECKED_WARNING" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>

app/src/main/AndroidManifest.xml

@@ -34,6 +34,11 @@
             android:theme="@style/Theme.AppCompat.Light.NoActionBar">
         </activity>
         <activity
+            android:name=".ui.setting.SettingActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        </activity>
+        <activity
             android:name=".ui.ScanActivity"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>

app/src/main/java/com/fusi24/entryPermitScanner/config/Constant.java

@@ -19,13 +19,13 @@ public final class Constant {
 
     /*===================================================================================================*/
 
-    // API < 3.0 BUAT TEST DEVICE di FUSI
-    /*public final static String PATH = "/dev/ttyS2";
-    public final static String PATHNAME = "/proc/gpiocontrol/set_id";*/
+    // SERIAL PORT ttyS2 BUAT TEST DEVICE di FUSI
+    public final static String PATH_SP2 = "/dev/ttyS2";
+    public final static String PATHNAME_SP2 = "/proc/gpiocontrol/set_id";
 
-    // API 3.0 BUAT TEST DEVICE di BERAU COAL
-    public final static String PATH = "/dev/ttyS3"; // Untuk versi 3.0
-    public final static String PATHNAME = "/proc/gpiocontrol/set_sam"; // untuk versi 3.0
+    // SERIAL PORT ttyS3 BUAT TEST DEVICE di BERAU COAL
+    public final static String PATH_SP3 = "/dev/ttyS3"; // Untuk versi 3.0
+    public final static String PATHNAME_SP3 = "/proc/gpiocontrol/set_sam"; // untuk versi 3.0
 
     /*===================================================================================================*/
 

app/src/main/java/com/fusi24/entryPermitScanner/data/SessionManager.java

@@ -13,6 +13,7 @@ public class SessionManager {
     private static final String USER_TELEPHONE          = "user_telephone";
     private static final String USER_RFID_NUMBER        = "user_rfid_number";
     private static final String GATE                    = "gate";
+    private static final String IS_SERIALPORT_2         = "serial_port_2";
 
     private final SharedPreferences preferences;
 
@@ -110,6 +111,16 @@ public class SessionManager {
         editor.apply();
     }
 
+    public Boolean isSerialPort2() {
+        return preferences.getBoolean(IS_SERIALPORT_2, false);
+    }
+
+    public void setIsSerialport2(Boolean isSerialport2) {
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(IS_SERIALPORT_2, isSerialport2);
+        editor.apply();
+    }
+
     public void clearData() {
         SharedPreferences.Editor editor = preferences.edit();
         editor.remove(IS_LOGIN);

app/src/main/java/com/fusi24/entryPermitScanner/data/entity/DataSerialPort.java

@@ -0,0 +1,38 @@
+package com.fusi24.entryPermitScanner.data.entity;
+
+import org.jetbrains.annotations.NotNull;
+
+public class DataSerialPort {
+
+    private Integer id;
+    private String name;
+
+    public DataSerialPort() {}
+
+    public DataSerialPort(Integer id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    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;
+    }
+
+    @NotNull
+    @Override
+    public String toString() {
+        return name;
+    }
+}

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

@@ -37,6 +37,7 @@ import com.fusi24.entryPermitScanner.data.entity.DataEntryPermit;
 import com.fusi24.entryPermitScanner.data.entity.DataSite;
 import com.fusi24.entryPermitScanner.databinding.ActivityHomeBinding;
 import com.fusi24.entryPermitScanner.ui.ScanActivity;
+import com.fusi24.entryPermitScanner.ui.setting.SettingActivity;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -99,6 +100,11 @@ public class HomeActivity extends BaseActivity implements HomeView, StatusScanAd
     @Override
     public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
+        if (item.getItemId() == R.id.action_setting) {
+            startActivity(new Intent(this, SettingActivity.class));
+            return true;
+        }
+
         if (item.getItemId() == R.id.action_logout) {
             getSessionManager().clearData();
             startActivity(new Intent(this, SplashScreenActivity.class));

app/src/main/java/com/fusi24/entryPermitScanner/ui/login/LoginActivity.java

@@ -3,12 +3,14 @@ package com.fusi24.entryPermitScanner.ui.login;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 import android.widget.Toast;
 
-import com.fusi24.entryPermitScanner.R;
 import com.fusi24.entryPermitScanner.data.SessionManager;
 import com.fusi24.entryPermitScanner.data.entity.DataAuth;
 import com.fusi24.entryPermitScanner.data.entity.DataUser;
+import com.fusi24.entryPermitScanner.databinding.ActivityLoginBinding;
+import com.fusi24.entryPermitScanner.ui.setting.SettingActivity;
 import com.fusi24.entryPermitScanner.util.Helper;
 import com.fusi24.entryPermitScanner.util.LFScanProcessing;
 
@@ -18,20 +20,36 @@ public class LoginActivity extends LFScanProcessing implements LoginView {
 
     private SessionManager session;
     private LoginPresenter presenter;
+    private ActivityLoginBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_login);
+        binding = ActivityLoginBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
 
         presenter = new LoginPresenter(getManager(), getAndroidScheduler(), getProcessScheduler());
         presenter.attachView(this);
         session = new SessionManager(Helper.getDefaultPreferences(this));
 
+        initEvent();
         initSound();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         onStart();
     }
 
+    private void initEvent() {
+        binding.ivIconScan.setOnClickListener(v -> {
+            Intent intent = new Intent(this, SettingActivity.class);
+            startActivity(intent);
+        });
+    }
+
     void startInstance(String numberRfidTemp){
         DataAuth dataAuth = new DataAuth();
         dataAuth.setRfidCode(Helper.formatRfidNumber(numberRfidTemp));

app/src/main/java/com/fusi24/entryPermitScanner/ui/setting/SettingActivity.java

@@ -0,0 +1,113 @@
+package com.fusi24.entryPermitScanner.ui.setting;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+
+import androidx.appcompat.widget.Toolbar;
+
+import com.fusi24.entryPermitScanner.R;
+import com.fusi24.entryPermitScanner.base.BaseActivity;
+import com.fusi24.entryPermitScanner.data.entity.DataSerialPort;
+import com.fusi24.entryPermitScanner.databinding.ActivitySettingBinding;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SettingActivity extends BaseActivity {
+
+    private DataSerialPort dataSerialPort;
+    private List<DataSerialPort> serialPortList;
+    private ActivitySettingBinding binding;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        binding = ActivitySettingBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        TextView toolbarTitle = findViewById(R.id.toolbar_text);
+
+        if (toolbarTitle != null && toolbar != null) {
+            toolbarTitle.setText(getString(R.string.label_setting));
+            setSupportActionBar(toolbar);
+        }
+
+        if (getSupportActionBar() != null) {
+            getSupportActionBar().setDisplayShowTitleEnabled(false);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        }
+
+        dataSerialPort = new DataSerialPort();
+        serialPortList = new ArrayList<>();
+
+        getDataSerialPort();
+        initEvent();
+    }
+
+    private void getDataSerialPort() {
+        serialPortList.add(new DataSerialPort(1, "Serial Port 2"));
+        serialPortList.add(new DataSerialPort(2, "Serial Port 3"));
+        setDataSerialPort();
+    }
+
+
+    private void setDataSerialPort(){
+        ArrayAdapter<DataSerialPort> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, serialPortList);
+        binding.spinnerSerialPort.setAdapter(adapter);
+        if (getSessionManager().isSerialPort2()){
+            binding.spinnerSerialPort.setSelection(0);
+        } else {
+            binding.spinnerSerialPort.setSelection(1);
+        }
+    }
+
+    private void initEvent(){
+
+        binding.spinnerSerialPort.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                dataSerialPort = (DataSerialPort) parent.getItemAtPosition(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                dataSerialPort = (DataSerialPort) parent.getSelectedItem();
+            }
+        });
+
+        binding.btnScan.setOnClickListener(v -> {
+            if (dataSerialPort.getId() == 1){
+                getSessionManager().setIsSerialport2(true);
+            } else {
+                getSessionManager().setIsSerialport2(false);
+            }
+            finish();
+        });
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId()==android.R.id.home){
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        finish();
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        binding = null;
+    }
+}

app/src/main/java/com/fusi24/entryPermitScanner/util/LFScanProcessing.java

@@ -38,7 +38,12 @@ public abstract class LFScanProcessing extends LFSerialPortActivity {
         super.onStart();
 
         // Start Reception
-        PowerUtil.power("1");
+        if (getSessionManager().isSerialPort2()){
+            PowerUtil.power("1", true);
+        } else {
+            // Serial Port 3
+            PowerUtil.power("1", false);
+        }
         this.open();
     }
 
@@ -48,6 +53,11 @@ public abstract class LFScanProcessing extends LFSerialPortActivity {
 
         // Stop Reception
         this.close();
-        PowerUtil.power("0");
+        if (getSessionManager().isSerialPort2()){
+            PowerUtil.power("0", true);
+        } else {
+            // Serial Port 3
+            PowerUtil.power("0", false);
+        }
     }
 }

app/src/main/java/com/fusi24/entryPermitScanner/util/LFSerialPortActivity.java

@@ -33,7 +33,8 @@ import android_serialport_api.SerialPortTool;
 
 public abstract class LFSerialPortActivity extends BaseActivity {
 
-  public static final String PATH = Constant.PATH;
+  public static final String PATH_SP2 = Constant.PATH_SP2;
+  public static final String PATH_SP3 = Constant.PATH_SP3;
   public static final int BAUTRATE = Constant.BAUTRATE;
 
   protected SerialPortTool serialPortTool;
@@ -95,7 +96,11 @@ public abstract class LFSerialPortActivity extends BaseActivity {
 
     try {
 
-      mSerialPort = serialPortTool.getSerialPort(PATH, BAUTRATE);
+      if (getSessionManager().isSerialPort2()){
+        mSerialPort = serialPortTool.getSerialPort(PATH_SP2, BAUTRATE);
+      } else {
+        mSerialPort = serialPortTool.getSerialPort(PATH_SP3, BAUTRATE);
+      }
       mOutputStream = mSerialPort.getOutputStream();
       mInputStream = mSerialPort.getInputStream();
 

app/src/main/java/com/fusi24/entryPermitScanner/util/PowerUtil.java

@@ -6,9 +6,14 @@ import java.io.File;
 import java.io.FileWriter;
 
 public class PowerUtil {
-  public static void power(String id) {
+  public static void power(String id, Boolean isSerialPort2) {
     try {
-      FileWriter localFileWriterOn = new FileWriter(new File(Constant.PATHNAME));
+      FileWriter localFileWriterOn;
+      if (isSerialPort2){
+        localFileWriterOn = new FileWriter(new File(Constant.PATHNAME_SP2));
+      } else {
+        localFileWriterOn = new FileWriter(new File(Constant.PATHNAME_SP3));
+      }
       localFileWriterOn.write(id);
       localFileWriterOn.close();
     } catch (Exception e) {

app/src/main/res/drawable/ic_scan_card.xml

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="512dp"
-    android:height="512dp"
+    android:width="200dp"
+    android:height="200dp"
     android:viewportWidth="300"
     android:viewportHeight="300">
   <path

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

@@ -3,8 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ui.ScanActivity"
-    tools:viewBindingIgnore="true">
+    tools:context=".ui.ScanActivity">
 
     <TextView
         android:id="@+id/tv_login_note"

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

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".ui.setting.SettingActivity">
+
+    <include layout="@layout/default_toolbar" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <TextView
+            android:id="@+id/tv_title_label"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:gravity="start"
+            style="@style/MyTextLabel"
+            android:text="@string/label_serial_port"/>
+
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/spinner_serial_port"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_title_label"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="0dp"
+            style="@style/spinner_style" />
+
+        <Button
+            android:id="@+id/btn_scan"
+            style="@style/ButtonCommon"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/spinner_serial_port"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginEnd="16dp"
+            android:text="@string/label_save" />
+
+    </RelativeLayout>
+
+</LinearLayout>

app/src/main/res/menu/menu_home.xml

@@ -16,6 +16,11 @@
                 app:showAsAction="withText"/>
 
             <item
+                android:id="@+id/action_setting"
+                android:title="@string/label_setting"
+                app:showAsAction="withText"/>
+
+            <item
                 android:id="@+id/action_logout"
                 android:title="@string/label_logout"
                 app:showAsAction="withText"/>

app/src/main/res/values/strings.xml

@@ -11,11 +11,22 @@
     <string name="label_more_options">More Options</string>
     <string name="label_app_version">App version</string>
     <string name="label_logout">Keluar</string>
+    <string name="label_setting">Pengaturan Device</string>
+    <string name="label_serial_port">Serial Port</string>
+    <string name="label_save">Simpan</string>
     <string name="label_home">Home</string>
     <string name="label_scan_other">Scan Other</string>
     <string name="label_status_passed">PASSED</string>
     <string name="label_status_not_passed">NOT PASSED</string>
     <string name="label_status_not_valid">NOT VALID</string>
+    <string name="label_number_rfid">Nomor RFID Gun</string>
+    <string name="label_number_rfid_card">Nomor RFID Card</string>
+    <string name="label_employee_name">Nama Karyawan</string>
+    <string name="label_gate">Gate</string>
+    <string name="label_site">Site</string>
+    <string name="label_entry_ermit">Izin Masuk</string>
+    <string name="label_scan_status">Status Scan</string>
+    <string name="label_strip">-</string>
 
     //Content Description
     <string name="cd_image">IMAGE</string>
@@ -26,13 +37,5 @@
     <string name="error_unknown">The serial port can not be opened for an unknown reason.</string>
     <string name="error_scan_id">Mohon maaf sistem sedang sibuk</string>
     <string name="error_only_security">Oops……… \n anda gagal login</string>
-    <string name="label_number_rfid">Nomor RFID Gun</string>
-    <string name="label_number_rfid_card">Nomor RFID Card</string>
-    <string name="label_employee_name">Nama Karyawan</string>
-    <string name="label_gate">Gate</string>
-    <string name="label_site">Site</string>
-    <string name="label_entry_ermit">Izin Masuk</string>
-    <string name="label_scan_status">Status Scan</string>
-    <string name="label_strip">-</string>
 
 </resources>