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-12 13:21:02 +05:30
parent 2b7f9fe882 dc4057b97d
commit 3a2fb11823
31 changed files with 327 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -41,7 +41,7 @@
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
.idea/modules.xml
Generated
-2
View File
@@ -3,8 +3,6 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" filepath="$PROJECT_DIR$/GSKMTOrange/GSKMTOrange.iml" />
<module fileurl="file://$PROJECT_DIR$/GSKORANGEV1.iml" filepath="$PROJECT_DIR$/GSKORANGEV1.iml" />
<module fileurl="file://$PROJECT_DIR$/GSKORANGEV1.iml" filepath="$PROJECT_DIR$/GSKORANGEV1.iml" />
</modules>
</component>
GSKMTOrange/src/main/AndroidManifest.xml
+7 -2
View File
@@ -77,9 +77,9 @@
<activity
android:name=".dailyentry.T2PComplianceActivity"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_t2_pcompliance"
android:screenOrientation="portrait"
android:configChanges="screenSize|orientation|keyboardHidden"
android:theme="@style/AppTheme.NoActionBar" />
<!-- Gagan Start Declaration -->
@@ -130,19 +130,24 @@
<activity
android:name=".dailyentry.NonWorkingReason"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_Non_Work"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"/>
<activity
android:name=".dailyentry.AdditionalVisibility"
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_Additional_visibility"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"/>
<activity
android:name=".upload.UploadActivity"
android:label="@string/title_activity_upload" />
android:configChanges="screenSize|orientation|keyboardHidden"
android:label="@string/title_activity_upload"
android:screenOrientation="portrait" />
</application>
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+14 -5
View File
@@ -279,7 +279,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
try {
dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "') As Brand", null);
dbcursor = db.rawQuery("SELECT * FROM(SELECT DISTINCT BR.BRAND_ID, SCM.SUB_CATEGORY||'-'||BR.BRAND AS BRAND FROM MAPPING_STOCK MS INNER JOIN SKU_MASTER SM ON MS.SKU_ID = SM.SKU_ID INNER JOIN BRAND_MASTER BR ON SM.BRAND_ID=BR.BRAND_ID INNER JOIN SUB_CATEGORY_MASTER SCM ON BR.SUB_CATEGORY_ID = SCM.SUB_CATEGORY_ID WHERE MS.KEYACCOUNT_ID ='" + key_account_id + "' AND STORETYPE_ID ='" + store_type_id + "' AND CLASS_ID = '" + class_id + "' AND BR.COMPANY_ID ='1') As Brand", null);
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -2449,14 +2449,22 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
}
// get T2P Compliance data
public ArrayList<T2PGetterSetter> getT2pComplianceData(String store_id, String common_id) {
public ArrayList<T2PGetterSetter> getT2pComplianceData(String store_id, String category_id) {
ArrayList<T2PGetterSetter> list = new ArrayList<>();
Cursor dbcursor = null;
try {
dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
CommonString.KEY_STORE_ID + "='" + store_id + "' AND " +
CommonString.KEY_CATEGORY_ID + "='" + common_id + "'", null);
if(category_id == null){
dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
CommonString.KEY_STORE_ID + "='" + store_id + "'", null);
}
else{
dbcursor = db.rawQuery("SELECT * FROM " + CommonString.TABLE_INSERT_T2P_COMPLIANCE + " where " +
CommonString.KEY_STORE_ID + "='" + store_id + "' AND " +
CommonString.KEY_CATEGORY_ID + "='" + category_id + "'", null);
}
if (dbcursor != null) {
dbcursor.moveToFirst();
@@ -2470,6 +2478,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
tp.setDisplay(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_DISPLAY)));
tp.setImage(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_IMAGE)));
tp.setRemark(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_REMARK)));
tp.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID)));
tp.setPresent((dbcursor.getString(dbcursor.getColumnIndexOrThrow(CommonString.KEY_PRESENT)).equalsIgnoreCase("1")));
list.add(tp);
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+31 -20
View File
@@ -74,7 +74,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
String categoryName, categoryId;
private SharedPreferences preferences;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id;
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow;
String path = "", str = CommonString.FILE_PATH, _pathforcheck = "", img = "";
int child_position = -1;
@@ -109,7 +109,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p);
@@ -221,16 +221,6 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
});
holder.img_cam.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
_pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
child_position = position;
path = str + _pathforcheck;
startCameraActivity();
}
});
holder.btn_sku.setOnClickListener(new View.OnClickListener() {
@Override
@@ -246,11 +236,29 @@ public class T2PComplianceActivity extends AppCompatActivity {
}
}
if (mItem.getImage().equals("")) {
holder.img_cam.setBackgroundResource(R.mipmap.camera);
} else {
holder.img_cam.setBackgroundResource(R.mipmap.camera_done);
if(camera_allow.equals("1")){
holder.img_cam.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
_pathforcheck = "T2P_Image_" + store_id + "_" + mItem.getBrand_id() + mItem.getDisplay_id() + visit_date.replace("/", "") + "_" + getCurrentTime().replace(":", "") + ".jpg";
child_position = position;
path = str + _pathforcheck;
startCameraActivity();
}
});
if (mItem.getImage().equals("")) {
holder.img_cam.setBackgroundResource(R.mipmap.camera_orange);
} else {
holder.img_cam.setBackgroundResource(R.mipmap.camera_green);
}
}
else {
holder.img_cam.setBackgroundResource(R.mipmap.camera_grey);
}
holder.toggle_btn.setChecked(mItem.isPresent());
@@ -841,7 +849,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
for (int i = 0; i < t2PGetterSetters.size(); i++) {
if (t2PGetterSetters.get(i).getImage().equals("")) {
if (camera_allow.equals("1") && t2PGetterSetters.get(i).getImage().equals("")) {
flag = false;
error_msg = getResources().getString(R.string.click_image);
break;
@@ -869,9 +877,12 @@ public class T2PComplianceActivity extends AppCompatActivity {
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int id) {
/* Intent i = new Intent(activity, StorelistActivity.class);
activity.startActivity(i);
activity.finish();*/
finish();
}
})
.setNegativeButton("Cancel ", new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
}
});
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+265 -125
View File
@@ -38,34 +38,43 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Promo_Compliance_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.Stock_FacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
import cpm.com.gskmtorange.xmlHandlers.FailureXMLHandler;
public class UploadActivity extends AppCompatActivity {
private Dialog dialog;
private ProgressBar pb;
private TextView percentage, message;
GSKOrangeDB db;
ArrayList<CoverageBean> coverageList;
private FailureGetterSetter failureGetterSetter = null;
private SharedPreferences preferences;
String date, userId, app_version;
StoreBean storeData;
String datacheck = "";
String[] words;
String validity;
int mid;
private int factor, k = 0;
String errormsg = "", Path;
Data data;
ArrayList<MSL_AvailabilityGetterSetter> msl_availabilityList;
ArrayList<Stock_FacingGetterSetter> stock_facingHeaderList, stock_facingChildList;
ArrayList<Promo_Compliance_DataGetterSetter> promotionSkuList, additionalPromotionList;
ArrayList<AddittionalGetterSetter> additionalVisibilityList;
ArrayList<T2PGetterSetter> t2PGetterSetters;
ArrayList<AddittionalGetterSetter> additionalVisibilityList;
ArrayList<AdditionalDialogGetterSetter> additionalVisibilitySkuList;
private Dialog dialog;
private ProgressBar pb;
private TextView percentage, message;
private FailureGetterSetter failureGetterSetter = null;
private SharedPreferences preferences;
private int factor, k = 0;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -88,85 +97,6 @@ public class UploadActivity extends AppCompatActivity {
new UploadTask(this).execute();
}
public String UploadImage(String path, String folder_name) throws Exception {
errormsg = "";
BitmapFactory.Options o = new BitmapFactory.Options();
o.inJustDecodeBounds = true;
BitmapFactory.decodeFile(Path + path, o);
// The new size we want to scale to
final int REQUIRED_SIZE = 1639;
// Find the correct scale value. It should be the power of 2.
int width_tmp = o.outWidth, height_tmp = o.outHeight;
int scale = 1;
while (true) {
if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE)
break;
width_tmp /= 2;
height_tmp /= 2;
scale *= 2;
}
// Decode with inSampleSize
BitmapFactory.Options o2 = new BitmapFactory.Options();
o2.inSampleSize = scale;
Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2);
ByteArrayOutputStream bao = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao);
byte[] ba = bao.toByteArray();
String ba1 = Base64.encodeBytes(ba);
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE);
String[] split = path.split("/");
String path1 = split[split.length - 1];
request.addProperty("img", ba1);
request.addProperty("name", path1);
request.addProperty("FolderName", folder_name);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
Object result = envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
return CommonString.KEY_FALSE;
}
SAXParserFactory saxPF = SAXParserFactory.newInstance();
SAXParser saxP = saxPF.newSAXParser();
XMLReader xmlR = saxP.getXMLReader();
// for failure
FailureXMLHandler failureXMLHandler = new FailureXMLHandler();
xmlR.setContentHandler(failureXMLHandler);
InputSource is = new InputSource();
is.setCharacterStream(new StringReader(result.toString()));
xmlR.parse(is);
failureGetterSetter = failureXMLHandler.getFailureGetterSetter();
if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
errormsg = failureGetterSetter.getErrorMsg();
return CommonString.KEY_FAILURE;
}
} else {
new File(Path + path).delete();
}
return result.toString();
}
class Data {
int value;
String name;
@@ -255,7 +185,7 @@ public class UploadActivity extends AppCompatActivity {
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope);
Object result = envelope.getResponse();
Object result = (Object) envelope.getResponse();
datacheck = result.toString();
words = datacheck.split("\\;");
@@ -287,7 +217,6 @@ public class UploadActivity extends AppCompatActivity {
+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityList.get(j).getCategory_id()) + "[/CATEGORY_ID]"
+ "[BRAND_ID]" + Integer.parseInt(msl_availabilityList.get(j).getBrand_id()) + "[/BRAND_ID]"
+ "[SKU_ID]" + Integer.parseInt(msl_availabilityList.get(j).getSku_id()) + "[/SKU_ID]"
+ "[MBQ]" + Integer.parseInt(msl_availabilityList.get(j).getMbq()) + "[/MBQ]"
//+ "[SKU]" + msl_availabilityList.get(j).getSku() + "[/SKU]"
+ "[TOGGLE_VALUE]" + Integer.parseInt(msl_availabilityList.get(j).getToggleValue()) + "[/TOGGLE_VALUE]"
+ "[/MSL_AVAILABILITY_DATA]";
@@ -311,7 +240,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -380,7 +309,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -439,7 +368,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -498,7 +427,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -516,7 +445,8 @@ public class UploadActivity extends AppCompatActivity {
data.name = "Additional Promotion Data Uploading";
publishProgress(data);
////ashish open
////ashish open
//Additional Visibility Data
String additional_visibility_data_xml = "";
@@ -528,11 +458,11 @@ public class UploadActivity extends AppCompatActivity {
if (additionalVisibilityList.size() > 0) {
for (int J = 0; J < additionalVisibilityList.size(); J++) {
String KeyID = additionalVisibilityList.get(J).getKey_id();
String KeyID = additionalVisibilityList.get(J).getKey_id();
additionalVisibilitySkuList = db.getDialogStock(KeyID);
additionalVisibilitySkuList = db.getDialogStock(KeyID);
for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
onXMLdIALOG = "[VISIBILITY_DAILOG]"
@@ -554,34 +484,34 @@ public class UploadActivity extends AppCompatActivity {
+ "[/QUANTITY]"
+ "[/VISIBILITY_DAILOG]";
additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
additional_visibility_dialog_xml = additional_visibility_dialog_xml + onXMLdIALOG;
}
}
onXML = "[ADDITIONAL_VISIBILITY_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]"
+ userId
+ "[/USER_ID]"
+ "[KEY_ID]"
+ additionalVisibilityList.get(J).getKey_id()
+ "[/KEY_ID]"
+ "[ADDITIONAL_DISPLAY]"
+ additionalVisibilityList.get(J).getBtn_toogle()
+ "[/ADDITIONAL_DISPLAY]"
+ "[BRAND_ID]"
+ additionalVisibilityList.get(J).getBrand_id()
+ "[/BRAND_ID]"
+ "[IMAGE_URL]"
+ additionalVisibilityList.get(J).getImage()
+ "[/IMAGE_URL]"
+ "[DISPLAY_ID]"
+ additionalVisibilityList.get(J).getSku_id()
+ "[/DISPLAY_ID]"
+ "[SKU_LIST]"
+ additional_visibility_dialog_xml
+ "[/SKU_LIST]"
+ "[/ADDITIONAL_VISIBILITY_DATA]";
onXML = "[ADDITIONAL_VISIBILITY_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]"
+ userId
+ "[/USER_ID]"
+ "[KEY_ID]"
+ additionalVisibilityList.get(J).getKey_id()
+ "[/KEY_ID]"
+ "[ADDITIONAL_DISPLAY]"
+ additionalVisibilityList.get(J).getBtn_toogle()
+ "[/ADDITIONAL_DISPLAY]"
+ "[BRAND_ID]"
+ additionalVisibilityList.get(J).getBrand_id()
+ "[/BRAND_ID]"
+ "[IMAGE_URL]"
+ additionalVisibilityList.get(J).getImage()
+ "[/IMAGE_URL]"
+ "[DISPLAY_ID]"
+ additionalVisibilityList.get(J).getSku_id()
+ "[/DISPLAY_ID]"
+ "[SKU_LIST]"
+ additional_visibility_dialog_xml
+ "[/SKU_LIST]"
+ "[/ADDITIONAL_VISIBILITY_DATA]";
additional_visibility_data_xml = additional_visibility_data_xml + onXML;
@@ -602,7 +532,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = envelope.getResponse();
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
@@ -616,13 +546,144 @@ public class UploadActivity extends AppCompatActivity {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 35;
data.name = "Additional Visibility Data";
publishProgress(data);
/////ashish close
//T2p Upload Data
String t2p_data_xml = "";
onXML = "";
t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null);
if (t2PGetterSetters.size() > 0) {
for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) {
ArrayList<GapsChecklistGetterSetter> gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id());
ArrayList<SkuGetterSetter> skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id());
String gaps_xml = "";
String gaps_child;
for (int l = 0; l < gapsList.size(); l++) {
String present = "";
if (gapsList.get(l).isPresent()) {
present = "1";
} else {
present = "0";
}
gaps_child = "[GAPS]"
+ "[CHECK_LIST_ID]"
+ gapsList.get(l).getChecklist_id()
+ "[/CHECK_LIST_ID]"
+ "[DISPLAY_ID]"
+ gapsList.get(l).getDisplay_id()
+ "[/DISPLAY_ID]"
+ "[PRESENT]"
+ present
+ "[/PRESENT]"
+ "[/GAPS]";
gaps_xml = gaps_xml + gaps_child;
}
String sku_xml = "";
String sku_child;
for (int k = 0; k < skuList.size(); k++) {
sku_child = "[SKU]"
+ "[SKU_ID]"
+ skuList.get(k).getSKU_ID()
+ "[/SKU_ID]"
+ "[BRAND_ID]"
+ skuList.get(k).getBRAND_ID()
+ "[/BRAND_ID]"
+ "[STOCK]"
+ skuList.get(k).getSTOCK()
+ "[/STOCK]"
+ "[/SKU]";
sku_xml = sku_xml + sku_child;
}
String present = "";
if (t2PGetterSetters.get(i1).isPresent()) {
present = "1";
} else {
present = "0";
}
onXML = "[T2P_DATA]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]" + userId + "[/USER_ID]"
+ "[CATEGORY_ID]"
+ Integer.parseInt(t2PGetterSetters.get(i1).getCategory_id())
+ "[/CATEGORY_ID]"
+ "[BRAND_ID]"
+ Integer.parseInt(t2PGetterSetters.get(i1).getBrand_id())
+ "[/BRAND_ID]"
+ "[DISPLAY_ID]"
+ Integer.parseInt(t2PGetterSetters.get(i1).getDisplay_id())
+ "[/DISPLAY_ID]"
+ "[COMMON_ID]"
+ Integer.parseInt(t2PGetterSetters.get(i1).getKey_id())
+ "[/COMMON_ID]"
+ "[IMAGE]"
+ t2PGetterSetters.get(i1).getImage()
+ "[/IMAGE]"
+ "[PRESENT]"
+ present
+ "[/PRESENT]"
+ "[GAPS_DATA]"
+ gaps_xml
+ "[/GAPS_DATA]"
+ "[SKU_DATA]"
+ sku_xml
+ "[/SKU_DATA]"
+ "[/T2P_DATA]";
t2p_data_xml = t2p_data_xml + onXML;
}
final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", t2p_final_xml);
request.addProperty("KEYS", "T2P_DATA");
request.addProperty("USERNAME", userId);
request.addProperty("MID", mid);
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
}
}
data.value = 40;
data.name = "T2P Data Uploading";
publishProgress(data);
//Image Upload
@@ -698,7 +759,7 @@ public class UploadActivity extends AppCompatActivity {
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_COVERAGE_STATUS, envelope);
result = envelope.getResponse();
result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
return CommonString.METHOD_UPLOAD_COVERAGE_STATUS;
@@ -741,4 +802,83 @@ public class UploadActivity extends AppCompatActivity {
}
}
}
public String UploadImage(String path, String folder_name) throws Exception {
errormsg = "";
BitmapFactory.Options o = new BitmapFactory.Options();
o.inJustDecodeBounds = true;
BitmapFactory.decodeFile(Path + path, o);
// The new size we want to scale to
final int REQUIRED_SIZE = 1639;
// Find the correct scale value. It should be the power of 2.
int width_tmp = o.outWidth, height_tmp = o.outHeight;
int scale = 1;
while (true) {
if (width_tmp < REQUIRED_SIZE && height_tmp < REQUIRED_SIZE)
break;
width_tmp /= 2;
height_tmp /= 2;
scale *= 2;
}
// Decode with inSampleSize
BitmapFactory.Options o2 = new BitmapFactory.Options();
o2.inSampleSize = scale;
Bitmap bitmap = BitmapFactory.decodeFile(Path + path, o2);
ByteArrayOutputStream bao = new ByteArrayOutputStream();
bitmap.compress(Bitmap.CompressFormat.JPEG, 90, bao);
byte[] ba = bao.toByteArray();
String ba1 = Base64.encodeBytes(ba);
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_IMAGE);
String[] split = path.split("/");
String path1 = split[split.length - 1];
request.addProperty("img", ba1);
request.addProperty("name", path1);
request.addProperty("FolderName", folder_name);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope);
Object result = (Object) envelope.getResponse();
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) {
return CommonString.KEY_FALSE;
}
SAXParserFactory saxPF = SAXParserFactory.newInstance();
SAXParser saxP = saxPF.newSAXParser();
XMLReader xmlR = saxP.getXMLReader();
// for failure
FailureXMLHandler failureXMLHandler = new FailureXMLHandler();
xmlR.setContentHandler(failureXMLHandler);
InputSource is = new InputSource();
is.setCharacterStream(new StringReader(result.toString()));
xmlR.parse(is);
failureGetterSetter = failureXMLHandler.getFailureGetterSetter();
if (failureGetterSetter.getStatus().equalsIgnoreCase(CommonString.KEY_FAILURE)) {
errormsg = failureGetterSetter.getErrorMsg();
return CommonString.KEY_FAILURE;
}
} else {
new File(Path + path).delete();
}
return result.toString();
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/T2PGetterSetter.java
+9 -1
View File
@@ -8,7 +8,7 @@ import java.util.ArrayList;
public class T2PGetterSetter {
String brand_id, display_id, brand, display, image, remark, key_id;
String brand_id, display_id, brand, display, image, remark, key_id, category_id;
boolean isPresent;
ArrayList<GapsChecklistGetterSetter> gapsChecklist = new ArrayList<>();
@@ -93,4 +93,12 @@ public class T2PGetterSetter {
public void setKey_id(String key_id) {
this.key_id = key_id;
}
public String getCategory_id() {
return category_id;
}
public void setCategory_id(String category_id) {
this.category_id = category_id;
}
}
GSKMTOrange/src/main/res/drawable/HFD.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

GSKMTOrange/src/main/res/drawable/HFD_done.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.5 KiB

GSKMTOrange/src/main/res/drawable/OHC.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

GSKMTOrange/src/main/res/drawable/OHC_done.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.4 KiB

GSKMTOrange/src/main/res/drawable/PDR.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

GSKMTOrange/src/main/res/drawable/PDR_done.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.4 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/OralCare_tick.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/additional_visibility_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.8 KiB

After

Width:  |  Height:  |  Size: 9.3 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/camera_green.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/camera_grey.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/camera_orange.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/exclamation.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/msl_availability_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.9 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/nutritionals_tick.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/oral_care.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/promo_compliance_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/stock_facing_done.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/t2p_compliance_done.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.0 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/tick.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/wellness.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

GSKMTOrange/src/main/res/mipmap-hdpi/wellness_tick.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB