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

Merge pull request #55 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_final

Browse Source 
T2P upload data newss
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-13 19:26:29 +05:30
committed by GitHub
parent c15aae0685 b0968e9ca6
commit 7d54e6c91b
2 changed files with 549 additions and 551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
+4 -4
View File
@@ -213,18 +213,18 @@ public class MainActivity extends AppCompatActivity
startActivity(i); startActivity(i);
} else { } else {
//if (isStoreCheckedIn()&& isValid()) { if (isStoreCheckedIn()&& isValid()) {
Intent i = new Intent(getBaseContext(), UploadActivity.class); Intent i = new Intent(getBaseContext(), UploadActivity.class);
startActivity(i); startActivity(i);
//finish(); //finish();
/*} else { } else {
Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT) Snackbar.make(webView, error_msg, Snackbar.LENGTH_SHORT)
.setAction("Action", null).show(); .setAction("Action", null).show();
}*/ }
} }
@@ -278,7 +278,7 @@ public class MainActivity extends AppCompatActivity
/*Intent startDownload = new Intent(this,T2PComplianceActivity.class); /*Intent startDownload = new Intent(this,T2PComplianceActivity.class);
startActivity(startDownload); startActivity(startDownload);
*/ */
overridePendingTransition(R.anim.activity_in, R.anim.activity_out); //overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
} else if (id == R.id.nav_setting) { } else if (id == R.id.nav_setting) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+9 -11
View File
@@ -231,8 +231,8 @@ public class UploadActivity extends AppCompatActivity {
storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId()); storeData = db.getSpecificStoreData(date, coverageList.get(i).getStoreId());
if (storeData.getSTORE_ID() != null) { if (storeData.getSTORE_ID() != null) {
/*if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L)|| storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_P) || if (storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_C) || storeData.getCHECKOUT_STATUS().equals(CommonString.KEY_L) ||
!storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {*/ !storeData.getUPLOAD_STATUS().equals(CommonString.KEY_U)) {
String camera_allow = storeData.getCAMERA_ALLOW(); String camera_allow = storeData.getCAMERA_ALLOW();
@@ -543,8 +543,7 @@ public class UploadActivity extends AppCompatActivity {
additionalVisibilitySkuList = db.getDialogStockUpload(KeyID); additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
if(additionalVisibilitySkuList.size()>0) if (additionalVisibilitySkuList.size() > 0) {
{
for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
@@ -569,7 +568,8 @@ public class UploadActivity extends AppCompatActivity {
additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG; additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
}} }
}
onXML = "[ADDITIONAL_VISIBILITY_DATA]" onXML = "[ADDITIONAL_VISIBILITY_DATA]"
+ "[MID]" + mid + "[/MID]" + "[MID]" + mid + "[/MID]"
@@ -599,6 +599,7 @@ public class UploadActivity extends AppCompatActivity {
+ "[/SKU_LIST]" + "[/SKU_LIST]"
+ "[/ADDITIONAL_VISIBILITY_DATA]"; + "[/ADDITIONAL_VISIBILITY_DATA]";
additional_visibility_data_xml = additional_visibility_data_xml + onXML; additional_visibility_data_xml = additional_visibility_data_xml + onXML;
KeyID=""; KeyID="";
additionalVisibilitySkuList.clear(); additionalVisibilitySkuList.clear();
@@ -864,7 +865,6 @@ public class UploadActivity extends AppCompatActivity {
//// ashish close image //// ashish close image
for (int m = 0; m < t2PGetterSetters.size(); m++) { for (int m = 0; m < t2PGetterSetters.size(); m++) {
if (t2PGetterSetters.get(m).getImage() != null && !t2PGetterSetters.get(m).getImage().equals("")) { if (t2PGetterSetters.get(m).getImage() != null && !t2PGetterSetters.get(m).getImage().equals("")) {
@@ -935,7 +935,7 @@ public class UploadActivity extends AppCompatActivity {
db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U); db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U);
db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i)
.getVisitDate(), CommonString.KEY_U); .getVisitDate(), CommonString.KEY_U);
// } }
} }
} }
} catch (IOException e) { } catch (IOException e) {
@@ -972,11 +972,9 @@ public class UploadActivity extends AppCompatActivity {
if (language.equalsIgnoreCase("English")) { if (language.equalsIgnoreCase("English")) {
lang = "EN"; lang = "EN";
} } else if (language.equalsIgnoreCase("UAE")) {
else if(language.equalsIgnoreCase("UAE")) {
lang = "AR"; lang = "AR";
} } else {
else {
lang = "TR"; lang = "TR";
} }