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 Category_G

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
Gagan290
2016-12-30 10:31:29 +05:30
parent c64303611e
commit fa6a5c526b
3 changed files with 287 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+151
View File
@@ -11,7 +11,15 @@ import java.util.ArrayList;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.CategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.DisplayMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.JourneyPlanGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MAPPINGT2PGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SkuMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.SubCategoryMasterGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.TableBean;
/**
@@ -38,7 +46,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
@Override
public void onCreate(SQLiteDatabase db) {
db.execSQL(TableBean.getJourneyPlan());
db.execSQL(TableBean.getBrandMaster());
db.execSQL(TableBean.getSkuMaster());
db.execSQL(TableBean.getCategoryMaster());
db.execSQL(TableBean.getSubCategoryMaster());
db.execSQL(TableBean.getDisplayMaster());
db.execSQL(TableBean.getMappingStock());
db.execSQL(TableBean.getMappingT2p());
}
@Override
@@ -179,4 +196,138 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return list;
}
//Gagan Goel
public void InsertCategory(CategoryMasterGetterSetter data) {
db.delete("CATEGORY_MASTER", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getCATEGORY_ID().size(); i++) {
values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
values.put("CATEGORY", data.getCATEGORY().get(i));
values.put("CATEGORY_SEQUENCE", data.getCATEGORY_SEQUENCE().get(i));
db.insert("CATEGORY_MASTER", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in CATEGORY_MASTER " + ex.toString());
}
}
public void InsertMappingStock(MappingStockGetterSetter data) {
db.delete("MAPPING_STOCK", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getKEYACCOUNT_ID().size(); i++) {
values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i));
values.put("CLASS_ID", data.getCLASS_ID().get(i));
values.put("SKU_ID", data.getSKU_ID().get(i));
values.put("MUST_HAVE", data.getMUST_HAVE().get(i));
values.put("MBQ", data.getMBQ().get(i));
db.insert("MAPPING_STOCK", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in MAPPING_STOCK " + ex.toString());
}
}
public void InsertSubCategoryMaster(SubCategoryMasterGetterSetter data) {
db.delete("SUB_CATEGORY_MASTER", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getSUB_CATEGORY_ID().size(); i++) {
values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
values.put("SUB_CATEGORY", data.getSUB_CATEGORY().get(i));
values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
values.put("SUB_CATEGORY_SEQUENCE", data.getSUB_CATEGORY_SEQUENCE().get(i));
db.insert("SUB_CATEGORY_MASTER", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in MAPPING_STOCK " + ex.toString());
}
}
public void InsertBrandMaster(BrandMasterGetterSetter data) {
db.delete("BRAND_MASTER", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getBRAND_ID().size(); i++) {
values.put("BRAND_ID", data.getBRAND_ID().get(i));
values.put("BRAND", data.getBRAND().get(i));
values.put("SUB_CATEGORY_ID", data.getSUB_CATEGORY_ID().get(i));
values.put("COMPANY_ID", data.getCOMPANY_ID().get(i));
values.put("BRAND_SEQUENCE", data.getBRAND_SEQUENCE().get(i));
db.insert("BRAND_MASTER", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in BRAND_MASTER " + ex.toString());
}
}
public void InsertSkuMaster(SkuMasterGetterSetter data) {
db.delete("SKU_MASTER", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getSKU_ID().size(); i++) {
values.put("SKU_ID", data.getSKU_ID().get(i));
values.put("SKU", data.getSKU().get(i));
values.put("BRAND_ID", data.getBRAND_ID().get(i));
values.put("MRP", data.getMRP().get(i));
values.put("SKU_SEQUENCE", data.getSKU_SEQUENCE().get(i));
db.insert("SKU_MASTER", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in SKU_MASTER " + ex.toString());
}
}
public void InsertDisplayMaster(DisplayMasterGetterSetter data) {
db.delete("DISPLAY_MASTER", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getDISPLAY_ID().size(); i++) {
values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
values.put("DISPLAY", data.getDISPLAY().get(i));
values.put("IMAGE_URL", data.getIMAGE_URL().get(i));
db.insert("DISPLAY_MASTER", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in DISPLAY_MASTER " + ex.toString());
}
}
public void InsertMAPPING_T2P(MAPPINGT2PGetterSetter data) {
db.delete("MAPPING_T2P", null, null);
ContentValues values = new ContentValues();
try {
for (int i = 0; i < data.getSTORE_ID().size(); i++) {
values.put("STORE_ID", data.getSTORE_ID().get(i));
values.put("BRAND_ID", data.getBRAND_ID().get(i));
values.put("DISPLAY_ID", data.getDISPLAY_ID().get(i));
db.insert("MAPPING_T2P", null, values);
}
} catch (Exception ex) {
Log.d("Exception ", " in MAPPING_T2P " + ex.toString());
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java
+34 -93
View File
@@ -81,7 +81,6 @@ public class DownloadActivity extends AppCompatActivity {
}
private class UploadTask extends AsyncTask<Void, Data, String> {
private Context context;
UploadTask(Context context) {
@@ -101,14 +100,11 @@ public class DownloadActivity extends AppCompatActivity {
message = (TextView) dialog.findViewById(R.id.message);
dialog.setCancelable(false);
dialog.show();
}
@Override
protected String doInBackground(Void... voids) {
try {
String resultHttp = "";
data = new Data();
@@ -116,31 +112,25 @@ public class DownloadActivity extends AppCompatActivity {
data.name = "JCP Data Downloading";
publishProgress(data);
XmlPullParserFactory factory = XmlPullParserFactory
.newInstance();
XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
factory.setNamespaceAware(true);
XmlPullParser xpp = factory.newPullParser();
SoapObject request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
SoapObject request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "JOURNEY_PLAN");
request.addProperty("cultureid", culture_id);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(
SoapEnvelope.VER11);
SoapSerializationEnvelope envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
envelope.dotNet = true;
envelope.setOutputSoapObject(request);
HttpTransportSE androidHttpTransport = new HttpTransportSE(
CommonString.URL);
HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL,
envelope);
Object result = (Object) envelope.getResponse();
if (result.toString() != null) {
//InputStream stream = new ByteArrayInputStream(result.toString().getBytes("UTF-8"));
xpp.setInput(new StringReader(result.toString()));
@@ -155,21 +145,18 @@ public class DownloadActivity extends AppCompatActivity {
resultHttp = CommonString.KEY_SUCCESS;
String jcpTable = jcpgettersetter.getTable_journey_plan();
TableBean.setJourneyPlan(jcpTable);
} else {
return "JOURNEY_PLAN";
}
data.value = 10;
data.name = "JCP Data Downloading";
}
publishProgress(data);
// Store List Master
request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
// Store List Master
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "SKU_MASTER");
request.addProperty("cultureid", culture_id);
@@ -179,9 +166,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = (Object) envelope.getResponse();
if (result.toString() != null) {
@@ -202,13 +188,11 @@ public class DownloadActivity extends AppCompatActivity {
data.value = 20;
data.name = "SKU_MASTER Data Download";
}
publishProgress(data);
// BRAND_MASTER
request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
// BRAND_MASTER
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "BRAND_MASTER");
request.addProperty("cultureid", culture_id);
@@ -218,9 +202,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = (Object) envelope.getResponse();
if (result.toString() != null) {
@@ -241,13 +224,11 @@ public class DownloadActivity extends AppCompatActivity {
data.value = 30;
data.name = "BRAND_MASTER Data Download";
}
publishProgress(data);
// SUB_CATEGORY_MASTER
request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
// SUB_CATEGORY_MASTER
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "SUB_CATEGORY_MASTER");
request.addProperty("cultureid", culture_id);
@@ -257,9 +238,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = (Object) envelope.getResponse();
if (result.toString() != null) {
@@ -276,17 +256,14 @@ public class DownloadActivity extends AppCompatActivity {
} else {
return "SUB_CATEGORY_MASTER";
}
data.value = 20;
data.name = "SUB_CATEGORY_MASTER Data Download";
}
publishProgress(data);
// CATEGORY_MASTER
request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
// CATEGORY_MASTER
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "CATEGORY_MASTER");
request.addProperty("cultureid", culture_id);
@@ -296,9 +273,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = (Object) envelope.getResponse();
if (result.toString() != null) {
@@ -315,17 +291,14 @@ public class DownloadActivity extends AppCompatActivity {
} else {
return "CATEGORY_MASTER";
}
data.value = 20;
data.name = "CATEGORY_MASTER Data Download";
}
publishProgress(data);
// DISPLAY_MASTER
request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
// DISPLAY_MASTER
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "DISPLAY_MASTER");
request.addProperty("cultureid", culture_id);
@@ -335,9 +308,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = (Object) envelope.getResponse();
if (result.toString() != null) {
@@ -354,17 +326,14 @@ public class DownloadActivity extends AppCompatActivity {
} else {
return "DISPLAY_MASTER";
}
data.value = 20;
data.name = "DISPLAY_MASTER Data Download";
}
publishProgress(data);
// MAPPING_STOCK
request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
// MAPPING_STOCK
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "MAPPING_STOCK");
request.addProperty("cultureid", culture_id);
@@ -374,9 +343,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = (Object) envelope.getResponse();
if (result.toString() != null) {
@@ -393,17 +361,14 @@ public class DownloadActivity extends AppCompatActivity {
} else {
return "MAPPING_STOCK";
}
data.value = 20;
data.name = "MAPPING_STOCK Data Download";
}
publishProgress(data);
// MAPPING_T2P
request = new SoapObject(CommonString.NAMESPACE,
CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
// MAPPING_T2P
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
request.addProperty("UserName", userId);
request.addProperty("Type", "MAPPING_T2P");
request.addProperty("cultureid", culture_id);
@@ -413,9 +378,8 @@ public class DownloadActivity extends AppCompatActivity {
envelope.setOutputSoapObject(request);
androidHttpTransport = new HttpTransportSE(CommonString.URL);
androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope);
androidHttpTransport.call(
CommonString.SOAP_ACTION_UNIVERSAL, envelope);
result = (Object) envelope.getResponse();
if (result.toString() != null) {
@@ -432,65 +396,47 @@ public class DownloadActivity extends AppCompatActivity {
} else {
return "MAPPING_T2P";
}
data.value = 20;
data.name = "MAPPING_T2P Data Download";
}
publishProgress(data);
db.open();
db.InsertJCP(jcpgettersetter);
db.InsertCategory(categoryMasterGetterSetter);
db.InsertSubCategoryMaster(subCategoryMasterGetterSetter);
db.InsertBrandMaster(brandMasterGetterSetter);
db.InsertSkuMaster(skumastergettersetter);
db.InsertDisplayMaster(displayMasterGetterSetter);
db.InsertMAPPING_T2P(mappingt2PGetterSetter);
db.InsertMappingStock(mappingStockGetterSetter);
} catch (MalformedURLException e) {
/*final AlertMessage message = new AlertMessage(
CompleteDownloadActivity.this,
AlertMessage.MESSAGE_EXCEPTION, "download", e);*/
runOnUiThread(new Runnable() {
@Override
public void run() {
// TODO Auto-generated method stub
showAlert(CommonString.MESSAGE_EXCEPTION);
}
});
} catch (IOException e) {
/* final AlertMessage message = new AlertMessage(
CompleteDownloadActivity.this,
AlertMessage.MESSAGE_SOCKETEXCEPTION, "socket", e);*/
runOnUiThread(new Runnable() {
@Override
public void run() {
showAlert(CommonString.MESSAGE_SOCKETEXCEPTION);
}
});
}
catch (Exception e) {
} catch (Exception e) {
/* final AlertMessage message = new AlertMessage(
CompleteDownloadActivity.this,
AlertMessage.MESSAGE_EXCEPTION, "download", e);*/
@@ -499,15 +445,12 @@ public class DownloadActivity extends AppCompatActivity {
e.printStackTrace();
e.getCause();*/
runOnUiThread(new Runnable() {
@Override
public void run() {
showAlert(CommonString.MESSAGE_EXCEPTION);
}
});
}
return "";
}
@@ -518,7 +461,6 @@ public class DownloadActivity extends AppCompatActivity {
pb.setProgress(values[0].value);
percentage.setText(values[0].value + "%");
message.setText(values[0].name);
}
@Override
@@ -526,7 +468,6 @@ public class DownloadActivity extends AppCompatActivity {
super.onPostExecute(s);
dialog.dismiss();
finish();
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/SkuGetterSetter.java
+51
View File
@@ -0,0 +1,51 @@
package cpm.com.gskmtorange.xmlGetterSetter;
import java.util.ArrayList;
/**
* Created by yadavendras on 28-12-2016.
*/
public class SkuGetterSetter {
String SKU_ID, SKU, BRAND_ID, MRP, SKU_SEQUENCE;
public String getSKU_ID() {
return SKU_ID;
}
public void setSKU_ID(String SKU_ID) {
this.SKU_ID = SKU_ID;
}
public String getSKU() {
return SKU;
}
public void setSKU(String SKU) {
this.SKU = SKU;
}
public String getBRAND_ID() {
return BRAND_ID;
}
public void setBRAND_ID(String BRAND_ID) {
this.BRAND_ID = BRAND_ID;
}
public String getMRP() {
return MRP;
}
public void setMRP(String MRP) {
this.MRP = MRP;
}
public String getSKU_SEQUENCE() {
return SKU_SEQUENCE;
}
public void setSKU_SEQUENCE(String SKU_SEQUENCE) {
this.SKU_SEQUENCE = SKU_SEQUENCE;
}
}