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

Merge pull request #26 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/newUPloadedBtAC

Browse Source 
review
This commit is contained in:
ashishchauhan009
2017-02-24 17:02:41 +05:30
committed by GitHub
parent 2ebc6549a8 244efc44e7
commit bded1a499a
1 changed files with 87 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+87 -102
View File
@@ -608,39 +608,30 @@ public class UploadActivity extends AppCompatActivity {
onXML = ""; onXML = "";
String onXMLdIALOG = ""; String onXMLdIALOG = "";
String imageV1,imageV2,imageV3; String imageV1, imageV2, imageV3;
additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId()); additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId());
if (additionalVisibilityList.size() > 0) { if (additionalVisibilityList.size() > 0) {
for (int J = 0; J < additionalVisibilityList.size(); J++) { for (int J = 0; J < additionalVisibilityList.size(); J++) {
if(additionalVisibilityList.get(J).getImage()==null) if (additionalVisibilityList.get(J).getImage() == null) {
{ imageV1 = "";
imageV1=""; } else {
} imageV1 = additionalVisibilityList.get(J).getImage();
else{
imageV1=additionalVisibilityList.get(J).getImage();
} }
if(additionalVisibilityList.get(J).getImage2()==null) if (additionalVisibilityList.get(J).getImage2() == null) {
{ imageV2 = "";
imageV2=""; } else {
} imageV2 = additionalVisibilityList.get(J).getImage2();
else{
imageV2=additionalVisibilityList.get(J).getImage2();
} }
if(additionalVisibilityList.get(J).getImage3()==null) if (additionalVisibilityList.get(J).getImage3() == null) {
{ imageV3 = "";
imageV3=""; } else {
imageV3 = additionalVisibilityList.get(J).getImage3();
} }
else{
imageV3=additionalVisibilityList.get(J).getImage3();
}
String KeyID = additionalVisibilityList.get(J).getKey_id(); String KeyID = additionalVisibilityList.get(J).getKey_id();
@@ -811,18 +802,18 @@ public class UploadActivity extends AppCompatActivity {
if (brandList.size() > 0) { if (brandList.size() > 0) {
for (int M = 0; M < brandList.size(); M++) { for (int M = 0; M < brandList.size(); M++) {
brandchild = "[BRAND]" brandchild = "[BRAND]"
+ "[MID]" + mid + "[/MID]" + "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]" + "[USER_ID]" + userId + "[/USER_ID]"
+ "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]" + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]"
/* + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"*/ /* + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"*/
+ "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]"
+ "[/BRAND]"; + "[/BRAND]";
brandxml = brandxml + brandchild; brandxml = brandxml + brandchild;
}
} }
}
String present = ""; String present = "";
if (t2PGetterSetters.get(i1).isPresent()) { if (t2PGetterSetters.get(i1).isPresent()) {
present = "1"; present = "1";
@@ -1138,14 +1129,13 @@ public class UploadActivity extends AppCompatActivity {
}*/ }*/
//Category Picture Data //Category Picture Data
String Category_xml = ""; String Category_xml = "";
onXML = ""; onXML = "";
String onCategoryList = ""; String onCategoryList = "";
String CategoryLISTDATA = ""; String CategoryLISTDATA = "";
String image1,image2,image3,image4; String image1, image2, image3, image4;
adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId()); adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId());
@@ -1154,44 +1144,34 @@ public class UploadActivity extends AppCompatActivity {
for (int J = 0; J < adddata.size(); J++) { for (int J = 0; J < adddata.size(); J++) {
if(adddata.get(J).getCategoryImage1()==null) if (adddata.get(J).getCategoryImage1() == null) {
{ image1 = "";
image1=""; } else {
} image1 = adddata.get(J).getCategoryImage1();
else{
image1=adddata.get(J).getCategoryImage1();
} }
if(adddata.get(J).getCategoryImage2()==null) if (adddata.get(J).getCategoryImage2() == null) {
{ image2 = "";
image2=""; } else {
} image2 = adddata.get(J).getCategoryImage2();
else{
image2=adddata.get(J).getCategoryImage2();
} }
if(adddata.get(J).getCategoryImage3()==null) if (adddata.get(J).getCategoryImage3() == null) {
{ image3 = "";
image3=""; } else {
} image3 = adddata.get(J).getCategoryImage3();
else{
image3=adddata.get(J).getCategoryImage3();
} }
if(adddata.get(J).getCategoryImage4()==null) if (adddata.get(J).getCategoryImage4() == null) {
{ image4 = "";
image4=""; } else {
image4 = adddata.get(J).getCategoryImage4();
} }
else{
image4=adddata.get(J).getCategoryImage4();
}
String KeyID = adddata.get(J).getKEY_ID(); String KeyID = adddata.get(J).getKEY_ID();
listdat = db.getCategoryPictureListUploaded(KeyID); listdat = db.getCategoryPictureListUploaded(KeyID);
if (listdat.size() > 0) { if (listdat.size() > 0) {
@@ -1241,7 +1221,7 @@ public class UploadActivity extends AppCompatActivity {
+ image1 /*adddata.get(J).getCategoryImage1()*/ + image1 /*adddata.get(J).getCategoryImage1()*/
+ "[/IMAGE_URL_1]" + "[/IMAGE_URL_1]"
+ "[IMAGE_URL_2]" + "[IMAGE_URL_2]"
+ image2 /*adddata.get(J).getCategoryImage2()*/ + image2 /*adddata.get(J).getCategoryImage2()*/
+ "[/IMAGE_URL_2]" + "[/IMAGE_URL_2]"
+ "[IMAGE_URL_3]" + "[IMAGE_URL_3]"
+ image3 /*adddata.get(J).getCategoryImage3()*/ + image3 /*adddata.get(J).getCategoryImage3()*/
@@ -1296,7 +1276,6 @@ public class UploadActivity extends AppCompatActivity {
publishProgress(data); publishProgress(data);
// ashish visibility image start // ashish visibility image start
if (additionalVisibilityList.size() > 0) { if (additionalVisibilityList.size() > 0) {
for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) { for (int i1 = 0; i1 < additionalVisibilityList.size(); i1++) {
@@ -1372,58 +1351,65 @@ public class UploadActivity extends AppCompatActivity {
//// ashish close image //// ashish close image
// ashish SUB_CATEGORY_PICTURE start // ashish SUB_CATEGORY_PICTURE start
if (listdat.size() > 0) { if (adddata.size() > 0) {
for (int i1 = 0; i1 < listdat.size(); i1++) { for (int J = 0; J < adddata.size(); J++) {
if (listdat.get(i1).getSubCategoryCamera1() != null && !listdat.get(i1).getSubCategoryCamera1().equals("")) { String KeyID = adddata.get(J).getKEY_ID();
if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera1()).exists()) {
try { listdat = db.getCategoryPictureListUploaded(KeyID);
result = UploadImage(listdat.get(i1).getSubCategoryCamera1(), "CategoryImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { if (listdat.size() > 0) {
return "CategoryImages"; for (int i1 = 0; i1 < listdat.size(); i1++) {
}
runOnUiThread(new Runnable() { if (listdat.get(i1).getSubCategoryCamera1() != null && !listdat.get(i1).getSubCategoryCamera1().equals("")) {
public void run() { if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera1()).exists()) {
message.setText("CategoryImages Uploaded");
try {
result = UploadImage(listdat.get(i1).getSubCategoryCamera1(), "CategoryImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
} }
}); }
} catch (Exception e) {
e.printStackTrace();
} }
if (listdat.get(i1).getSubCategoryCamera2() != null && !listdat.get(i1).getSubCategoryCamera2().equals("")) {
if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera2()).exists()) {
try {
result = UploadImage(listdat.get(i1).getSubCategoryCamera2(), "CategoryImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
} }
} }
if (listdat.get(i1).getSubCategoryCamera2() != null && !listdat.get(i1).getSubCategoryCamera2().equals("")) {
if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera2()).exists()) {
try {
result = UploadImage(listdat.get(i1).getSubCategoryCamera2(), "CategoryImages");
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return "CategoryImages";
}
runOnUiThread(new Runnable() {
public void run() {
message.setText("CategoryImages Uploaded");
}
});
} catch (Exception e) {
e.printStackTrace();
}
}
}
} }
} }
// ashish CATEGORY_PICTURE start // ashish CATEGORY_PICTURE start
if (adddata.size() > 0) { if (adddata.size() > 0) {
for (int i1 = 0; i1 < adddata.size(); i1++) { for (int i1 = 0; i1 < adddata.size(); i1++) {
@@ -1515,7 +1501,6 @@ public class UploadActivity extends AppCompatActivity {
} }
///////Start store images ///////Start store images
if (coverageList.size() > 0) { if (coverageList.size() > 0) {
@@ -1729,7 +1714,7 @@ public class UploadActivity extends AppCompatActivity {
} else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) {
lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; lang = CommonString.KEY_RETURE_LANGUAGE_OMAN;
}else{ } else {
lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT;
} }