diff --git a/.idea/misc.xml b/.idea/misc.xml index b8dc4d6..b15ecee 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index e18ffec..7705f9b 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -15,8 +15,8 @@ android { minSdkVersion 15 targetSdkVersion 22 - versionCode 9 - versionName "2.2" + versionCode 10 + versionName "2.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 2fd024c..9347d8e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -62,7 +62,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.TableBean; */ public class GSKOrangeDB extends SQLiteOpenHelper { - public static final String DATABASE_NAME = "GSK_ORANGE_DB3"; + public static final String DATABASE_NAME = "GSK_ORANGE_DB4"; public static final int DATABASE_VERSION = 13; TableBean tableBean; private SQLiteDatabase db; @@ -1579,6 +1579,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setIn_stock("0"); cd.setPromo_announcer("0"); cd.setRunning_pos("0"); + cd.setImage_promotion(""); list.add(cd); dbcursor.moveToNext(); @@ -1655,6 +1656,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock())); values.put("PROMO_ANNOUNCER_VALUE", Integer.parseInt(data.getPromo_announcer())); values.put("RUNNING_POS_VALUE", Integer.parseInt(data.getRunning_pos())); + values.put("ADD_PROMO_IMAGE", data.getImage_promotion()); db.insert(CommonString.TABLE_INSERT_ADDITIONAL_PROMO_COMPLIANCE, null, values); } catch (Exception ex) { @@ -1683,6 +1685,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE"))); cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE"))); cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE"))); + cd.setImage_promotion(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ADD_PROMO_IMAGE"))); + list.add(cd); dbcursor.moveToNext(); } @@ -1712,6 +1716,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock())); values.put("PROMO_ANNOUNCER_VALUE", Integer.parseInt(data.getPromo_announcer())); values.put("RUNNING_POS_VALUE", Integer.parseInt(data.getRunning_pos())); + values.put("PROMO_IMAGE", data.getImage_promotion()); db.insert(CommonString.TABLE_INSERT_PROMO_SKU, null, values); } @@ -1945,6 +1950,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("IN_STOCK_VALUE", Integer.parseInt(data.getIn_stock())); values.put("PROMO_ANNOUNCER_VALUE", Integer.parseInt(data.getPromo_announcer())); values.put("RUNNING_POS_VALUE", Integer.parseInt(data.getRunning_pos())); + values.put("PROMO_IMAGE", data.getImage_promotion()); db.update(CommonString.TABLE_INSERT_PROMO_SKU, values, "CATEGORY_ID='" + categoryId + "' AND STORE_ID='" + storeId + @@ -1979,6 +1985,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE"))); cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE"))); cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE"))); + cd.setImage_promotion(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_IMAGE"))); list.add(cd); dbcursor.moveToNext(); @@ -2124,6 +2131,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE"))); cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE"))); cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE"))); + cd.setImage_promotion(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_IMAGE"))); list.add(cd); dbcursor.moveToNext(); @@ -2160,6 +2168,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { cd.setIn_stock(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IN_STOCK_VALUE"))); cd.setPromo_announcer(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMO_ANNOUNCER_VALUE"))); cd.setRunning_pos(dbcursor.getString(dbcursor.getColumnIndexOrThrow("RUNNING_POS_VALUE"))); + cd.setImage_promotion(dbcursor.getString(dbcursor.getColumnIndexOrThrow("ADD_PROMO_IMAGE"))); list.add(cd); dbcursor.moveToNext(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java index 35a08f5..fbbded4 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagStoreList.java @@ -41,25 +41,26 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi private SharedPreferences preferences; ArrayList storelist = new ArrayList(); - String date,visit_status; + String date, visit_status; GSKOrangeDB db; - // ListView list; - ValueAdapter adapter; + // ListView list; + ValueAdapter adapter; RecyclerView recyclerView; private SharedPreferences.Editor editor = null; - LinearLayout parent_linear,nodata_linear; + LinearLayout parent_linear, nodata_linear; LinearLayout linearlay; FloatingActionButton fab; Toolbar toolbar; + protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub super.onCreate(savedInstanceState); setContentView(R.layout.geotagstorelistfab); //list = (ListView) findViewById(R.id.list_id); - recyclerView=(RecyclerView) findViewById(R.id.drawer_layout_recycle); + recyclerView = (RecyclerView) findViewById(R.id.drawer_layout_recycle); linearlay = (LinearLayout) findViewById(R.id.no_data_lay); - // nodata_linear = (LinearLayout) findViewById(R.id.no_data_lay); + // nodata_linear = (LinearLayout) findViewById(R.id.no_data_lay); //parent_linear = (LinearLayout) findViewById(R.id.parent_linear); fab = (FloatingActionButton) findViewById(R.id.fab); @@ -71,7 +72,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi preferences = PreferenceManager.getDefaultSharedPreferences(this); - updateResources(getApplicationContext(),preferences.getString(CommonString.KEY_LANGUAGE, "")); + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); date = preferences.getString(CommonString.KEY_DATE, null); visit_status = preferences.getString(CommonString.KEY_STOREVISITED_STATUS, ""); @@ -82,31 +83,24 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - Intent in = new Intent(getApplicationContext(), DownloadActivity.class); startActivity(in); finish(); - } }); - storelist = db.getStoreData(date); - if (storelist.size()>0) { - - adapter=new ValueAdapter(getApplicationContext(),storelist); + if (storelist.size() > 0) { + adapter = new ValueAdapter(getApplicationContext(), storelist); recyclerView.setAdapter(adapter); recyclerView.setLayoutManager(new LinearLayoutManager(this)); - } - else - { + } else { recyclerView.setVisibility(View.INVISIBLE); linearlay.setVisibility(View.VISIBLE); fab.setVisibility(View.VISIBLE); - } } @@ -117,7 +111,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi // as you specify a parent activity in AndroidManifest.xml. int id = item.getItemId(); - if(id==android.R.id.home){ + if (id == android.R.id.home) { finish(); @@ -127,6 +121,7 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi return super.onOptionsItemSelected(item); } + @Override public void onBackPressed() { // TODO Auto-generated method stub @@ -137,86 +132,66 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi } - public class ValueAdapter extends RecyclerView.Adapter{ + public class ValueAdapter extends RecyclerView.Adapter { private LayoutInflater inflator; - List data= Collections.emptyList(); + List data = Collections.emptyList(); - public ValueAdapter(Context context, List data){ + public ValueAdapter(Context context, List data) { inflator = LayoutInflater.from(context); - this.data=data; + this.data = data; } @Override public ValueAdapter.MyViewHolder onCreateViewHolder(ViewGroup parent, int i) { + View view = inflator.inflate(R.layout.geotagstorelist, parent, false); - View view=inflator.inflate(R.layout.geotagstorelist,parent,false); - - MyViewHolder holder=new MyViewHolder(view); - + MyViewHolder holder = new MyViewHolder(view); return holder; } @Override public void onBindViewHolder(final ValueAdapter.MyViewHolder viewHolder, final int position) { - - final StoreBean current=data.get(position); - + final StoreBean current = data.get(position); //viewHolder.txt.setText(current.txt); viewHolder.txt.setText(current.getSTORE_NAME()); + viewHolder.txt_storeAddress.setText(current.getADDRESS()); - if(current.getGEO_TAG().equalsIgnoreCase("Y")) - { + if (current.getGEO_TAG().equalsIgnoreCase("Y")) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.geopin); - } - else if(current.getGEO_TAG().equalsIgnoreCase("D")){ + } else if (current.getGEO_TAG().equalsIgnoreCase("D")) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); - } - else if(current.getGEO_TAG().equalsIgnoreCase("U")){ + } else if (current.getGEO_TAG().equalsIgnoreCase("U")) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.tick); - } - else if(current.getGEO_TAG().equalsIgnoreCase("P")){ + } else if (current.getGEO_TAG().equalsIgnoreCase("P")) { viewHolder.imageview.setVisibility(View.VISIBLE); viewHolder.imageview.setBackgroundResource(R.mipmap.exclamation); - } - else - { + } else { viewHolder.imageview.setVisibility(View.INVISIBLE); } viewHolder.relativelayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - if(current.getGEO_TAG().equalsIgnoreCase("Y")) - { + if (current.getGEO_TAG().equalsIgnoreCase("Y")) { Snackbar.make(v, R.string.title_geo_tag_activity_geo_already_done, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - else if(current.getGEO_TAG().equalsIgnoreCase("D")){ - - Snackbar.make(v, R.string.title_geo_tag_activity_geo_data, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - - } - else if(current.getGEO_TAG().equalsIgnoreCase("U")){ + } else if (current.getGEO_TAG().equalsIgnoreCase("D")) { + Snackbar.make(v, R.string.title_geo_tag_activity_geo_data, Snackbar.LENGTH_LONG).setAction("Action", null).show(); + } else if (current.getGEO_TAG().equalsIgnoreCase("U")) { Snackbar.make(v, R.string.title_geo_tag_activity_upload_data, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - - } - else if(current.getGEO_TAG().equalsIgnoreCase("P")){ - + } else if (current.getGEO_TAG().equalsIgnoreCase("P")) { Snackbar.make(v, R.string.title_geo_tag_activity_geo_data, Snackbar.LENGTH_LONG).setAction("Action", null).show(); - } - else - { + } else { // PUT IN PREFERENCES editor = preferences.edit(); editor.putString(CommonString.KEY_STORE_ID, current.getSTORE_ID()); @@ -224,11 +199,10 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi editor.putString(CommonString.KEY_VISIT_DATE, current.getVISIT_DATE()); editor.commit(); - Intent in =new Intent(GeoTagStoreList.this,GeoTagActivity.class); + Intent in = new Intent(GeoTagStoreList.this, GeoTagActivity.class); startActivity(in); finish(); } - } }); } @@ -238,21 +212,20 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi return data.size(); } - class MyViewHolder extends RecyclerView.ViewHolder{ - - TextView txt; + class MyViewHolder extends RecyclerView.ViewHolder { + TextView txt, txt_storeAddress; ImageView icon; RelativeLayout relativelayout; ImageView imageview; public MyViewHolder(View itemView) { super(itemView); - txt=(TextView) itemView.findViewById(R.id.geolistviewxml_storename); - relativelayout=(RelativeLayout) itemView.findViewById(R.id.relativelayout); - imageview=(ImageView) itemView.findViewById(R.id.imageView1); - + txt = (TextView) itemView.findViewById(R.id.geolistviewxml_storename); + relativelayout = (RelativeLayout) itemView.findViewById(R.id.relativelayout); + imageview = (ImageView) itemView.findViewById(R.id.imageView1); + txt_storeAddress = (TextView) itemView.findViewById(R.id.txt_storeAddress); } - } + } } public List getdata() { @@ -260,17 +233,16 @@ public class GeoTagStoreList extends AppCompatActivity implements View.OnClickLi storelist = db.getStoreData(date); - StoreBean storelistdata=new StoreBean(); + StoreBean storelistdata = new StoreBean(); - for(int i=0;i promoSkuListData; ArrayList promoSpinnerListData; @@ -45,9 +59,17 @@ public class PromoComplianceActivity extends AppCompatActivity { GSKOrangeDB db; String categoryName, categoryId; - 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; private SharedPreferences preferences; + String str = CommonString.FILE_PATH, + path = "", _pathforcheck = "", img = ""; + int child_position = -1; + Uri outputFileUri; + String gallery_package = ""; + String error_msg; + Promo_Compliance_DataGetterSetter cd; + private static boolean updateResources(Context context, String language) { /*String lang; @@ -73,9 +95,9 @@ public class PromoComplianceActivity extends AppCompatActivity { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC; - }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; - }else{ + } else { lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } @@ -115,6 +137,7 @@ public class PromoComplianceActivity extends AppCompatActivity { toggle_add_promoAnnouncer = (ToggleButton) findViewById(R.id.toggle_add_promoAnnouncer); toggle_add_runningPos = (ToggleButton) findViewById(R.id.toggle_add_runningPos); btn_add = (Button) findViewById(R.id.btn_add); + img_addPromotion = (ImageView) findViewById(R.id.img_addPromotion); db = new GSKOrangeDB(this); db.open(); @@ -130,6 +153,7 @@ public class PromoComplianceActivity 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, ""); //Intent data categoryName = getIntent().getStringExtra("categoryName"); @@ -141,7 +165,8 @@ public class PromoComplianceActivity extends AppCompatActivity { additionalPromoListData = new ArrayList<>(); AdditionalPromoListView(); - final Promo_Compliance_DataGetterSetter cd = new Promo_Compliance_DataGetterSetter(); + cd = new Promo_Compliance_DataGetterSetter(); + cd.setStore_id(store_id); cd.setPromo_id(""); cd.setPromo(""); @@ -151,14 +176,34 @@ public class PromoComplianceActivity extends AppCompatActivity { cd.setPromo_announcer("0"); cd.setRunning_pos("0"); cd.setSp_promo("0"); + cd.setImage_promotion(""); + + img_addPromotion.setBackgroundResource(R.mipmap.camera_grey); toggle_add_InStock.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { cd.setIn_stock("1"); + + img_addPromotion.setBackgroundResource(R.mipmap.camera_orange); + + if (camera_allow.equals("1")) { + img_addPromotion.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck = "AddPromo_Image_" + store_id + categoryId + "_" + + visit_date.replace("/", "") + "_" + + getCurrentTime().replace(":", "") + ".jpg"; + path = str + _pathforcheck; + + startCameraActivity(2); + } + }); + } } else { cd.setIn_stock("0"); + img_addPromotion.setBackgroundResource(R.mipmap.camera_grey); } } }); @@ -273,6 +318,7 @@ public class PromoComplianceActivity extends AppCompatActivity { @Override public void onClick(final View view) { + //if (isValid()) { boolean flag = true; if (promoSkuListData.size() <= 0) { if (additionalPromoListData.size() <= 0) { @@ -308,7 +354,10 @@ public class PromoComplianceActivity extends AppCompatActivity { AlertDialog alert = builder.create(); alert.show(); } - + /*} else { + Snackbar.make(view, error_msg, Snackbar.LENGTH_LONG) + .setAction("Action", null).show(); + }*/ } }); @@ -326,6 +375,24 @@ public class PromoComplianceActivity extends AppCompatActivity { } + public boolean isValid() { + boolean flag = true; + + for (int i = 0; i < promoSkuListData.size(); i++) { + + if (promoSkuListData.get(i).getIn_stock().equals("1")) { + if (promoSkuListData.get(i).getImage_promotion().equals("")) { + flag = false; + error_msg = getResources().getString(R.string.click_image); + break; + } + } + + } + + return flag; + } + @Override protected void onResume() { super.onResume(); @@ -355,7 +422,11 @@ public class PromoComplianceActivity extends AppCompatActivity { private void promoSkuListView() { try { - View view; + View view = null; + + if (lin_promo_sku != null) { + lin_promo_sku.removeAllViews(); + } for (int i = 0; i < promoSkuListData.size(); i++) { view = getLayoutInflater().inflate(R.layout.item_promo_sku_list, null, false); @@ -366,17 +437,38 @@ public class PromoComplianceActivity extends AppCompatActivity { ToggleButton toggle_inStock = (ToggleButton) view.findViewById(R.id.toggle_inStock); ToggleButton toggle_promoAnnouncer = (ToggleButton) view.findViewById(R.id.toggle_promoAnnouncer); ToggleButton toggle_runningPos = (ToggleButton) view.findViewById(R.id.toggle_runningPos); + final ImageView img_promotion = (ImageView) view.findViewById(R.id.img_promotion); txt_promoSkuName.setText(data.getPromo()); //In Stock + final int finalI = i; toggle_inStock.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { if (isChecked) { data.setIn_stock("1"); + img_promotion.setBackgroundResource(R.mipmap.camera_orange); + + if (camera_allow.equals("1")) { + img_promotion.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + _pathforcheck = "Promo_Image_" + store_id + categoryId + "_" + data.getSku_id() + + data.getPromo_id() + visit_date.replace("/", "") + "_" + + getCurrentTime().replace(":", "") + ".jpg"; + //child_position = position; + child_position = finalI; + path = str + _pathforcheck; + + startCameraActivity(1); + } + }); + } } else { data.setIn_stock("0"); + img_promotion.setBackgroundResource(R.mipmap.camera_grey); + data.setImage_promotion(""); } } }); @@ -423,6 +515,29 @@ public class PromoComplianceActivity extends AppCompatActivity { toggle_runningPos.setChecked(false); } + + if (!img.equalsIgnoreCase("")) { + if (i == child_position) { + data.setImage_promotion(img); + img = ""; + } + } + + if (camera_allow.equals("1")) { + //Camera + if (data.getIn_stock().equals("1")) { + if (data.getImage_promotion().equals("")) { + img_promotion.setBackgroundResource(R.mipmap.camera_orange); + } else { + img_promotion.setBackgroundResource(R.mipmap.camera_green); + } + } else { + img_promotion.setBackgroundResource(R.mipmap.camera_grey); + } + } else { + img_promotion.setBackgroundResource(R.mipmap.camera_grey); + } + lin_promo_sku.addView(view); } } catch (Exception e) { @@ -449,6 +564,7 @@ public class PromoComplianceActivity extends AppCompatActivity { TextView txt_inStock = (TextView) view.findViewById(R.id.txt_inStock); TextView txt_promoAnnouncer = (TextView) view.findViewById(R.id.txt_promoAnnouncer); TextView txt_runningPos = (TextView) view.findViewById(R.id.txt_runningPos); + ImageView img_add_promotion_view= (ImageView) view.findViewById(R.id.img_add_promotion_view); txt_promoName.setText(data.getPromo()); @@ -473,6 +589,13 @@ public class PromoComplianceActivity extends AppCompatActivity { txt_runningPos.setText(getResources().getString(R.string.no)); } + //Camera Image + if(!data.getImage_promotion().equals("")){ + img_add_promotion_view.setBackgroundResource(R.mipmap.camera_green); + }else{ + img_add_promotion_view.setBackgroundResource(R.mipmap.camera_orange); + } + lin_addtional_promo.addView(view); } } catch (Exception e) { @@ -543,4 +666,121 @@ public class PromoComplianceActivity extends AppCompatActivity { android.app.AlertDialog alert = builder.create(); alert.show(); } + + private void startCameraActivity(int pos) { + try { + + Log.i("Stock & Facing ", "startCameraActivity()"); + File file = new File(path); + outputFileUri = Uri.fromFile(file); + + String defaultCameraPackage = ""; + final PackageManager packageManager = getPackageManager(); + List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); + for (int n = 0; n < list.size(); n++) { + if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) { + //temp value in case camera is gallery app above jellybean + String packag = list.get(n).loadLabel(packageManager).toString(); + if (packag.equalsIgnoreCase("Gallery") || packag.equalsIgnoreCase("Galeri") || packag.equalsIgnoreCase("الاستوديو")) { + gallery_package = list.get(n).packageName; + } + + if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) { + defaultCameraPackage = list.get(n).packageName; + break; + } + } else { + + if (packag.equalsIgnoreCase("Camera") || packag.equalsIgnoreCase("Kamera") || packag.equalsIgnoreCase("الكاميرا")) { + + defaultCameraPackage = list.get(n).packageName; + break; + } + } + } + } + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, pos); + + } catch (ActivityNotFoundException e) { + e.printStackTrace(); + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(gallery_package); + startActivityForResult(intent, pos); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + Log.e("Stock & Facing", "resultCode: " + resultCode + " requestCode: " + requestCode); + + switch (requestCode) { + case 1: + if (resultCode == 0) { + Log.e("Stock & Facing", "User cancelled"); + } else if (resultCode == -1) { + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + img = _pathforcheck; + promoSkuListView(); + //t2PAdapter.notifyDataSetChanged(); + _pathforcheck = ""; + } + } + } + break; + + case 2: + if (resultCode == 0) { + Log.e("Stock & Facing", "User cancelled"); + } else if (resultCode == -1) { + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + //img = _pathforcheck; + cd.setImage_promotion(_pathforcheck); + _pathforcheck = ""; + } + } + } + break; + } + + super.onActivityResult(requestCode, resultCode, data); + } + + private static String arabicToenglish(String number) { + char[] chars = new char[number.length()]; + for (int i = 0; i < number.length(); i++) { + char ch = number.charAt(i); + if (ch >= 0x0660 && ch <= 0x0669) + ch -= 0x0660 - '0'; + else if (ch >= 0x06f0 && ch <= 0x06F9) + ch -= 0x06f0 - '0'; + chars[i] = ch; + } + return new String(chars); + } + + public String getCurrentTime() { + Calendar m_cal = Calendar.getInstance(); + + SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss:mmm"); + String cdate = formatter.format(m_cal.getTime()); + + if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { + cdate = arabicToenglish(cdate); + } else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { + cdate = arabicToenglish(cdate); + } + + return cdate; + } } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java index 2fbd281..16c33d6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Locale; @@ -293,14 +294,14 @@ public class PreviousDataUploadActivity extends AppCompatActivity { db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), date, CommonString.KEY_P); } else { - return CommonString.METHOD_UPLOAD_COVERAGE; + continue; + //return CommonString.METHOD_UPLOAD_COVERAGE; } - mid = Integer.parseInt((words[1])); //MSL_Availability - String mslAvailability_xml = ""; + /*String mslAvailability_xml = ""; onXML = ""; msl_availabilityList = db.getMSL_AvailabilityUploadServerData(coverageList.get(i).getStoreId()); @@ -354,74 +355,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } data.value = 10; data.name = getString(R.string.availability_data_uploading); - publishProgress(data); - - - - //MSL_Availability_StockFacing - String mslAvailability_stockFacing_xml = ""; - onXML = ""; - msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId()); - - if (msl_availabilityStockFacingList.size() > 0) { - for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) { - if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) { - - String stock; - if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) { - stock = msl_availabilityStockFacingList.get(j).getStock(); - } else { - stock = "0"; - } - onXML = "[MSL_AVAILABILITY_STOCK_FACING_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - //+ "[CATEGORY_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getCategory_id()) + "[/CATEGORY_ID]" - //+ "[BRAND_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getBrand_id()) + "[/BRAND_ID]" - + "[SKU_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKU_ID]" - + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]" - + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]" - + "[FACING]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]" - + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" + - "[/MSL_AVAILABILITY_STOCK_FACING_DATA]"; - - mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML; - } - } - - final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]"; - - request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); - request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "MSL_AVAILABILITY_STOCK_FACING_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 = 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 = 15; - data.name = getString(R.string.availability_data_uploading); - publishProgress(data); - + publishProgress(data);*/ //Stock and Facing @@ -429,75 +363,6 @@ public class PreviousDataUploadActivity extends AppCompatActivity { onXML = ""; stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId()); - if (stock_facingHeaderList.size() > 0) { - for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { - String stockChildXML = ""; - - if (!stock_facingHeaderList.get(i1).getCategory_id().equals("0")) { - - stock_facingChildList = db.getStockAndFacingSKUServerUploadData( - stock_facingHeaderList.get(i1).getCategory_id(), stock_facingHeaderList.get(i1).getBrand_id()); - - String onXML1 = ""; - for (int j = 0; j < stock_facingChildList.size(); j++) { - - onXML1 = "[STOCK_FACING_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - + "[CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" - + "[SUB_CATEGORY_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getSub_category_id()) + "[/SUB_CATEGORY_ID]" - + "[BRAND_ID]" + Integer.parseInt(stock_facingHeaderList.get(i1).getBrand_id()) + "[/BRAND_ID]" - + "[IAMGE1]" + stock_facingHeaderList.get(i1).getImage1() + "[/IAMGE1]" - + "[IAMGE2]" + stock_facingHeaderList.get(i1).getImage2() + "[/IAMGE2]" - + "[SKU_ID]" + Integer.parseInt(stock_facingChildList.get(j).getSku_id()) + "[/SKU_ID]" - //+ "[SKU]" + stock_facingChildList.get(j).getSku() + "[/SKU]" - + "[STOCK]" + Integer.parseInt(stock_facingChildList.get(j).getStock()) + "[/STOCK]" - + "[FACEUP]" + Integer.parseInt(stock_facingChildList.get(j).getFacing()) + "[/FACEUP]" - + "[/STOCK_FACING_DATA]"; - - stockChildXML = stockChildXML + onXML1; - } - } - stock_facing_xml = stock_facing_xml + stockChildXML; - } - - final String sos_xml = "[DATA]" + stock_facing_xml + "[/DATA]"; - - request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); - request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STOCK_FACING_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 = 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 = 20; - data.name = "Stock Facing Uploading"; - publishProgress(data);*/ - - String stock_facing_xml = ""; - onXML = ""; - stock_facingHeaderList = db.getStockAndFacingHeaderServerUploadData(coverageList.get(i).getStoreId()); - if (stock_facingHeaderList.size() > 0) { for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { @@ -546,39 +411,44 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } data.value = 20; data.name = getString(R.string.stock_data_uploading); - publishProgress(data); + publishProgress(data);*/ - //Promo Compliance - Promotion Data - String promoition_data_xml = ""; + //MSL_Availability_StockFacing + String mslAvailability_stockFacing_xml = ""; onXML = ""; - promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId()); + msl_availabilityStockFacingList = db.getMSL_Availability_StockFacing_UploadServerData(coverageList.get(i).getStoreId()); - if (promotionSkuList.size() > 0) { - for (int i1 = 0; i1 < promotionSkuList.size(); i1++) { - if (!promotionSkuList.get(i1).getCategory_id().equals("0")) { + if (msl_availabilityStockFacingList.size() > 0) { + for (int j = 0; j < msl_availabilityStockFacingList.size(); j++) { + if (!msl_availabilityStockFacingList.get(j).getSku_id().equals("0")) { - onXML = "[PROMOTION_DATA]" + String stock; + if (!msl_availabilityStockFacingList.get(j).getStock().equals("")) { + stock = msl_availabilityStockFacingList.get(j).getStock(); + } else { + stock = "0"; + } + onXML = "[MSL_AVAILABILITY_STOCK_FACING_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" - + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" - + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]" - //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]" - + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]" - + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]" - + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]" - + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]" - + "[/PROMOTION_DATA]"; + + "[SKU_ID]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getSku_id()) + "[/SKU_ID]" + + "[MBQ]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMbq()) + "[/MBQ]" + + "[AVAILABILITY]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getToggleValue()) + "[/AVAILABILITY]" + + "[FACING]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getFacing()) + "[/FACING]" + + "[STOCK]" + Integer.parseInt(stock) + "[/STOCK]" + + "[MUST_HAVE]" + Integer.parseInt(msl_availabilityStockFacingList.get(j).getMust_have()) + "[/MUST_HAVE]" + + "[/MSL_AVAILABILITY_STOCK_FACING_DATA_NEW]"; - promoition_data_xml = promoition_data_xml + onXML; + mslAvailability_stockFacing_xml = mslAvailability_stockFacing_xml + onXML; } } - final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]"; + final String sos_xml = "[DATA]" + mslAvailability_stockFacing_xml + "[/DATA]"; request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "PROMOTION_DATA"); + request.addProperty("KEYS", "MSL_AVAILABILITY_STOCK_FACING_DATA_NEW"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -591,17 +461,61 @@ public class PreviousDataUploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; + }*/ + } + data.value = 15; + data.name = getString(R.string.availability_data_uploading); + publishProgress(data); + + + //Promo Compliance - Promotion Data + String promoition_data_xml = ""; + onXML = ""; + promotionSkuList = db.getPromoComplianceSkuServerUploadData(coverageList.get(i).getStoreId()); + + if (promotionSkuList.size() > 0) { + for (int i1 = 0; i1 < promotionSkuList.size(); i1++) { + if (!promotionSkuList.get(i1).getCategory_id().equals("0")) { + + onXML = "[PROMOTION_DATA_NEW]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + + "[PROMO_ID]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_id()) + "[/PROMO_ID]" + //+ "[SKU]" + promotionSkuList.get(i1).getSku() + "[/SKU]" + + "[SKU_ID]" + Integer.parseInt(promotionSkuList.get(i1).getSku_id()) + "[/SKU_ID]" + + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]" + + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]" + + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]" + + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]" + + "[/PROMOTION_DATA_NEW]"; + + promoition_data_xml = promoition_data_xml + onXML; + } } - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + final String sos_xml = "[DATA]" + promoition_data_xml + "[/DATA]"; - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "PROMOTION_DATA_NEW"); + 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 = envelope.getResponse(); + + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return CommonString.METHOD_UPLOAD_STOCK_XML_DATA; - } + }*/ } data.value = 30; data.name = getString(R.string.promo_data_uploading); @@ -617,7 +531,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) { if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) { - onXML = "[ADDITIONAL_PROMOTION_DATA]" + onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" @@ -627,7 +541,8 @@ public class PreviousDataUploadActivity extends AppCompatActivity { + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]" + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]" + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]" - + "[/ADDITIONAL_PROMOTION_DATA]"; + + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]" + + "[/ADDITIONAL_PROMOTION_DATA_NEW]"; additional_promoition_data_xml = additional_promoition_data_xml + onXML; } @@ -637,7 +552,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA"); + request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA_NEW"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -650,139 +565,86 @@ public class PreviousDataUploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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 = getString(R.string.additional_data_uploading); publishProgress(data); - ////ashish open - //Additional Visibility Data String additional_visibility_data_xml = ""; String additional_visibility_dialog_xml = ""; onXML = ""; String onXMLdIALOG = ""; - - String imageV1,imageV2,imageV3; + String imageV1, imageV2, imageV3; additionalVisibilityList = db.getAdditionalStockUpload(coverageList.get(i).getStoreId()); if (additionalVisibilityList.size() > 0) { for (int J = 0; J < additionalVisibilityList.size(); J++) { - if(additionalVisibilityList.get(J).getImage()==null) - { - imageV1=""; - } - else{ - imageV1=additionalVisibilityList.get(J).getImage(); + if (additionalVisibilityList.get(J).getImage() == null) { + imageV1 = ""; + } else { + imageV1 = additionalVisibilityList.get(J).getImage(); } - if(additionalVisibilityList.get(J).getImage2()==null) - { - imageV2=""; - } - else{ - imageV2=additionalVisibilityList.get(J).getImage2(); + if (additionalVisibilityList.get(J).getImage2() == null) { + imageV2 = ""; + } else { + imageV2 = additionalVisibilityList.get(J).getImage2(); } - if(additionalVisibilityList.get(J).getImage3()==null) - { - imageV3=""; + if (additionalVisibilityList.get(J).getImage3() == null) { + imageV3 = ""; + } else { + imageV3 = additionalVisibilityList.get(J).getImage3(); } - else{ - imageV3=additionalVisibilityList.get(J).getImage3(); - } - - - - String KeyID = additionalVisibilityList.get(J).getKey_id(); additionalVisibilitySkuList = db.getDialogStockUpload(KeyID); + //additionalVisibilitySkuList = additionalVisibilityList.get(J).getSkuDialogList(); if (additionalVisibilitySkuList.size() > 0) { - for (int k = 0; k < additionalVisibilitySkuList.size(); k++) { onXMLdIALOG = "[VISIBILITY_DAILOG]" + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + additionalVisibilitySkuList.get(k).getCOMMON_ID() - + "[/KEY_ID]" - + "[CATEGORY_ID]" - + additionalVisibilitySkuList.get(k).getCategoryId() - + "[/CATEGORY_ID]" - + "[SKU_ID]" - + additionalVisibilitySkuList.get(k).getSku_id() - + "[/SKU_ID]" - + "[QUANTITY]" - + additionalVisibilitySkuList.get(k).getQuantity() - + "[/QUANTITY]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[KEY_ID]" + additionalVisibilitySkuList.get(k).getCOMMON_ID() + "[/KEY_ID]" + + "[CATEGORY_ID]" + additionalVisibilitySkuList.get(k).getCategoryId() + "[/CATEGORY_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_NEW]" + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + additionalVisibilityList.get(J).getKey_id() - + "[/KEY_ID]" - + "[CATEGORY_ID]" - + additionalVisibilityList.get(J).getCategoryId() - + "[/CATEGORY_ID]" - + "[ADDITIONAL_DISPLAY]" - + additionalVisibilityList.get(J).getBtn_toogle() - + "[/ADDITIONAL_DISPLAY]" - /* + "[BRAND_ID]" - + additionalVisibilityList.get(J).getBrand_id() - + "[/BRAND_ID]"*/ - + "[IMAGE_URL]" - + imageV1 /*additionalVisibilityList.get(J).getImage()*/ - + "[/IMAGE_URL]" - + "[IMAGE_URL1]" - + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ - + "[/IMAGE_URL1]" - + "[IMAGE_URL2]" - + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ - + "[/IMAGE_URL2]" - + "[DISPLAY_ID]" - + additionalVisibilityList.get(J).getSku_id() - + "[/DISPLAY_ID]" - + "[SKU_LIST]" - + additional_visibility_dialog_xml - + "[/SKU_LIST]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[KEY_ID]" + additionalVisibilityList.get(J).getKey_id() + "[/KEY_ID]" + + "[CATEGORY_ID]" + additionalVisibilityList.get(J).getCategoryId() + "[/CATEGORY_ID]" + + "[ADDITIONAL_DISPLAY]" + additionalVisibilityList.get(J).getBtn_toogle() + "[/ADDITIONAL_DISPLAY]" + //+ "[BRAND_ID]"+ additionalVisibilityList.get(J).getBrand_id()+ "[/BRAND_ID]" + + "[IMAGE_URL]" + imageV1 /*additionalVisibilityList.get(J).getImage()*/ + "[/IMAGE_URL]" + + "[IMAGE_URL1]" + imageV2 /*additionalVisibilityList.get(J).getImage2()*/ + "[/IMAGE_URL1]" + + "[IMAGE_URL2]" + imageV3 /*additionalVisibilityList.get(J).getImage3()*/ + "[/IMAGE_URL2]" + + "[DISPLAY_ID]" + additionalVisibilityList.get(J).getSku_id() + "[/DISPLAY_ID]" + + "[SKU_LIST]" + additional_visibility_dialog_xml + "[/SKU_LIST]" + "[/ADDITIONAL_VISIBILITY_NEW]"; - + //Here getSku_id gives display_id additional_visibility_data_xml = additional_visibility_data_xml + onXML; KeyID = ""; additionalVisibilitySkuList.clear(); additional_visibility_dialog_xml = ""; - } final String sos_xml = "[DATA]" + additional_visibility_data_xml + "[/DATA]"; @@ -802,27 +664,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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.value = 45; data.name = getString(R.string.additional_data_uploading); publishProgress(data); - /////ashish close //T2p Upload Data - String t2p_data_xml = ""; onXML = ""; t2PGetterSetters = db.getT2pComplianceData(coverageList.get(i).getStoreId(), null); @@ -830,21 +681,19 @@ public class PreviousDataUploadActivity extends AppCompatActivity { if (t2PGetterSetters.size() > 0) { for (int i1 = 0; i1 < t2PGetterSetters.size(); i1++) { - ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i).getKey_id()); - ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i).getKey_id()); - ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i).getKey_id()); + ArrayList gapsList = db.getGapsData(t2PGetterSetters.get(i1).getKey_id()); + ArrayList skuList = db.getT2PSKUData(t2PGetterSetters.get(i1).getKey_id()); + ArrayList brandList = db.getT2BrandData(t2PGetterSetters.get(i1).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]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" @@ -860,7 +709,6 @@ public class PreviousDataUploadActivity extends AppCompatActivity { String sku_child; for (int k = 0; k < skuList.size(); k++) { - sku_child = "[SKU]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" @@ -879,17 +727,17 @@ public class PreviousDataUploadActivity extends AppCompatActivity { if (brandList.size() > 0) { for (int M = 0; M < brandList.size(); M++) { - brandchild = "[BRAND]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[BRAND_ID]" + brandList.get(M).getBRAND_ID() + "[/BRAND_ID]" - /* + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]"*/ + // + "[BRAND]" + brandList.get(M).getBRAND() + "[/BRAND]" + "[COMMON_ID]" + Integer.parseInt(t2PGetterSetters.get(i1).getKey_id()) + "[/COMMON_ID]" + "[/BRAND]"; brandxml = brandxml + brandchild; } } + String present = ""; if (t2PGetterSetters.get(i1).isPresent()) { present = "1"; @@ -911,11 +759,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { + "[GAPS_DATA]" + gaps_xml + "[/GAPS_DATA]" + "[SKU_DATA]" + sku_xml + "[/SKU_DATA]" + "[BRAND_DATA]" + brandxml + "[/BRAND_DATA]" - + "[/T2P_DATA]"; t2p_data_xml = t2p_data_xml + onXML; - } final String t2p_final_xml = "[DATA]" + t2p_data_xml + "[/DATA]"; @@ -935,20 +781,11 @@ public class PreviousDataUploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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.value = 50; data.name = getString(R.string.t2p_data_uploading); publishProgress(data); @@ -994,338 +831,84 @@ public class PreviousDataUploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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 = 50; + data.value = 55; data.name = getString(R.string.stock_planogram_data_uploading); publishProgress(data); - //Store Wise Camera - /*String store_wise_camera_xml = ""; - onXML = ""; - storeWiseCameraDataGetterSetters = db.getStoreWiseCameraServerUploadData(coverageList.get(i).getStoreId()); - - if (storeWiseCameraDataGetterSetters.size() > 0) { - - for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { - onXML = "[STORE_WISE_CAMERA_DATA]" - + "[MID]" + mid + "[/MID]" - + "[USER_ID]" + userId + "[/USER_ID]" - + "[CAMERA1]" + storeWiseCameraDataGetterSetters.get(i).getCamera1() + "[/CAMERA1]" - + "[CAMERA2]" + storeWiseCameraDataGetterSetters.get(i).getCamera2() + "[/CAMERA2]" - + "[CAMERA3]" + storeWiseCameraDataGetterSetters.get(i).getCamera3() + "[/CAMERA3]" - + "[CAMERA4]" + storeWiseCameraDataGetterSetters.get(i).getCamera4() + "[/CAMERA4]" - + "[/STORE_WISE_CAMERA_DATA]"; - - store_wise_camera_xml = store_wise_camera_xml + onXML; - } - - final String sos_xml = "[DATA]" + store_wise_camera_xml + "[/DATA]"; - - request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); - request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "STORE_WISE_CAMERA_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 = 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 = 55; - data.name = getString(R.string.stock_planogram_data_uploading); - publishProgress(data);*/ - - - //Image Upload - - //Store Wise Camera Images Upload - /*if (storeWiseCameraDataGetterSetters.size() > 0) { - for (int i1 = 0; i1 < storeWiseCameraDataGetterSetters.size(); i1++) { - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera1() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera1().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera1()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera1(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera2() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera2().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera2()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera2(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera3() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera3().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera3()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera3(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (storeWiseCameraDataGetterSetters.get(i1).getCamera4() != null && !storeWiseCameraDataGetterSetters.get(i1).getCamera4().equals("")) { - if (new File(CommonString.FILE_PATH + storeWiseCameraDataGetterSetters.get(i1).getCamera4()).exists()) { - - try { - result = UploadImage(storeWiseCameraDataGetterSetters.get(i1).getCamera4(), "StockCameraImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockCameraImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - }*/ - - //Stock Facing Images Upload - /*if (stock_facingHeaderList.size() > 0) { - for (int i1 = 0; i1 < stock_facingHeaderList.size(); i1++) { - - if (stock_facingHeaderList.get(i1).getImage1() != null && !stock_facingHeaderList.get(i1).getImage1().equals("")) { - if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage1()).exists()) { - - try { - result = UploadImage(stock_facingHeaderList.get(i1).getImage1(), "StockImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - - if (stock_facingHeaderList.get(i1).getImage2() != null && !stock_facingHeaderList.get(i1).getImage2().equals("")) { - if (new File(CommonString.FILE_PATH + stock_facingHeaderList.get(i1).getImage2()).exists()) { - - try { - result = UploadImage(stock_facingHeaderList.get(i1).getImage2(), "StockImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "StockImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("StockFacing Images Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } - }*/ - - - //Category Picture Data String Category_xml = ""; - onXML = ""; String onCategoryList = ""; String CategoryLISTDATA = ""; - String image1,image2,image3,image4; - + String image1, image2, image3, image4; adddata = db.getCategoryPictureUpload(coverageList.get(i).getStoreId()); if (adddata.size() > 0) { for (int J = 0; J < adddata.size(); J++) { - - - if(adddata.get(J).getCategoryImage1()==null) - { - image1=""; - } - else{ - image1=adddata.get(J).getCategoryImage1(); + if (adddata.get(J).getCategoryImage1() == null) { + image1 = ""; + } else { + image1 = adddata.get(J).getCategoryImage1(); } - if(adddata.get(J).getCategoryImage2()==null) - { - image2=""; - } - else{ - image2=adddata.get(J).getCategoryImage2(); + if (adddata.get(J).getCategoryImage2() == null) { + image2 = ""; + } else { + image2 = adddata.get(J).getCategoryImage2(); } - if(adddata.get(J).getCategoryImage3()==null) - { - image3=""; - } - else{ - image3=adddata.get(J).getCategoryImage3(); + if (adddata.get(J).getCategoryImage3() == null) { + image3 = ""; + } else { + image3 = adddata.get(J).getCategoryImage3(); } - if(adddata.get(J).getCategoryImage4()==null) - { - image4=""; + if (adddata.get(J).getCategoryImage4() == null) { + image4 = ""; + } else { + image4 = adddata.get(J).getCategoryImage4(); } - else{ - image4=adddata.get(J).getCategoryImage4(); - } - - String KeyID = adddata.get(J).getKEY_ID(); - - listdat = db.getCategoryPictureListUploaded(KeyID); if (listdat.size() > 0) { - for (int k = 0; k < listdat.size(); k++) { - onCategoryList = "[SUB_CATEGORY_LIST]" + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + listdat.get(k).getCOMMON_ID() - + "[/KEY_ID]" - + "[SUB_CATEGORY_ID]" - + listdat.get(k).getSUB_CATEGORY_ID() - + "[/SUB_CATEGORY_ID]" - + "[SUB_CategoryImage1]" - + listdat.get(k).getSubCategoryCamera1() - + "[/SUB_CategoryImage1]" - + "[SUB_CategoryImage2]" - + listdat.get(k).getSubCategoryCamera2() - + "[/SUB_CategoryImage2]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[KEY_ID]" + listdat.get(k).getCOMMON_ID() + "[/KEY_ID]" + + "[SUB_CATEGORY_ID]" + listdat.get(k).getSUB_CATEGORY_ID() + "[/SUB_CATEGORY_ID]" + + "[SUB_CategoryImage1]" + listdat.get(k).getSubCategoryCamera1() + "[/SUB_CategoryImage1]" + + "[SUB_CategoryImage2]" + listdat.get(k).getSubCategoryCamera2() + "[/SUB_CategoryImage2]" + "[/SUB_CATEGORY_LIST]"; CategoryLISTDATA = CategoryLISTDATA + onCategoryList; - } } onXML = "[CATEGORY_LIST]" + "[MID]" + mid + "[/MID]" - + "[USER_ID]" - + userId - + "[/USER_ID]" - + "[KEY_ID]" - + adddata.get(J).getKEY_ID() - + "[/KEY_ID]" - + "[CATEGORY_ID]" - + adddata.get(J).getCategoryId() - + "[/CATEGORY_ID]" - + "[CAMERA_ALLOW]" - + adddata.get(J).getCamera_allow() - + "[/CAMERA_ALLOW]" - - + "[IMAGE_URL_1]" - + image1 /*adddata.get(J).getCategoryImage1()*/ - + "[/IMAGE_URL_1]" - + "[IMAGE_URL_2]" - + image2 /*adddata.get(J).getCategoryImage2()*/ - + "[/IMAGE_URL_2]" - + "[IMAGE_URL_3]" - + image3 /*adddata.get(J).getCategoryImage3()*/ - + "[/IMAGE_URL_3]" - + "[IMAGE_URL_4]" - + image4 /*adddata.get(J).getCategoryImage4()*/ - + "[/IMAGE_URL_4]" - + "[SUB_LIST]" - + CategoryLISTDATA - + "[/SUB_LIST]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[KEY_ID]" + adddata.get(J).getKEY_ID() + "[/KEY_ID]" + + "[CATEGORY_ID]" + adddata.get(J).getCategoryId() + "[/CATEGORY_ID]" + + "[CAMERA_ALLOW]" + adddata.get(J).getCamera_allow() + "[/CAMERA_ALLOW]" + + "[IMAGE_URL_1]" + image1 /*adddata.get(J).getCategoryImage1()*/ + "[/IMAGE_URL_1]" + + "[IMAGE_URL_2]" + image2 /*adddata.get(J).getCategoryImage2()*/ + "[/IMAGE_URL_2]" + + "[IMAGE_URL_3]" + image3 /*adddata.get(J).getCategoryImage3()*/ + "[/IMAGE_URL_3]" + + "[IMAGE_URL_4]" + image4 /*adddata.get(J).getCategoryImage4()*/ + "[/IMAGE_URL_4]" + + "[SUB_LIST]" + CategoryLISTDATA + "[/SUB_LIST]" + "[/CATEGORY_LIST]"; - Category_xml = Category_xml + onXML; - CategoryLISTDATA = ""; - } final String sos_xml = "[DATA]" + Category_xml + "[/DATA]"; @@ -1345,24 +928,16 @@ public class PreviousDataUploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*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.value = 60; data.name = getString(R.string.additional_data_uploading); publishProgress(data); + // Images Upload // ashish visibility image start if (additionalVisibilityList.size() > 0) { @@ -1373,10 +948,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1394,10 +968,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage2(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1416,10 +989,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(additionalVisibilityList.get(i1).getImage3(), "AdditionalVisibilityImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "AdditionalVisibilityImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1434,61 +1006,68 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } - - - //// ashish close image - + data.value = 60; + publishProgress(data); + // ashish close image // ashish SUB_CATEGORY_PICTURE start - if (listdat.size() > 0) { - for (int i1 = 0; i1 < listdat.size(); i1++) { + if (adddata.size() > 0) { + for (int J = 0; J < adddata.size(); J++) { - if (listdat.get(i1).getSubCategoryCamera1() != null && !listdat.get(i1).getSubCategoryCamera1().equals("")) { - if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera1()).exists()) { + String KeyID = adddata.get(J).getKEY_ID(); - try { - result = UploadImage(listdat.get(i1).getSubCategoryCamera1(), "CategoryImages"); + listdat = db.getCategoryPictureListUploaded(KeyID); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "CategoryImages"; - } + if (listdat.size() > 0) { + for (int i1 = 0; i1 < listdat.size(); i1++) { - runOnUiThread(new Runnable() { - public void run() { - message.setText("CategoryImages Uploaded"); + if (listdat.get(i1).getSubCategoryCamera1() != null && !listdat.get(i1).getSubCategoryCamera1().equals("")) { + if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera1()).exists()) { + + try { + result = UploadImage(listdat.get(i1).getSubCategoryCamera1(), "CategoryImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "CategoryImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("CategoryImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); } - }); - } catch (Exception e) { - e.printStackTrace(); + } } + + if (listdat.get(i1).getSubCategoryCamera2() != null && !listdat.get(i1).getSubCategoryCamera2().equals("")) { + if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera2()).exists()) { + + try { + result = UploadImage(listdat.get(i1).getSubCategoryCamera2(), "CategoryImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "CategoryImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("CategoryImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } } - - if (listdat.get(i1).getSubCategoryCamera2() != null && !listdat.get(i1).getSubCategoryCamera2().equals("")) { - if (new File(CommonString.FILE_PATH + listdat.get(i1).getSubCategoryCamera2()).exists()) { - - try { - result = UploadImage(listdat.get(i1).getSubCategoryCamera2(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return "CategoryImages"; - } - - runOnUiThread(new Runnable() { - public void run() { - message.setText("CategoryImages Uploaded"); - } - }); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - } } - + data.value = 70; + publishProgress(data); // ashish CATEGORY_PICTURE start @@ -1500,10 +1079,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage1(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1521,10 +1099,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage2(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1542,10 +1119,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage3(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1562,10 +1138,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(adddata.get(i1).getCategoryImage4(), "CategoryImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "CategoryImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1580,11 +1155,10 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } + data.value = 75; + publishProgress(data); - - - ///////Start store images - + //Start store images if (coverageList.size() > 0) { for (int i1 = 0; i1 < coverageList.size(); i1++) { @@ -1593,10 +1167,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(coverageList.get(i1).getImage(), "StoreImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "StoreImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1610,8 +1183,67 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } } + data.value = 80; + publishProgress(data); + //PromoCompliance Image + if (promotionSkuList.size() > 0) { + for (int i1 = 0; i1 < promotionSkuList.size(); i1++) { + + if (promotionSkuList.get(i1).getImage_promotion() != null && !promotionSkuList.get(i1).getImage_promotion().equals("")) { + if (new File(CommonString.FILE_PATH + promotionSkuList.get(i1).getImage_promotion()).exists()) { + + try { + result = UploadImage(promotionSkuList.get(i1).getImage_promotion(), "PromotionImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StoreImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("PromotionImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + data.value = 85; + publishProgress(data); + + + //Additional PromoCompliance Image + if (additionalPromotionList.size() > 0) { + for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) { + + if (additionalPromotionList.get(i1).getImage_promotion() != null && !additionalPromotionList.get(i1).getImage_promotion().equals("")) { + if (new File(CommonString.FILE_PATH + additionalPromotionList.get(i1).getImage_promotion()).exists()) { + + try { + result = UploadImage(additionalPromotionList.get(i1).getImage_promotion(), "AdditionalPromotionImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StoreImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("AdditionalPromotionImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + data.value = 88; + publishProgress(data); + //CheckOut Store Image if (coverageList.size() > 0) { for (int i1 = 0; i1 < coverageList.size(); i1++) { @@ -1621,10 +1253,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(coverageList.get(i1).getCheckOut_Image(), "StoreImages"); - - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "StoreImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1638,9 +1269,11 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } } + data.value = 85; + publishProgress(data); + //T2p Images - for (int m = 0; m < t2PGetterSetters.size(); m++) { if (t2PGetterSetters.get(m).getImage() != null && !t2PGetterSetters.get(m).getImage().equals("")) { @@ -1648,9 +1281,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1668,9 +1301,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage1(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1688,9 +1321,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { try { result = UploadImage(t2PGetterSetters.get(m).getImage2(), "T2PImages"); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { return "T2PImages"; - } + }*/ runOnUiThread(new Runnable() { public void run() { @@ -1702,8 +1335,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } } } - } + data.value = 90; + publishProgress(data); // SET COVERAGE STATUS @@ -1732,32 +1366,35 @@ public class PreviousDataUploadActivity extends AppCompatActivity { result = envelope.getResponse(); - if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } - if (result.toString().equalsIgnoreCase(CommonString.KEY_NO_DATA)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } - if (result.toString().equalsIgnoreCase(CommonString.KEY_FAILURE)) { - return CommonString.METHOD_UPLOAD_COVERAGE_STATUS; - } + //If Result is success then status of that store is update + if (result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + k = k + factor; + data.value = k; + data.name = "Uploading"; + publishProgress(data); - k = k + factor; - data.value = k; - data.name = "Uploading"; + db.open(); + db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U); + db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) + .getVisitDate(), CommonString.KEY_U); + + db.deleteTableWithStoreID(coverageList.get(i).getStoreId()); + } + data.value = 100; publishProgress(data); - - db.open(); - db.updateCoverageStatus(coverageList.get(i).getStoreId(), CommonString.KEY_U); - db.updateStoreStatusOnLeave(coverageList.get(i).getStoreId(), coverageList.get(i) - .getVisitDate(), CommonString.KEY_U); } } } + return result.toString(); + + } catch (MalformedURLException e) { + e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } catch (XmlPullParserException e) { e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); } return ""; @@ -1767,12 +1404,19 @@ public class PreviousDataUploadActivity extends AppCompatActivity { protected void onPostExecute(String result) { super.onPostExecute(result); - dialog.dismiss(); + /*dialog.dismiss(); db.deleteAllTables(); if (result.equals("")) { - showAlert(getString(R.string.menu_upload_data)); + }*/ + dialog.dismiss(); + if (result.contains(CommonString.KEY_SUCCESS)) { + //db.deleteAllTables(); + showAlert(getString(R.string.menu_upload_data)); + //showAlert(getString(R.string.menu_upload_data)); + } else { + showAlert(getString(R.string.error) + result.toString()); } } } @@ -1808,9 +1452,9 @@ public class PreviousDataUploadActivity extends AppCompatActivity { } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC; - }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { + } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { lang = CommonString.KEY_RETURE_LANGUAGE_OMAN; - }else{ + } else { lang = CommonString.KEY_RETURN_LANGUAGE_DEFAULT; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java index f6aef51..deb4da1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -481,7 +481,7 @@ public class UploadActivity extends AppCompatActivity { for (int i1 = 0; i1 < promotionSkuList.size(); i1++) { if (!promotionSkuList.get(i1).getCategory_id().equals("0")) { - onXML = "[PROMOTION_DATA]" + onXML = "[PROMOTION_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(promotionSkuList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" @@ -491,7 +491,8 @@ public class UploadActivity extends AppCompatActivity { + "[IN_STOCK]" + Integer.parseInt(promotionSkuList.get(i1).getIn_stock()) + "[/IN_STOCK]" + "[PROMO_ANNOUNCER]" + Integer.parseInt(promotionSkuList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]" + "[RUNNING_POS]" + Integer.parseInt(promotionSkuList.get(i1).getRunning_pos()) + "[/RUNNING_POS]" - + "[/PROMOTION_DATA]"; + + "[PROMO_IMAGE]" + promotionSkuList.get(i1).getImage_promotion() + "[/PROMO_IMAGE]" + + "[/PROMOTION_DATA_NEW]"; promoition_data_xml = promoition_data_xml + onXML; } @@ -501,7 +502,7 @@ public class UploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "PROMOTION_DATA"); + request.addProperty("KEYS", "PROMOTION_DATA_NEW"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -532,7 +533,7 @@ public class UploadActivity extends AppCompatActivity { for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) { if (!additionalPromotionList.get(i1).getCategory_id().equals("0")) { - onXML = "[ADDITIONAL_PROMOTION_DATA]" + onXML = "[ADDITIONAL_PROMOTION_DATA_NEW]" + "[MID]" + mid + "[/MID]" + "[USER_ID]" + userId + "[/USER_ID]" + "[CATEGORY_ID]" + Integer.parseInt(additionalPromotionList.get(i1).getCategory_id()) + "[/CATEGORY_ID]" @@ -542,7 +543,8 @@ public class UploadActivity extends AppCompatActivity { + "[IN_STOCK]" + Integer.parseInt(additionalPromotionList.get(i1).getIn_stock()) + "[/IN_STOCK]" + "[PROMO_ANNOUNCER]" + Integer.parseInt(additionalPromotionList.get(i1).getPromo_announcer()) + "[/PROMO_ANNOUNCER]" + "[RUNNING_POS]" + Integer.parseInt(additionalPromotionList.get(i1).getRunning_pos()) + "[/RUNNING_POS]" - + "[/ADDITIONAL_PROMOTION_DATA]"; + + "[ADD_PROMO_IMAGE]" + additionalPromotionList.get(i1).getImage_promotion() + "[/ADD_PROMO_IMAGE]" + + "[/ADDITIONAL_PROMOTION_DATA_NEW]"; additional_promoition_data_xml = additional_promoition_data_xml + onXML; } @@ -552,7 +554,7 @@ public class UploadActivity extends AppCompatActivity { request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); request.addProperty("XMLDATA", sos_xml); - request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA"); + request.addProperty("KEYS", "ADDITIONAL_PROMOTION_DATA_NEW"); request.addProperty("USERNAME", userId); request.addProperty("MID", mid); @@ -1158,6 +1160,94 @@ public class UploadActivity extends AppCompatActivity { data.value = 75; publishProgress(data); + + if (adddata.size() > 0) { + for (int i1 = 0; i1 < adddata.size(); i1++) { + + if (adddata.get(i1).getCategoryImage1() != null && !adddata.get(i1).getCategoryImage1().equals("")) { + if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage1()).exists()) { + + try { + result = UploadImage(adddata.get(i1).getCategoryImage1(), "CategoryImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "CategoryImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("CategoryImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (adddata.get(i1).getCategoryImage2() != null && !adddata.get(i1).getCategoryImage2().equals("")) { + if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage2()).exists()) { + + try { + result = UploadImage(adddata.get(i1).getCategoryImage2(), "CategoryImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "CategoryImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("CategoryImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + if (adddata.get(i1).getCategoryImage3() != null && !adddata.get(i1).getCategoryImage3().equals("")) { + if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage3()).exists()) { + + try { + result = UploadImage(adddata.get(i1).getCategoryImage3(), "CategoryImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "CategoryImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("CategoryImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + if (adddata.get(i1).getCategoryImage4() != null && !adddata.get(i1).getCategoryImage4().equals("")) { + if (new File(CommonString.FILE_PATH + adddata.get(i1).getCategoryImage4()).exists()) { + + try { + result = UploadImage(adddata.get(i1).getCategoryImage4(), "CategoryImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "CategoryImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("CategoryImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + } + } + data.value = 75; + publishProgress(data); + //Start store images if (coverageList.size() > 0) { for (int i1 = 0; i1 < coverageList.size(); i1++) { @@ -1187,6 +1277,64 @@ public class UploadActivity extends AppCompatActivity { publishProgress(data); + //PromoCompliance Image + if (promotionSkuList.size() > 0) { + for (int i1 = 0; i1 < promotionSkuList.size(); i1++) { + + if (promotionSkuList.get(i1).getImage_promotion() != null && !promotionSkuList.get(i1).getImage_promotion().equals("")) { + if (new File(CommonString.FILE_PATH + promotionSkuList.get(i1).getImage_promotion()).exists()) { + + try { + result = UploadImage(promotionSkuList.get(i1).getImage_promotion(), "PromotionImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StoreImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("PromotionImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + data.value = 85; + publishProgress(data); + + + //Additional PromoCompliance Image + if (additionalPromotionList.size() > 0) { + for (int i1 = 0; i1 < additionalPromotionList.size(); i1++) { + + if (additionalPromotionList.get(i1).getImage_promotion() != null && !additionalPromotionList.get(i1).getImage_promotion().equals("")) { + if (new File(CommonString.FILE_PATH + additionalPromotionList.get(i1).getImage_promotion()).exists()) { + + try { + result = UploadImage(additionalPromotionList.get(i1).getImage_promotion(), "AdditionalPromotionImages"); + /*if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { + return "StoreImages"; + }*/ + + runOnUiThread(new Runnable() { + public void run() { + message.setText("AdditionalPromotionImages Uploaded"); + } + }); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + } + } + data.value = 88; + publishProgress(data); + + //CheckOut Store Image if (coverageList.size() > 0) { for (int i1 = 0; i1 < coverageList.size(); i1++) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java index b219547..11640d7 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/Promo_Compliance_DataGetterSetter.java @@ -7,7 +7,8 @@ import java.util.ArrayList; */ public class Promo_Compliance_DataGetterSetter { - String store_id, sku_id, sku, promo_id, promo, in_stock, promo_announcer, running_pos, sp_promo, category_id; + String store_id, sku_id, sku, promo_id, promo, in_stock, promo_announcer, + running_pos, sp_promo, category_id,image_promotion; public String getStore_id() { return store_id; @@ -88,4 +89,12 @@ public class Promo_Compliance_DataGetterSetter { public void setCategory_id(String category_id) { this.category_id = category_id; } + + public String getImage_promotion() { + return image_promotion; + } + + public void setImage_promotion(String image_promotion) { + this.image_promotion = image_promotion; + } } diff --git a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml index 3a1c281..03e9720 100644 --- a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml @@ -90,16 +90,39 @@ + android:orientation="horizontal" + android:weightSum="2"> -