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/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 77a914a..937cda1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -82,6 +82,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.execSQL(TableBean.getMappingAdditionalPromotion()); db.execSQL(TableBean.getMappingPromotion()); db.execSQL(CommonString.CREATE_TABLE_INSERT_MSL_AVAILABILITY); + db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_ADDITIONAL_VISIBILITY); db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_HEADER); db.execSQL(CommonString.CREATE_TABLE_INSERT_STOCK_FACING_CHILD); db.execSQL(CommonString.CREATE_TABLE_STOCK_DIALOG); @@ -141,7 +142,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { values.put("CAMERA_ALLOW", data.getCAMERA_ALLOW().get(i)); values.put("GEO_TAG", data.getGEO_TAG().get(i)); - + values.put("CHANNEL_ID", data.getCHANNEL_ID().get(i)); db.insert("JOURNEY_PLAN", null, values); @@ -2014,22 +2015,13 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public ArrayList getDialogStock(String store_id) { + public ArrayList getDialogStock(String keyid) { Cursor cursordata = null; ArrayList productData = new ArrayList(); try { - cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE STORE_ID = '"+store_id + "'", null); - - /* cursordata = db.rawQuery("SELECT * from " - + CommonString.TABLE_INSERT_STOCK_TOT + " WHERE " - + CommonString.KEY_STORE_ID + "='" + store_id + "' AND " - + CommonString.KEY_CATEGORY_ID + "='" + cate_id + "' AND " - + CommonString.KEY_PROCESS_ID + " ='" + process_id + "' AND " - + CommonString.KEY_DISPLAY_ID + "= '" + display_id + "' AND " - + CommonString.UNIQUE_KEY_ID + "= '" + unique_id + "'", - null);*/ + cursordata = db.rawQuery("SELECT * FROM STOCK_DIALOG WHERE COMMON_ID = '"+keyid + "'", null); if (cursordata != null) { cursordata.moveToFirst(); @@ -2045,12 +2037,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setBrand(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_BRAND))); - /*sb.setCategory_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.KEY_CATEGORY_ID))); - - - sb.setDisplay_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.KEY_DISPLAY_ID)));*/ sb.setQuantity(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_QUANTITY))); @@ -2061,12 +2047,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { sb.setSku_name(cursordata.getString(cursordata .getColumnIndexOrThrow(CommonString.KEY_SKUNAME))); - /* sb.setProcess_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.KEY_PROCESS_ID))); - - sb.setUnique_id(cursordata.getString(cursordata - .getColumnIndexOrThrow(CommonString.UNIQUE_KEY_ID)));*/ - productData.add(sb); cursordata.moveToNext(); @@ -2094,7 +2074,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper { public void deleteStockEntry(String id) { try { - db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL_DATA, "Id" + "='" + id + "'", null); + db.delete(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, "KEY_ID" + "='" + id + "'", null); } catch (Exception e) { System.out.println("" + e); } @@ -2186,20 +2166,44 @@ public class GSKOrangeDB extends SQLiteOpenHelper { } - public void InsertAdditionalData(AddittionalGetterSetter data) { + public void InsertAdditionalData(AddittionalGetterSetter data,ArrayList dialog) { ContentValues values = new ContentValues(); - + ContentValues values1 = new ContentValues(); try { - values.put(CommonString.KEY_STORE_ID, data.getStore_id()); - values.put(CommonString.KEY_BRAND, data.getBrand()); - values.put(CommonString.KEY_BRAND_ID, data.getBrand_id()); - values.put(CommonString.KEY_IMAGE, data.getImage()); - values.put(CommonString.KEY_SKU_ID, data.getSku_id()); - values.put(CommonString.KEY_SKUNAME, data.getSku()); + values.put("Store_Id", data.getStore_id()); + values.put("brand_name", data.getBrand()); + values.put("brand_id", data.getBrand_id()); + values.put("image_url", data.getImage()); + values.put("sku_id", data.getSku_id()); + values.put("sku_name", data.getSku()); + values.put("toggle_value", data.getBtn_toogle()); + + long key_id = db.insert(CommonString.TABLE_INSERT_STOCK_ADDITIONAL, null, values); + + for(int i=0;i list = new ArrayList(); ArrayList listdata = new ArrayList(); + ArrayList uploadlist = new ArrayList(); + ArrayList defdata = new ArrayList(); Spinner spinner_brand, spinner_sku; Spinner spinner_brand_list, spinner_sku_list; @@ -69,7 +75,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl Button btnsku, btnaddlayout; GSKOrangeDB db; ArrayList sku_list; - String brand_name="", brand_id ="", SKU_name ="", SKU_ID="",brand_list_name="",brand_list_id="",sku_list_name="",sku_list_id=""; + String brand_name = "", brand_id = "", SKU_name = "", SKU_ID = "", brand_list_name = "", brand_list_id = "", sku_list_name = "", sku_list_id = ""; public ListView listview; LinearLayout linearlay; ArrayList brandList; @@ -79,15 +85,20 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl ArrayList empty_list = new ArrayList<>(); - String _pathforcheck,_path,str; + String _pathforcheck, _path, str,msg; private SharedPreferences preferences; - String store_id,date,intime,img_str; - ImageView img_cam,img_clicked; + String store_id, date, intime, img_str, togglevalue = "1"; + ImageView img_cam, img_clicked; Button btn_add; EditText Edt_txt; - MyAdaptorStock adapterData; + MyAdaptorStock adapterData; ListView listviewlay; + String errormsg; MyAdaptorAdditionalStock adapteradditional; + AddittionalGetterSetter adGt; + LinearLayout brandlayout, diaplylayout, cameralayout; + //RelativeLayout skulayout; + ////String brand_id,SKU_ID; protected void onCreate(Bundle savedInstanceState) { // TODO Auto-generated method stub @@ -103,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 = "1"; date = preferences.getString(CommonString.KEY_DATE, null); intime = preferences.getString(CommonString.KEY_STORE_IN_TIME, ""); @@ -118,7 +129,16 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl btnsku = (Button) findViewById(R.id.btn_sku); btnaddlayout = (Button) findViewById(R.id.btadd); listviewlay = (ListView) findViewById(R.id.listviewlv); + brandlayout = (LinearLayout) findViewById(R.id.tv_brandlayout); + diaplylayout = (LinearLayout) findViewById(R.id.tv_displaylayout); + cameralayout = (LinearLayout) findViewById(R.id.tv_cameralayout); + //skulayout = (RelativeLayout) findViewById(R.id.tv_skulayout); + + btntoggle.setChecked(true); + + + str = CommonString.FILE_PATH; ///band List brand_list = db.getBrandMasterData(store_id); @@ -135,7 +155,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl SkuMasterGetterSetter select = new SkuMasterGetterSetter(); select.setSKU("Select"); - skuMaster_list.add(0,select); + skuMaster_list.add(0, select); CustomSkuMasterAdpter skuadapter = new CustomSkuMasterAdpter(AdditionalVisibility.this, R.layout.custom_spinner_item, skuMaster_list); spinner_sku_list.setAdapter(skuadapter); @@ -145,8 +165,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position != 0) { - brand_list_name=brand_list.get(position).getBRAND().get(0); - brand_list_id=brand_list.get(position).getBRAND_ID().get(0); + brand_list_name = brand_list.get(position).getBRAND().get(0); + brand_list_id = brand_list.get(position).getBRAND_ID().get(0); } } @@ -163,8 +183,8 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl if (position != 0) { - sku_list_name=skuMaster_list.get(position).getSKU().get(0); - sku_list_id=skuMaster_list.get(position).getSKU_ID().get(0); + sku_list_name = skuMaster_list.get(position).getSKU().get(0); + sku_list_id = skuMaster_list.get(position).getSKU_ID().get(0); } } @@ -175,57 +195,126 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } }); + listdata = db.getAdditionalStock(store_id); + + for(int k=0;k 0) { + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } btnaddlayout.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - - AddittionalGetterSetter adGt=new AddittionalGetterSetter(); - + adGt = new AddittionalGetterSetter(); adGt.setBrand(brand_list_name); adGt.setBrand_id(brand_list_id); adGt.setImage(img_str); adGt.setSku(sku_list_name); adGt.setSku_id(sku_list_id); adGt.setStore_id(store_id); + adGt.setBtn_toogle(togglevalue); - db.InsertAdditionalData(adGt); + if (validateData(adGt,defdata)) { - spinner_brand_list.setSelection(0); + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( + AdditionalVisibility.this); - spinner_sku_list.setSelection(0); + // set title + alertDialogBuilder.setTitle("Do You Want To Save"); - img_str=""; + // set dialog message + alertDialogBuilder + .setMessage("") + .setCancelable(false) + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { - listdata = db.getAdditionalStock(store_id); + db.InsertAdditionalData(adGt,defdata); - if(listdata.size()>0) - { - adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this,listdata); - listviewlay.setAdapter(adapteradditional); - listviewlay.invalidateViews(); + spinner_brand_list.setSelection(0); + + spinner_sku_list.setSelection(0); + + img_str = ""; + brand_list_name = ""; + brand_list_id = ""; + sku_list_name = ""; + sku_list_id = ""; + + defdata.clear(); + + btntoggle.setChecked(true); + + togglevalue = "1"; + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); + + listdata = db.getAdditionalStock(store_id); + + if (listdata.size() > 0) { + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } else { + + } + + } + }) + .setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // if this button is clicked, just close + // the dialog box and do nothing + dialog.cancel(); + } + }); + + // create alert dialog + AlertDialog alertDialog = alertDialogBuilder.create(); + + // show it + alertDialog.show(); + + } else { + Snackbar.make(view, errormsg, Snackbar.LENGTH_LONG).setAction("Action", null).show(); } - else - { - - } - - - - } }); - - - btntoggle.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { + if (btntoggle.isChecked()) { + togglevalue = "1"; + brandlayout.setVisibility(View.VISIBLE); + diaplylayout.setVisibility(View.VISIBLE); + cameralayout.setVisibility(View.VISIBLE); + btnsku.setVisibility(View.VISIBLE); + + } else { + togglevalue = "0"; + + brandlayout.setVisibility(View.INVISIBLE); + diaplylayout.setVisibility(View.INVISIBLE); + cameralayout.setVisibility(View.INVISIBLE); + btnsku.setVisibility(View.INVISIBLE); + } } }); @@ -233,12 +322,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl @Override public void onClick(View view) { _pathforcheck = store_id + "Store" - + "Image" + date.replace("/","") + getCurrentTime().replace(":","")+".jpg"; + + "Image" + date.replace("/", "") + getCurrentTime().replace(":", "") + ".jpg"; _path = CommonString.FILE_PATH + _pathforcheck; - intime = getCurrentTime(); - startCameraActivity(); } @@ -254,6 +341,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); } + public String getCurrentTime() { Calendar m_cal = Calendar.getInstance(); @@ -405,9 +493,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - - - public class CustomSkuMasterAdpter extends ArrayAdapter { private Activity activity; @@ -471,15 +556,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } - - - - - - - - - protected void startCameraActivity() { try { @@ -488,10 +564,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl File file = new File(_path); Uri outputFileUri = Uri.fromFile(file); - String defaultCameraPackage=""; + String defaultCameraPackage = ""; final PackageManager packageManager = getPackageManager(); List list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES); - for (int n=0;n0) - { + if (defdata.size() > 0) { linearlay.setVisibility(View.VISIBLE); - adapterData = new MyAdaptorStock(AdditionalVisibility.this,list); + adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata); listview.setAdapter(adapterData); listview.invalidateViews(); - } - else{ + } else { } - spinner_sku.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { @Override public void onItemSelected(AdapterView parent, View view, int position, long id) { @@ -608,10 +680,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); - - - - btn_add.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -623,29 +691,40 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl //ab.setDisplay_id(data.get(position).getDisplay_id()); ab.setStore_id(store_id); - // ab.setUnique_id(data.get(position).getUnique_id()); + // ab.setUnique_id(data.get(position).getUnique_id()); ab.setSku_id(SKU_ID); ab.setSku_name(SKU_name); - // ab.setProcess_id(process_id); + // ab.setProcess_id(process_id); ab.setQuantity(Edt_txt.getText().toString()); - // ab.setCategory_id(category_id); + // ab.setCategory_id(category_id); - db.InsertStockDialog(ab); - spinner_brand.setSelection(0); - spinner_sku.setSelection(0); - Edt_txt.setText(""); + if(validateDialogData(ab)) + { - list = db.getDialogStock(store_id); + defdata.add(ab); + // db.InsertStockDialog(ab); + + spinner_brand.setSelection(0); + spinner_sku.setSelection(0); + Edt_txt.setText(""); + + // list = db.getDialogStock(store_id); linearlay.setVisibility(View.VISIBLE); - adapterData = new MyAdaptorStock(AdditionalVisibility.this,list); + adapterData = new MyAdaptorStock(AdditionalVisibility.this, defdata); listview.setAdapter(adapterData); listview.invalidateViews(); + } + else + { + Snackbar.make(v, msg, Snackbar.LENGTH_LONG).setAction("Action", null).show(); + } - // dialog.cancel(); + + // dialog.cancel(); } }); @@ -712,8 +791,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); - - dialog.show(); } @@ -778,7 +855,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl class ViewHolder { TextView brand, qty_bought, display; - Button save,delete; + Button save, delete; } @@ -799,7 +876,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought); - holder.delete = (Button) convertView.findViewById(R.id.delete_btn); convertView.setTag(holder); @@ -822,11 +898,12 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl alertDialogBuilder .setMessage("Click Yes To Delete!") .setCancelable(false) - .setPositiveButton("Yes",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + // db.deletedialogStockEntry(list.get(position1).getKEY_ID()); - db.deletedialogStockEntry(list.get(position1).getKEY_ID()); + defdata.remove(position1); adapterData.notifyDataSetChanged(); @@ -834,15 +911,15 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl list.get(position1).getDisplay_id(),list.get(position1).getUnique_id());*/ - list = db.getDialogStock(store_id); + //list = db.getDialogStock(store_id); - listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, list)); + listview.setAdapter(new MyAdaptorStock(AdditionalVisibility.this, defdata)); listview.invalidateViews(); } }) - .setNegativeButton("No",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing dialog.cancel(); @@ -859,7 +936,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl }); - holder.brand.setText(list.get(position1).getBrand().toString()); holder.display.setText(list.get(position1).getSku_name().toString()); @@ -909,7 +985,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl class ViewHolder { TextView brand, qty_bought, display; - Button save,delete; + Button save, delete; } @@ -930,7 +1006,6 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl holder.qty_bought = (TextView) convertView.findViewById(R.id.qty_bought); - holder.delete = (Button) convertView.findViewById(R.id.delete_btn); convertView.setTag(holder); @@ -953,23 +1028,25 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl alertDialogBuilder .setMessage("Click Yes To Delete!") .setCancelable(false) - .setPositiveButton("Yes",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setPositiveButton("Yes", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { db.deleteStockEntry(listdata.get(position1).getKey_id()); - adapterData.notifyDataSetChanged(); + adapteradditional.notifyDataSetChanged(); listdata = db.getAdditionalStock(store_id); - listview.setAdapter(new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata)); - listview.invalidateViews(); + adapteradditional = new MyAdaptorAdditionalStock(AdditionalVisibility.this, listdata); + listviewlay.setAdapter(adapteradditional); + listviewlay.invalidateViews(); + } }) - .setNegativeButton("No",new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog,int id) { + .setNegativeButton("No", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { // if this button is clicked, just close // the dialog box and do nothing dialog.cancel(); @@ -998,8 +1075,87 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl } } + boolean validateData(AddittionalGetterSetter data,ArrayList dialog) { + boolean flag = true; + + String brandid = data.getBrand_id(); + String skuid = data.getSku_id(); + + String imageu = data.getImage(); + String toggleid = data.getBtn_toogle(); + if (toggleid.equalsIgnoreCase("0")) { + flag = true; + } + else { -} + if (brandid.equalsIgnoreCase("") || skuid.equalsIgnoreCase("")) { + flag = false; + + errormsg = "Please Select dropdown"; + + } else if (imageu == null || imageu.equalsIgnoreCase("")) { + flag = false; + + errormsg = "Please Take a image"; + + } + else if (dialog.size()==0) { + + errormsg = "Please fill sku data"; + flag = false; + + + } + + + else { + flag = true; + } + + + } + + + return flag; + } + + boolean validateDialogData(AdditionalDialogGetterSetter data) { + boolean flag = true; + + String brandid=data.getBrand_id(); + String displayid=data.getSku_id(); + String QTy=data.getQuantity(); + + + if(brandid.equalsIgnoreCase("")||brandid==null) + { + flag = false; + + msg="Please Select Dropdown"; + } + else if(displayid==null||displayid.equalsIgnoreCase("")) + { + flag = false; + msg="Please Select Dropdown"; + } + + + else if(QTy.equalsIgnoreCase("") || QTy==null) + { + flag = false; + msg="Please enter Quantity"; + } + else + { + flag = true; + } + + + return flag; + } + + +} \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java index 8d99043..7150336 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/JourneyPlanGetterSetter.java @@ -24,6 +24,19 @@ public class JourneyPlanGetterSetter { ArrayList CLASS_ID = new ArrayList(); ArrayList CAMERA_ALLOW = new ArrayList(); + public ArrayList getCHANNEL_ID() { + return CHANNEL_ID; + } + + public void setCHANNEL_ID(String CHANNEL_ID) { + this.CHANNEL_ID.add(CHANNEL_ID); + } + + ArrayList CHANNEL_ID = new ArrayList(); + + + + public ArrayList getCHECKOUT_STATUS() { return CHECKOUT_STATUS; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java index 6e320e9..d152992 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -174,6 +174,11 @@ public class XMLHandlers { jcpGetterSetter.setGEO_TAG(xpp.nextText()); } + if (xpp.getName().equals("CHANNEL_ID")) { + jcpGetterSetter.setCHANNEL_ID(xpp.nextText()); + } + + } xpp.next(); } diff --git a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml index dee8b28..cd17dec 100644 --- a/GSKMTOrange/src/main/res/layout/additionallistlayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionallistlayout.xml @@ -19,9 +19,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="2dp" + android:layout_marginTop="10dp" android:layout_weight="10" android:orientation="horizontal" - android:layout_marginTop="10dp" android:weightSum="25"> diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml index af8a9a3..7855508 100644 --- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml @@ -10,16 +10,6 @@ - diff --git a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml index e463a12..be17555 100644 --- a/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml +++ b/GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml @@ -21,6 +21,8 @@ + + - - -