-Add config dynamic for service URL

-Make default to Serial Port 3 and Production URL

app/src/main/java/com/fusi24/entryPermitScanner/base/BaseActivity.java

@@ -21,7 +21,7 @@ public abstract class BaseActivity extends AppCompatActivity {
 
     public RestService getRestService() {
         if (restService == null) {
-            restService = RestServiceFactory.create(getJwtToken());
+            restService = RestServiceFactory.create(getJwtToken(), this);
         }
         return restService;
     }

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

@@ -29,29 +29,16 @@ public final class Constant {
 
     /*===================================================================================================*/
 
-    //Direct ke BCUI
-    public final static String BASE_URL = "http://bcui2.fusi24.com";
+    //Direct API Service
+    public final static String BASE_URL_DEV = "http://bcui2.fusi24.com"; // Development
+    public final static String BASE_URL_PROD = "http://hseautomation.beraucoal.co.id"; // Production
 
     public final static String BEATS_ENDPOINT = "/beats";
     public final static String BEATS2_ENDPOINT = "/beats2";
-    public final static String SID_ENDPOINT = "/sid";
     public final static String SID2_ENDPOINT = "/sid2";
-    public final static String RFID_ENDPOINT = "/rfid";
     public final static String RFID_NEW_ENDPOINT = "/new/rfid";
 
-    public static final String URL_PHOTO = BASE_URL + BEATS2_ENDPOINT + "/file?path=";
-
-    //Direct ke Production
-    /*public final static String BASE_URL = "http://hseautomation.beraucoal.co.id";
-
-    public final static String BEATS_ENDPOINT = "/beats";
-    public final static String BEATS2_ENDPOINT = "/beats2";
-    public final static String SID_ENDPOINT = "/sid";
-    public final static String SID2_ENDPOINT = "/sid2";
-    public final static String RFID_ENDPOINT = "/rfid";
-    public final static String RFID_NEW_ENDPOINT = "/new/rfid";
-
-    public static final String URL_PHOTO = BASE_URL + BEATS2_ENDPOINT + "/file?path=";*/
+    public static final String URL_PHOTO = BEATS2_ENDPOINT + "/file?path=";
 
     /*===================================================================================================*/
 

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

@@ -14,6 +14,7 @@ public class SessionManager {
     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 static final String IS_DEVELOPMENT          = "development";
 
     private final SharedPreferences preferences;
 
@@ -121,6 +122,16 @@ public class SessionManager {
         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.apply();
+    }
+
     public void clearData() {
         SharedPreferences.Editor editor = preferences.edit();
         editor.remove(IS_LOGIN);

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

@@ -1,9 +1,13 @@
 package com.fusi24.entryPermitScanner.data.api;
 
+import android.content.Context;
+
 import androidx.annotation.NonNull;
 
 import com.fusi24.entryPermitScanner.BuildConfig;
 import com.fusi24.entryPermitScanner.config.Constant;
+import com.fusi24.entryPermitScanner.data.SessionManager;
+import com.fusi24.entryPermitScanner.util.Helper;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 
@@ -16,19 +20,30 @@ import retrofit2.converter.gson.GsonConverterFactory;
 
 public class RestServiceFactory {
 
-    public static RestService create(String token) {
+    public static RestService create(String token, Context context) {
         OkHttpClient client = makeClientService(makeLoggingInterceptor(), token);
-        return makeRestService(client, makeGson());
+        return makeRestService(client, makeGson(), context);
     }
 
-    private static RestService makeRestService(OkHttpClient okHttp, Gson gson) {
+    private static RestService makeRestService(OkHttpClient okHttp, Gson gson, Context context) {
 
-        Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl(Constant.BASE_URL)
-                .client(okHttp)
-                .addConverterFactory(GsonConverterFactory.create(gson))
-                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
-                .build();
+        Retrofit retrofit;
+        SessionManager session = new SessionManager(Helper.getDefaultPreferences(context));
+        if (session.isDevelopment()){
+            retrofit = new Retrofit.Builder()
+                    .baseUrl(Constant.BASE_URL_DEV)
+                    .client(okHttp)
+                    .addConverterFactory(GsonConverterFactory.create(gson))
+                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                    .build();
+        } else {
+            retrofit = new Retrofit.Builder()
+                    .baseUrl(Constant.BASE_URL_PROD)
+                    .client(okHttp)
+                    .addConverterFactory(GsonConverterFactory.create(gson))
+                    .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                    .build();
+        }
         return retrofit.create(RestService.class);
     }
 

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

@@ -0,0 +1,38 @@
+package com.fusi24.entryPermitScanner.data.entity;
+
+import org.jetbrains.annotations.NotNull;
+
+public class DataDirectURL {
+
+    private Integer id;
+    private String name;
+
+    public DataDirectURL() {}
+
+    public DataDirectURL(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/login/LoginActivity.java

@@ -46,6 +46,7 @@ public class LoginActivity extends LFScanProcessing implements LoginView {
     private void initEvent() {
         binding.ivIconScan.setOnClickListener(v -> {
             Intent intent = new Intent(this, SettingActivity.class);
+            intent.putExtra(SettingActivity.IS_FROM_LOGIN, true);
             startActivity(intent);
         });
     }
@@ -123,5 +124,6 @@ public class LoginActivity extends LFScanProcessing implements LoginView {
     protected void onDestroy() {
         super.onDestroy();
         presenter.detachView();
+        binding = null;
     }
 }

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

@@ -62,8 +62,7 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
             getSupportActionBar().setDisplayShowTitleEnabled(false);
         }
 
-        presenter = new ScanResultPresenter(
-                getManager(), getAndroidScheduler(), getProcessScheduler());
+        presenter = new ScanResultPresenter(getManager(), getAndroidScheduler(), getProcessScheduler());
         presenter.attachView(this);
 
         if (getIntent() != null) {
@@ -144,7 +143,11 @@ public class ScanResultActivity extends BaseActivity implements ScanResultView {
     public void showDataRfid(DataResultRfid dataResultRfid) {
 
         if (dataResultRfid.getEmployee() != null) {
-            dataUrl = Constant.URL_PHOTO + dataResultRfid.getEmployee().getUrlPhoto().substring(14);
+            if (getSessionManager().isDevelopment()){
+                dataUrl = Constant.BASE_URL_DEV + Constant.URL_PHOTO + dataResultRfid.getEmployee().getUrlPhoto().substring(14);
+            } else {
+                dataUrl = Constant.BASE_URL_PROD + Constant.URL_PHOTO + dataResultRfid.getEmployee().getUrlPhoto().substring(14);
+            }
 
             binding.tvProfileName.setText(dataResultRfid.getEmployee().getName());
             binding.tvStructuralPosition.setText(dataResultRfid.getEmployee().getStructuralPosition().getName());

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

@@ -1,27 +1,36 @@
 package com.fusi24.entryPermitScanner.ui.setting;
 
+import android.content.Intent;
 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 android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
 
 import com.fusi24.entryPermitScanner.R;
 import com.fusi24.entryPermitScanner.base.BaseActivity;
+import com.fusi24.entryPermitScanner.data.entity.DataDirectURL;
 import com.fusi24.entryPermitScanner.data.entity.DataSerialPort;
 import com.fusi24.entryPermitScanner.databinding.ActivitySettingBinding;
+import com.fusi24.entryPermitScanner.ui.home.HomeActivity;
+import com.fusi24.entryPermitScanner.ui.login.LoginActivity;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class SettingActivity extends BaseActivity {
 
+    public static final String IS_FROM_LOGIN = "is_from_login"; // <== To define from Login Page or Home Page
     private DataSerialPort dataSerialPort;
+    private DataDirectURL dataDirectURL;
     private List<DataSerialPort> serialPortList;
+    private List<DataDirectURL> directURLList;
     private ActivitySettingBinding binding;
+    private boolean isFromLogin = false;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -29,6 +38,7 @@ public class SettingActivity extends BaseActivity {
         binding = ActivitySettingBinding.inflate(getLayoutInflater());
         View view = binding.getRoot();
         setContentView(view);
+        System.out.println("DEVELOPER Setting onCreate");
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         TextView toolbarTitle = findViewById(R.id.toolbar_text);
@@ -43,10 +53,17 @@ public class SettingActivity extends BaseActivity {
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         }
 
+        if (getIntent().getExtras() != null){
+            isFromLogin = getIntent().getExtras().getBoolean(IS_FROM_LOGIN);
+        }
+
         dataSerialPort = new DataSerialPort();
+        dataDirectURL = new DataDirectURL();
         serialPortList = new ArrayList<>();
+        directURLList = new ArrayList<>();
 
         getDataSerialPort();
+        getDataDirectURL();
         initEvent();
     }
 
@@ -56,6 +73,12 @@ public class SettingActivity extends BaseActivity {
         setDataSerialPort();
     }
 
+    private void getDataDirectURL() {
+        directURLList.add(new DataDirectURL(1, "Development"));
+        directURLList.add(new DataDirectURL(2, "Production"));
+        setDataDirectURL();
+    }
+
 
     private void setDataSerialPort(){
         ArrayAdapter<DataSerialPort> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, serialPortList);
@@ -67,6 +90,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);
+        }
+    }
+
     private void initEvent(){
 
         binding.spinnerSerialPort.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -81,12 +114,45 @@ public class SettingActivity extends BaseActivity {
             }
         });
 
+        binding.spinnerDirectUrl.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                dataDirectURL = (DataDirectURL) parent.getItemAtPosition(position);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+                dataDirectURL = (DataDirectURL) parent.getSelectedItem();
+            }
+        });
+
         binding.btnScan.setOnClickListener(v -> {
+
+            Toast.makeText(this, dataSerialPort.getName() + " " + dataDirectURL.getName(), Toast.LENGTH_LONG).show();
+
+            // ID 1 ==> Serial Port 2
             if (dataSerialPort.getId() == 1){
                 getSessionManager().setIsSerialport2(true);
             } else {
                 getSessionManager().setIsSerialport2(false);
             }
+
+            // ID 1 ==> Development
+            if (dataDirectURL.getId() == 1){
+                getSessionManager().setIsDevelopment(true);
+            } else {
+                getSessionManager().setIsDevelopment(false);
+            }
+
+            Intent intent;
+            if (isFromLogin){
+                intent = new Intent(this, LoginActivity.class);
+            } else {
+                intent = new Intent(this, HomeActivity.class);
+            }
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
             finish();
         });
     }
@@ -108,6 +174,7 @@ public class SettingActivity extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
+        System.out.println("DEVELOPER Setting onDestroy");
         binding = null;
     }
 }

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

@@ -17,19 +17,29 @@
     <ImageView
         android:id="@+id/iv_icon_scan"
         android:layout_width="match_parent"
-        android:layout_height="400dp"
+        android:layout_height="250dp"
         android:src="@drawable/ic_scan_card"
         android:layout_below="@+id/tv_login_note"
         android:layout_alignParentStart="true"
         android:layout_alignParentEnd="true"
         android:layout_marginStart="0dp"
-        android:layout_marginTop="0dp"
+        android:layout_marginTop="32dp"
         android:layout_marginEnd="0dp"
         android:layout_marginBottom="0dp"
         android:gravity="center"
         android:contentDescription="@string/cd_image" />
 
     <TextView
+        android:id="@+id/tv_note"
+        style="@style/MyTextData"
+        android:layout_below="@id/iv_icon_scan"
+        android:layout_marginTop="24dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:text="@string/label_tap_to_setting" />
+
+    <TextView
         android:id="@+id/tv_company_label"
         style="@style/BottomText"
         android:layout_width="match_parent"

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

@@ -14,7 +14,7 @@
         android:layout_height="match_parent">
 
         <TextView
-            android:id="@+id/tv_title_label"
+            android:id="@+id/tv_serial_label"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
@@ -30,7 +30,34 @@
             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_below="@+id/tv_serial_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" />
+
+        <TextView
+            android:id="@+id/tv_service_label"
+            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_marginTop="16dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:gravity="start"
+            style="@style/MyTextLabel"
+            android:text="@string/label_direct_url"/>
+
+        <androidx.appcompat.widget.AppCompatSpinner
+            android:id="@+id/spinner_direct_url"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/tv_service_label"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="16dp"
@@ -44,7 +71,7 @@
             style="@style/ButtonCommon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/spinner_serial_port"
+            android:layout_below="@+id/spinner_direct_url"
             android:layout_alignParentStart="true"
             android:layout_alignParentEnd="true"
             android:layout_marginStart="16dp"

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

@@ -8,11 +8,13 @@
     <string name="label_btn_scan">Start Scanning</string>
     <string name="label_info_scan">Tempelkan RFID Gun \n pada RFID Card</string>
     <string name="label_login_scan">Tempelkan \n RFID Card untuk login</string>
+    <string name="label_tap_to_setting">Klik gambar untuk pengaturan device</string>
     <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_direct_url">Direct URL</string>
     <string name="label_save">Simpan</string>
     <string name="label_home">Home</string>
     <string name="label_scan_other">Scan Other</string>