AndroidNative2026/LorealBa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lockout_preference

Browse Source
This commit is contained in:
ravik
2025-09-12 18:18:45 +05:30
parent 251a713be6
commit 741480e66e
140 changed files with 73 additions and 609 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+1 -1
View File
@@ -34,7 +34,7 @@ android {
buildTypes {
release {
buildConfigField "boolean", "LOG_ENABLED", "true"
debuggable true
debuggable false
minifyEnabled true
shrinkResources true
signingConfig signingConfigs.config
app/release/LorealBa-LP-280825-release.apk → app/release/LorealBa-LP-T1-release.apk
BIN
View File
Binary file not shown.
app/src/main/java/com/cpm/lorealbaautomation/Database/Lorealba_Database.java
+4 -4
View File
@@ -1996,19 +1996,19 @@ public class Lorealba_Database extends SQLiteOpenHelper {
values.put("SaleableIn", tStockSummary.getSaleableIn());
values.put("SaleableOut", tStockSummary.getSaleableOut());
values.put("SaleableDamage", tStockSummary.getSaleableDamage());
values.put("SaleableBalance", tStockSummary.getSaleableBalance());
values.put("SaleableBalance", tStockSummary.getSaleableStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSaleableBalance()==-1 ? 0 : tStockSummary.getSaleableBalance());
values.put("TesterIn", tStockSummary.getTesterIn());
values.put("TesterOut", tStockSummary.getTesterOut());
values.put("TesterDamage", tStockSummary.getTesterDamage());
values.put("TesterBalance", tStockSummary.getTesterBalance());
values.put("TesterBalance", tStockSummary.getTesterStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getTesterBalance()==-1 ? 0 :tStockSummary.getTesterBalance());
values.put("SampleIn", tStockSummary.getSampleIn());
values.put("SampleOut", tStockSummary.getSampleOut());
values.put("SampleDamage", tStockSummary.getSampleDamage());
values.put("SampleBalance", tStockSummary.getSampleBalance());
values.put("SampleBalance", tStockSummary.getSampleStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSampleBalance()==-1 ? 0 : tStockSummary.getSampleBalance());
values.put("GwpIn", tStockSummary.getGwpIn());
values.put("GwpOut", tStockSummary.getGwpOut());
values.put("GwpDamage", tStockSummary.getGwpDamage());
values.put("GwpBalance", tStockSummary.getGwpBalance());
values.put("GwpBalance", tStockSummary.getGwpStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getGwpBalance()==-1 ? 0 : tStockSummary.getGwpBalance());
values.put("SaleableStatus", tStockSummary.getSaleableStatus().trim());
values.put("TesterStatus", tStockSummary.getTesterStatus().trim());
values.put("SampleStatus", tStockSummary.getSampleStatus().trim());
app/src/main/java/com/cpm/lorealbaautomation/constant/AlertandMessages.java
+6 -4
View File
@@ -101,12 +101,14 @@ public class AlertandMessages {
Snackbar.make(Objects.requireNonNull(((Activity) context).getCurrentFocus()), message, Snackbar.LENGTH_SHORT).show();
}
public void backpressedAlert(final Activity activity) {
public static void closeApp(final Activity activity, String str) {
final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle("Alert");
builder.setMessage("Do you want to exit? Filled data will be lost").setCancelable(false)
.setPositiveButton("Ok", (dialog, id) -> activity.finish());
builder.setNegativeButton("Cancel", (dialog, which) -> dialog.dismiss());
builder.setMessage(str).setCancelable(false)
.setPositiveButton("Ok", (dialog, id) -> {
dialog.dismiss();
activity.finishAffinity();
});
AlertDialog alert = builder.create();
alert.show();
}
app/src/main/java/com/cpm/lorealbaautomation/constant/CommonString.java
+1
View File
@@ -1027,6 +1027,7 @@ public class CommonString {
public static final String MANUALINWARD_DMS_NEWPRODUCT = "MANUALINWARD_DMS_NEWPRODUCT";
public static final String CONSUMERSALE = "CONSUMERSALE";
public static final String SKINGENIUS = "SKINGENIUS";
public static final String KEY_LOCKOUT = "LOCKOUT";
public static final String OPEN_SKINGENIUS = "OPEN_SKINGENIUS";
public static final String OPEN_MAYBELLINE = "OPEN_MAYBELLINE";
public static final String CONSUMERRETURN = "CONSUMERRETURN";
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/TabLoginActivity.java
+8 -14
View File
@@ -13,14 +13,10 @@ import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.location.LocationManager;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Build;
import android.os.Bundle;
import android.provider.Settings;
import android.text.InputFilter;
import android.text.Spanned;
import android.util.Log;
import android.view.View;
import android.view.WindowManager;
import android.widget.AdapterView;
@@ -358,7 +354,7 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
}
}
String jsonString = jsonObject.toString();
// Log.e("loginjson", jsonString);
// Log.e("loginjson", jsonString);
try {
OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).writeTimeout(CommonString.TIMEOUT,
@@ -380,20 +376,18 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
if (data != null && data.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.KEY_FAILURE + " Please try again");
loading.dismiss();
}
else if (data != null && data.contains("Changed")) {
} else if (data != null && data.contains("Changed")) {
loading.dismiss();
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_CHANGED);
}
else if (data != null && data.contains("Lockout")) {
} else if (data != null && data.contains("Lockout")) {
loading.dismiss();
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOCKED);
}
else if (data != null && data.contains("No data")) {
editor.putBoolean(CommonString.KEY_LOCKOUT + userId + visitdate, true);
editor.commit();
AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED);
} else if (data != null && data.contains("No data")) {
loading.dismiss();
AlertandMessages.showAlertlogin(TabLoginActivity.this, CommonString.MESSAGE_LOGIN_NO_DATA);
}
else {
} else {
JSONObject obj = new JSONObject();
obj.put("Downloadtype", "LoginTime");
obj.put("Username", userId);
app/src/main/java/com/cpm/lorealbaautomation/pinviewactivity/PinViewActivity.java
+11 -13
View File
@@ -34,7 +34,6 @@ import androidx.cardview.widget.CardView;
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import com.cpm.lorealbaautomation.dailyactivity.TabLoginActivity;
import com.goodiebag.pinview.Pinview;
import com.google.android.gms.common.api.ResolvableApiException;
import com.google.android.gms.location.FusedLocationProviderClient;
@@ -83,7 +82,6 @@ import retrofit2.converter.gson.GsonConverterFactory;
public class
PinViewActivity extends AppCompatActivity implements View.OnClickListener {
private String counterId = "";
private final String visitdate = "";
private String Update_Visit_Date;
private String userType;
Pinview pinview_confirm, pinview_start;
@@ -143,9 +141,12 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
}
getDeviceName();
getLastLocation();
if (preferences.getBoolean(CommonString.KEY_LOCKOUT + user_id + visit_date, false)) {
AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED);
}
}
private boolean checkAndRequestPermissions() {
private void checkAndRequestPermissions() {
int CAMERA = ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA);
int ACCESS_NETWORK_STATE = ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_NETWORK_STATE);
int ACCESS_COARSE_LOCATION = ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION);
@@ -174,9 +175,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
if (!listPermissionsNeeded.isEmpty()) {
ActivityCompat.requestPermissions(this, listPermissionsNeeded.toArray(new String[listPermissionsNeeded.size()]), PERMISSION_ALL);
return false;
}
return true;
}
private void showDialogOK(String message, DialogInterface.OnClickListener okListener) {
@@ -366,7 +365,6 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
os_version = Build.VERSION.RELEASE;
}
@SuppressLint("NonConstantResourceId")
@Override
public void onClick(View v) {
@@ -519,7 +517,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
}
String jsonString = jsonObject.toString();
Log.d("pinviewjson",jsonString);
Log.d("pinviewjson", jsonString);
try {
final OkHttpClient okHttpClient = new OkHttpClient.Builder().readTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).
writeTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).connectTimeout(CommonString.TIMEOUT, TimeUnit.SECONDS).build();
@@ -544,12 +542,12 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
} else if (data_Login.contains("No data")) {
loading.dismiss();
AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOGIN_NO_DATA);
}
else if (data_Login.contains("Lockout")) {
} else if (data_Login.contains("Lockout")) {
loading.dismiss();
AlertandMessages.showAlertlogin((Activity) context, CommonString.MESSAGE_LOCKED);
}
else if (data_Login.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
editor.putBoolean(CommonString.KEY_LOCKOUT + user_id + visit_date, true);
editor.commit();
AlertandMessages.closeApp((Activity) context, CommonString.MESSAGE_LOCKED);
} else if (data_Login.equalsIgnoreCase(CommonString.KEY_FAILURE)) {
AlertandMessages.showAlertlogin((Activity) context, CommonString.KEY_FAILURE + " Please try again");
loading.dismiss();
} else {
@@ -594,7 +592,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
loginGetterSetter = new LoginGetterSetter();
loginGetterSetter.setUserId(user_id);
loginGetterSetter.setPassword(allLoginData.get(0).getPassword());
loginGetterSetter.setVisitDate(visitdate);
loginGetterSetter.setVisitDate(visit_date);
loginGetterSetter.setUserType(userType);
if (data_login_Tym != null) {
loginGetterSetter.setUserLoginTym(data_login_Tym.getLoginTime().get(0).getLoginTime());
app/src/main/java/com/cpm/lorealbaautomation/retrofit/DownloadAllDatawithRetro.java
+2 -2
View File
@@ -2077,7 +2077,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
baListObject = new Gson().fromJson(data, JCPGetterSetter.class);
db.open();
if (baListObject != null && !db.insertBalistData(baListObject)) {
AlertandMessages.showSnackbarMsg(context, "Ba List data not saved");
AlertandMessages.showToastMsg(context, "Ba List data not saved");
}
} else {
throw new java.lang.Exception();
@@ -2089,7 +2089,7 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
jcpObject = new Gson().fromJson(data, JCPGetterSetter.class);
db.open();
if (jcpObject != null && !db.insertJCPData(jcpObject)) {
AlertandMessages.showSnackbarMsg(context, "JCP data not saved");
AlertandMessages.showToastMsg(context, "JCP data not saved");
}
}