Penambahan data serial port menjadi 3 untuk 3 device yang berbeda di BC

Menghilangkan URL Development (bcui.fusi24.com)

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

@@ -19,18 +19,21 @@ public final class Constant {
 
     /*===================================================================================================*/
 
-    // 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";
+    // SERIAL PORT Device V1
+    public final static String PATH_SP1 = "/dev/ttyS2";
+    public final static String PATHNAME_SP1 = "/proc/gpiocontrol/set_id";
 
-    // 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
+    // SERIAL PORT Device V2 (Lecom U8000)
+    public final static String PATH_SP2 = "/dev/ttyS3";
+    public final static String PATHNAME_SP2 = "/proc/gpiocontrol/set_sam";
+
+    // SERIAL PORT Device V2 (Lecom U9000)
+    public final static String PATH_SP3 = "/dev/ttyS3";
+    public final static String PATHNAME_SP3 = "/proc/gpiocontrol/set_id";
 
     /*===================================================================================================*/
 
     //Direct API Service
-    public final static String BASE_URL_DEV = "https://bcui2.fusi24.com"; // Development
     public final static String BASE_URL_STAGING = "http://beats-dev.beraucoal.co.id"; // Development
     public final static String BASE_URL_PROD = "http://hseautomation.beraucoal.co.id"; // Production
 

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

@@ -23,8 +23,7 @@ public class SessionManager {
     private static final String GATE                    = "gate";
     private static final String SITE_LIST               = "site_list";
     private static final String PERMIT_LIST             = "permit_list";
-    private static final String IS_SERIALPORT_2         = "serial_port_2";
-    private static final String IS_DEVELOPMENT          = "development";
+    private static final String DATA_SERIAL_PORT        = "serial_port_2";
     private static final String DATA_DIRECT_ID          = "data_direct_id";
 
     private final SharedPreferences preferences;
@@ -159,23 +158,13 @@ public class SessionManager {
         editor.apply();
     }
 
-    public Boolean isSerialPort2() {
-        return preferences.getBoolean(IS_SERIALPORT_2, false);
+    public Integer getDataSerialPort() {
+        return preferences.getInt(DATA_SERIAL_PORT, 1);
     }
 
-    public void setIsSerialport2(Boolean isSerialport2) {
+    public void setDataSerialPort(Integer serialPort) {
         SharedPreferences.Editor editor = preferences.edit();
-        editor.putBoolean(IS_SERIALPORT_2, isSerialport2);
-        editor.apply();
-    }
-
-    public Boolean isDevelopment() {
-        return preferences.getBoolean(IS_DEVELOPMENT, false);
-    }
-
-    public void setIsDevelopment(Boolean isDevelopment) {
-        SharedPreferences.Editor editor = preferences.edit();
-        editor.putBoolean(IS_DEVELOPMENT, isDevelopment);
+        editor.putInt(DATA_SERIAL_PORT, serialPort);
         editor.apply();
     }
 

app/src/main/java/com/fusi24/entryPermitScanner/data/api/RestServiceFactory.java

@@ -29,14 +29,7 @@ public class RestServiceFactory {
 
         Retrofit retrofit;
         SessionManager session = new SessionManager(Helper.getDefaultPreferences(context));
-        if (session.getDataDirectId() == 1){ // DEVELOPMENT
-            retrofit = new Retrofit.Builder()
-                    .baseUrl(Constant.BASE_URL_DEV)
-                    .client(okHttp)
-                    .addConverterFactory(GsonConverterFactory.create(gson))
-                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                    .build();
-        } else if (session.getDataDirectId() == 2) { // STAGING
+       if (session.getDataDirectId() == 1) { // STAGING
             retrofit = new Retrofit.Builder()
                     .baseUrl(Constant.BASE_URL_STAGING)
                     .client(okHttp)

app/src/main/java/com/fusi24/entryPermitScanner/ui/scanresult/ScanResultActivity.java

@@ -228,8 +228,6 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     public void showDataPermit(DataWorkingPermit dataWorkingPermit) {
         if (dataWorkingPermit.getEmployee() != null) {
             if (getSessionManager().getDataDirectId() == 1){
-                dataUrl = Constant.BASE_URL_DEV + Constant.URL_PHOTO + dataWorkingPermit.getEmployee().getUrlPhoto().substring(14);
-            } else if (getSessionManager().getDataDirectId() == 1){
                 dataUrl = Constant.BASE_URL_STAGING + Constant.URL_PHOTO + dataWorkingPermit.getEmployee().getUrlPhoto().substring(14);
             } else {
                 dataUrl = Constant.BASE_URL_PROD + Constant.URL_PHOTO + dataWorkingPermit.getEmployee().getUrlPhoto().substring(14);

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

@@ -70,15 +70,15 @@ public class SettingActivity extends BaseActivity {
     }
 
     private void getDataSerialPort() {
-        serialPortList.add(new DataSerialPort(1, "Serial Port 2"));
-        serialPortList.add(new DataSerialPort(2, "Serial Port 3"));
+        serialPortList.add(new DataSerialPort(1, "Serial Port 1"));
+        serialPortList.add(new DataSerialPort(2, "Serial Port 2"));
+        serialPortList.add(new DataSerialPort(3, "Serial Port 3"));
         setDataSerialPort();
     }
 
     private void getDataDirectURL() {
         directURLList.add(new DataDirectURL(1, "Development"));
-        directURLList.add(new DataDirectURL(2, "Staging"));
-        directURLList.add(new DataDirectURL(3, "Production"));
+        directURLList.add(new DataDirectURL(2, "Production"));
         setDataDirectURL();
     }
 
@@ -86,10 +86,16 @@ public class SettingActivity extends BaseActivity {
     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);
+        switch (getSessionManager().getDataSerialPort()){
+            case 1:
+                binding.spinnerSerialPort.setSelection(0);
+                break;
+            case 2:
+                binding.spinnerSerialPort.setSelection(1);
+                break;
+            case 3:
+                binding.spinnerSerialPort.setSelection(2);
+                break;
         }
     }
 
@@ -103,9 +109,6 @@ public class SettingActivity extends BaseActivity {
             case 2:
                 binding.spinnerDirectUrl.setSelection(1);
                 break;
-            case 3:
-                binding.spinnerDirectUrl.setSelection(2);
-                break;
         }
     }
 
@@ -140,16 +143,16 @@ public class SettingActivity extends BaseActivity {
             Toast.makeText(this, dataSerialPort.getName() + " " + dataDirectURL.getName(), Toast.LENGTH_LONG).show();
 
             // ID 1 ==> Serial Port 2
-            if (dataSerialPort.getId() == 1){
-                getSessionManager().setIsSerialport2(true);
+            if (dataSerialPort.getId() != null){
+                Timber.i("Data Serial Port : %s", dataSerialPort.getId());
+                getSessionManager().setDataSerialPort(dataSerialPort.getId());
             } else {
-                getSessionManager().setIsSerialport2(false);
+                Timber.i("Data Serial Port Null");
             }
 
             // DATA DIRECT URL
             // ID 1 ==> DEV
-            // ID 2 ==> STAGING
-            // ID 3 ==> PRODUCTION
+            // ID 2 ==> PRODUCTION
             if (dataDirectURL.getId() != null){
                 Timber.i("Data Direct ID : %s", dataDirectURL.getId());
                 getSessionManager().setDataDirectId(dataDirectURL.getId());

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

@@ -36,28 +36,18 @@ public abstract class LFScanProcessing extends LFSerialPortActivity {
     @Override
     protected void onStart() {
         super.onStart();
-
         // Start Reception
-        if (getSessionManager().isSerialPort2()){
-            PowerUtil.power("1", true);
-        } else {
-            // Serial Port 3
-            PowerUtil.power("1", false);
-        }
+        Integer serialPort = getSessionManager().getDataSerialPort();
+        PowerUtil.power("1", serialPort);
         this.open();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-
         // Stop Reception
         this.close();
-        if (getSessionManager().isSerialPort2()){
-            PowerUtil.power("0", true);
-        } else {
-            // Serial Port 3
-            PowerUtil.power("0", false);
-        }
+        Integer serialPort = getSessionManager().getDataSerialPort();
+        PowerUtil.power("0", serialPort);
     }
 }

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

@@ -33,6 +33,7 @@ import android_serialport_api.SerialPortTool;
 
 public abstract class LFSerialPortActivity extends BaseActivity {
 
+  public static final String PATH_SP1 = Constant.PATH_SP1;
   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;
@@ -96,7 +97,9 @@ public abstract class LFSerialPortActivity extends BaseActivity {
 
     try {
 
-      if (getSessionManager().isSerialPort2()){
+      if (getSessionManager().getDataSerialPort() == 1){
+        mSerialPort = serialPortTool.getSerialPort(PATH_SP1, BAUTRATE);
+      } else if (getSessionManager().getDataSerialPort() == 2) {
         mSerialPort = serialPortTool.getSerialPort(PATH_SP2, BAUTRATE);
       } else {
         mSerialPort = serialPortTool.getSerialPort(PATH_SP3, BAUTRATE);

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

@@ -6,13 +6,15 @@ import java.io.File;
 import java.io.FileWriter;
 
 public class PowerUtil {
-  public static void power(String id, Boolean isSerialPort2) {
+  public static void power(String id, Integer serialPort) {
     try {
       FileWriter localFileWriterOn;
-      if (isSerialPort2){
+      if (serialPort == 1){
+        localFileWriterOn = new FileWriter(new File(Constant.PATHNAME_SP1));
+      } else if (serialPort == 2) {
         localFileWriterOn = new FileWriter(new File(Constant.PATHNAME_SP2));
       } else {
-        localFileWriterOn = new FileWriter(new File(Constant.PATHNAME_SP2));
+        localFileWriterOn = new FileWriter(new File(Constant.PATHNAME_SP3));
       }
       localFileWriterOn.write(id);
       localFileWriterOn.close();