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

minsdk23

Browse Source
This commit is contained in:
ravik
2025-09-26 19:03:00 +05:30
parent cd4c4cc8e0
commit a1f14ac912
144 changed files with 597 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+3 -3
View File
@@ -8,12 +8,12 @@ android {
namespace("com.cpm.lorealbaMabeline")
compileSdk(35)
defaultConfig {
minSdkVersion 29
minSdkVersion 23
applicationId "com.cpm.lorealbaMabeline"
//noinspection OldTargetApi
targetSdk 34
versionCode 20
versionName "2.9"
versionCode 21
versionName "3.0"
multiDexEnabled true
useLibrary 'org.apache.http.legacy'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
app/release/LorealBa-MNY-T1-release.apk → app/release/LorealBa-Mny-T-release.apk
BIN
View File
Binary file not shown.
app/release/output-metadata.json
+2 -2
View File
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 20,
"versionName": "2.9",
"versionCode": 21,
"versionName": "3.0",
"outputFile": "app-release.apk"
}
],
app/src/main/java/com/cpm/lorealbaMabeline/CounterLoginActivity.java
+1 -1
View File
@@ -502,7 +502,7 @@ public class CounterLoginActivity extends AppCompatActivity implements View.OnCl
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version);
versioncode_txt.setText("Version : " + version +"-T");
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaMabeline/Database/Lorealba_Database.java
+19 -15
View File
@@ -294,12 +294,15 @@ public class Lorealba_Database extends SQLiteOpenHelper {
}
}
private void isOpenDb(){
private void isOpenDb() {
try {
if (!db.isOpen()) open();
}catch (Exception e){e.printStackTrace();}
} catch (Exception e) {
e.printStackTrace();
}
}
public void deleteNotificationTableafterOneWeek() {
try {
isOpenDb();
@@ -1995,19 +1998,19 @@ public class Lorealba_Database extends SQLiteOpenHelper {
values.put("ProductId", tStockSummary.getProductId());
values.put("SaleableIn", tStockSummary.getSaleableIn());
values.put("SaleableOut", tStockSummary.getSaleableOut());
values.put("SaleableBalance", tStockSummary.getSaleableStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSaleableBalance()==-1 ? 0 : 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.getTesterStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getTesterBalance()==-1 ? 0 :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.getSampleStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSampleBalance()==-1 ? 0 : 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.getGwpStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getGwpBalance()==-1 ? 0 : 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());
@@ -2609,7 +2612,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
}
///jeevanp
/// jeevanp
public long deleteconsumersale(String visit_date, int reciept_count, String user_id) {
long l = 0;
try {
@@ -3238,7 +3241,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
}
///jp work
/// jp work
public ArrayList<ProductMaster> getproduct_masterlist(String invoice_type, String visit_date, String counterId, String userType) {
////////test("Fetching", "Storedata--------------->Start<------------");
ArrayList<ProductMaster> list = new ArrayList<>();
@@ -5029,7 +5032,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
isOpenDb();
id = db.insert(CommonString.TABLE_INSERT_MANUAL_INWARD_TRANSACTION, null, values2);
if (id > 0){
if (id > 0) {
isOpenDb();
TStockSummary stockObj = getTStockSummaryProductDetails(Integer.parseInt(selected_list.get(j).getProduct_Id()));
if (stockObj != null) {
@@ -5103,7 +5106,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
return list;
}
///jp_update_getSaleable Stock
/// jp_update_getSaleable Stock
public ProductMaster getActualSaleableStock(String productId, String coulmn_name, String visit_date, String counterId, String userType) {
ProductMaster list = new ProductMaster();
Cursor dbcursor = null;
@@ -5640,7 +5643,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
}
}
///jp changes
/// jp changes
public JourneyPlan getBIDfromJCP(String UserId, String CounterId) {
JourneyPlan sb = new JourneyPlan();
Cursor dbcursor = null;
@@ -6144,7 +6147,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
}
////jp get ba login tyme
/// /jp get ba login tyme
public LoginGetterSetter get_baLoginTym(String visit_date, String userId) {
LoginGetterSetter sb = new LoginGetterSetter();
Cursor dbcursor = null;
@@ -14936,16 +14939,17 @@ public class Lorealba_Database extends SQLiteOpenHelper {
return sb;
}
public void updateStatus(String id, String counterId, String bID, String status, double latitude, double longitude) {
public long updateStatus(String id, String counterId, String bID, String status, double latitude, double longitude) {
ContentValues values = new ContentValues();
try {
values.put("GeoTag", status);
values.put("Latitude", latitude);
values.put("Longitude", longitude);
db.update("Mapping_JourneyPlan", values, "StoreId" + " = " + id + " And BID = " + bID + " And CounterId = " + counterId, null);
return db.update("Mapping_JourneyPlan", values, "StoreId" + " = " + id + " And BID = " + bID + " And CounterId = " + counterId, null);
} catch (Exception ignored) {
return 0;
}
}
}
public void updateCheckoutStatus(String counterId, String bID, String userId) {
ContentValues values = new ContentValues();
app/src/main/java/com/cpm/lorealbaMabeline/DealarBoardActivity.java
+1 -1
View File
@@ -818,7 +818,7 @@ public class DealarBoardActivity extends AppCompatActivity implements Navigation
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
version_code.setText("Version : " + version);
version_code.setText("Version : " + version +"-T");
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
version_code.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaMabeline/IMEILoginActivity.java
+1 -1
View File
@@ -166,7 +166,7 @@ public class IMEILoginActivity extends AppCompatActivity implements GoogleApiCli
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version);
versioncode_txt.setText("Version : " + version+"-T");
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaMabeline/UserLoginActivity.java
+1 -1
View File
@@ -285,7 +285,7 @@ public class UserLoginActivity extends AppCompatActivity implements View.OnClick
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version);
versioncode_txt.setText("Version : " + version +"-T");
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/StoreImageActivity.java
+1 -1
View File
@@ -968,7 +968,7 @@ public class StoreImageActivity extends AppCompatActivity implements View.OnClic
return;
}
db.open();
if (!isGeoTagAlertShown && db.getinsertGeotaggingData(storeId.toString(), counter_id, username, "Y").isEmpty()) {
if (jcp.getGeoTag() != null && !jcp.getGeoTag().equalsIgnoreCase(CommonString.KEY_Y) && !isGeoTagAlertShown) {
isGeoTagAlertShown = true;
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getResources().getString(R.string.dialog_title));
app/src/main/java/com/cpm/lorealbaMabeline/dailyactivity/TabLoginActivity.java
+1 -2
View File
@@ -80,7 +80,6 @@ import retrofit2.Response;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;
public class TabLoginActivity extends AppCompatActivity implements View.OnClickListener {
private String counterId = "", str_updated_date = "0", visitdate = "", tag_from = "", userId, passwordData, app_ver, manufacturer, model, os_version;
private Spinner sp_sppiner;
@@ -261,7 +260,7 @@ public class TabLoginActivity extends AppCompatActivity implements View.OnClickL
try {
PackageInfo pInfo = context.getPackageManager().getPackageInfo(getPackageName(), 0);
String version = pInfo.versionName;
versioncode_txt.setText("Version : " + version);
versioncode_txt.setText("Version : " + version +"-T");
} catch (PackageManager.NameNotFoundException e) {
e.fillInStackTrace();
versioncode_txt.setText("Version : 0.0");
app/src/main/java/com/cpm/lorealbaMabeline/geotag/GeoTaggingActivity.java
+7 -4
View File
@@ -112,9 +112,11 @@ public class GeoTaggingActivity extends AppCompatActivity implements OnMapReadyC
if (!img_str.isEmpty()) {
if (db.InsertSTOREgeotag(jcpGetset.getStoreId().toString(), counter_id, jcpGetset.getBID().toString(), username, latitude, longitude, img_str) > 0) {
img_str = "";
db.updateStatus(jcpGetset.getStoreId().toString(), jcpGetset.getCounterId().toString(),
jcpGetset.getBID().toString(), CommonString.KEY_Y, latitude, longitude);
new GeoTagUpload().execute();
if (checkNetIsAvailable(view.getContext())) {
new GeoTagUpload().execute();
} else {
AlertandMessages.showToastMsg(context, getResources().getString(R.string.nonetwork));
}
} else {
AlertandMessages.showToastMsg(context, "Error in saving Geotag");
}
@@ -469,7 +471,8 @@ public class GeoTaggingActivity extends AppCompatActivity implements OnMapReadyC
dialog.dismiss();
if (result != null && result.equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
db.open();
if (db.updateInsertedGeoTagStatus(jcpGetset.getStoreId().toString(), counter_id, username, CommonString.KEY_Y) > 0) {
if (db.updateInsertedGeoTagStatus(jcpGetset.getStoreId().toString(), counter_id, username, CommonString.KEY_Y) > 0
&& db.updateStatus(jcpGetset.getStoreId().toString(), jcpGetset.getCounterId().toString(), jcpGetset.getBID().toString(), CommonString.KEY_Y, latitude, longitude) > 0) {
img_str = "";
AlertandMessages.showToastMsg(context, "Geotag Saved Successfully");
finish();
app/src/main/java/com/cpm/lorealbaMabeline/pinviewactivity/PinViewActivity.java
+16 -3
View File
@@ -388,7 +388,13 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
} else if (!allLoginData.isEmpty() && allLoginData.get(0).getMpin() != null && !pinview_confirm.getValue().equalsIgnoreCase(allLoginData.get(0).getMpin())) {
AlertandMessages.showToastMsg(context, "Your MPIN Does Not Match From Inserted Database");
} else {
if (IS_PASSWORD_CHECK && Update_Visit_Date != null && Update_Visit_Date.equals("1")) {
if (CommonFunctions.checkNetIsAvailable(context)) {
AttempLogin();
} else {
AlertandMessages.showToastMsg(context, CommonString.MESSAGE_INTERNET_NOT_AVALABLE);
}
}
/* if (IS_PASSWORD_CHECK && Update_Visit_Date != null && Update_Visit_Date.equals("1")) {
if (CommonFunctions.checkNetIsAvailable(context)) {
AttempLogin();
} else {
@@ -446,7 +452,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
finish();
}
}
}
}*/
} else if (v.getId() == R.id.btn_clear) {
hideKeyboard(this);
@@ -618,8 +624,15 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
finish();
});
builder.show();
} else {
}
else {
loading.dismiss();
Toast.makeText(context,"Success",Toast.LENGTH_SHORT).show();
editor.putString(user_id, pinview_confirm.getValue());
editor.putString(CommonString.KEY_USERNAME, user_id.toLowerCase());
editor.commit();
db.open();
db.updateLoginMpnData(user_id, pinview_confirm.getValue());
if (!allLoginData.isEmpty()) {
if (allLoginData.get(0).getImg().isEmpty()) {
startActivity(new Intent(context, StoreImageActivity.class));