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

newcode

Browse Source
This commit is contained in:
ashishandroid
2017-01-11 16:13:47 +05:30
parent 82ec3c7203
commit 8a6056a10b
5 changed files with 173 additions and 17 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_7" 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_8" 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">
GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
+18 -1
View File
@@ -98,7 +98,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
db.execSQL("DROP TABLE IF EXISTS " + TableBean.getJourneyPlan());
}
public void deleteTableWithStoreID(String storeid, String process_id) {
public void deleteTableWithStoreID(String storeid) {
db.delete( CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
}
public void deleteAllTables() {
@@ -2250,6 +2253,9 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
sb.setSku(cursordata.getString(cursordata
.getColumnIndexOrThrow("sku_name")));
sb.setBtn_toogle(cursordata.getString(cursordata
.getColumnIndexOrThrow("toggle_value")));
productData.add(sb);
cursordata.moveToNext();
@@ -2265,5 +2271,16 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
return productData;
}
public void updateStoreStatus(String storeid, String visitdate,
String status) {
try {
ContentValues values = new ContentValues();
values.put(CommonString.KEY_CHECKOUT_STATUS, status);
db.update("JOURNEY_PLAN", values, CommonString.KEY_STORE_ID + "='" + storeid + "' AND " + CommonString.KEY_VISIT_DATE + "='" + visitdate + "'", null);
} catch (Exception e) {
}
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java
+5 -5
View File
@@ -114,7 +114,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
store_id = preferences.getString(CommonString.KEY_STORE_ID, null);
store_id = "1";
store_id = "2";
date = preferences.getString(CommonString.KEY_DATE, null);
intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, "");
@@ -255,6 +255,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
btntoggle.setChecked(true);
btnimage.setBackgroundResource(R.mipmap.camera);
togglevalue = "1";
brandlayout.setVisibility(View.VISIBLE);
diaplylayout.setVisibility(View.VISIBLE);
@@ -611,10 +612,9 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl
if (_pathforcheck != null && !_pathforcheck.equals("")) {
if (new File(str + _pathforcheck).exists()) {
// Bitmap bmp = BitmapFactory.decodeFile(str + _pathforcheck);
// img_cam.setImageBitmap(bmp);
// img_clicked.setVisibility(View.GONE);
// img_cam.setVisibility(View.VISIBLE);
btnimage.setBackgroundResource(R.mipmap.camera_done);
img_str = _pathforcheck;
_pathforcheck = "";
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java
+34 -10
View File
@@ -42,6 +42,7 @@ import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
import cpm.com.gskmtorange.download.DownloadActivity;
import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity;
/**
* Created by ashishc on 29-12-2016.
@@ -250,7 +251,6 @@ public class StoreListActivity extends AppCompatActivity {
store_id = current.getSTORE_ID();
if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_U)) {
Snackbar.make(v, R.string.title_store_list_activity_store_already_done, Snackbar.LENGTH_LONG).setAction("Action", null).show();
} else if (current.getUPLOAD_STATUS().equalsIgnoreCase(CommonString.KEY_D)) {
@@ -361,13 +361,29 @@ public class StoreListActivity extends AppCompatActivity {
public void onCheckedChanged(RadioGroup group, int checkedId) {
// find which radio button is selected
if (checkedId == R.id.yes) {
Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel();
boolean flag=true;
if(coverage.size()>0) {
for (int i = 0; i < coverage.size(); i++) {
if (store_id.equals(coverage.get(i).getStoreId())) {
flag=false;
break;
}
}
}
if(flag==true)
{
Intent in = new Intent(StoreListActivity.this, StoreimageActivity.class);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel();
}
else
{
Intent in=new Intent(StoreListActivity.this,CategoryListActivity.class);
startActivity(in);
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
dialog.cancel();
}
} else if (checkedId == R.id.no) {
@@ -383,6 +399,9 @@ public class StoreListActivity extends AppCompatActivity {
int id) {
UpdateStore(store_id);
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
startActivity(in);
@@ -404,8 +423,6 @@ public class StoreListActivity extends AppCompatActivity {
} else {
Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class);
startActivity(in);
}
@@ -439,5 +456,12 @@ public class StoreListActivity extends AppCompatActivity {
return result_flag;
}
public void UpdateStore(String storeid) {
db.open();
db.deleteTableWithStoreID(storeid);
db.updateStoreStatus(storeid, storelist.get(0).getVISIT_DATE(), "N");
}
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+115
View File
@@ -31,6 +31,8 @@ import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.GetterSetter.AdditionalDialogGetterSetter;
import cpm.com.gskmtorange.GetterSetter.AddittionalGetterSetter;
import cpm.com.gskmtorange.GetterSetter.CoverageBean;
import cpm.com.gskmtorange.GetterSetter.StoreBean;
import cpm.com.gskmtorange.R;
@@ -66,6 +68,8 @@ public class UploadActivity extends AppCompatActivity {
ArrayList<MSL_AvailabilityGetterSetter> msl_availabilityList;
ArrayList<Stock_FacingGetterSetter> stock_facingHeaderList, stock_facingChildList;
ArrayList<Promo_Compliance_DataGetterSetter> promotionSkuList, additionalPromotionList;
ArrayList<AddittionalGetterSetter> additionalVisibilityList;
ArrayList<AdditionalDialogGetterSetter> additionalVisibilitySkuList;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -436,6 +440,117 @@ public class UploadActivity extends AppCompatActivity {
data.name = "Additional Promotion Data Uploading";
publishProgress(data);
////ashish open
//Additional Visibility Data
String additional_visibility_data_xml = "";
String additional_visibility_dialog_xml = "";
onXML = "";
String onXMLdIALOG = "";
additionalVisibilityList = db.getAdditionalStock(coverageList.get(i).getStoreId());
if (additionalVisibilityList.size() > 0) {
for (int J = 0; J < additionalVisibilityList.size(); J++) {
String KeyID = additionalVisibilityList.get(J).getKey_id();
additionalVisibilitySkuList = db.getDialogStock(KeyID);
for (int k = 0; k < additionalVisibilitySkuList.size(); k++) {
onXMLdIALOG = "[VISIBILITY_DAILOG]"
+ "[MID]" + mid + "[/MID]"
+ "[USER_ID]"
+ userId
+ "[/USER_ID]"
+ "[KEY_ID]"
+ additionalVisibilitySkuList.get(k).getKEY_ID()
+ "[/KEY_ID]"
/* + "[DIALOG_BRAND_ID]"
+ additionalVisibilitySkuList.get(k).getBrand_id()
+ "[/DIALOG_BRAND_ID]"*/
+ "[SKU_ID]"
+ additionalVisibilitySkuList.get(k).getSku_id()
+ "[/SKU_ID]"
+ "[QUANTITY]"
+ additionalVisibilitySkuList.get(k).getQuantity()
+ "[/QUANTITY]"
+ "[/VISIBILITY_DAILOG]";
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]";
additional_visibility_data_xml = additional_visibility_data_xml + onXML;
}
final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]";
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
request.addProperty("XMLDATA", sos_xml);
request.addProperty("KEYS", "ADDITIONAL_VISIBILITY_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 = 35;
data.name = "Additional Visibility Data";
publishProgress(data);
/////ashish close
//Image Upload