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

updated_code

Browse Source
This commit is contained in:
ravik
2025-09-26 17:47:51 +05:30
parent 741480e66e
commit a04e0db9d5
133 changed files with 609 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/build.gradle
+3 -3
View File
@@ -12,8 +12,8 @@ android {
applicationId "com.cpm.lorealbaautomation"
//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"
@@ -34,7 +34,7 @@ android {
buildTypes {
release {
buildConfigField "boolean", "LOG_ENABLED", "true"
debuggable false
debuggable true
minifyEnabled true
shrinkResources true
signingConfig signingConfigs.config
app/release/LorealBa-LP-T1-release.apk → app/release/LorealBa-LP-U-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/lorealbaautomation/Database/Lorealba_Database.java
+15 -18
View File
@@ -1997,6 +1997,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
values.put("SaleableOut", tStockSummary.getSaleableOut());
values.put("SaleableDamage", tStockSummary.getSaleableDamage());
values.put("SaleableBalance", tStockSummary.getSaleableStatus().trim().equalsIgnoreCase("COMPLETE") && tStockSummary.getSaleableBalance()==-1 ? 0 : tStockSummary.getSaleableBalance());
// values.put("SaleableBalance", tStockSummary.getSaleableBalance());
values.put("TesterIn", tStockSummary.getTesterIn());
values.put("TesterOut", tStockSummary.getTesterOut());
values.put("TesterDamage", tStockSummary.getTesterDamage());
@@ -2019,7 +2020,6 @@ public class Lorealba_Database extends SQLiteOpenHelper {
if (l == -1) {
throw new Exception();
}
}
if (isTStockTotalLine(date, counterId, "T_StockSummary") != data.size()) {
@@ -2855,23 +2855,22 @@ public class Lorealba_Database extends SQLiteOpenHelper {
public String getStatus(String columnName, String counterId) {
String status = null;
Cursor dbcursor = null;
String query = "select distinct t1." + columnName + " from T_StockSummary t1 INNER JOIN Product_Master t2 on t1.ProductId=t2.ProductId where t1." + columnName + "<>''and t1.CounterId=" + counterId + " and t2.ProductType='Normal'";
Log.d("querydata",query);
try {
if (columnName != null && columnName.equalsIgnoreCase(CommonString.KEY_GwpStatus)) {
dbcursor = db.rawQuery("select distinct t1.GwpStatus as GwpStatus from T_StockSummary t1 INNER JOIN Product_Master t2 on t1.ProductId=t2.ProductId where t1.GwpStatus<>''and t1.CounterId=" + counterId + " and t2.ProductType='GWP'", null);
} else {
dbcursor = db.rawQuery("select distinct t1." + columnName + " from T_StockSummary t1 INNER JOIN Product_Master t2 on t1.ProductId=t2.ProductId where t1." + columnName + "<>''and t1.CounterId=" + counterId + " and t2.ProductType='Normal'", null);
//dbcursor = db.rawQuery("select distinct t1." + columnName + " from T_StockSummary t1 INNER JOIN Product_Master t2 on t1.ProductId=t2.ProductId where t1." + columnName + "<>''and t1.CounterId=" + counterId + " and t2.ProductType='Normal'", null);
dbcursor = db.rawQuery(query, null);
}
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
status = dbcursor.getString(dbcursor.getColumnIndexOrThrow(columnName));
dbcursor.moveToNext();
}
dbcursor.close();
return status;
}
@@ -5127,10 +5126,7 @@ public class Lorealba_Database extends SQLiteOpenHelper {
} else {
query = " Select " + getDataMe + " from " + table + " s" + " Left join" + " (Select CounterId, ProductId, sum(DamageQty) as DamageQty from (" + " select T.COUNTER_ID as CounterId, T.ProductId, T.Stock as DamageQty from" + " TABLE_TRANSACTION_DATA T INNER JOIN DR_TABLE_TRANSACTION_WISE_MASTER M" + " ON T.MASTER_TRANSACTION_ID = M.MASTER_TRANSACTION_ID where T.STOCK_TYPE='DAMAGE'" + " AND T.Visit_Date ='" + visit_date + "' and T.COUNTER_ID =" + counterId + " and T.ProductId = " + productId + " Union All SELECT CounterId, ProductId, DamageQty from Damage_PreviousPending Where" + " CounterId =" + counterId + " and Verify ='Pending' and ProductId=" + productId + " UNION ALL" + " Select T2.COUNTER_ID AS CounterId, T1.PRODUCT_ID AS ProductId , SUM(T1.QUANTITY) AS DamageQty" + " FROM SALE_TRACKING_TABLE T1 INNER JOIN SALE_TRACKING_HEADER_TABLE T2 ON" + " T2.RECCEPT_COUNT=T1.RECCEPT_COUNT" + " WHERE T2.COUNTER_ID =" + counterId + " AND T2.Visit_Date='" + visit_date + "' AND T1.INVOICE_TYPE='Saleable'" + " and T1.PRODUCT_ID=" + productId + q1 + " GROUP BY T1.PRODUCT_ID UNION ALL" + " select S.COUNTER_ID as CounterId, S.PROMO_PRODUCT_ID AS ProductId , SUM(S.PROMO_PRODUCT_QTY) AS DamageQty" + " from APPLYED_PROMOTION_TABLE S INNER JOIN SALE_TRACKING_HEADER_TABLE S1" + " ON S.RECCEPT_COUNT=S1.RECCEPT_COUNT" + " Where S.PROMO_TYPE ='Product' AND S.COUNTER_ID = " + counterId + " AND S1.VISIT_DATE = '" + visit_date + "' and S.PROMO_PRODUCT_ID=" + productId + q2 + " GROUP BY S.PROMO_PRODUCT_ID) as" + " t Group by CounterId, ProductId) as dm on s.ProductId = dm.ProductId" + additionQueryMe + " where s.ProductId=" + productId;
}
dbcursor = db.rawQuery(query, null);
//test("Query--", query);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -5664,10 +5660,8 @@ public class Lorealba_Database extends SQLiteOpenHelper {
sb.setVisitDate(dbcursor.getString(dbcursor.getColumnIndexOrThrow("VisitDate")));
sb.setCheckout(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Checkout")));
}
dbcursor.moveToNext();
}
dbcursor.close();
return sb;
@@ -6444,8 +6438,13 @@ public class Lorealba_Database extends SQLiteOpenHelper {
boolean filled = false;
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT (ifnull(T4.TotLine,0) + ifnull(T4.TotalStock,0)) as StockStatus From" + " (select case when c.TotalLine = t.TotLine then 1 else 0 end as TotLine," + " case when c.TotalStock = t.TotValue then 1 else 0 end as TotalStock from" + " (SELECT * FROM StockSummary_Check Where VisitDate='" + visit_date + "' and CounterId=" + counterId + ") as c" + " INNER JOIN" + " (select counterId, count(*) as TotLIne, sum(SaleableBalance)as TotValue from T_StockSummary Where VisitDate='" + visit_date + "' and CounterId=" + counterId + " group by CounterId) AS t" + " ON c.CounterId = t.CounterId) as T4", null);
dbcursor = db.rawQuery("SELECT (ifnull(T4.TotLine,0) + ifnull(T4.TotalStock,0)) as StockStatus From" +
" (select case when c.TotalLine = t.TotLine then 1 else 0 end as TotLine," +
" case when c.TotalStock = t.TotValue then 1 else 0 end as TotalStock from" +
" (SELECT * FROM StockSummary_Check Where VisitDate='" + visit_date +
"' and CounterId=" + counterId + ") as c" +
" INNER JOIN" + " (select counterId, count(*) as TotLIne, sum(SaleableBalance)as TotValue from T_StockSummary Where VisitDate='"
+ visit_date + "' and CounterId=" + counterId + " group by CounterId) AS t" + " ON c.CounterId = t.CounterId) as T4", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -6456,17 +6455,14 @@ public class Lorealba_Database extends SQLiteOpenHelper {
} else {
filled = false;
}
dbcursor.moveToNext();
}
dbcursor.close();
}
} catch (Exception e) {
////////test("Exception--", e.toString());
return filled;
}
return filled;
}
@@ -14937,14 +14933,15 @@ 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;
}
}
app/src/main/java/com/cpm/lorealbaautomation/UserLoginActivity.java
-1
View File
@@ -462,7 +462,6 @@ public class UserLoginActivity extends AppCompatActivity implements View.OnClick
break;
case "Mapping_JourneyPlan":
Log.d("JSON_DATA", data);
if (!data.contains("No Data")) {
JCPGetterSetter jcpObject = new Gson().fromJson(data, JCPGetterSetter.class);
db.open();
app/src/main/java/com/cpm/lorealbaautomation/dailyactivity/StoreImageActivity.java
+6 -6
View File
@@ -118,7 +118,6 @@ public class StoreImageActivity extends AppCompatActivity implements View.OnClic
private LocationCallback locationCallback = null;
private SharedPreferences.Editor editor = null;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -635,7 +634,6 @@ public class StoreImageActivity extends AppCompatActivity implements View.OnClic
}
private boolean hasGPSDevice(Context context) {
final LocationManager mgr = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
if (mgr == null) return false;
@@ -676,6 +674,7 @@ public class StoreImageActivity extends AppCompatActivity implements View.OnClic
jcpObject = new Gson().fromJson(data, JCPGetterSetter.class);
db.open();
if (jcpObject != null && db.insertJCPData(jcpObject)) {
Log.d("jcpdatanew","jcp data inserted");
/// checking GeoFencing
getLastLocation();
AlertandMessages.showToastMsg(context, "Journey Plan Download Successfully.");
@@ -944,14 +943,14 @@ public class StoreImageActivity extends AppCompatActivity implements View.OnClic
if (jcp.getGeoTag() != null && !jcp.getGeoTag().equalsIgnoreCase(CommonString.KEY_N) && jcp.getGeoFencingAllow() != null && jcp.getGeoFencingAllow() == 1) {
int distance = jcp.getGeoFencingRadius() != null ? jcp.getGeoFencingRadius() : 0;
int current_dist_from_store_using_lat = 0;
Log.d("latdata",lat + ","+lon + ","+jcp.getLatitude() + ","+jcp.getLongitude());
Log.d("latdata", lat + "," + lon + "," + jcp.getLatitude() + "," + jcp.getLongitude());
if (jcp.getLatitude() != 0.0 && jcp.getLongitude() != 0.0 && jcp.getGeoFencingRadius() != 0 && lat != 0.0 && lon != 0.0) {
current_dist_from_store_using_lat = DistanceUtils.calculateDistanceInMeters(lat, lon, jcp.getLatitude(), jcp.getLongitude());
Log.d("TagLoc", "Radius " + distance + "\nCurrent dist " + current_dist_from_store_using_lat);
if (current_dist_from_store_using_lat > distance) {
String msg = getString(R.string.you_need_to_be_within) + " " + distance + " metres " + getString(R.string.you_need_to_be_in_the_store) +
"\n\n" + getString(R.string.distance_from_the_store) + " " + current_dist_from_store_using_lat + " " + getString(R.string.meters);
if (isFinishing() || (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1 && isDestroyed())) {
if (isFinishing() || isDestroyed()) {
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -965,11 +964,12 @@ public class StoreImageActivity extends AppCompatActivity implements View.OnClic
}
}
} else {
if (isFinishing() || (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR1 && isDestroyed())) {
if (isFinishing() || isDestroyed()) {
return;
}
db.open();
if (!isGeoTagAlertShown && db.getinsertGeotaggingData(storeId.toString(), counter_id, username, "Y").isEmpty()) {
Log.d("jcpdata", jcp.getGeoTag());
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/lorealbaautomation/dailyactivity/TabLoginActivity.java
-1
View File
@@ -69,7 +69,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import okhttp3.MediaType;
import okhttp3.OkHttpClient;
import okhttp3.RequestBody;
app/src/main/java/com/cpm/lorealbaautomation/fragements/BAdvisorMenuFragment.java
+3 -1
View File
@@ -8,6 +8,7 @@ import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -133,7 +134,8 @@ public class BAdvisorMenuFragment extends Fragment {
ba_survey = R.mipmap.ba_survey;
} else if (db.isGroomedChecked(counterId, username, visit_date).equalsIgnoreCase("Amber")) {
}
else if (db.isGroomedChecked(counterId, username, visit_date).equalsIgnoreCase("Amber")) {
if (complete) {
consumer_return = R.mipmap.consumer_return;
consumer_interaction = R.mipmap.consumer_interaction;
app/src/main/java/com/cpm/lorealbaautomation/geotag/GeoTaggingActivity.java
+19 -22
View File
@@ -111,10 +111,11 @@ public class GeoTaggingActivity extends AppCompatActivity implements OnMapReadyC
startLocationUpdates();
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");
}
@@ -122,26 +123,22 @@ public class GeoTaggingActivity extends AppCompatActivity implements OnMapReadyC
AlertandMessages.showToastMsg(view.getContext(), getResources().getString(R.string.takeimage));
}
} catch (Exception e) {
e.printStackTrace();
e.fillInStackTrace();
}
});
camera_fab.setOnClickListener(view -> {
try {
if (checkNetIsAvailable(view.getContext())) {
if (latitude != 0.0 && longitude != 0.0) {
_pathforcheck = jcpGetset.getStoreId().toString() + "-" + jcpGetset.getCounterId().toString() +
"-" + jcpGetset.getBID().toString() + "_GeoTag-" + jcpGetset.getVisitDate().replace("/", "")
+ "_" + getCurrentTime().replace(":", "") + ".jpg";
_path = CommonString.getImagesFolder(context) + _pathforcheck;
CommonFunctions.startAnncaCameraActivity(context, _path, null, false, CommonString.CAMERA_FACE_REAR);
} else {
AlertandMessages.showToastMsg(context, "Please wait for location");
}
if (latitude != 0.0 && longitude != 0.0) {
_pathforcheck = jcpGetset.getStoreId().toString() + "-" + jcpGetset.getCounterId().toString() +
"-" + jcpGetset.getBID().toString() + "_GeoTag-" + jcpGetset.getVisitDate().replace("/", "")
+ "_" + getCurrentTime().replace(":", "") + ".jpg";
_path = CommonString.getImagesFolder(context) + _pathforcheck;
CommonFunctions.startAnncaCameraActivity(context, _path, null, false, CommonString.CAMERA_FACE_REAR);
} else {
AlertandMessages.showToastMsg(context, getResources().getString(R.string.nonetwork));
AlertandMessages.showToastMsg(context, "Please wait for location");
}
} catch (Exception e) {
e.printStackTrace();
e.fillInStackTrace();
}
});
if (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED ||
@@ -249,7 +246,7 @@ public class GeoTaggingActivity extends AppCompatActivity implements OnMapReadyC
mMap.setMapType(GoogleMap.MAP_TYPE_NORMAL);
mMap.getUiSettings().setZoomControlsEnabled(true);
mMap.getUiSettings().setCompassEnabled(true);
mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(latitude,longitude), 15));
mMap.moveCamera(CameraUpdateFactory.newLatLngZoom(new LatLng(latitude, longitude), 15));
if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED ||
ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) == PackageManager.PERMISSION_GRANTED) {
mMap.setMyLocationEnabled(true);
@@ -451,7 +448,7 @@ public class GeoTaggingActivity extends AppCompatActivity implements OnMapReadyC
@NonNull
private JSONObject getJsonObject(int j) throws JSONException {
JSONObject obj = new JSONObject();
obj.put("UserId",username);
obj.put("UserId", username);
obj.put("StoreId", geotaglist.get(j).getStoreid());
obj.put("CounterId", geotaglist.get(j).getCounterId());
obj.put("bID", geotaglist.get(j).getBid());
@@ -468,7 +465,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();
@@ -506,9 +504,8 @@ public class GeoTaggingActivity extends AppCompatActivity implements OnMapReadyC
settingsClient.checkLocationSettings(builder.build()).addOnSuccessListener(locationSettingsResponse -> {
// All location settings are satisfied. You can request location updates here.
}).addOnFailureListener(e -> {
if (e instanceof ResolvableApiException) {
if (e instanceof ResolvableApiException resolvable) {
try {
ResolvableApiException resolvable = (ResolvableApiException) e;
resolvable.startResolutionForResult((Activity) this, REQUEST_LOCATION);
} catch (IntentSender.SendIntentException sendEx) {
// Ignore the error.
app/src/main/java/com/cpm/lorealbaautomation/pinviewactivity/PinViewActivity.java
+15 -3
View File
@@ -384,7 +384,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 {
@@ -441,8 +447,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
finish();
}
}
}
}*/
} else if (v.getId() == R.id.btn_clear) {
hideKeyboard(this);
@@ -615,6 +620,12 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
builder.show();
} 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));
@@ -627,6 +638,7 @@ PinViewActivity extends AppCompatActivity implements View.OnClickListener {
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
finish();
} else {
//Toast.makeText(context,"Success",Toast.LENGTH_SHORT).show();
Intent in = new Intent(context, DealarBoardActivity.class);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
app/src/main/java/com/cpm/lorealbaautomation/retrofit/DownloadAllDatawithRetro.java
-1
View File
@@ -1923,7 +1923,6 @@ public class DownloadAllDatawithRetro extends ReferenceVariablesForDownloadActiv
editor.putInt(CommonString.KEY_INCORRECT_TSTOCK_SUMMERY + date, 0);
editor.apply();
}
int incorrect_tStockSummery = preferences.getInt(CommonString.KEY_INCORRECT_TSTOCK_SUMMERY + date, 0);
if (incorrect_tStockSummery != 0) {
if (incorrect_tStockSummery == 1) {