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

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
This commit is contained in:
Gagan290
2017-01-10 17:43:29 +05:30
parent 05c199dddd
commit 084cfd7b70
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java
+4
View File
@@ -102,6 +102,10 @@ public class CommonString {
public static final String SOAP_ACTION_UPLOAD_STORE_COVERAGE = "http://tempuri.org/" public static final String SOAP_ACTION_UPLOAD_STORE_COVERAGE = "http://tempuri.org/"
+ METHOD_UPLOAD_COVERAGE; + METHOD_UPLOAD_COVERAGE;
public static final String METHOD_UPLOAD_IMAGE = "GetImageWithFolderName";
public static final String SOAP_ACTION_UPLOAD_IMAGE = "http://tempuri.org/" + METHOD_UPLOAD_IMAGE;
//Alert Messages //Alert Messages
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+5 -6
View File
@@ -440,7 +440,7 @@ public class UploadActivity extends AppCompatActivity {
//Image Upload //Image Upload
//Stock Facing Images Upload //Stock Facing Images Upload
/*if (stock_facingHeaderList.size() > 0) { if (stock_facingHeaderList.size() > 0) {
for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) {
if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) { if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) {
@@ -484,7 +484,7 @@ public class UploadActivity extends AppCompatActivity {
} }
} }
} }
}*/ }
// SET COVERAGE STATUS // SET COVERAGE STATUS
@@ -586,7 +586,7 @@ public class UploadActivity extends AppCompatActivity {
byte[] ba = bao.toByteArray(); byte[] ba = bao.toByteArray();
String ba1 = Base64.encodeBytes(ba); String ba1 = Base64.encodeBytes(ba);
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE);
String[] split = path.split("/"); String[] split = path.split("/");
String path1 = split[split.length - 1]; String path1 = split[split.length - 1];
@@ -600,8 +600,7 @@ public class UploadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request); envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
//androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
Object result = (Object) envelope.getResponse(); Object result = (Object) envelope.getResponse();
@@ -629,7 +628,7 @@ public class UploadActivity extends AppCompatActivity {
return CommonString.KEY_FAILURE; return CommonString.KEY_FAILURE;
} }
} else { } else {
new File(Path + path).delete(); //new File(Path + path).delete();
} }
return result.toString(); return result.toString();