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

Initial_Commit

Browse Source
This commit is contained in:
Ravi Kumar
2026-05-19 13:14:14 +05:30
parent 325b565b00
commit 3c049099f1
130 changed files with 889 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/build.gradle
+4 -6
View File
@@ -45,8 +45,8 @@ android {
versionName "4.4"*/
//For KSA
versionCode 29
versionName "4.1"
/* versionCode 31
versionName "4.3"*/
// aading price facing
/* versionCode 27
@@ -85,8 +85,8 @@ android {
versionName "1.0"*/
//For Libya
/* versionCode 3
versionName "1.2"*/
versionCode 3
versionName "1.2"
//For Oman
/*versionCode 1
@@ -142,7 +142,6 @@ dependencies {
androidTestImplementation "androidx.test:annotation:1.0.1"
implementation 'com.google.code.gson:gson:2.11.0'
implementation 'com.github.bumptech.glide:glide:4.16.0'
implementation platform('com.google.firebase:firebase-bom:33.14.0')
implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-messaging'
@@ -152,7 +151,6 @@ dependencies {
implementation 'com.google.firebase:firebase-appindexing:20.0.0'
// implementation 'com.google.firebase:firebase-crashlytics:19.4.3'
implementation 'com.google.firebase:firebase-auth:23.2.1'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
implementation 'com.squareup.retrofit:converter-gson:2.0.0-beta1'
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
GSKMTOrange/release/Haleon-Ksa-direction-release.apk → GSKMTOrange/release/Haleon-Ksa-V-4.3-U-release.apk
BIN
View File
Binary file not shown.
GSKMTOrange/release/output-metadata.json
+2 -2
View File
@@ -11,8 +11,8 @@
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 29,
"versionName": "4.1",
"versionCode": 31,
"versionName": "4.3",
"outputFile": "GSKMTOrange-release.apk"
}
],
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+4 -10
View File
@@ -5396,7 +5396,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setBrand_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND_ID")));
cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND")));
cd.setCompany_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("COMPANY_ID")));
list.add(cd);
dbcursor.moveToNext();
}
@@ -5509,7 +5508,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
public ArrayList<MSL_AvailabilityStockFacingGetterSetter> getOrderTaking_StockFacingHeaderData(
String country_id, String category_id, String keyAccount_id, String storeType_id, String class_id, String store_id, String tableName, String tableMappingSOS, String store_flag_facing_hide) {
ArrayList<MSL_AvailabilityStockFacingGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
@@ -5559,7 +5557,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"on BR.SUB_CATEGORY_ID=SB.SUB_CATEGORY_ID " +
"inner join CATEGORY_MASTER CA " +
"on SB.CATEGORY_ID=CA.CATEGORY_ID " +
"where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' AND BR.COMPANY_ID = '" + 1 + "' AND SB.SUB_CATEGORY_ID = '1'" +
"where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' " +
"AND BR.COMPANY_ID = '" + 1 + "' " +
"AND SB.SUB_CATEGORY_ID = '1'" +
" order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null);
}
else{
@@ -5577,8 +5577,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"where CA.CATEGORY_ID='" + category_id + "' AND M.STORE_ID = '" + store_id + "' AND BR.COMPANY_ID = '" + 1 + "'" +
" order by SB.SUB_CATEGORY_SEQUENCE_SA, BR.BRAND_SEQUENCE_SA", null);
}
}
if (dbcursor != null) {
@@ -6018,7 +6016,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
"where CA.CATEGORY_ID='" + category_id + "' AND BR.BRAND_ID='" + brand_id +
"' AND M.STORE_ID = '" + store_id + "' AND BR.COMPANY_ID = '" + 1 + "' order by M.MUST_HAVE DESC", null);
}
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
@@ -6034,7 +6031,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
cd.setToggleValue("1");
cd.setFacing("");
cd.setStock("");
list.add(cd);
dbcursor.moveToNext();
}
@@ -6304,8 +6300,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
public void InsertStock_EntryNew(String visit_date,
String storeId, String categoryId, List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData,
public void InsertStock_EntryNew(String visit_date,String storeId, String categoryId, List<MSL_AvailabilityStockFacingGetterSetter> hashMapListHeaderData,
HashMap<MSL_AvailabilityStockFacingGetterSetter, List<MSL_AvailabilityStockFacingGetterSetter>> hashMapListChildData) {
db.delete(CommonString.TABLE_INSERT_STOCK_ENTRY, CommonString.KEY_VISIT_DATE + "<>'" + visit_date + "'", null);
ContentValues values = new ContentValues();
@@ -6733,7 +6728,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
if (dbcursor.moveToFirst()) {
do {
MSL_AvailabilityStockFacingGetterSetter sb = new MSL_AvailabilityStockFacingGetterSetter();
sb.setSku_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU_ID")));
list.add(sb);
} while (dbcursor.moveToNext());
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CheckoutActivity.java
-12
View File
@@ -241,12 +241,6 @@ public class CheckoutActivity extends AppCompatActivity {
public void run() {
showAlert(CommonString.MESSAGE_SOCKETEXCEPTION);
// TODO Auto-generated method stub
/*
* if (counter < 10) { new
* BackgroundTask(CheckOutUploadActivity
* .this).execute(); } else { message.showMessage();
* counter =1; }
*/
}
});
} catch (Exception e) {
@@ -286,11 +280,8 @@ public class CheckoutActivity extends AppCompatActivity {
} else if (!result.equals("")) {
Toast.makeText(context, "Network Error Try Again", Toast.LENGTH_SHORT).show();
finish();
}
}
}
class Data {
@@ -315,16 +306,13 @@ public class CheckoutActivity extends AppCompatActivity {
ch -= 0x06f0 - '0';
chars[i] = ch;
}
return new String(chars);
}
public String getCurrentTimeNotUsed() {
Calendar m_cal = Calendar.getInstance();
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm");
String cdate = formatter.format(m_cal.getTime());
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
cdate = arabicToenglish(cdate);
}else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/OrderTakingActivity.java
-1
View File
@@ -162,7 +162,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
store_flag_hide = preferences.getString(CommonString.KEY_STORE_FLAG_FACING_HIDE, null);
visit_date = preferences.getString(CommonString.KEY_DATE, null);
date = preferences.getString(CommonString.KEY_DATE, null);
username = preferences.getString(CommonString.KEY_USERNAME, null);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreCheckoutImageActivity.java
-3
View File
@@ -255,19 +255,16 @@ public class StoreCheckoutImageActivity extends AppCompatActivity implements Vie
}
//com.android.gallery3d
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
intent.setPackage(defaultCameraPackage);
startActivityForResult(intent, 0);
} catch (ActivityNotFoundException e) {
e.printStackTrace();
Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
intent.setPackage(gallery_package);
startActivityForResult(intent, 0);
} catch (Exception e) {
e.printStackTrace();
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+49 -7
View File
@@ -963,11 +963,58 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
double store_lat = 0.0;
double store_lon = 0.0;
try {
store_lat = Double.parseDouble(current.getLATITUDE());
store_lon = Double.parseDouble(current.getLONGITUDE());
} catch (Exception e) {
e.printStackTrace();
}
boolean allowCheckout = true;
int distance = 0;
// ✅ Geo fencing check enabled?
if (geoFencingGetterSetters != null &&
geoFencingGetterSetters.size() > 0 &&
geoFencingGetterSetters.get(0).getGEO_FENCING().get(0).equals("1")) {
distanceGeoPhence = Integer.parseInt(
geoFencingGetterSetters.get(0).getDISTANCE_MTR().get(0)
);
if (store_lat != 0.0 && store_lon != 0.0 && lat != 0.0 && lon != 0.0) {
distance = distFrom(store_lat, store_lon, lat, lon);
if (distance > distanceGeoPhence) {
allowCheckout = false;
}
}
}
// ❌ Block checkout if outside geo range
if (!allowCheckout && country_id.equals("5")) {
String msg = getString(R.string.you_need_to_be_in_the_store)
+ "\nDistance: " + distance + " meters";
new AlertDialog.Builder(StoreListActivity.this)
.setTitle("Parinaam")
.setMessage(msg)
.setCancelable(false)
.setPositiveButton("OK", null)
.show();
return; // 🚫 STOP checkout
}
boolean coaching_visit_flag = false;
//Enable disable According to Configuration
ArrayList<ConfigurationMasterGetterSetter> configurationData = db.getConfigurationMasterData(country_id);
if (configurationData.size() > 0) {
for (int i = 0; i < configurationData.size(); i++) {
if (configurationData.get(i).getCONFIGURE().get(0).equalsIgnoreCase("COACHING VISIT") &&
configurationData.get(i).getACTIVE().get(0).equalsIgnoreCase("1")) {
@@ -988,10 +1035,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
} else {
if (CheckNetAvailability()) {
/* Intent i = new Intent(StoreListActivity.this, CheckoutActivity.class);
i.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
startActivity(i);*/
Intent i = new Intent(StoreListActivity.this, StoreCheckoutImageActivity.class);
i.putExtra(CommonString.KEY_STORE_ID, current.getSTORE_ID());
i.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
@@ -1059,7 +1102,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
chkbtn = (Button) itemView.findViewById(R.id.chkout);
cancel_btn = (Button) itemView.findViewById(R.id.btn_cancel);
Cardbtn = (CardView) itemView.findViewById(R.id.card_view);
}
}
@@ -1097,6 +1139,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
distance = distFrom(store_lat, store_lon, lat, lon);
if (distance > distanceGeoPhence) {
flag_entry = false;
// flag_entry = true;
} else {
String msg = getString(R.string.distance_from_the_store) + " " + distance + " meters";
Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
@@ -1120,7 +1163,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
editor.putString(CommonString.KEY_UPLOAD_STATUS, current.getUPLOAD_STATUS());
editor.putString(CommonString.KEY_STORE_FLAG, store_flag_str);
editor.commit();
if (flag == true) {
Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
in.putExtra(CommonString.KEY_STORE_FLAG, store_flag_str);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderConfirmActivity.java
-9
View File
@@ -22,21 +22,12 @@ import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.google.firebase.crashlytics.internal.common.CrashlyticsCore;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.OrderReceivedStatus;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.dailyentry.OrderTakingActivity;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
public class OrderConfirmActivity extends AppCompatActivity {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/OrderStatusDetailActivity.java
+4 -74
View File
@@ -141,7 +141,6 @@ public class OrderStatusDetailActivity extends AppCompatActivity{
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, "");
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
//Intent data
categoryName = getIntent().getStringExtra("categoryName");
categoryId = getIntent().getStringExtra("categoryId");
@@ -389,7 +388,10 @@ public class OrderStatusDetailActivity extends AppCompatActivity{
for (int i = 0; i < headerDataList.size(); i++) {
hashMapListHeaderData.add(headerDataList.get(i));
//childDataList = new ArrayList<>();
childDataList = db.getOrder_RECEIVED_SKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
ArrayList<MSL_AvailabilityStockFacingGetterSetter> filteredChildList =
new ArrayList<>();
// childDataList = db.getOrder_RECEIVED_SKU_AfterSaveData(categoryId, headerDataList.get(i).getBrand_id(), store_id);
if (!(childDataList.size() > 0)) {
if (country_id.equals("7") || country_id.equals("8")) {
childDataList = db.getOrderReceivedSKUData(headerDataList.get(i).getSub_category_id(), categoryId, headerDataList.get(i).getBrand_id(), null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE, store_flag_hide);
@@ -477,27 +479,6 @@ public class OrderStatusDetailActivity extends AppCompatActivity{
card_view.setCardBackgroundColor(getResources().getColor(R.color.grey_background));
}
}
//empty check color change
/*if (headerTitle.getCompany_id().equals("1")) {
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
//card_view.setCardBackgroundColor(getResources().getColor(android.R.color.holo_red_dark));
txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.colorPrimaryDark));
}
}
} else {
if (!checkflag) {
if (checkHeaderArray.contains(groupPosition)) {
txt_categoryHeader.setTextColor(getResources().getColor(android.R.color.holo_red_dark));
} else {
txt_categoryHeader.setTextColor(getResources().getColor(R.color.black));
}
}
}*/
return convertView;
}
@@ -548,60 +529,9 @@ public class OrderStatusDetailActivity extends AppCompatActivity{
}
holder.poqtyTV.setText(context.getString(R.string.po_qty) + ":"+childData.getOrderqty());
// holder.poqtyTV.setText("PO QTY" + ":"+childData.getOrderqty());
// uae facing hide
/*if (store_flag_hide.equals("1")) {
holder.facing.setVisibility(View.GONE);
holder.facing_view.setVisibility(View.GONE);
} else {
holder.facing.setVisibility(View.VISIBLE);
holder.facing_view.setVisibility(View.VISIBLE);
}*/
//usk
/* if (childData.getPricing().equals("0")) {
holder.ed_pricing.setVisibility(View.GONE);
holder.pricing_view.setVisibility(View.GONE);
holder.ed_pricing.setId(childPosition);
holder.pricing_view.setId(childPosition);
} else {
holder.ed_pricing.setVisibility(View.VISIBLE);
holder.pricing_view.setVisibility(View.VISIBLE);
holder.ed_pricing.setId(childPosition);
holder.pricing_view.setId(childPosition);
}*/
holder.txt_skuName.setText(childData.getSku());
// holder.txt_mbq.setText(childData.getMbq());
/* if (childData.getCompany_id().equals("1") && childData.getMust_have().equals("1")) {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.colorOrange));
//holder.txt_mbq.setVisibility(View.VISIBLE);
holder.toggle_available.setVisibility(View.VISIBLE);
// holder.facing.setVisibility(View.VISIBLE);
if (country_id.equals("6")) {
holder.stock.setVisibility(View.VISIBLE);
holder.stock_view.setVisibility(View.VISIBLE);
} else {
if (childData.getToggleValue().equals("1")) {
holder.stock.setVisibility(View.GONE);
holder.stock_view.setVisibility(View.GONE);
} else {
holder.stock.setVisibility(View.VISIBLE);
holder.stock_view.setVisibility(View.VISIBLE);
}
}
} else {
holder.lin_category.setBackgroundColor(getResources().getColor(R.color.white));
// holder.txt_mbq.setVisibility(View.GONE);
holder.toggle_available.setVisibility(View.GONE);
// holder.facing.setVisibility(View.VISIBLE);
holder.stock.setVisibility(View.GONE);
holder.stock_view.setVisibility(View.GONE);
}*/
if (childData.getCompany_id().equals("1")) {
holder.txt_skuName.setTextColor(getResources().getColor(R.color.colorPrimary));
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java
-14
View File
@@ -72,8 +72,6 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
toolbar.setTitle(getResources().getString(R.string.title_activity_store_wise_performance));
setSupportActionBar(toolbar);
@@ -113,12 +111,10 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
finish();
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}*/
Intent intent = new Intent(StoreWisePerformanceActivity.this, MessageActivity.class);
startActivity(intent);
finish();
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
}
});
} catch (Resources.NotFoundException e) {
@@ -132,15 +128,11 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
super.onResume();
try {
CommonFunctions.updateLangResources(context, preferences.getString(CommonString.KEY_LANGUAGE, ""));
if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
storeWisePerformanceList = db.getStoreWisePerformance(store_id, CommonString.TABLE_STORE_PERFORMANCE_NEW_ADHOC);
} else {
storeWisePerformanceList = db.getStoreWisePerformance(store_id, "STORE_PERFORMANCE_REVISED");
}
adapter = new StoreWisePerformaceAdapter(StoreWisePerformanceActivity.this, storeWisePerformanceList);
recyclerView.setAdapter(adapter);
recyclerView.setLayoutManager(new LinearLayoutManager(context));
@@ -151,21 +143,15 @@ public class StoreWisePerformanceActivity extends AppCompatActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
int id = item.getItemId();
if (id == android.R.id.home) {
finish();
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
}
//noinspection SimplifiableIfStatement
if (id == R.id.action_settings) {
return true;
}
return super.onOptionsItemSelected(item);
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/storeinmap/StoreRouteActivity.java
-1
View File
@@ -59,7 +59,6 @@ public class StoreRouteActivity extends FragmentActivity implements OnMapReadyCa
private GoogleMap mMap;
private StoreBean store;
private LatLng origin, destination;
private FusedLocationProviderClient fusedLocationClient;
private LocationRequest locationRequest;
private LocationCallback locationCallback;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
-2
View File
@@ -1907,9 +1907,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[IS_EXISTS]" + exists + "[/IS_EXISTS]"
+ "[COMPETITION_DATA]" + add_competiton_data_xml + "[/COMPETITION_DATA]"
+ "[/COMPETITION_PROMOTION_DATA]";
competiton_data_xml = competiton_data_xml + competiton_exists_xml;
}
final String sos_xml = "[DATA]" + competiton_data_xml + "[/DATA]";
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/MSL_AvailabilityStockFacingGetterSetter.java
+5
View File
@@ -268,4 +268,9 @@ public class MSL_AvailabilityStockFacingGetterSetter implements Serializable{
this.warehouseStock = warehouseStock;
}
/*@Override
public String toString() {
return getSku();
}*/
}