AndroidNative2026/Haleon-Egypt-PD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

metadata changes

Browse Source
This commit is contained in:
ravik
2025-11-04 16:24:53 +05:30
parent 564797c2c9
commit 903b281f8c
33 changed files with 781 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/caches/deviceStreaming.xml
Generated
+108
View File
@@ -100,6 +100,18 @@
<option name="screenX" value="1200" />
<option name="screenY" value="1920" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a06" />
<option name="id" value="a06" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A06" />
<option name="screenDensity" value="300" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@@ -136,6 +148,18 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a16" />
<option name="id" value="a16" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A165M" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@@ -160,6 +184,18 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="a36xq" />
<option name="id" value="a36xq" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="SM-A366E" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
@@ -232,6 +268,18 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2640" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="google" />
<option name="codename" value="blazer" />
<option name="id" value="blazer" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 10 Pro" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2410" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="32" />
<option name="brand" value="google" />
@@ -306,6 +354,18 @@
<option name="screenX" value="2220" />
<option name="screenY" value="1080" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="dm1q" />
<option name="id" value="dm1q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="S23" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@@ -439,6 +499,18 @@
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="google" />
<option name="codename" value="frankel" />
<option name="id" value="frankel" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 10" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2424" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@@ -657,6 +729,18 @@
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="google" />
<option name="codename" value="mustang" />
<option name="id" value="mustang" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 10 Pro XL" />
<option name="screenDensity" value="390" />
<option name="screenX" value="1080" />
<option name="screenY" value="2404" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@@ -705,6 +789,18 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="35" />
<option name="brand" value="samsung" />
<option name="codename" value="psq" />
<option name="id" value="psq" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S25 Edge" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@@ -755,6 +851,18 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="36" />
<option name="brand" value="google" />
<option name="codename" value="rango" />
<option name="id" value="rango" />
<option name="labId" value="google" />
<option name="manufacturer" value="Google" />
<option name="name" value="Pixel 10 Pro Fold" />
<option name="screenDensity" value="390" />
<option name="screenX" value="2076" />
<option name="screenY" value="2152" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="30" />
<option name="brand" value="google" />
GSKMTOrange/build.gradle
+6 -4
View File
@@ -31,8 +31,8 @@ android {
/*versionCode 1
versionName "1.0"*/
//For Egypt
versionCode 37
versionName "4.8"
versionCode 38
versionName "4.9"
//For UAE
/*versionCode 29
versionName "4.1"*/
@@ -156,7 +156,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'
@@ -165,7 +164,10 @@ dependencies {
implementation 'androidx.multidex:multidex:2.0.1'
// Main SDK dependency
// implementation("com.github.pratham-PDots:camera_lib:1.5.1.1")
implementation("com.github.pratham-PDots:camera_lib:1.5.3.2")
// implementation("com.github.pratham-PDots:camera_lib:1.5.3.2")
// implementation("com.github.pratham-PDots:camera_lib:1.5.4.5")
//latest
implementation("com.github.pratham-PDots:camera_lib:1.5.4.9")
implementation "androidx.core:core-splashscreen:1.0.1"
}
GSKMTOrange/release/Haleon-Egypt-rollback-release.apk → GSKMTOrange/release/Haleon-Egypt-PD-metadata-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": 37,
"versionName": "4.8",
"versionCode": 38,
"versionName": "4.9",
"outputFile": "GSKMTOrange-release.apk"
}
],
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+83 -3
View File
@@ -68,6 +68,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
@@ -141,6 +142,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL(TableBean.getMappingAdditionalPromotion());
db.execSQL(TableBean.getMappingPromotion());
db.execSQL(TableBean.getTable_VISIT_TYPE_STATUS());
db.execSQL(TableBean.getTable_Master_PDA_STORE_LIST());
db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY);
db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_HEADER);
@@ -713,13 +715,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception get JCP!", e.toString());
return list;
}
return list;
}
@@ -757,6 +756,53 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
public ArrayList<Master_Storelist_PDA_GetterSetter> getMasterStoreListPd(String storeid, String table_name) {
ArrayList<Master_Storelist_PDA_GetterSetter> list = new ArrayList<Master_Storelist_PDA_GetterSetter>();
Cursor dbcursor = null;
try {
String query = "SELECT * FROM " + table_name + " WHERE StoreId = ?";
dbcursor = db.rawQuery(query, new String[]{storeid});
if (dbcursor != null) {
dbcursor.moveToFirst();
while (!dbcursor.isAfterLast()) {
Master_Storelist_PDA_GetterSetter sb = new Master_Storelist_PDA_GetterSetter();
sb.setStoreId(dbcursor.getString(dbcursor.getColumnIndexOrThrow("StoreId")));
sb.setChannel((dbcursor.getString(dbcursor.getColumnIndexOrThrow("channel"))));
sb.setFormat((dbcursor.getString(dbcursor.getColumnIndexOrThrow("format"))));
sb.setRegion((dbcursor.getString(dbcursor.getColumnIndexOrThrow("region"))));
sb.setBay_type((dbcursor.getString(dbcursor.getColumnIndexOrThrow("bay_type"))));
sb.setNo_of_bays((dbcursor.getString(dbcursor.getColumnIndexOrThrow("no_of_bays"))));
sb.setCategory((dbcursor.getString(dbcursor.getColumnIndexOrThrow("category"))));
sb.setUser_id((dbcursor.getString(dbcursor.getColumnIndexOrThrow("user_id"))));
sb.setActive((dbcursor.getString(dbcursor.getColumnIndexOrThrow("Active"))));
sb.setASMArea((dbcursor.getString(dbcursor.getColumnIndexOrThrow("ASMArea"))));
sb.setEmployeeName((dbcursor.getString(dbcursor.getColumnIndexOrThrow("EmployeeName"))));
sb.setDesignationName((dbcursor.getString(dbcursor.getColumnIndexOrThrow("DesignationName"))));
sb.setSupervisorId((dbcursor.getString(dbcursor.getColumnIndexOrThrow("SupervisorId"))));
sb.setSupervisor((dbcursor.getString(dbcursor.getColumnIndexOrThrow("Supervisor"))));
sb.setStoreCode((dbcursor.getString(dbcursor.getColumnIndexOrThrow("StoreCode"))));
sb.setChainId((dbcursor.getString(dbcursor.getColumnIndexOrThrow("ChainId"))));
sb.setStoreTypeId((dbcursor.getString(dbcursor.getColumnIndexOrThrow("StoreTypeId"))));
sb.setSOName((dbcursor.getString(dbcursor.getColumnIndexOrThrow("SOName"))));
list.add(sb);
dbcursor.moveToNext();
}
dbcursor.close();
return list;
}
} catch (Exception e) {
Log.d("Exception get JCP!", e.toString());
return list;
}
return list;
}
public ArrayList<Visit_Type_Master_GetterSetter> getInsertedVisitType(String storeid, String visitdate, String visittype) {
ArrayList<Visit_Type_Master_GetterSetter> list = new ArrayList<Visit_Type_Master_GetterSetter>();
Cursor dbcursor = null;
@@ -10606,6 +10652,40 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
}
public void InsertMaster_Storelist_Pda(Master_Storelist_PDA_GetterSetter data) {
db.delete("Master_StoreList_PDA", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getStoreId().size(); i++) {
values.put("StoreId", data.getStoreId().get(i));
values.put("channel", data.getChannel().get(i));
values.put("format", data.getFormat().get(i));
values.put("region", data.getRegion().get(i));
values.put("bay_type", data.getBay_type().get(i));
values.put("no_of_bays", data.getNo_of_bays().get(i));
values.put("category", data.getCategory().get(i));
values.put("user_id", data.getUser_id().get(i));
values.put("Active", data.getActive().get(i));
values.put("ASMArea", data.getASMArea().get(i));
values.put("EmployeeName", data.getEmployeeName().get(i));
values.put("DesignationName", data.getDesignationName().get(i));
values.put("SupervisorId", data.getSupervisorId().get(i));
values.put("Supervisor", data.getSupervisor().get(i));
values.put("StoreCode", data.getStoreCode().get(i));
values.put("ChainId", data.getChainId().get(i));
values.put("StoreTypeId", data.getStoreTypeId().get(i));
values.put("SOName", data.getSOName().get(i));
db.insert("Master_StoreList_PDA", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", "Master_StoreList_PDA!" + ex.toString());
}
}
public ArrayList<CategoryPictureGetterSetter> getirVisibilityData(String visitdate,String store_id, String categoryId) {
ArrayList<CategoryPictureGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java
+2 -2
View File
@@ -160,7 +160,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
e.printStackTrace();
}
tv_version.setText("Version/Versiyon - " + app_ver + "-T5");
tv_version.setText("Version/Versiyon - " + app_ver + "-T2");
preferences = PreferenceManager.getDefaultSharedPreferences(context);
editor = preferences.edit();
// Set up the login form.
@@ -551,7 +551,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
+ "[/PASSWORD]" + "[IN_TIME]" + CommonFunctions.getCurrentTimeWithLanguage(context)
+ "[/IN_TIME]" + "[LATITUDE]" + lat
+ "[/LATITUDE]" + "[LONGITUDE]" + lon
+ "[/LONGITUDE]" + "[APP_VERSION]" + app_ver + "-T5"
+ "[/LONGITUDE]" + "[APP_VERSION]" + app_ver + "-T2"
+ "[/APP_VERSION]" + "[ATT_MODE]OnLine[/ATT_MODE]"
+ "[NETWORK_STATUS]" + "LoginStatus"
+ "[/NETWORK_STATUS]" + "[/USER_DATA][/DATA]";
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+1 -1
View File
@@ -173,7 +173,7 @@ public class MainActivity extends AppCompatActivity
nav_route_plan14.setTitle(getResources().getString(R.string.menu_services));
MenuItem nav_route_plan15 = menu.findItem(R.id.nav_version);
nav_route_plan15.setTitle("Version/Versiyon - " + app_ver + "-T5");
nav_route_plan15.setTitle("Version/Versiyon - " + app_ver + "-T2");
//Enable disable According to Configuration
ArrayList<ConfigurationMasterGetterSetter> configurationData = db.getConfigurationMasterData(country_id);
if (!configurationData.isEmpty()) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+1
View File
@@ -1157,6 +1157,7 @@ public class CommonString {
public static String MPIN = "MPIN";
public static String TABLE_MAPPING_STOCK_ADHOC = "MAPPING_STOCK_ADHOC";
public static String TABLE_MAPPING_STOCK = "MAPPING_STOCK";
public static String TABLE_MASTER_STORELIST_PD = "Master_StoreList_PDA";
public static String TABLE_MAPPING_STOCK_STOREWISE = "MAPPING_STOCK_STOREWISE";
public static String TABLE_MAPPING_STOCK_ADDITIONAL = "MAPPING_STOCK_ADDITIONAL";
public static String TABLE_MAPPING_T2P_ADHOC = "MAPPING_T2P_ADHOC";
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonUtils.kt
+1 -1
View File
@@ -17,7 +17,7 @@ object CommonUtils {
fun initializePDSDK(context: Context?,projectId:String, _userId: String?) {
if (context != null) {
if (_userId != null) {
init(context = context, projectId = projectId, userId = _userId)
init(context = context, projectId = projectId, userId = _userId,uploadToSWServer = true)
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PDVisibilityActivity.kt
+44 -31
View File
@@ -33,6 +33,7 @@ import cpm.com.gskmtorange.constant.CommonFunctions.savefile
import cpm.com.gskmtorange.constant.CommonString
import cpm.com.gskmtorange.constant.CommonUtils
import cpm.com.gskmtorange.databinding.ActivityPdvisibilityBinding
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.json.JSONObject
@@ -53,6 +54,7 @@ class PDVisibilityActivity : AppCompatActivity() {
private var preferences: SharedPreferences? = null
var db: GSKOrangeDB? = null
var listdat: ArrayList<CategoryPictureGetterSetter>? = ArrayList()
var masterStoreListPd: ArrayList<Master_Storelist_PDA_GetterSetter>? = ArrayList()
var username: String? = ""
private var kpi_name: String? = ""
private lateinit var binding: ActivityPdvisibilityBinding
@@ -95,11 +97,13 @@ class PDVisibilityActivity : AppCompatActivity() {
Log.d("catdata",categoryId.toString() +","+categoryName);
kpi_name = it.getStringExtra("kpi_name")
}
supportActionBar?.apply {
setHomeButtonEnabled(true)
setDisplayHomeAsUpEnabled(true)
title = kpi_name
}
masterStoreListPd = db?.getMasterStoreListPd(store_id,CommonString.TABLE_MASTER_STORELIST_PD)
preferences?.getString(CommonString.KEY_PD_PROJECT_Id, "")?.let { projectId ->
val userId = preferences?.getString(CommonString.KEY_PD_USER_Id, "")
.takeIf { !it.isNullOrBlank() } ?: username
@@ -187,7 +191,6 @@ class PDVisibilityActivity : AppCompatActivity() {
return checkFlag // Correctly return validation result
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
// as you specify a parent activity in AndroidManifest.xml.
val id = item.itemId
@@ -261,37 +264,47 @@ class PDVisibilityActivity : AppCompatActivity() {
val uploadFrom = "TestApp"
var shelftype = "posm_$subCategory" +"_"+subCategoryId
shelftype = shelftype.lowercase().replace("[^a-z0-9_]".toRegex(), "")
val uploadParams = JSONObject(
"""
{
"shop_id": 62475,
"store_name": "abc",
"project_id": "4f57635b-6b07-45bf-bfba-c61c2826b6db",
"td_version_id": 178,
"shelf_image_id": null,
"asset_image_id": null,
"shelf_type": "Primary Shelf",
"category_id": 123,
"user_id": 133,
"isConnected": true,
"sn_image_type": "skus",
"image_type": "multiple",
"seq_no": 1,
"level": 1,
"uploadOnlyOnWifi": 0,
"app_session_id": "8e2faa6b-d6fe-413a-a693-76a0cbe0ce71",
"metadata": { "Device_Name": $devicename,"User_name": $username }
}
"""
)
uploadParams.put("shelf_type", shelftype)
uploadParams.put("store_name", store_name)
uploadParams.put("shop_id", store_id)
uploadParams.put("user_id", username)
uploadParams.put("category_id", subCat_code)
uploadParams.put("project_id", preferences?.getString(CommonString.KEY_PD_PROJECT_Id, ""))
Log.d("uploadparams",uploadParams.toString());
val masterstorelistpddata = masterStoreListPd?.getOrNull(0)
val metadata = JSONObject().apply {
put("Device_Name", devicename ?: "NA")
put("username", username ?: "NA")
put("shop_name", store_name ?: "NA")
put("parinaam_id", masterstorelistpddata?.storeId?.getOrNull(0) ?: "NA") //storeid
put("channel", masterstorelistpddata?.channel?.getOrNull(0) ?: "NA")
put("format", masterstorelistpddata?.format?.getOrNull(0) ?: "NA")
put("region", masterstorelistpddata?.region?.getOrNull(0) ?: "NA")
put("bay_type", masterstorelistpddata?.bay_type?.getOrNull(0) ?: "NA")
put("no_of_bays", masterstorelistpddata?.no_of_bays?.getOrNull(0) ?: "NA")
put("category", categoryName?: "NA")
put("user_id", masterstorelistpddata?.user_id?.getOrNull(0) ?: "NA")
put("Active", masterstorelistpddata?.active?.getOrNull(0) ?: "NA")
put("ASMArea", masterstorelistpddata?.asmArea?.getOrNull(0) ?: "NA")
put("EmployeeName", masterstorelistpddata?.employeeName?.getOrNull(0) ?: "NA")
put("DesignationName", masterstorelistpddata?.designationName?.getOrNull(0) ?: "NA")
put("SupervisorId", masterstorelistpddata?.supervisorId?.getOrNull(0) ?: "NA")
put("Supervisor", masterstorelistpddata?.supervisor?.getOrNull(0) ?: "NA")
put("StoreCode", masterstorelistpddata?.storeCode?.getOrNull(0) ?: "NA")
put("ChainId", masterstorelistpddata?.chainId?.getOrNull(0) ?: "NA")
put("StoreTypeId", masterstorelistpddata?.storeTypeId?.getOrNull(0) ?: "NA")
put("SOName", masterstorelistpddata?.soName?.getOrNull(0) ?: "NA")
}
val uploadParams = JSONObject().apply {
put("shop_id", store_id)
put("project_id", preferences?.getString(CommonString.KEY_PD_PROJECT_Id, ""))
put("shelf_type", shelftype)
put("category_id", subCat_code)
put("user_id", username)
put("metadata", metadata)
}
// "metadata": { "Device_Name": $devicename,"Username": $username }
/* uploadParams.put("shop_id", store_id)
uploadParams.put("user_id", username)
uploadParams.put("category_id", subCat_code)
uploadParams.put("project_id", preferences?.getString(CommonString.KEY_PD_PROJECT_Id, ""))*/
Log.d("uploadParams", uploadParams.toString())
if(!lang.equals("ENGLISH",ignoreCase = true)){
CameraSDK.startCamera(
context = this,
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/PDimageActivity.kt
+66 -46
View File
@@ -5,13 +5,10 @@ import android.content.Context
import android.content.Intent
import android.content.IntentFilter
import android.content.SharedPreferences
import android.net.ConnectivityManager
import android.net.NetworkCapabilities
import android.os.Bundle
import android.preference.PreferenceManager
import android.util.Log
import android.view.MenuItem
import android.widget.Toast
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.core.net.toUri
@@ -33,6 +30,7 @@ import cpm.com.gskmtorange.constant.CommonFunctions.savefile
import cpm.com.gskmtorange.constant.CommonString
import cpm.com.gskmtorange.constant.CommonUtils
import cpm.com.gskmtorange.databinding.ActivityPdimageBinding
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import org.json.JSONObject
@@ -53,6 +51,7 @@ class PDimageActivity : AppCompatActivity() {
private var preferences: SharedPreferences? = null
var db: GSKOrangeDB? = null
var listdat: ArrayList<CategoryPictureGetterSetter>? = ArrayList()
var masterStoreListPd: ArrayList<Master_Storelist_PDA_GetterSetter>? = ArrayList()
var username: String? = ""
private var kpi_name: String? = ""
private lateinit var binding: ActivityPdimageBinding
@@ -84,7 +83,7 @@ class PDimageActivity : AppCompatActivity() {
date = it.getString(CommonString.KEY_DATE, "")
}
devicename = android.os.Build.MANUFACTURER
Log.d("device_name",devicename.toString())
// Log.d("device_name",devicename.toString())
CommonFunctions.updateLangResources(
context, preferences?.getString(CommonString.KEY_LANGUAGE, "")
@@ -99,6 +98,9 @@ class PDimageActivity : AppCompatActivity() {
setDisplayHomeAsUpEnabled(true)
title = kpi_name
}
masterStoreListPd = db?.getMasterStoreListPd(store_id,CommonString.TABLE_MASTER_STORELIST_PD)
// Log.d("master_store_list_size",masterStoreListPd.toString())
preferences?.getString(CommonString.KEY_PD_PROJECT_Id, "")?.let { projectId ->
val userId = preferences?.getString(CommonString.KEY_PD_USER_Id, "")
.takeIf { !it.isNullOrBlank() } ?: username
@@ -166,7 +168,7 @@ class PDimageActivity : AppCompatActivity() {
}
}
callAdapter()
// checkAndRequestPermissions()
// checkAndRequestPermissions()
}
override fun onResume() {
@@ -263,7 +265,32 @@ class PDimageActivity : AppCompatActivity() {
private fun launchCamera(subCat_code: String) {
val uploadFrom = "TestApp"
val uploadParams = JSONObject(
val masterstorelistpddata = masterStoreListPd?.getOrNull(0)
val metadata = JSONObject().apply {
put("Device_Name", devicename ?: "NA")
put("username", username ?: "NA")
put("shop_name", store_name ?: "NA")
put("parinaam_id", masterstorelistpddata?.storeId?.getOrNull(0) ?: "NA") //storeid
put("channel", masterstorelistpddata?.channel?.getOrNull(0) ?: "NA")
put("format", masterstorelistpddata?.format?.getOrNull(0) ?: "NA")
put("region", masterstorelistpddata?.region?.getOrNull(0) ?: "NA")
put("bay_type", masterstorelistpddata?.bay_type?.getOrNull(0) ?: "NA")
put("no_of_bays", masterstorelistpddata?.no_of_bays?.getOrNull(0) ?: "NA")
put("category", categoryName?: "NA")
put("user_id", masterstorelistpddata?.user_id?.getOrNull(0) ?: "NA")
put("Active", masterstorelistpddata?.active?.getOrNull(0) ?: "NA")
put("ASMArea", masterstorelistpddata?.asmArea?.getOrNull(0) ?: "NA")
put("EmployeeName", masterstorelistpddata?.employeeName?.getOrNull(0) ?: "NA")
put("DesignationName", masterstorelistpddata?.designationName?.getOrNull(0) ?: "NA")
put("SupervisorId", masterstorelistpddata?.supervisorId?.getOrNull(0) ?: "NA")
put("Supervisor", masterstorelistpddata?.supervisor?.getOrNull(0) ?: "NA")
put("StoreCode", masterstorelistpddata?.storeCode?.getOrNull(0) ?: "NA")
put("ChainId", masterstorelistpddata?.chainId?.getOrNull(0) ?: "NA")
put("StoreTypeId", masterstorelistpddata?.storeTypeId?.getOrNull(0) ?: "NA")
put("SOName", masterstorelistpddata?.soName?.getOrNull(0) ?: "NA")
}
/* val uploadParams = JSONObject(
"""
{
"shop_id": 62475,
@@ -282,18 +309,43 @@ class PDimageActivity : AppCompatActivity() {
"level": 1,
"uploadOnlyOnWifi": 0,
"app_session_id": "8e2faa6b-d6fe-413a-a693-76a0cbe0ce71",
"metadata": { "Device_Name": $devicename,"User_name": $username }
"metadata": { "Device_Name": $devicename,"User_name": $username,
"StoreId":${masterstorelistpddata?.storeId?.get(0)},
"channel":${masterstorelistpddata?.channel?.get(0)},
"format":${masterstorelistpddata?.format?.get(0)},
"region":${masterstorelistpddata?.region?.get(0)},
"bay_type":"NA",
"no_of_bays":"NA",
"category":${masterstorelistpddata?.category?.get(0)},
"user_id":$username,
"Active":${masterstorelistpddata?.active?.get(0)},
"ASMArea":"NA",
"EmployeeName":${masterstorelistpddata?.employeeName?.get(0)},
"DesignationName":${masterstorelistpddata?.designationName?.get(0)},
"SupervisorId":${masterstorelistpddata?.supervisorId?.get(0)},
"Supervisor":${masterstorelistpddata?.supervisor?.get(0)},
"StoreCode":${masterstorelistpddata?.storeCode?.get(0)},
"ChainId":${masterstorelistpddata?.chainId?.get(0)},
"StoreTypeId":${masterstorelistpddata?.storeTypeId?.get(0)},
"SOName":${masterstorelistpddata?.soName?.get(0)}
}
"""
)
// "metadata": { "Device_Name": $devicename,"Username": $username }
uploadParams.put("store_name", store_name)
uploadParams.put("shop_id", store_id)
)*/
val uploadParams = JSONObject().apply {
put("shop_id", store_id)
put("project_id", preferences?.getString(CommonString.KEY_PD_PROJECT_Id, ""))
put("shelf_type", "Primary Shelf")
put("category_id", subCat_code)
put("user_id", username)
put("metadata", metadata)
}
// "metadata": { "Device_Name": $devicename,"Username": $username }
/* uploadParams.put("shop_id", store_id)
uploadParams.put("user_id", username)
uploadParams.put("category_id", subCat_code)
uploadParams.put("project_id", preferences?.getString(CommonString.KEY_PD_PROJECT_Id, ""))
Log.d("uploadparamdata",uploadParams.toString());
uploadParams.put("project_id", preferences?.getString(CommonString.KEY_PD_PROJECT_Id, ""))*/
Log.d("uploadParams", uploadParams.toString())
if(!lang.equals("ENGLISH",ignoreCase = true)){
CameraSDK.startCamera(
context = this,
@@ -370,7 +422,6 @@ class PDimageActivity : AppCompatActivity() {
)
}
// Log.d("listdatsize", listdat?.size.toString())
adapter = SubCatPdAdapter(
category = categoryName,
context = this,
@@ -378,23 +429,7 @@ class PDimageActivity : AppCompatActivity() {
btnlistener = object : SubCatPdAdapter.BtnClickListener {
override fun onStartSessionClick(_pos: Int, data: CategoryPictureGetterSetter) {
this@PDimageActivity._pos = _pos
/* val intent = Intent(this@PDimageActivity, PD_Realtime_Report::class.java)
intent.putExtra("categoryName", categoryName)
intent.putExtra("categoryId", categoryId)
intent.putExtra("kpi_name", "IR Realtime Analytics")
startActivity(intent)
overridePendingTransition(R.anim.activity_in, R.anim.activity_out)*/
// launchCamera(data.subCatCode)
/* if (isNetworkAvailable(this@PDimageActivity)) {
launchCamera(data.subCatCode)
}
else {
Toast.makeText(context, "No internet connection", Toast.LENGTH_SHORT).show()
}*/
launchCamera(data.subCatCode)
// Log.d("subCatCode", data.subCatCode)
}
})
binding.rlContent.apply {
@@ -411,19 +446,4 @@ class PDimageActivity : AppCompatActivity() {
db?.InsertPdImageData(date, store_id, categoryId, listdat, CommonString.KEY_DRAFT)
}
}
fun isNetworkAvailable(context: Context): Boolean {
val connectivityManager =
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val network = connectivityManager.activeNetwork ?: return false
val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false
return when {
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true
activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true
else -> false
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+9 -15
View File
@@ -76,7 +76,6 @@ import com.google.android.material.snackbar.Snackbar;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
import org.ksoap2.serialization.SoapSerializationEnvelope;
import org.ksoap2.transport.HttpTransportSE;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
@@ -112,26 +111,22 @@ import cpm.com.gskmtorange.constant.CommonUtils;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity;
import cpm.com.gskmtorange.pharma_stores.PharmaActivity;
import cpm.com.gskmtorange.storeinmap.StoreListMapActivity;
import cpm.com.gskmtorange.storeinmap.StoreListRouteActivity;
import cpm.com.gskmtorange.storeinmap.StoreRouteActivity;
import cpm.com.gskmtorange.utils.OkHttpTransportSE;
import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationContrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.ConfigurationMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayChecklistMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GeoFencingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramCountrywiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPlanogramStorewiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
@@ -147,7 +142,6 @@ import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SupervisorListGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
import cpm.com.gskmtorange.xmlGetterSetter.Visit_Type_Master_GetterSetter;
import cpm.com.gskmtorange.xmlHandlers.XMLHandlers;
public class StoreListActivity extends AppCompatActivity implements GoogleApiClient.ConnectionCallbacks, GoogleApiClient.OnConnectionFailedListener, LocationListener {
@@ -1444,7 +1438,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
Object result = envelope.getResponse();
@@ -1481,7 +1475,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1521,7 +1515,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1557,7 +1551,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1592,7 +1586,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1630,7 +1624,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1667,7 +1661,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1703,7 +1697,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+88 -46
View File
@@ -19,7 +19,6 @@ import androidx.appcompat.widget.Toolbar;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
import org.ksoap2.serialization.SoapSerializationEnvelope;
import org.ksoap2.transport.HttpTransportSE;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
@@ -38,6 +37,7 @@ import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.utils.OkHttpTransportSE;
import cpm.com.gskmtorange.utils.TLSSocketFactory;
import cpm.com.gskmtorange.xmlGetterSetter.ADDITIONAL_DISPLAY_MASTERGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.AdditionalQuestiongetterSetter;
@@ -64,6 +64,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter;
@@ -138,6 +139,7 @@ public class DownloadActivity extends AppCompatActivity {
MAPPING_SKU_PRICING_ENABLEGetterSetter mapping_sku_pricing_enableGetterSetter;
Order_Received_Status_GetterSetter order_received_status_getterSetter;
Visit_Type_Master_GetterSetter visit_type_master_getterSetter;
Master_Storelist_PDA_GetterSetter masterStorelistPdaGetterSetter;
private Dialog dialog;
private ProgressBar pb;
@@ -252,8 +254,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
// HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
// OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
/* if (androidHttpTransport.responseDump != null) {
@@ -293,7 +295,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -329,7 +331,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -358,7 +360,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -393,7 +395,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -431,7 +433,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -469,7 +471,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -507,7 +509,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -544,7 +546,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -581,7 +583,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -617,7 +619,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -657,7 +659,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -698,7 +700,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -738,7 +740,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);;
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);;
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -775,7 +777,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -814,7 +816,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -850,7 +852,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -889,7 +891,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -927,7 +929,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -965,7 +967,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1002,7 +1004,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1042,7 +1044,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1080,7 +1082,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1117,7 +1119,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1155,7 +1157,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1194,7 +1196,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1231,7 +1233,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1268,7 +1270,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1305,7 +1307,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1340,7 +1342,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1376,7 +1378,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1414,7 +1416,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1450,7 +1452,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1486,7 +1488,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1522,7 +1524,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1558,7 +1560,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1595,7 +1597,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1634,7 +1636,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1665,7 +1667,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1696,7 +1698,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
@@ -1735,7 +1737,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1776,7 +1778,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1814,7 +1816,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1853,7 +1855,7 @@ public class DownloadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
@@ -1882,6 +1884,45 @@ public class DownloadActivity extends AppCompatActivity {
publishProgress(data);
//VISIT_TYPE_MASTER
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "Master_StoreList_PDA");
request.addProperty("cultureid", culture_id);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
;
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = envelope.getResponse();
Log.d("resultdata", result.toString());
if (result.toString() != null) {
xpp.setInput(new StringReader(result.toString()));
xpp.next();
eventType = xpp.getEventType();
masterStorelistPdaGetterSetter = XMLHandlers.Master_Storelist_PDA_XMLHandler(xpp, eventType);
String stocktable = masterStorelistPdaGetterSetter.getTable_master_storelist_pda();
if (stocktable != null) {
resultHttp = CommonString.KEY_SUCCESS;
TableBean.setTable_Master_PDA_STORE_LIST(stocktable);
}
if (order_received_status_getterSetter.getSTORE_ID().size() > 0) {
data.value = 99;
data.name = "Master_StoreList_PDA" + getResources().getString(R.string.download_data);
} else {
// return "MAPPING_PHARMA_MSL";
}
}
publishProgress(data);
//Images DownLoads
//MAPPING_PLANOGRAM Image save into folder
@@ -2117,6 +2158,7 @@ public class DownloadActivity extends AppCompatActivity {
db.InsertPROMOTION_TYPE_MASTER(promotion_type_masterGetterSetter);
db.InsertCATEGORYWISE_SOS_TARGET(store_category_wiseGetterSetter);
db.InsertMAPPING_SKU_PRICING_ENABLE(mapping_sku_pricing_enableGetterSetter);
db.InsertMaster_Storelist_Pda(masterStorelistPdaGetterSetter);
} catch (MalformedURLException e) {
ResultFlag = false;
str = CommonString.MESSAGE_EXCEPTION;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/password/MPinActivity.java
+1 -3
View File
@@ -474,7 +474,7 @@ public class MPinActivity extends AppCompatActivity implements BlurLockView.OnPa
protected String doInBackground(Void... params) {
try {
versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
String userauth_xml = "[DATA]" + "[USER_DATA][USER_ID]" + userId + "[/USER_ID]" + "[PASSWORD]" + password + "[/PASSWORD]" + "[IN_TIME]" + CommonFunctions.getCurrentTimeWithLanguage(context) + "[/IN_TIME]" + "[LATITUDE]" + lat + "[/LATITUDE]" + "[LONGITUDE]" + lon + "[/LONGITUDE]" + "[APP_VERSION]" + app_ver+"-T5" + "[/APP_VERSION]" + "[ATT_MODE]OnLine[/ATT_MODE]" + "[NETWORK_STATUS]" + "LoginStatus" + "[/NETWORK_STATUS]" + "[/USER_DATA][/DATA]";
String userauth_xml = "[DATA]" + "[USER_DATA][USER_ID]" + userId + "[/USER_ID]" + "[PASSWORD]" + password + "[/PASSWORD]" + "[IN_TIME]" + CommonFunctions.getCurrentTimeWithLanguage(context) + "[/IN_TIME]" + "[LATITUDE]" + lat + "[/LATITUDE]" + "[LONGITUDE]" + lon + "[/LONGITUDE]" + "[APP_VERSION]" + app_ver+"-T2" + "[/APP_VERSION]" + "[ATT_MODE]OnLine[/ATT_MODE]" + "[NETWORK_STATUS]" + "LoginStatus" + "[/NETWORK_STATUS]" + "[/USER_DATA][/DATA]";
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_LOGIN);
request.addProperty("onXML", userauth_xml);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
@@ -596,10 +596,8 @@ public class MPinActivity extends AppCompatActivity implements BlurLockView.OnPa
finish();
}
}
dialog.dismiss();
}
}
ArrayList<String> language, culture_id, notice_url;
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java
+30 -34
View File
@@ -14,15 +14,10 @@ import android.util.Log;
import android.view.WindowManager;
import android.widget.ProgressBar;
import android.widget.TextView;
//import com.crashlytics.android.Crashlytics;
import androidx.appcompat.app.AppCompatActivity;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
import org.ksoap2.serialization.SoapSerializationEnvelope;
import org.ksoap2.transport.HttpTransportSE;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
import org.xmlpull.v1.XmlPullParserException;
@@ -48,6 +43,7 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.utils.OkHttpTransportSE;
import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
@@ -168,7 +164,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
Object result = envelope.getResponse();
@@ -267,7 +263,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -350,7 +346,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + coverage_service, envelope);
result = envelope.getResponse();
@@ -413,7 +409,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -475,7 +471,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -522,7 +518,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -567,7 +563,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -632,7 +628,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
}
@@ -689,7 +685,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -742,7 +738,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -820,7 +816,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -875,7 +871,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -975,7 +971,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1105,7 +1101,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1156,7 +1152,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1254,7 +1250,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1306,7 +1302,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1353,7 +1349,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1396,7 +1392,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1445,7 +1441,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1494,7 +1490,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1565,7 +1561,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1638,7 +1634,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1704,7 +1700,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1755,7 +1751,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1800,7 +1796,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1830,7 +1826,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
}
@@ -1867,7 +1863,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1903,7 +1899,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + status_service, envelope);
result = envelope.getResponse();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+32 -32
View File
@@ -18,7 +18,6 @@ import androidx.appcompat.widget.Toolbar;
import org.ksoap2.SoapEnvelope;
import org.ksoap2.serialization.SoapObject;
import org.ksoap2.serialization.SoapSerializationEnvelope;
import org.ksoap2.transport.HttpTransportSE;
import java.io.File;
import java.util.ArrayList;
@@ -34,6 +33,7 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonFunctions;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.utils.OkHttpTransportSE;
import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter;
@@ -174,7 +174,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -201,7 +201,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -261,7 +261,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
OkHttpTransportSE androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + coverage_service, envelope);
result = envelope.getResponse();
@@ -313,7 +313,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -357,7 +357,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -396,7 +396,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -444,7 +444,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -482,7 +482,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -521,7 +521,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -579,7 +579,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -630,7 +630,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -674,7 +674,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -734,7 +734,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -780,7 +780,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -863,7 +863,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -961,7 +961,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1003,7 +1003,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1083,7 +1083,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1121,7 +1121,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1157,7 +1157,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1193,7 +1193,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1236,7 +1236,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1279,7 +1279,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1334,7 +1334,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1394,7 +1394,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1443,7 +1443,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1480,7 +1480,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1513,7 +1513,7 @@ public class UploadActivity extends AppCompatActivity {
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
}
@@ -1541,7 +1541,7 @@ public class UploadActivity extends AppCompatActivity {
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
}
@@ -1573,7 +1573,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
@@ -1605,7 +1605,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + status_service, envelope);
result = envelope.getResponse();
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java
-8
View File
@@ -50,14 +50,8 @@ import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.retrofit.PostApiForFile;
import cpm.com.gskmtorange.retrofit.StringConverterFactory;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import retrofit.GsonConverterFactory;
import retrofit.Retrofit;
/**
* Created by yadavendras on 4/5/2018.
*/
public class UploadImageWithRetrofit {
RequestBody body1;
private Retrofit adapter;
@@ -147,11 +141,9 @@ public class UploadImageWithRetrofit {
finalFile = originalFile;
}
OkHttpClient okHttpClient = new OkHttpClient();
// okHttpClient.setProtocols(Arrays.asList(Protocol.));
okHttpClient.setConnectTimeout(20, TimeUnit.SECONDS);
okHttpClient.setWriteTimeout(20, TimeUnit.SECONDS);
okHttpClient.setReadTimeout(20, TimeUnit.SECONDS);
// MediaType mediaType = MediaType.parse("text/plain");
RequestBody photo = RequestBody.create(MediaType.parse("application/octet-stream"), finalFile);
body1 = new MultipartBuilder()
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Master_Storelist_PDA_GetterSetter.java
+177
View File
@@ -0,0 +1,177 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
public class Master_Storelist_PDA_GetterSetter {
String table_master_storelist_pda;
ArrayList<String> StoreId = new ArrayList<>();
ArrayList<String> channel = new ArrayList<>();
ArrayList<String> format = new ArrayList<>();
ArrayList<String> region = new ArrayList<>();
ArrayList<String> bay_type = new ArrayList<>();
ArrayList<String> no_of_bays = new ArrayList<>();
ArrayList<String> category = new ArrayList<>();
ArrayList<String> user_id = new ArrayList<>();
ArrayList<String> Active = new ArrayList<>();
ArrayList<String> ASMArea = new ArrayList<>();
ArrayList<String> EmployeeName = new ArrayList<>();
ArrayList<String> DesignationName = new ArrayList<>();
ArrayList<String> SupervisorId = new ArrayList<>();
ArrayList<String> Supervisor = new ArrayList<>();
ArrayList<String> StoreCode = new ArrayList<>();
ArrayList<String> ChainId = new ArrayList<>();
ArrayList<String> StoreTypeId = new ArrayList<>();
ArrayList<String> SOName = new ArrayList<>();
public ArrayList<String> getRegion() {
return region;
}
public void setRegion(String region) {
this.region.add(region);
}
public String getTable_master_storelist_pda() {
return table_master_storelist_pda;
}
public void setTable_master_storelist_pda(String table_master_storelist_pda) {
this.table_master_storelist_pda = table_master_storelist_pda;
}
public ArrayList<String> getStoreId() {
return StoreId;
}
public void setStoreId(String storeId) {
this.StoreId.add(storeId);
}
public ArrayList<String> getChannel() {
return channel;
}
public void setChannel(String channel) {
this.channel.add(channel);
}
public ArrayList<String> getFormat() {
return format;
}
public void setFormat(String format) {
this.format.add(format);
}
public ArrayList<String> getBay_type() {
return bay_type;
}
public void setBay_type(String bay_type) {
this.bay_type.add(bay_type);
}
public ArrayList<String> getNo_of_bays() {
return no_of_bays;
}
public void setNo_of_bays(String no_of_bays) {
this.no_of_bays.add(no_of_bays);
}
public ArrayList<String> getCategory() {
return category;
}
public void setCategory(String category) {
this.category.add(category);
}
public ArrayList<String> getUser_id() {
return user_id;
}
public void setUser_id(String user_id) {
this.user_id.add(user_id);
}
public ArrayList<String> getActive() {
return Active;
}
public void setActive(String active) {
this.Active.add(active);
}
public ArrayList<String> getASMArea() {
return ASMArea;
}
public void setASMArea(String ASMArea) {
this.ASMArea.add(ASMArea);
}
public ArrayList<String> getEmployeeName() {
return EmployeeName;
}
public void setEmployeeName(String employeeName) {
this.EmployeeName.add(employeeName);
}
public ArrayList<String> getDesignationName() {
return DesignationName;
}
public void setDesignationName(String designationName) {
this.DesignationName.add(designationName);
}
public ArrayList<String> getSupervisorId() {
return SupervisorId;
}
public void setSupervisorId(String supervisorId) {
this.SupervisorId.add(supervisorId);
}
public ArrayList<String> getSupervisor() {
return Supervisor;
}
public void setSupervisor(String supervisor) {
this.Supervisor.add(supervisor);
}
public ArrayList<String> getStoreCode() {
return StoreCode;
}
public void setStoreCode(String storeCode) {
this.StoreCode.add(storeCode);
}
public ArrayList<String> getChainId() {
return ChainId;
}
public void setChainId(String chainId) {
this.ChainId.add(chainId);
}
public ArrayList<String> getStoreTypeId() {
return StoreTypeId;
}
public void setStoreTypeId(String storeTypeId) {
this.StoreTypeId.add(storeTypeId);
}
public ArrayList<String> getSOName() {
return SOName;
}
public void setSOName(String SOName) {
this.SOName.add(SOName);
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java
+25
View File
@@ -19,6 +19,17 @@ public class TableBean {
public static String MAPPING_DISPLAY_CHECKLIST;
public static String NON_WORKING_REASON;
public static String MAPPING_PROMOTION;
public static String Master_StoreList_PDA;
public static String getMaster_StoreList_PDA() {
return Master_StoreList_PDA;
}
public static void setMaster_StoreList_PDA(String master_StoreList_PDA) {
Master_StoreList_PDA = master_StoreList_PDA;
}
public static String getCategoryWiseSos() {
return CATEGORY_WISE_SOS;
@@ -39,6 +50,7 @@ public class TableBean {
public static String MAPPING_SUB_CATEGORY_IMAGE_ALLOW;
public static String SKUGROUP_MASTER;
//YSY
public static String MAPPING_CATEGORY_IMAGE_ALLOW;
public static String MAPPING_COUNTRYWISE_PLANOGRAM;
@@ -56,6 +68,18 @@ public class TableBean {
public static String Table_PROMOTION_TYPE_MASTER;
public static String Table_ORDER_RECEIVED_STATUS;
public static String Table_Master_PDA_STORE_LIST;
public static String getTable_Master_PDA_STORE_LIST() {
return Table_Master_PDA_STORE_LIST;
}
public static void setTable_Master_PDA_STORE_LIST(String table_Master_PDA_STORE_LIST) {
Table_Master_PDA_STORE_LIST = table_Master_PDA_STORE_LIST;
}
public static String getTable_VISIT_TYPE_STATUS() {
return Table_VISIT_TYPE_STATUS;
}
@@ -66,6 +90,7 @@ public class TableBean {
public static String Table_VISIT_TYPE_STATUS;
public static String getTable_ORDER_RECEIVED_STATUS() {
return Table_ORDER_RECEIVED_STATUS;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java
+77
View File
@@ -34,6 +34,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
@@ -1798,6 +1799,82 @@ public class XMLHandlers {
return visittype;
}
public static Master_Storelist_PDA_GetterSetter Master_Storelist_PDA_XMLHandler(XmlPullParser xpp,
int eventType) {
Master_Storelist_PDA_GetterSetter masterStorelistPda = new Master_Storelist_PDA_GetterSetter();
try {
while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
if (xpp.getEventType() == XmlPullParser.START_TAG) {
if (xpp.getName().equals("META_DATA")) {
masterStorelistPda.setTable_master_storelist_pda(xpp.nextText());
}
if (xpp.getName().equals("StoreId")) {
masterStorelistPda.setStoreId(xpp.nextText());
}
if (xpp.getName().equals("channel")) {
masterStorelistPda.setChannel(xpp.nextText());
}
if (xpp.getName().equals("format")) {
masterStorelistPda.setFormat(xpp.nextText());
}
if (xpp.getName().equals("region")) {
masterStorelistPda.setRegion(xpp.nextText());
}
if (xpp.getName().equals("bay_type")) {
masterStorelistPda.setBay_type(xpp.nextText());
}
if (xpp.getName().equals("no_of_bays")) {
masterStorelistPda.setNo_of_bays(xpp.nextText());
}
if (xpp.getName().equals("category")) {
masterStorelistPda.setCategory(xpp.nextText());
}
if (xpp.getName().equals("user_id")) {
masterStorelistPda.setUser_id(xpp.nextText());
}
if (xpp.getName().equals("Active")) {
masterStorelistPda.setActive(xpp.nextText());
}
if (xpp.getName().equals("ASMArea")) {
masterStorelistPda.setASMArea(xpp.nextText());
}
if (xpp.getName().equals("EmployeeName")) {
masterStorelistPda.setEmployeeName(xpp.nextText());
}
if (xpp.getName().equals("DesignationName")) {
masterStorelistPda.setDesignationName(xpp.nextText());
}
if (xpp.getName().equals("SupervisorId")) {
masterStorelistPda.setSupervisorId(xpp.nextText());
}
if (xpp.getName().equals("Supervisor")) {
masterStorelistPda.setSupervisor(xpp.nextText());
}
if (xpp.getName().equals("StoreCode")) {
masterStorelistPda.setStoreCode(xpp.nextText());
}
if (xpp.getName().equals("ChainId")) {
masterStorelistPda.setChainId(xpp.nextText());
}
if (xpp.getName().equals("StoreTypeId")) {
masterStorelistPda.setStoreTypeId(xpp.nextText());
}
if (xpp.getName().equals("SOName")) {
masterStorelistPda.setSOName(xpp.nextText());
}
}
xpp.next();
}
} catch (XmlPullParserException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return masterStorelistPda;
}
// JCP XML HANDLER
public static PD_CONFIGURATION PDConfigXMLHandler(XmlPullParser xpp) {
PD_CONFIGURATION jcpGetterSetter = new PD_CONFIGURATION();
library/build.gradle
+1 -1
View File
@@ -28,7 +28,7 @@ android {
compileSdk(35)
defaultConfig {
minSdkVersion 24
targetSdk(35)
targetSdk(34)
}
buildTypes {
release {
library/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/layout_activity_main.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/layout_alert_dialog_listview_search.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/layout_item_listview_multiple.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/layout_item_listview_single.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/compiled_local_resources/release/compileReleaseLibraryResources/out/layout_textview_for_spinner.xml.flat
BIN
View File
Binary file not shown.
library/build/intermediates/incremental/mergeReleaseAssets/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\main\assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\release\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\build\intermediates\shader_assets\release\compileReleaseShaders\out"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\main\assets"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\release\assets"/></dataSet><dataSet config="generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\build\intermediates\shader_assets\release\compileReleaseShaders\out"/></dataSet></merger>
library/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\release\jniLibs"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\release\jniLibs"/></dataSet></merger>
library/build/intermediates/incremental/mergeReleaseShaders/merger.xml
+1 -1
View File
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\release\shaders"/></dataSet></merger>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\release\shaders"/></dataSet></merger>
library/build/intermediates/incremental/release/packageReleaseResources/compile-file-map.properties
+6 -6
View File
@@ -1,6 +1,6 @@
#Thu Sep 25 11:55:29 IST 2025
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\Haleon_Egypt_PD_Git\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\textview_for_spinner.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\Haleon_Egypt_PD_Git\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\Haleon_Egypt_PD_Git\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_single.xml=D\:\\Haleon_Egypt_PD_Git\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_single.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\Haleon_Egypt_PD_Git\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_multiple.xml
#Tue Nov 04 15:03:36 IST 2025
com.androidbuts.multispinnerfilter.library-main-5\:/layout/textview_for_spinner.xml=D\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\textview_for_spinner.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=D\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=D\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_single.xml=D\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_single.xml
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=D\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_multiple.xml
library/build/intermediates/incremental/release/packageReleaseResources/merger.xml
+4 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\main\res"><file name="activity_main" path="D:\Haleon_Egypt_PD_Git\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\Haleon_Egypt_PD_Git\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\Haleon_Egypt_PD_Git\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\Haleon_Egypt_PD_Git\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\Haleon_Egypt_PD_Git\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\Haleon_Egypt_PD_Git\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\Haleon_Egypt_PD_Git\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\Haleon_Egypt_PD_Git\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\Haleon_Egypt_PD_Git\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\main\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\main\res"><file name="activity_main" path="D:\Haleon_Egypt_PD\library\src\main\res\layout\activity_main.xml" qualifiers="" type="layout"/><file name="alert_dialog_listview_search" path="D:\Haleon_Egypt_PD\library\src\main\res\layout\alert_dialog_listview_search.xml" qualifiers="" type="layout"/><file name="item_listview_multiple" path="D:\Haleon_Egypt_PD\library\src\main\res\layout\item_listview_multiple.xml" qualifiers="" type="layout"/><file name="item_listview_single" path="D:\Haleon_Egypt_PD\library\src\main\res\layout\item_listview_single.xml" qualifiers="" type="layout"/><file name="textview_for_spinner" path="D:\Haleon_Egypt_PD\library\src\main\res\layout\textview_for_spinner.xml" qualifiers="" type="layout"/><file path="D:\Haleon_Egypt_PD\library\src\main\res\values\colors.xml" qualifiers=""><color name="ColorPrimary">#29CA97</color><color name="ColorPrimaryDark">#06ACE4</color><color name="list_background">#06ACE4</color><color name="blue">#1589FF</color><color name="white">#FFFFFF</color><color name="black">#000000</color><color name="gray">#D1D0CE</color><color name="background_color">#E1E2E2</color><color name="primary">#3f51b5</color><color name="primary_pressed">#E1E2E2</color><color name="primary_dark">#303f9f</color><color name="ripple">#F06292</color><color name="red">#FF0000</color><color name="cyan">#00FFFF</color><color name="lightBlue">#ADD8E6</color><color name="text_color">#686868</color><color name="android_text_color">#747474</color><color name="app_topbar_color">#AAAAAA</color><color name="list_even">#AAAAAA</color><color name="list_odd">#E1E2E2</color><color name="list_selected">#455FB6</color><color name="list_header">#99979C</color></file><file path="D:\Haleon_Egypt_PD\library\src\main\res\values\dimens.xml" qualifiers=""><dimen name="activity_horizontal_margin">16dp</dimen><dimen name="activity_vertical_margin">16dp</dimen></file><file path="D:\Haleon_Egypt_PD\library\src\main\res\values\strings.xml" qualifiers=""><string name="type_to_search">Type to Search</string></file><file path="D:\Haleon_Egypt_PD\library\src\main\res\values\styles.xml" qualifiers=""><style name="MaterialSpinner" parent="Widget.AppCompat.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
@@ -14,9 +14,9 @@
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style></file><file path="D:\Haleon_Egypt_PD_Git\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
</style></file><file path="D:\Haleon_Egypt_PD\library\src\main\res\values-v21\attrs.xml" qualifiers="v21"><declare-styleable name="MultiSpinnerSearch">
<attr format="string" name="hintText"/>
</declare-styleable></file><file path="D:\Haleon_Egypt_PD_Git\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
</declare-styleable></file><file path="D:\Haleon_Egypt_PD\library\src\main\res\values-v21\styles.xml" qualifiers="v21"><style name="MaterialSpinner" parent="Material.Widget.Spinner">
<item name="rd_style">@style/Material.Drawable.Ripple.Wave.Light</item>
<item name="spn_labelEnable">true</item>
<item name="spn_labelTextSize">18sp</item>
@@ -31,4 +31,4 @@
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD_Git\library\build\generated\res\resValues\release"/></dataSet><mergedItems/></merger>
</style></file></source></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="D:\Haleon_Egypt_PD\library\build\generated\res\resValues\release"/></dataSet><mergedItems/></merger>
library/build/intermediates/manifest_merge_blame_file/release/processReleaseManifest/manifest-merger-blame-release-report.txt
+2 -2
View File
@@ -5,8 +5,8 @@
5 <uses-sdk android:minSdkVersion="24" />
6
7 <application android:allowBackup="true" >
7-->D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:5:5-7:19
7-->D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:5:18-44
7-->D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:5:5-7:19
7-->D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:5:18-44
8 </application>
9
10</manifest>
library/build/outputs/logs/manifest-merger-release-report.txt
+12 -12
View File
@@ -1,21 +1,21 @@
-- Merging decision tree log ---
manifest
ADDED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:2:1-9:12
ADDED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:2:1-9:12
INJECTED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:2:1-9:12
package
ADDED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:3:5-49
INJECTED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml
ADDED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:3:5-49
INJECTED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml
xmlns:android
ADDED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:2:11-69
ADDED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:2:11-69
application
ADDED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:5:5-7:19
ADDED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:5:5-7:19
android:allowBackup
ADDED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml:5:18-44
ADDED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml:5:18-44
uses-sdk
INJECTED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from D:\Haleon_Egypt_PD_Git\library\src\main\AndroidManifest.xml
INJECTED from D:\Haleon_Egypt_PD\library\src\main\AndroidManifest.xml