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
+23 -38
View File
@@ -615,34 +615,25 @@ public class UploadActivity extends AppCompatActivity {
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 {
else{
imageV1 = additionalVisibilityList.get(J).getImage(); imageV1 = additionalVisibilityList.get(J).getImage();
} }
if(additionalVisibilityList.get(J).getImage2()==null) if (additionalVisibilityList.get(J).getImage2() == null) {
{
imageV2 = ""; imageV2 = "";
} } else {
else{
imageV2 = additionalVisibilityList.get(J).getImage2(); imageV2 = additionalVisibilityList.get(J).getImage2();
} }
if(additionalVisibilityList.get(J).getImage3()==null) if (additionalVisibilityList.get(J).getImage3() == null) {
{
imageV3 = ""; imageV3 = "";
} } else {
else{
imageV3 = additionalVisibilityList.get(J).getImage3(); imageV3 = additionalVisibilityList.get(J).getImage3();
} }
String KeyID = additionalVisibilityList.get(J).getKey_id(); String KeyID = additionalVisibilityList.get(J).getKey_id();
additionalVisibilitySkuList = db.getDialogStockUpload(KeyID); additionalVisibilitySkuList = db.getDialogStockUpload(KeyID);
@@ -1138,7 +1129,6 @@ public class UploadActivity extends AppCompatActivity {
}*/ }*/
//Category Picture Data //Category Picture Data
String Category_xml = ""; String Category_xml = "";
@@ -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 {
else{
image1 = adddata.get(J).getCategoryImage1(); image1 = adddata.get(J).getCategoryImage1();
} }
if(adddata.get(J).getCategoryImage2()==null) if (adddata.get(J).getCategoryImage2() == null) {
{
image2 = ""; image2 = "";
} } else {
else{
image2 = adddata.get(J).getCategoryImage2(); image2 = adddata.get(J).getCategoryImage2();
} }
if(adddata.get(J).getCategoryImage3()==null) if (adddata.get(J).getCategoryImage3() == null) {
{
image3 = ""; image3 = "";
} } else {
else{
image3 = adddata.get(J).getCategoryImage3(); image3 = adddata.get(J).getCategoryImage3();
} }
if(adddata.get(J).getCategoryImage4()==null) if (adddata.get(J).getCategoryImage4() == null) {
{
image4 = ""; image4 = "";
} } else {
else{
image4 = adddata.get(J).getCategoryImage4(); 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) {
@@ -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,8 +1351,14 @@ public class UploadActivity extends AppCompatActivity {
//// ashish close image //// ashish close image
// ashish SUB_CATEGORY_PICTURE start // ashish SUB_CATEGORY_PICTURE start
if (adddata.size() > 0) {
for (int J = 0; J < adddata.size(); J++) {
String KeyID = adddata.get(J).getKEY_ID();
listdat = db.getCategoryPictureListUploaded(KeyID);
if (listdat.size() > 0) { if (listdat.size() > 0) {
for (int i1 = 0; i1 < listdat.size(); i1++) { for (int i1 = 0; i1 < listdat.size(); i1++) {
@@ -1421,7 +1406,8 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
}
}
// ashish CATEGORY_PICTURE start // ashish CATEGORY_PICTURE start
@@ -1515,7 +1501,6 @@ public class UploadActivity extends AppCompatActivity {
} }
///////Start store images ///////Start store images
if (coverageList.size() > 0) { if (coverageList.size() > 0) {