Penambahan URL Staging

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

@@ -31,6 +31,7 @@ public final class Constant {
 
     //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
 
     public final static String BEATS_ENDPOINT = "/beats";

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

@@ -25,6 +25,7 @@ public class SessionManager {
     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_DIRECT_ID          = "data_direct_id";
 
     private final SharedPreferences preferences;
 
@@ -178,6 +179,16 @@ public class SessionManager {
         editor.apply();
     }
 
+    public Integer getDataDirectId() {
+        return preferences.getInt(DATA_DIRECT_ID, 1); // 1 For Development ==> BCUI
+    }
+
+    public void setDataDirectId(Integer dataDirectId) {
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putInt(DATA_DIRECT_ID, dataDirectId);
+        editor.apply();
+    }
+
     public void clearData() {
         SharedPreferences.Editor editor = preferences.edit();
         editor.remove(IS_LOGIN);

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

@@ -29,14 +29,21 @@ public class RestServiceFactory {
 
         Retrofit retrofit;
         SessionManager session = new SessionManager(Helper.getDefaultPreferences(context));
-        if (session.isDevelopment()){
+        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 {
+        } else if (session.getDataDirectId() == 2) { // STAGING
+            retrofit = new Retrofit.Builder()
+                    .baseUrl(Constant.BASE_URL_STAGING)
+                    .client(okHttp)
+                    .addConverterFactory(GsonConverterFactory.create(gson))
+                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                    .build();
+        } else { // PRODUCTION
             retrofit = new Retrofit.Builder()
                     .baseUrl(Constant.BASE_URL_PROD)
                     .client(okHttp)

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

@@ -227,8 +227,10 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     @Override
     public void showDataPermit(DataWorkingPermit dataWorkingPermit) {
         if (dataWorkingPermit.getEmployee() != null) {
-            if (getSessionManager().isDevelopment()){
+            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

@@ -22,6 +22,8 @@ import com.fusi24.entryPermitScanner.ui.login.LoginActivity;
 import java.util.ArrayList;
 import java.util.List;
 
+import timber.log.Timber;
+
 public class SettingActivity extends BaseActivity {
 
     public static final String IS_FROM_LOGIN = "is_from_login"; // <== To define from Login Page or Home Page
@@ -75,7 +77,8 @@ public class SettingActivity extends BaseActivity {
 
     private void getDataDirectURL() {
         directURLList.add(new DataDirectURL(1, "Development"));
-        directURLList.add(new DataDirectURL(2, "Production"));
+        directURLList.add(new DataDirectURL(2, "Staging"));
+        directURLList.add(new DataDirectURL(3, "Production"));
         setDataDirectURL();
     }
 
@@ -93,10 +96,16 @@ public class SettingActivity extends BaseActivity {
     private void setDataDirectURL(){
         ArrayAdapter<DataDirectURL> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, directURLList);
         binding.spinnerDirectUrl.setAdapter(adapter);
-        if (getSessionManager().isDevelopment()){
-            binding.spinnerDirectUrl.setSelection(0);
-        } else {
-            binding.spinnerDirectUrl.setSelection(1);
+        switch (getSessionManager().getDataDirectId()){
+            case 1:
+                binding.spinnerDirectUrl.setSelection(0);
+                break;
+            case 2:
+                binding.spinnerDirectUrl.setSelection(1);
+                break;
+            case 3:
+                binding.spinnerDirectUrl.setSelection(2);
+                break;
         }
     }
 
@@ -137,11 +146,15 @@ public class SettingActivity extends BaseActivity {
                 getSessionManager().setIsSerialport2(false);
             }
 
-            // ID 1 ==> Development
-            if (dataDirectURL.getId() == 1){
-                getSessionManager().setIsDevelopment(true);
+            // DATA DIRECT URL
+            // ID 1 ==> DEV
+            // ID 2 ==> STAGING
+            // ID 3 ==> PRODUCTION
+            if (dataDirectURL.getId() != null){
+                Timber.i("Data Direct ID : %s", dataDirectURL.getId());
+                getSessionManager().setDataDirectId(dataDirectURL.getId());
             } else {
-                getSessionManager().setIsDevelopment(false);
+                Timber.i("Data URL NULL");
             }
 
             Intent intent;