diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..681f41a --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e4e2330..865d964 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -3,6 +3,9 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index d1a5190..6229e93 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -42,7 +42,7 @@ - + diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index fda9071..b200704 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -21,15 +21,15 @@ android { targetSdkVersion 26 //For Egypt - /*versionCode 27 - versionName "3.9"*/ + versionCode 28 + versionName "4.0" //For UAE /*versionCode 24 versionName "3.6"*/ //For Turkey - /*versionCode 23 + /* versionCode 23 versionName "3.5"*/ //For KSA @@ -37,8 +37,8 @@ android { versionName "3.7"*/ //For SA - versionCode 26 - versionName "3.7" + /* versionCode 26 + versionName "3.7"*/ multiDexEnabled true diff --git a/GSKMTOrange/src/main/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 6d7d3fc..d274fc3 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -358,6 +358,13 @@ android:screenOrientation="portrait" android:theme="@style/AppTheme.NoActionBar" android:windowSoftInputMode="adjustPan" /> + counterfeitProductListData, String category_id, String store_id, boolean exists) { + + try { + db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); + db.delete(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, "STORE_ID = '"+ store_id +"' AND CATEGORY_ID ='"+ category_id +"'", null); + + ContentValues values = new ContentValues(); + ContentValues values1 = new ContentValues(); + int existexist_int = 0; + + if(exists){ + existexist_int = 1; + } + + values1.put("STORE_ID", Integer.parseInt(store_id)); + values1.put("CATEGORY_ID", Integer.parseInt(category_id)); + values1.put("Existss", existexist_int); + + long id = db.insert(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS, null, values1); + + + db.beginTransaction(); + for (int i = 0; i < counterfeitProductListData.size(); i++) { + CompetitonPromoGetterSetter data = counterfeitProductListData.get(i); + + values.put("STORE_ID", Integer.parseInt(store_id)); + values.put("CATEGORY_ID", Integer.parseInt(category_id)); + values.put("BRAND_ID", data.getBrandId()); + values.put("BRAND", data.getBrand()); + values.put("PROMOTION_ID", data.getPromotion_id()); + values.put("PROMOTION", data.getPromotion()); + values.put("SKU", data.getSkuName()); + values.put("IMAGE", data.getImgStr()); + values.put("IMAGE1", data.getImgStr1()); + values.put("IMAGE2", data.getImgStr2()); + values.put("COMMON_ID", id); + + db.insert(CommonString.TABLE_INSERT_COMPETIOTIONN_PROMO, null, values); + } + db.setTransactionSuccessful(); + db.endTransaction(); + } catch (Exception ex) { + Log.d("Exception ", "Counterfeit Data " + ex.toString()); + } + } + + public ArrayList getCompetitionPromoExistsAfterData(String store_id, String category_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + + if(category_id==null){ + dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO_EXISTS " + + "where STORE_ID='" + store_id + "'", null); + } + else { + dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO_EXISTS " + + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); + } + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + CompetitonPromoGetterSetter cd = new CompetitonPromoGetterSetter(); + + cd.setExists(dbcursor.getString(dbcursor.getColumnIndexOrThrow("Existss")).equals("1")); + cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); + cd.set_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("KEY_ID"))); + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "getCounterfeitAfterData!" + e.toString()); + return list; + } + return list; + } + + + public ArrayList getCometionPromoAfterData(String store_id, String category_id) { + ArrayList list = new ArrayList<>(); + Cursor dbcursor = null; + + try { + + if(category_id==null){ + + dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO " + + "where COMMON_ID='" + store_id + "'", null); + } + else { + dbcursor = db.rawQuery("Select * from COMPETIOTIONN_PROMO " + + "where STORE_ID='" + store_id + "' AND CATEGORY_ID='" + category_id + "'", null); + } + + if (dbcursor != null) { + dbcursor.moveToFirst(); + while (!dbcursor.isAfterLast()) { + CompetitonPromoGetterSetter cd = new CompetitonPromoGetterSetter(); + + cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID"))); + cd.setSkuName(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SKU"))); + cd.setBrandId(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("BRAND_ID"))); + cd.setBrand(dbcursor.getString(dbcursor.getColumnIndexOrThrow("BRAND"))); + cd.setPromotion_id(dbcursor.getInt(dbcursor.getColumnIndexOrThrow("PROMOTION_ID"))); + cd.setPromotion(dbcursor.getString(dbcursor.getColumnIndexOrThrow("PROMOTION"))); + cd.setImgStr(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE"))); + cd.setImgStr1(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE1"))); + cd.setImgStr2(dbcursor.getString(dbcursor.getColumnIndexOrThrow("IMAGE2"))); + + + list.add(cd); + dbcursor.moveToNext(); + } + dbcursor.close(); + return list; + } + } catch (Exception e) { + Log.d("Exception ", "getPromoComplianceSkuwiseAfterData!" + e.toString()); + return list; + } + return list; + } + + public ArrayList getCompetionData(String keyaccountId, String storetypeid,String classid,String categoryid,int subcategoryId) { + Cursor cursordata = null; + ArrayList Data = new ArrayList(); + + try { + + cursordata = db.rawQuery("Select DISTINCT bm.BRAND_ID,bm.BRAND from MAPPING_STOCK ms inner join SKU_MASTER sm on sm.SKU_ID=ms.SKU_ID " + + "inner join BRAND_MASTER bm on bm.BRAND_ID=sm.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER cm on cm.SUB_CATEGORY_ID=bm.SUB_CATEGORY_ID " + + "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid +"' AND ms.CLASS_ID='" + classid +"' AND cm.CATEGORY_ID='" + categoryid +"'AND cm.SUB_CATEGORY_ID='" + subcategoryId +"' AND bm.COMPANY_ID<>1 ", null); + + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + BrandMasterGetterSetter sb = new BrandMasterGetterSetter(); + + sb.setBRAND_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND_ID"))); + sb.setBRAND(cursordata.getString(cursordata.getColumnIndexOrThrow("BRAND"))); + + Data.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + + } + + + } catch (Exception ex) { + + } + return Data; + + } + + public ArrayList getSubcategoryData(String keyaccountId, String storetypeid,String classid,String categoryid) { + Cursor cursordata = null; + ArrayList Data = new ArrayList(); + + try { + + cursordata = db.rawQuery("Select DISTINCT cm.SUB_CATEGORY_ID,cm.SUB_CATEGORY from MAPPING_STOCK ms inner join SKU_MASTER sm on sm.SKU_ID=ms.SKU_ID " + + "inner join BRAND_MASTER bm on bm.BRAND_ID=sm.BRAND_ID " + + "inner join SUB_CATEGORY_MASTER cm on cm.SUB_CATEGORY_ID=bm.SUB_CATEGORY_ID " + + "WHERE ms.KEYACCOUNT_ID = '" + keyaccountId + "' AND ms.STORETYPE_ID='" + storetypeid +"' AND ms.CLASS_ID='" + classid +"' AND cm.CATEGORY_ID='" + categoryid +"' AND bm.COMPANY_ID<>1 ", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + BrandMasterGetterSetter sb = new BrandMasterGetterSetter(); + + sb.setSUB_CATEGORY_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY_ID"))); + sb.setSUB_CATEGORY(cursordata.getString(cursordata.getColumnIndexOrThrow("SUB_CATEGORY"))); + + Data.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + + } + + + } catch (Exception ex) { + Log.d("Exception ", "getPromoComplianceSkuwiseAfterData!" + ex.toString()); + } + return Data; + + } + + + public ArrayList getPromotionTypeData() { + Cursor cursordata = null; + ArrayList Data = new ArrayList(); + + try { + + cursordata = db.rawQuery("SELECT * FROM PROMOTION_TYPE_MASTER", null); + + if (cursordata != null) { + cursordata.moveToFirst(); + while (!cursordata.isAfterLast()) { + PROMOTION_TYPE_MASTERGetterSetter sb = new PROMOTION_TYPE_MASTERGetterSetter(); + + sb.setPROMOTION_TYPE_ID(cursordata.getString(cursordata.getColumnIndexOrThrow("PROMOTION_TYPE_ID"))); + sb.setPROMOTION_TYPE(cursordata.getString(cursordata.getColumnIndexOrThrow("PROMOTION_TYPE"))); + + Data.add(sb); + cursordata.moveToNext(); + } + cursordata.close(); + + } + + + } catch (Exception ex) { + + } + return Data; + + } + + + public void InsertPROMOTION_TYPE_MASTER(PROMOTION_TYPE_MASTERGetterSetter data) { + db.delete("PROMOTION_TYPE_MASTER", null, null); + + ContentValues values = new ContentValues(); + try { + + for (int i = 0; i < data.getPROMOTION_TYPE_ID().size(); i++) { + + values.put("PROMOTION_TYPE_ID", data.getPROMOTION_TYPE_ID().get(i)); + values.put("PROMOTION_TYPE", data.getPROMOTION_TYPE().get(i)); + db.insert("PROMOTION_TYPE_MASTER", null, values); + + } + + } catch (Exception ex) { + + } + } + + + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java index 98991f7..90ce71c 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/LoginActivity.java @@ -193,9 +193,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. //populateAutoComplete(); mPasswordView = (EditText) findViewById(R.id.password); - /* museridView.setText("testmer"); - mPasswordView.setText("cpm123"); -*/ + // museridView.setText("egypt.1"); + // museridView.setText("DSR_Alex_61"); + // mPasswordView.setText("cpm123"); mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() { @Override public boolean onEditorAction(TextView textView, int id, KeyEvent keyEvent) { @@ -686,16 +686,14 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient. if (result.equals(CommonString.KEY_SUCCESS)) { //set true for South Africa - boolean forSA = true; + boolean forSA = false; // database.open(); if(forSA){ //For SA Only if (preferences.getString(CommonString.KEY_LANGUAGE, "").equals("")) { - Intent intent = new Intent(getBaseContext(), - SelectLanguageActivity.class); - + Intent intent = new Intent(getBaseContext(), SelectLanguageActivity.class); intent.putExtra(CommonString.KEY_LOGIN_DATA, lgs); startActivity(intent); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java index 8ce7469..f334d10 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/SelectLanguageActivity.java @@ -99,14 +99,10 @@ public class SelectLanguageActivity extends AppCompatActivity implements View.On switch (id) { case R.id.btn_language_one: - selected_flag = true; - CommonFunctions.updateLangResources(getApplicationContext(), language.get(0)); - btn_lang_1.setBackgroundColor(getResources().getColor(R.color.colorPrimary)); btn_lang_2.setBackgroundColor(getResources().getColor(R.color.grey_background)); - editor.putString(CommonString.KEY_LANGUAGE, language.get(0)); editor.putString(CommonString.KEY_CULTURE_ID, culture_id.get(0)); editor.putString(CommonString.KEY_NOTICE_BOARD_LINK, login_data.getNOTICE_URL().get(0)); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java index d07798f..0ac4735 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonFunctions.java @@ -29,16 +29,12 @@ public class CommonFunctions { public static boolean updateLangResources(Context context, String language) { String lang; - if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ENGLISH)) { lang = CommonString.KEY_RETURE_LANGUAGE_ENGLISH; - } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) { lang = CommonString.KEY_RETURE_LANGUAGE_ARABIC_KSA; - } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_TURKISH)) { lang = CommonString.KEY_RETURE_LANGUAGE_TURKISH; - } else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) { lang = CommonString.KEY_RETURE_LANGUAGE_UAE_ARABIC; }else if (language.equalsIgnoreCase(CommonString.KEY_LANGUAGE_OMAN)) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java index da4f061..ead4732 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/constant/CommonString.java @@ -1087,7 +1087,7 @@ public class CommonString { public static String TABLE_MAPPING_PLANOGRAM_ADHOC = "MAPPING_PLANOGRAM_ADHOC"; public static String TABLE_MAPPING_SOS_TARGET_ADHOC = "MAPPING_SOS_TARGET_ADHOC"; public static String TABLE_NO_CAMERA_LAST_VISIT_DATA_ADHOC = "NO_CAMERA_LAST_VISIT_DATA_ADHOC"; - public static String TABLE_STORE_PERFORMANCE_NEW_ADHOC = "STORE_PERFORMANCE_NEW_ADHOC"; + public static String TABLE_STORE_PERFORMANCE_NEW_ADHOC = "STORE_PERFORMANCE_NEW_ADHOC_REVISED"; public static final String TABLE_IS_ADHOC_SAVED = "IS_ADHOC_SAVED"; public static final String CREATE_ABLE_IS_ADHOC_SAVED = "CREATE TABLE IF NOT EXISTS " @@ -1269,4 +1269,70 @@ public class CommonString { + KEY_SKU + " VARCHAR," + KEY_IMAGE + " VARCHAR," + KEY_PRESENT + " INTEGER)"; + + //usk + public static final String TABLE_INSERT_COMPETIOTIONN_PROMO = "COMPETIOTIONN_PROMO"; + + public static final String CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_COMPETIOTIONN_PROMO + + "(" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + + "STORE_ID" + + " INTEGER," + + + "CATEGORY_ID" + + " INTEGER," + + + "COMMON_ID" + + " INTEGER," + + + "SKU" + + " VARCHAR," + + + "BRAND_ID" + + " INTEGER," + + + "BRAND" + + " VARCHAR," + + + "PROMOTION_ID" + + " INTEGER," + + + "PROMOTION" + + " VARCHAR," + + + "STOCK" + + " INTEGER," + + + "IMAGE" + + " VARCHAR," + + + "IMAGE1" + + " VARCHAR," + + + "IMAGE2" + + " VARCHAR" + + + ")"; + + public static final String TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS = "COMPETIOTIONN_PROMO_EXISTS"; + + public static final String CREATE_TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS = "CREATE TABLE IF NOT EXISTS " + + TABLE_INSERT_COMPETIOTIONN_PROMO_EXISTS + + "(" + + "KEY_ID" + + " INTEGER PRIMARY KEY AUTOINCREMENT ," + + + "STORE_ID" + + " INTEGER," + + + "CATEGORY_ID" + + " INTEGER," + + + "Existss" + + " INTEGER" + + + ")"; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java new file mode 100644 index 0000000..adc066e --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CompetitionPromoActivity.java @@ -0,0 +1,809 @@ +package cpm.com.gskmtorange.dailyentry; + +import android.app.Activity; +import android.content.ActivityNotFoundException; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.SharedPreferences; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; +import android.net.Uri; +import android.os.Build; +import android.os.Bundle; +import android.preference.PreferenceManager; +import android.provider.MediaStore; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v4.content.FileProvider; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.LinearLayoutManager; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.EditText; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.Spinner; +import android.widget.TextView; +import android.widget.ToggleButton; + +import java.io.File; +import java.util.ArrayList; +import java.util.List; + +import cpm.com.gskmtorange.Database.GSKOrangeDB; +import cpm.com.gskmtorange.R; +import cpm.com.gskmtorange.constant.CommonFunctions; +import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter; + +public class CompetitionPromoActivity extends AppCompatActivity implements AdapterView.OnItemSelectedListener, View.OnClickListener { + + ToggleButton btntoggle; + boolean isDataAdded = false, isExists = true, is_camera_compulsory = false; + LinearLayout lin_parent; + GSKOrangeDB db; + private SharedPreferences preferences; + Spinner spinner_brand_list,sp_promotion_typ,sp_subcategory; + String store_id, visit_date, username, country_id,keyAccount_id,class_id,storeType_id; + String categoryName, categoryId; + ArrayList brand_list = new ArrayList<>(); + ArrayList subcategory_list = new ArrayList<>(); + ArrayList promotion_list = new ArrayList<>(); + String brand = "",subcategory="", _path = ""; + String promotion = ""; + EditText et_sku_name; + FloatingActionButton fab_save, fab_add; + ImageView imgCam, imgCam1, imgCam2; + String img_str = "", img_str1 = "", img_str2 = ""; + String _pathforcheck, _pathforcheck1, _pathforcheck2; + Uri outputFileUri; + String gallery_package = ""; + boolean editFlag = false, isdata_added = false; + String str, skuName; + int brand_id = 0; + int subcategoryId = 0; + int promotion_id = 0; + RecyclerView rec_added_counterfeit_product; + ArrayList addedCounterfeitProducts = new ArrayList<>(); + ArrayList exists_data = new ArrayList<>(); + private LinearLayout lay_competitor_name; + + ProductAdapter productAdapter; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_compition_promo); + Toolbar toolbar = findViewById(R.id.toolbar); + setSupportActionBar(toolbar); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + btntoggle = (ToggleButton) findViewById(R.id.btntoggle); + lin_parent = (LinearLayout) findViewById(R.id.lin_parent_promo); + et_sku_name = (EditText) findViewById(R.id.et_sku_name); + sp_subcategory = (Spinner) findViewById(R.id.sp_subcategory); + spinner_brand_list = (Spinner) findViewById(R.id.sp_brand); + sp_promotion_typ = (Spinner) findViewById(R.id.sp_promotion_typ); + lay_competitor_name = (LinearLayout) findViewById(R.id.lay_competitor_name); + rec_added_counterfeit_product = (RecyclerView) findViewById(R.id.rec_added_counterfeit_product); + + //fab + fab_save = findViewById(R.id.fab); + fab_add = findViewById(R.id.fab_add); + + //camera Images + imgCam = (ImageView) findViewById(R.id.img_cam); + imgCam1 = (ImageView) findViewById(R.id.img_cam1); + imgCam2 = (ImageView) findViewById(R.id.img_cam2); + + //preference data + preferences = PreferenceManager.getDefaultSharedPreferences(this); + store_id = preferences.getString(CommonString.KEY_STORE_ID, null); + visit_date = preferences.getString(CommonString.KEY_DATE, null); + username = preferences.getString(CommonString.KEY_USERNAME, null); + country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null); + + + keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, ""); + class_id = preferences.getString(CommonString.KEY_CLASS_ID, ""); + storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, ""); + + + CommonFunctions.updateLangResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + + //Intent data + categoryName = getIntent().getStringExtra("categoryName"); + categoryId = getIntent().getStringExtra("categoryId"); + + db = new GSKOrangeDB(CompetitionPromoActivity.this); + db.open(); + + btntoggle.setOnClickListener(this); + fab_save.setOnClickListener(this); + fab_add.setOnClickListener(this); + imgCam.setOnClickListener(this); + imgCam1.setOnClickListener(this); + imgCam2.setOnClickListener(this); + + promotion_list = db.getPromotionTypeData(); + subcategory_list = db.getSubcategoryData(keyAccount_id, storeType_id,class_id,categoryId); + + //subcategory data + BrandMasterGetterSetter subcategory_select = new BrandMasterGetterSetter(); + String subcat_select = getResources().getString(R.string.select); + subcategory_select.setSUB_CATEGORY(subcat_select); + subcategory_select.setSUB_CATEGORY_ID("0"); + subcategory_list.add(0, subcategory_select); + CustomSubcategoryAdapter subcat_adapter = new CustomSubcategoryAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, subcategory_list); + sp_subcategory.setAdapter(subcat_adapter); + sp_subcategory.setOnItemSelectedListener(this); + + + /*//brand data + BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter(); + String select = getResources().getString(R.string.select); + brand_select.setBRAND(select); + brand_select.setBRAND_ID("0"); + brand_list.add(0, brand_select); + CustomBrandAdapter adapter = new CustomBrandAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, brand_list); + spinner_brand_list.setAdapter(adapter); + spinner_brand_list.setOnItemSelectedListener(this);*/ + + //competitor + PROMOTION_TYPE_MASTERGetterSetter promoType_select = new PROMOTION_TYPE_MASTERGetterSetter(); + String selectcomp = getResources().getString(R.string.select); + promoType_select.setPROMOTION_TYPE(selectcomp); + promoType_select.setPROMOTION_TYPE_ID("0"); + promotion_list.add(0, promoType_select); + CustomPromotionTypeAdapter comp_adapter = new CustomPromotionTypeAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, promotion_list); + sp_promotion_typ.setAdapter(comp_adapter); + sp_promotion_typ.setOnItemSelectedListener(this); + + + + + //Product List + exists_data = db.getCompetitionPromoExistsAfterData(store_id, categoryId); + + if(exists_data.size()>0){ + isExists = exists_data.get(0).isExists(); + if(exists_data.get(0).isExists()){ + addedCounterfeitProducts = db.getCometionPromoAfterData(store_id, categoryId); + if(addedCounterfeitProducts.size()>0){ + rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + productAdapter = new ProductAdapter(addedCounterfeitProducts); + rec_added_counterfeit_product.setAdapter(productAdapter); + } + } + else { + //fab_add.hide();//.setVisibility(View.GONE); + addedCounterfeitProducts.clear(); + lin_parent.setVisibility(View.GONE); + } + } + + btntoggle.setChecked(isExists); + + str = CommonString.FILE_PATH; + } + + @Override + public void onClick(View v) { + int id = v.getId(); + + switch (id) { + case R.id.btntoggle: + isExists = btntoggle.isChecked(); + + if (isExists) { + lin_parent.setVisibility(View.VISIBLE); + isdata_added = true; + } else { + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(CompetitionPromoActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + lin_parent.setVisibility(View.GONE); + + brand = ""; + subcategory = ""; + promotion = ""; + brand_id = 0; + subcategoryId = 0; + promotion_id = 0; + skuName = ""; + img_str = ""; + img_str1 = ""; + img_str2 = ""; + et_sku_name.setText(""); + sp_subcategory.setSelection(0); + spinner_brand_list.setSelection(0); + sp_promotion_typ.setSelection(0); + + addedCounterfeitProducts.clear(); + isdata_added = true; + } + }) + .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + //checkBox.setChecked(true); + btntoggle.setChecked(true); + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + break; + + case R.id.fab_add: + + skuName = et_sku_name.getText().toString().replaceAll("[&^<>{}'$]", "").replaceFirst("^0+(?!$)", ""); + + if (promotion.equals("")) { + Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_promo_type, Snackbar.LENGTH_SHORT).show(); + } else if (subcategory.equals("")) { + Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_sub_category, Snackbar.LENGTH_SHORT).show(); + }else if (brand.equals("")) { + Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_competitor, Snackbar.LENGTH_SHORT).show(); + } else if (skuName.equals("")) { + Snackbar.make(rec_added_counterfeit_product, R.string.pls_enter_comment, Snackbar.LENGTH_SHORT).show(); + } /*else if (img_str.equals("") && img_str1.equals("") && img_str2.equals("")) { + Snackbar.make(rec_added_counterfeit_product, R.string.click_image, Snackbar.LENGTH_SHORT).show(); + }*/ else { + CompetitonPromoGetterSetter product = new CompetitonPromoGetterSetter(); + product.setBrand(brand); + product.setPromotion(promotion); + product.setBrandId(brand_id); + product.setPromotion_id(promotion_id); + product.setSkuName(skuName); + product.setImgStr(img_str); + product.setImgStr1(img_str1); + product.setImgStr2(img_str2); + + addedCounterfeitProducts.add(product); + + rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(getApplicationContext())); + productAdapter = new ProductAdapter(addedCounterfeitProducts); + rec_added_counterfeit_product.setAdapter(productAdapter); + + subcategory = ""; + brand = ""; + promotion = ""; + subcategoryId = 0; + brand_id = 0; + promotion_id = 0; + skuName = ""; + img_str = ""; + img_str1 = ""; + img_str2 = ""; + et_sku_name.setText(""); + sp_subcategory.setSelection(0); + spinner_brand_list.setSelection(0); + sp_promotion_typ.setSelection(0); + //clearBrandSpinner(); + + imgCam.setBackgroundResource(R.mipmap.camera_orange); + imgCam1.setBackgroundResource(R.mipmap.camera_orange); + imgCam2.setBackgroundResource(R.mipmap.camera_orange); + + isdata_added = true; + } + + break; + + case R.id.fab: + if(isExists && addedCounterfeitProducts.size()==0){ + Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add,Snackbar.LENGTH_SHORT).show(); + } + else { + db.InsertComptionPromotData(addedCounterfeitProducts, categoryId, store_id, isExists); + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + + break; + + case R.id.img_cam: + _pathforcheck = store_id + "CounterfeitProductImg1" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; + _path = CommonString.FILE_PATH + _pathforcheck; + startCameraActivity(); + break; + + case R.id.img_cam1: + _pathforcheck1 = store_id + "CounterfeitProductImg2" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; + _path = CommonString.FILE_PATH + _pathforcheck1; + startCameraActivity(); + break; + + case R.id.img_cam2: + _pathforcheck2 = store_id + "CounterfeitProductImg3" + categoryId + visit_date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(getApplicationContext()).replace(":", "") + ".jpg"; + _path = CommonString.FILE_PATH + _pathforcheck2; + startCameraActivity(); + break; + } + + } + + void clearBrandSpinner() { + brand_list.clear(); + + BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter(); + String str = getResources().getString(R.string.select); + brand_select.setBRAND(str); + brand_select.setBRAND_ID("0"); + brand_list.add(0, brand_select); + CustomBrandAdapter adapter = new CustomBrandAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, brand_list); + + spinner_brand_list.setAdapter(adapter); + spinner_brand_list.setOnItemSelectedListener(this); + } + + @Override + public void onItemSelected(AdapterView parent, View view, int position, long id) { + switch (parent.getId()) { + case R.id.sp_subcategory: + if (position != 0) { + subcategory = subcategory_list.get(position).getSUB_CATEGORY().get(0); + subcategoryId = Integer.parseInt(subcategory_list.get(position).getSUB_CATEGORY_ID().get(0)); + + brand_list = db.getCompetionData(keyAccount_id, storeType_id,class_id,categoryId,subcategoryId); + //brand data + BrandMasterGetterSetter brand_select = new BrandMasterGetterSetter(); + String select = getResources().getString(R.string.select); + brand_select.setBRAND(select); + brand_select.setBRAND_ID("0"); + brand_list.add(0, brand_select); + CustomBrandAdapter adapter = new CustomBrandAdapter(CompetitionPromoActivity.this, R.layout.custom_spinner_item, brand_list); + spinner_brand_list.setAdapter(adapter); + spinner_brand_list.setOnItemSelectedListener(this); + + lay_competitor_name.setVisibility(View.VISIBLE); + } else { + subcategory = ""; + subcategoryId = 0; + lay_competitor_name.setVisibility(View.GONE); + } + break; + + case R.id.sp_brand: + + if (position != 0) { + brand = brand_list.get(position).getBRAND().get(0); + brand_id = Integer.parseInt(brand_list.get(position).getBRAND_ID().get(0)); + } else { + brand = ""; + brand_id = 0; + } + + break; + case R.id.sp_promotion_typ: + + if (position != 0) { + promotion = promotion_list.get(position).getPROMOTION_TYPE().get(0); + promotion_id = Integer.parseInt(promotion_list.get(position).getPROMOTION_TYPE_ID().get(0)); + } else { + promotion = ""; + promotion_id = 0; + + } + + break; + + + } + + } + + @Override + public void onNothingSelected(AdapterView parent) { + + } + + //subcategory data + public class CustomSubcategoryAdapter extends ArrayAdapter { + + private Activity activity; + private ArrayList data; + BrandMasterGetterSetter tempValues = null; + LayoutInflater inflater; + + /************* + * CustomSubcategoryAdapter Constructor + *****************/ + public CustomSubcategoryAdapter( + CompetitionPromoActivity activitySpinner, + int textViewResourceId, + ArrayList objects + + ) { + super(activitySpinner, textViewResourceId, objects); + + /********** Take passed values **********/ + activity = activitySpinner; + data = objects; + /*********** Layout inflator to call external xml layout () **********************/ + inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + // This funtion called for each row ( Called data.size() times ) + public View getCustomView(int position, View convertView, ViewGroup parent) { + + /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ + View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); + + /***** Get each Model object from Arraylist ********/ + tempValues = null; + tempValues = (BrandMasterGetterSetter) data.get(position); + + TextView label = (TextView) row.findViewById(R.id.tv_text); + + if (position == 0) { + + // Default selected Spinner item + label.setText(getResources().getString(R.string.select)); + //sub.setText(""); + } else { + // Set values for spinner each row + label.setText(tempValues.getSUB_CATEGORY().get(0)); + } + + return row; + } + } + + + + public class CustomBrandAdapter extends ArrayAdapter { + + private Activity activity; + private ArrayList data; + BrandMasterGetterSetter tempValues = null; + LayoutInflater inflater; + + /************* + * CustomBrandAdapter Constructor + *****************/ + public CustomBrandAdapter( + CompetitionPromoActivity activitySpinner, + int textViewResourceId, + ArrayList objects + + ) { + super(activitySpinner, textViewResourceId, objects); + + /********** Take passed values **********/ + activity = activitySpinner; + data = objects; + /*********** Layout inflator to call external xml layout () **********************/ + inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + // This funtion called for each row ( Called data.size() times ) + public View getCustomView(int position, View convertView, ViewGroup parent) { + + /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ + View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); + + /***** Get each Model object from Arraylist ********/ + tempValues = null; + tempValues = (BrandMasterGetterSetter) data.get(position); + + TextView label = (TextView) row.findViewById(R.id.tv_text); + + if (position == 0) { + + // Default selected Spinner item + label.setText(getResources().getString(R.string.select)); + //sub.setText(""); + } else { + // Set values for spinner each row + label.setText(tempValues.getBRAND().get(0)); + } + + return row; + } + } + + + public class CustomPromotionTypeAdapter extends ArrayAdapter { + + private Activity activity; + private ArrayList data; + PROMOTION_TYPE_MASTERGetterSetter tempValues = null; + LayoutInflater inflater; + + /************* + * CustomPromotionTypeAdapter Constructor + *****************/ + public CustomPromotionTypeAdapter( + CompetitionPromoActivity activitySpinner, + int textViewResourceId, + ArrayList objects + + ) { + super(activitySpinner, textViewResourceId, objects); + + /********** Take passed values **********/ + activity = activitySpinner; + data = objects; + /*********** Layout inflator to call external xml layout () **********************/ + inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); + + } + + @Override + public View getDropDownView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + return getCustomView(position, convertView, parent); + } + + // This funtion called for each row ( Called data.size() times ) + public View getCustomView(int position, View convertView, ViewGroup parent) { + + /********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/ + View row = inflater.inflate(R.layout.custom_spinner_item, parent, false); + + /***** Get each Model object from Arraylist ********/ + tempValues = null; + tempValues = (PROMOTION_TYPE_MASTERGetterSetter) data.get(position); + + TextView label = (TextView) row.findViewById(R.id.tv_text); + + if (position == 0) { + + // Default selected Spinner item + label.setText(getResources().getString(R.string.select)); + //sub.setText(""); + } else { + // Set values for spinner each row + label.setText(tempValues.getPROMOTION_TYPE().get(0)); + } + + return row; + } + } + + protected void startCameraActivity() { + try { + + Log.i("MakeMachine", "startCameraActivity()"); + File file = new File(_path); + outputFileUri = FileProvider.getUriForFile(getApplicationContext(), "cpm.com.gskmtorange.fileprovider", 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) { + Log.e("TAG", "Installed Applications : " + list.get(n).loadLabel(packageManager).toString()); + Log.e("TAG", "package name : " + list.get(n).packageName); + + //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 (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; + } + } + } + } + + //com.android.gallery3d + + Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); + intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri); + intent.setPackage(defaultCameraPackage); + startActivityForResult(intent, 0); + } 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, 0); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + + Log.i("MakeMachine", "resultCode: " + resultCode); + switch (resultCode) { + case 0: + Log.i("MakeMachine", "User cancelled"); + break; + + case -1: + + editFlag = true; + + if (_pathforcheck != null && !_pathforcheck.equals("")) { + if (new File(str + _pathforcheck).exists()) { + + imgCam.setBackgroundResource(R.mipmap.camera_green); + + img_str = _pathforcheck; + _pathforcheck = ""; + } + } + + if (_pathforcheck1 != null && !_pathforcheck1.equals("")) { + if (new File(str + _pathforcheck1).exists()) { + + imgCam1.setBackgroundResource(R.mipmap.camera_green); + + img_str1 = _pathforcheck1; + _pathforcheck1 = ""; + } + } + if (_pathforcheck2 != null && !_pathforcheck2.equals("")) { + if (new File(str + _pathforcheck2).exists()) { + + imgCam2.setBackgroundResource(R.mipmap.camera_green); + + img_str2 = _pathforcheck2; + _pathforcheck2 = ""; + } + } + + + break; + } + + super.onActivityResult(requestCode, resultCode, data); + } + + public class ProductAdapter extends RecyclerView.Adapter { + + private ArrayList list; + + public ProductAdapter(ArrayList promoList) { + list = promoList; + } + + @Override + public ProductAdapter.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.item_competition_promo, parent, false); + return new ProductAdapter.ViewHolder(view); + } + + @Override + public void onBindViewHolder(final ProductAdapter.ViewHolder holder, int position) { + + final CompetitonPromoGetterSetter mItem = list.get(position); + holder.tv_brand.setText(getString(R.string.promotion_type) + " - " + mItem.getPromotion()); + holder.tv_competitor.setText(getString(R.string.competitor) + " - " + mItem.getBrand()); + holder.tv_sku_name.setText(getString(R.string.comment) + " - " + mItem.getSkuName()); + + } + + @Override + public int getItemCount() { + return list.size(); + } + + public class ViewHolder extends RecyclerView.ViewHolder { + public final View mView; + public final TextView tv_brand, tv_competitor,tv_sku_name; + + public ViewHolder(View view) { + super(view); + + mView = view; + tv_brand = (TextView) mView.findViewById(R.id.tv_brand); + tv_sku_name = (TextView) mView.findViewById(R.id.tv_sku_name); + tv_competitor = (TextView) mView.findViewById(R.id.tv_competitor); + + } + + } + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + + if (id == android.R.id.home) { + ischanged(); + } + + //noinspection SimplifiableIfStatement + if (id == R.id.action_settings) { + return true; + } + + return super.onOptionsItemSelected(item); + } + + void ischanged(){ + if(isdata_added){ + android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(CompetitionPromoActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false) + .setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + finish(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + }) + .setNegativeButton(getString(R.string.cancel), new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + + } + }); + android.app.AlertDialog alert = builder.create(); + alert.show(); + } + else { + super.onBackPressed(); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); + } + } + + @Override + public void onBackPressed() { + ischanged(); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java index a764cf7..6827a49 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/CounterfeitProductsActivity.java @@ -72,7 +72,6 @@ public class CounterfeitProductsActivity extends AppCompatActivity implements Ad RecyclerView rec_added_counterfeit_product; ArrayList addedCounterfeitProducts = new ArrayList<>(); ArrayList exists_data = new ArrayList<>(); - ProductAdapter productAdapter; @Override diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java index 3ee992f..5656222 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -1704,7 +1704,7 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli //STORE_PERFORMANCE_NEW_ADHOC request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", storeId); - request.addProperty("Type", "STORE_PERFORMANCE_NEW_ADHOC"); + request.addProperty("Type", "STORE_PERFORMANCE_NEW_ADHOC_REVISED"); request.addProperty("cultureid", culture_id); envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java index 07f998e..e7bf179 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/download/DownloadActivity.java @@ -70,6 +70,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter; @@ -127,6 +128,7 @@ public class DownloadActivity extends AppCompatActivity { JourneyPlanGetterSetter pharmaJcpGetterSetter; MappingPharmaQuestionGetterSetter mappingPharmaQuestionGetterSetter; MappingPharmaMSLGetterSetter mappingPharmaMSLGetterSetter; + PROMOTION_TYPE_MASTERGetterSetter promotion_type_masterGetterSetter; private Dialog dialog; private ProgressBar pb; @@ -308,8 +310,7 @@ public class DownloadActivity extends AppCompatActivity { if (additionalJcpGetterSetter.getSTORE_ID().size() > 0) { resultHttp = CommonString.KEY_SUCCESS; - } - else { + } else { no_addtional_jcp_flag = true; @@ -342,8 +343,7 @@ public class DownloadActivity extends AppCompatActivity { if (additionalAdhocJcpGetterSetter.getSTORE_ID().size() > 0) { resultHttp = CommonString.KEY_SUCCESS; - } - else { + } else { if (no_jcp_flag && no_adhoc_flag && no_addtional_jcp_flag) { return "JOURNEY_PLAN"; @@ -905,7 +905,7 @@ public class DownloadActivity extends AppCompatActivity { //STORE_PERFORMANCE request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); request.addProperty("UserName", userId); - request.addProperty("Type", "STORE_PERFORMANCE_NEW"); + request.addProperty("Type", "STORE_PERFORMANCE_REVISED"); request.addProperty("cultureid", culture_id); envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); @@ -1518,7 +1518,7 @@ public class DownloadActivity extends AppCompatActivity { result = envelope.getResponse(); if (result.toString() != null) { - xpp.setInput(new StringReader(result.toString())); + xpp.setInput(new StringReader(result.toString())); xpp.next(); eventType = xpp.getEventType(); pharmaJcpGetterSetter = XMLHandlers.JCPXMLHandler(xpp, eventType); @@ -1595,6 +1595,47 @@ public class DownloadActivity extends AppCompatActivity { } } + + + //usk + // MAPPING_PHARMA_MSL + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD); + request.addProperty("UserName", userId); + request.addProperty("Type", "PROMOTION_TYPE_MASTER"); + request.addProperty("cultureid", culture_id); + + envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11); + envelope.dotNet = true; + envelope.setOutputSoapObject(request); + + androidHttpTransport = new HttpTransportSE(CommonString.URL); + androidHttpTransport.call(CommonString.SOAP_ACTION_UNIVERSAL, envelope); + + result = envelope.getResponse(); + + if (result.toString() != null) { + xpp.setInput(new StringReader(result.toString())); + xpp.next(); + eventType = xpp.getEventType(); + + promotion_type_masterGetterSetter = XMLHandlers.mappingPROMOTION_TYPE_MASTERXMLHandler(xpp, eventType); + + String stocktable = promotion_type_masterGetterSetter.getTable_PROMOTION_TYPE_MASTER(); + if (stocktable != null) { + resultHttp = CommonString.KEY_SUCCESS; + TableBean.setTable_PROMOTION_TYPE_MASTER(stocktable); + } + + if (mappingPharmaMSLGetterSetter.getSKU_ID().size() > 0) { + data.value = 99; + data.name = "PROMOTION_TYPE_MASTER " + getResources().getString(R.string.download_data); + } else { + // return "MAPPING_PHARMA_MSL"; + } + + } + + publishProgress(data); /* //MAPPING_COUNTRYWISE_PLANOGRAM @@ -1654,7 +1695,7 @@ public class DownloadActivity extends AppCompatActivity { file.mkdir(); } - if(!new File(PATH + image_name).exists()){ + if (!new File(PATH + image_name).exists()) { if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) { URL url = new URL(path + "/" + image_name); HttpURLConnection c = (HttpURLConnection) url.openConnection(); @@ -1780,7 +1821,7 @@ public class DownloadActivity extends AppCompatActivity { file.mkdir(); } - if(!new File(PATH + image_name).exists()){ + if (!new File(PATH + image_name).exists()) { if (!image_name.equalsIgnoreCase("NA") && !image_name.equalsIgnoreCase("")) { URL url = new URL(path + "/" + image_name); HttpURLConnection c = (HttpURLConnection) url.openConnection(); @@ -1953,8 +1994,8 @@ public class DownloadActivity extends AppCompatActivity { //NON_WORKING_SUB_REASON added - 26.09.2018 db.insertNonWorkingSubreasonData(nonWorkingSubReasonGetterSetter); - - db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter, "STORE_PERFORMANCE_NEW"); + //usk + db.InsertSTORE_PERFORMANCE(store_performance_masterGetterSetter, "STORE_PERFORMANCE_REVISED"); db.InsertMAPPING_PLANOGRAM(mapping_planogram_masterGetterSetter, "MAPPING_PLANOGRAM"); db.InsertADDITIONAL_DISPLAY(additional_display_getter_setter); db.InsertMAPPING_SOS_TARGET(mapping_sos_target_masterGetterSetter, "MAPPING_SOS_TARGET"); @@ -1968,7 +2009,7 @@ public class DownloadActivity extends AppCompatActivity { db.InsertPOGQUESTION(pogQuestionGetterSetter); db.InsertNON_T2P_REASON(nonT2pReasonGetterSetter); db.InsertCONFIGURATION_COUNTRY_WISE(configurationContrywiseGetterSetter); - db.InsertNO_CAMERA_LAST_VISIT_DATA(noCameraLastVisitGetterSetter,"NO_CAMERA_LAST_VISIT_DATA"); + db.InsertNO_CAMERA_LAST_VISIT_DATA(noCameraLastVisitGetterSetter, "NO_CAMERA_LAST_VISIT_DATA"); db.insertSUPERVISOR_LIST_DATA(supervisorListGetterSetter); db.InsertGeoTag_DATA(geoFencingGetterSetter); db.InsertCONFIGURATION_MASTER(configurationMasterGetterSetter); @@ -1980,6 +2021,7 @@ public class DownloadActivity extends AppCompatActivity { db.InsertPharmaJCP(pharmaJcpGetterSetter); db.InsertMAPPING_PHARMA_MSL(mappingPharmaMSLGetterSetter); db.InsertAdditionalAdhocJCP(additionalAdhocJcpGetterSetter); + db.InsertPROMOTION_TYPE_MASTER(promotion_type_masterGetterSetter); } catch (MalformedURLException e) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java index be2b549..04420a0 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryListActivity.java @@ -271,6 +271,16 @@ public class CategoryListActivity extends AppCompatActivity { } } + //usk + if(country_id.equals("6")&& category_id.equals("2")){ + + if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) { + flag = false; + } + + } + + } flag_filled = flag; @@ -656,6 +666,15 @@ public class CategoryListActivity extends AppCompatActivity { break; } + } + //usk + if(country_id.equals("6")&& category_id.equals("2")){ + + if (db.getCompetitionPromoExistsAfterData(store_id, category_id).size() == 0) { + flag_filled = false; + break; + } + } flag_filled = true; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java index 035a92e..381de67 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/CategoryWisePerformanceActivity.java @@ -107,7 +107,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId, CommonString.TABLE_STORE_PERFORMANCE_NEW_ADHOC); } else { - categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId, "STORE_PERFORMANCE_NEW"); + categoryWisePerformanceList = db.getCategoryWisePerformance(store_id, categoryId, "STORE_PERFORMANCE_REVISED"); } @@ -180,7 +180,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { holder.txt_sos.setText(categoryData.getSos()); holder.txt_t2p.setText(categoryData.getT2p()); holder.txt_promo.setText(categoryData.getPromo()); - holder.txt_oss.setText(categoryData.getOss()); + holder.txt_planogram.setText(categoryData.getPLANOGRAM()); } @@ -191,7 +191,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { } class MyViewHolder extends RecyclerView.ViewHolder { - TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss,txt_planogram; + TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability,txt_planogram; LinearLayout lay_menu; public MyViewHolder(View itemView) { @@ -202,7 +202,6 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { txt_t2p = (TextView) itemView.findViewById(R.id.txt_t2p); txt_promo = (TextView) itemView.findViewById(R.id.txt_promo); txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability); - txt_oss = (TextView) itemView.findViewById(R.id.txt_oss); txt_planogram = (TextView) itemView.findViewById(R.id.txt_planogram); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java index e8b7752..ac2ab93 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/DailyDataMenuActivity.java @@ -36,6 +36,7 @@ import cpm.com.gskmtorange.dailyentry.AdditionalPromoSKUwiseActivity; import cpm.com.gskmtorange.dailyentry.AdditionalVisibility; import cpm.com.gskmtorange.dailyentry.AuditActivity; import cpm.com.gskmtorange.dailyentry.CategoryPicture; +import cpm.com.gskmtorange.dailyentry.CompetitionPromoActivity; import cpm.com.gskmtorange.dailyentry.CounterfeitProductsActivity; import cpm.com.gskmtorange.dailyentry.CreateSelfActivity; import cpm.com.gskmtorange.dailyentry.POGQuestionsActivity; @@ -342,6 +343,24 @@ public class DailyDataMenuActivity extends AppCompatActivity { categoryList.add(data); } + //usk + //Cometition promo Option - Egypt + if (categoryId.equals("2")){ + if(country_id.equals("6")){ + data = new DailyDataMenuGetterSetter(); + + if (db.getCompetitionPromoExistsAfterData(store_id, categoryId).size() > 0) { + data.setCategory_img(R.mipmap.competition_done); + } else { + data.setCategory_img(R.mipmap.competition); + } + + data.setCategory_name(getString(R.string.title_activity_competition_promo)); + categoryList.add(data); + } + + } + //Stock Pricing Option - Turkey /*if(country_id.equals("4")){ data = new DailyDataMenuGetterSetter(); @@ -727,8 +746,16 @@ public class DailyDataMenuActivity extends AppCompatActivity { intent.putExtra("categoryId", categoryId); startActivity(intent); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); + } else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_competition_promo))) { + Intent intent = new Intent(DailyDataMenuActivity.this, CompetitionPromoActivity.class); + intent.putExtra("categoryName", dailyData.getCategory_name()); + intent.putExtra("categoryId", categoryId); + startActivity(intent); + overridePendingTransition(R.anim.activity_in, R.anim.activity_out); } + + } }); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java index 7b1d4c9..ecaa86d 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/StoreWisePerformanceActivity.java @@ -136,7 +136,8 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { storeWisePerformanceList = db.getStoreWisePerformance(store_id, CommonString.TABLE_STORE_PERFORMANCE_NEW_ADHOC); } else { - storeWisePerformanceList = db.getStoreWisePerformance(store_id, "STORE_PERFORMANCE_NEW"); + storeWisePerformanceList = db.getStoreWisePerformance(store_id, "STORE_PERFORMANCE_REVISED"); + } @@ -208,7 +209,6 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { holder.txt_sos.setText(categoryData.getSos()); holder.txt_t2p.setText(categoryData.getT2p()); holder.txt_promo.setText(categoryData.getPromo()); - holder.txt_oss.setText(categoryData.getOss()); holder.txt_planogram.setText(categoryData.getPLANOGRAM()); } @@ -219,7 +219,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { } class MyViewHolder extends RecyclerView.ViewHolder { - TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability, txt_oss,txt_planogram; + TextView txt_period, txt_sos, txt_t2p, txt_promo, txt_msl_availability,txt_planogram; LinearLayout lay_menu; public MyViewHolder(View itemView) { @@ -230,7 +230,6 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { txt_t2p = (TextView) itemView.findViewById(R.id.txt_t2p); txt_promo = (TextView) itemView.findViewById(R.id.txt_promo); txt_msl_availability = (TextView) itemView.findViewById(R.id.txt_msl_availability); - txt_oss = (TextView) itemView.findViewById(R.id.txt_oss); txt_planogram = (TextView) itemView.findViewById(R.id.txt_planogram); 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 bddaff6..9f7869e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/PreviousDataUploadActivity.java @@ -47,6 +47,7 @@ import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonFunctions; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; @@ -105,6 +106,7 @@ public class PreviousDataUploadActivity extends AppCompatActivity { ArrayList promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters; ArrayList counterfeitProductGetterSetters, counterfeitProductExistsGetterSetters; + ArrayList competitonGetterSetters, competitonExistsGetterSetters; @Override protected void onCreate(Bundle savedInstanceState) { @@ -1470,6 +1472,76 @@ public class PreviousDataUploadActivity extends AppCompatActivity { data.value = 65; data.name = getString(R.string.title_activity_counterfeit_products); publishProgress(data); + + //usk upload + //Competitomn promo - Country Id - 6 (egipt) + String competiton_data_xml = "", add_competiton_data_xml = "", competiton_exists_xml = "", competiton_add_xml = ""; + + db.open(); + competitonExistsGetterSetters = db.getCompetitionPromoExistsAfterData(coverageList.get(i).getStoreId(), null); + if (competitonExistsGetterSetters.size() > 0) { + + for (int l = 0; l < competitonExistsGetterSetters.size(); l++) { + + add_competiton_data_xml = ""; + + competitonGetterSetters = db.getCometionPromoAfterData(competitonExistsGetterSetters.get(l).get_id(), null); + + for (int i1 = 0; i1 < competitonGetterSetters.size(); i1++) { + if (!competitonGetterSetters.get(i1).getCategory_id().equals("0")) { + + competiton_add_xml = "[COMPETITION_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + Integer.parseInt(competitonGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + + "[COMMENT]" + competitonGetterSetters.get(i1).getSkuName() + "[/COMMENT]" + + "[BRAND_ID]" + competitonGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]" + + "[IMAGE1]" + competitonGetterSetters.get(i1).getImgStr() + "[/IMAGE1]" + + "[PROMO_TYPE]" + competitonGetterSetters.get(i1).getPromotion_id() + "[/PROMO_TYPE]" + + "[/COMPETITION_DATA]"; + + add_competiton_data_xml = add_competiton_data_xml + competiton_add_xml; + } + } + + int exists = 0; + if (competitonExistsGetterSetters.get(l).isExists()) { + exists = 1; + } + + competiton_exists_xml = "[COMPETITION_PROMOTION_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + Integer.parseInt(competitonExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]" + + "[IS_EXISTS]" + exists + "[/IS_EXISTS]" + + "[COMPETITION_DATA]" + add_competiton_data_xml + "[/COMPETITION_DATA]" + + "[/COMPETITION_PROMOTION_DATA]"; + + competiton_data_xml = competiton_data_xml + competiton_exists_xml; + + } + + final String sos_xml = "[DATA]" + competiton_data_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "COMPETITION_PROMOTION_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(); + } + + data.value = 68; + data.name = getString(R.string.title_activity_competition_promo); + publishProgress(data); } //----------------------------------------------------------------------------------------------------------------------------------------------------- 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 3b709c8..ba054ef 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -63,6 +63,7 @@ import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.retrofit.PostApiForFile; import cpm.com.gskmtorange.retrofit.StringConverterFactory; import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.CompetitonPromoGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.CounterfeitProductGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; @@ -120,6 +121,7 @@ public class UploadActivity extends AppCompatActivity { ArrayList storeWiseCameraDataGetterSetters; ArrayList promoComplianceSkuwiseGetterSetters, promoComplianceSkuwiseExistsGetterSetters; ArrayList counterfeitProductGetterSetters, counterfeitProductExistsGetterSetters; + ArrayList competitonGetterSetters, competitonExistsGetterSetters; RequestBody body1; private Retrofit adapter; @@ -1650,6 +1652,76 @@ public class UploadActivity extends AppCompatActivity { data.value = 65; data.name = getString(R.string.title_activity_counterfeit_products); publishProgress(data); + + //usk upload + //Competion promo - Country Id - 6 (egipt) + String competiton_data_xml = "", add_competiton_data_xml = "", competiton_exists_xml = "", competiton_add_xml = ""; + + db.open(); + competitonExistsGetterSetters = db.getCompetitionPromoExistsAfterData(coverageList.get(i).getStoreId(), null); + if (competitonExistsGetterSetters.size() > 0) { + + for (int l = 0; l < competitonExistsGetterSetters.size(); l++) { + + add_competiton_data_xml = ""; + + competitonGetterSetters = db.getCometionPromoAfterData(competitonExistsGetterSetters.get(l).get_id(), null); + + for (int i1 = 0; i1 < competitonGetterSetters.size(); i1++) { + if (!competitonGetterSetters.get(i1).getCategory_id().equals("0")) { + + competiton_add_xml = "[COMPETITION_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + Integer.parseInt(competitonGetterSetters.get(i1).getCategory_id()) + "[/CATEGORY_ID]" + + "[COMMENT]" + competitonGetterSetters.get(i1).getSkuName() + "[/COMMENT]" + + "[BRAND_ID]" + competitonGetterSetters.get(i1).getBrandId() + "[/BRAND_ID]" + + "[IMAGE1]" + competitonGetterSetters.get(i1).getImgStr() + "[/IMAGE1]" + + "[PROMO_TYPE]" + competitonGetterSetters.get(i1).getPromotion_id() + "[/PROMO_TYPE]" + + "[/COMPETITION_DATA]"; + + add_competiton_data_xml = add_competiton_data_xml + competiton_add_xml; + } + } + + int exists = 0; + if (competitonExistsGetterSetters.get(l).isExists()) { + exists = 1; + } + + competiton_exists_xml = "[COMPETITION_PROMOTION_DATA]" + + "[MID]" + mid + "[/MID]" + + "[USER_ID]" + userId + "[/USER_ID]" + + "[CATEGORY_ID]" + Integer.parseInt(competitonExistsGetterSetters.get(l).getCategory_id()) + "[/CATEGORY_ID]" + + "[IS_EXISTS]" + exists + "[/IS_EXISTS]" + + "[COMPETITION_DATA]" + add_competiton_data_xml + "[/COMPETITION_DATA]" + + "[/COMPETITION_PROMOTION_DATA]"; + + competiton_data_xml = competiton_data_xml + competiton_exists_xml; + + } + + final String sos_xml = "[DATA]" + competiton_data_xml + "[/DATA]"; + + request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA); + request.addProperty("XMLDATA", sos_xml); + request.addProperty("KEYS", "COMPETITION_PROMOTION_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(); + } + + data.value = 68; + data.name = getString(R.string.title_activity_competition_promo); + publishProgress(data); } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java index 0297821..758476a 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadImageWithRetrofit.java @@ -331,7 +331,7 @@ public class UploadImageWithRetrofit { } - public void UploadDeliveryImageRecursive(final Context context, final ArrayList file_list, final int index) { + public void UploadDeliveryImageRecursive(final Context context, final ArrayList file_list, final int index) { try { final int[] _index = {index}; status = 0; diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/BrandMasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/BrandMasterGetterSetter.java index 26cfda9..3b1bbc1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/BrandMasterGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/BrandMasterGetterSetter.java @@ -13,6 +13,16 @@ public class BrandMasterGetterSetter { ArrayList BRAND_ID = new ArrayList<>(); ArrayList BRAND = new ArrayList<>(); ArrayList SUB_CATEGORY_ID = new ArrayList<>(); + + public ArrayList getSUB_CATEGORY() { + return SUB_CATEGORY; + } + + public void setSUB_CATEGORY(String SUB_CATEGORY) { + this.SUB_CATEGORY.add(SUB_CATEGORY); + } + + ArrayList SUB_CATEGORY = new ArrayList<>(); ArrayList COMPANY_ID = new ArrayList<>(); ArrayList BRAND_SEQUENCE = new ArrayList<>(); ArrayList BRAND_SEQUENCE_SA = new ArrayList<>(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CompetitonPromoGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CompetitonPromoGetterSetter.java new file mode 100644 index 0000000..3b9d34b --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/CompetitonPromoGetterSetter.java @@ -0,0 +1,105 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +public class CompetitonPromoGetterSetter { + + String skuName; + String imgStr; + String imgStr1; + String imgStr2; + String brand; + String _id; + String category_id; + int brandId; + String promotion; + int promotion_id; + + public String getPromotion() { + return promotion; + } + + public void setPromotion(String promotion) { + this.promotion = promotion; + } + + public int getPromotion_id() { + return promotion_id; + } + + public void setPromotion_id(int promotion_id) { + this.promotion_id = promotion_id; + } + + boolean isExists = true; + + public String getSkuName() { + return skuName; + } + + public void setSkuName(String skuName) { + this.skuName = skuName; + } + + public String getImgStr() { + return imgStr; + } + + public void setImgStr(String imgStr) { + this.imgStr = imgStr; + } + + public String getImgStr1() { + return imgStr1; + } + + public void setImgStr1(String imgStr1) { + this.imgStr1 = imgStr1; + } + + public String getImgStr2() { + return imgStr2; + } + + public void setImgStr2(String imgStr2) { + this.imgStr2 = imgStr2; + } + + public int getBrandId() { + return brandId; + } + + public void setBrandId(int brandId) { + this.brandId = brandId; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String get_id() { + return _id; + } + + public void set_id(String _id) { + this._id = _id; + } + + public boolean isExists() { + return isExists; + } + + public void setExists(boolean exists) { + isExists = exists; + } + + public String getCategory_id() { + return category_id; + } + + public void setCategory_id(String category_id) { + this.category_id = category_id; + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/PROMOTION_TYPE_MASTERGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/PROMOTION_TYPE_MASTERGetterSetter.java new file mode 100644 index 0000000..31d8a8f --- /dev/null +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/PROMOTION_TYPE_MASTERGetterSetter.java @@ -0,0 +1,35 @@ +package cpm.com.gskmtorange.xmlGetterSetter; + +import java.util.ArrayList; + +public class PROMOTION_TYPE_MASTERGetterSetter { + + String table_PROMOTION_TYPE_MASTER; + + ArrayList PROMOTION_TYPE_ID = new ArrayList<>(); + ArrayList PROMOTION_TYPE = new ArrayList<>(); + + public String getTable_PROMOTION_TYPE_MASTER() { + return table_PROMOTION_TYPE_MASTER; + } + + public void setTable_PROMOTION_TYPE_MASTER(String table_PROMOTION_TYPE_MASTER) { + this.table_PROMOTION_TYPE_MASTER = table_PROMOTION_TYPE_MASTER; + } + + public ArrayList getPROMOTION_TYPE_ID() { + return PROMOTION_TYPE_ID; + } + + public void setPROMOTION_TYPE_ID(String PROMOTION_TYPE_ID) { + this.PROMOTION_TYPE_ID.add(PROMOTION_TYPE_ID); + } + + public ArrayList getPROMOTION_TYPE() { + return PROMOTION_TYPE; + } + + public void setPROMOTION_TYPE(String PROMOTION_TYPE) { + this.PROMOTION_TYPE.add(PROMOTION_TYPE); + } +} diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java index 1114991..96317c6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/STORE_PERFORMANCE_MasterGetterSetter.java @@ -16,7 +16,6 @@ public class STORE_PERFORMANCE_MasterGetterSetter { ArrayList T2P = new ArrayList<>(); ArrayList PROMO = new ArrayList<>(); ArrayList MSL_AVAILABILITY = new ArrayList<>(); - ArrayList OSS = new ArrayList<>(); ArrayList ORDERID = new ArrayList<>(); ArrayList PLANOGRAM = new ArrayList<>(); public ArrayList getPLANOGRAM() { @@ -95,14 +94,6 @@ public class STORE_PERFORMANCE_MasterGetterSetter { this.MSL_AVAILABILITY.add(MSL_AVAILABILITY); } - public ArrayList getOSS() { - return OSS; - } - - public void setOSS(String OSS) { - this.OSS.add(OSS); - } - public ArrayList getORDERID() { return ORDERID; } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java index a7e104e..d21927b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlGetterSetter/TableBean.java @@ -43,6 +43,15 @@ public class TableBean { public static String Table_CONFIGURATION_MASTER; public static String Table_MAPPING_STOCK_STOREWISE; public static String Table_MAPPING_PLANOGRAM_STORE_WISE; + public static String Table_PROMOTION_TYPE_MASTER; + + public static String getTable_PROMOTION_TYPE_MASTER() { + return Table_PROMOTION_TYPE_MASTER; + } + + public static void setTable_PROMOTION_TYPE_MASTER(String table_PROMOTION_TYPE_MASTER) { + Table_PROMOTION_TYPE_MASTER = table_PROMOTION_TYPE_MASTER; + } public static String getTable_MAPPING_PHARMA_MSL() { return Table_MAPPING_PHARMA_MSL; 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 d35864f..c5f80fd 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/xmlHandlers/XMLHandlers.java @@ -38,6 +38,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.NonWorkingSubReasonGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.POGQuestionGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.PROMOTION_TYPE_MASTERGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.STORE_PERFORMANCE_MasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.ShelfMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGroupMasterGetterSetter; @@ -771,9 +772,6 @@ public class XMLHandlers { if (xpp.getName().equals("MSL")) { st.setMSL_AVAILABILITY(xpp.nextText()); } - if (xpp.getName().equals("OSS")) { - st.setOSS(xpp.nextText()); - } if (xpp.getName().equals("ORDERID")) { st.setORDERID(xpp.nextText()); } @@ -1590,4 +1588,37 @@ public class XMLHandlers { } return stock; } + + + + public static PROMOTION_TYPE_MASTERGetterSetter mappingPROMOTION_TYPE_MASTERXMLHandler(XmlPullParser xpp, + int eventType) { + PROMOTION_TYPE_MASTERGetterSetter stock = new PROMOTION_TYPE_MASTERGetterSetter(); + + try { + while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) { + if (xpp.getEventType() == XmlPullParser.START_TAG) { + if (xpp.getName().equals("META_DATA")) { + stock.setTable_PROMOTION_TYPE_MASTER(xpp.nextText()); + } + if (xpp.getName().equals("PROMOTION_TYPE_ID")) { + stock.setPROMOTION_TYPE_ID(xpp.nextText()); + } + if (xpp.getName().equals("PROMOTION_TYPE")) { + stock.setPROMOTION_TYPE(xpp.nextText()); + } + + } + xpp.next(); + } + } catch (XmlPullParserException e) { + + e.printStackTrace(); + } catch (IOException e) { + + e.printStackTrace(); + } + return stock; + } + } diff --git a/GSKMTOrange/src/main/res/layout/activity_compition_promo.xml b/GSKMTOrange/src/main/res/layout/activity_compition_promo.xml new file mode 100644 index 0000000..8d1f6fd --- /dev/null +++ b/GSKMTOrange/src/main/res/layout/activity_compition_promo.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml b/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml index 73411db..f94c503 100644 --- a/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/content_category_wise_performance.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" - android:weightSum="28"> + android:weightSum="24"> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +//SUB CATEGORY + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml b/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml index 0165cfa..1a8bc92 100644 --- a/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/content_store_wise_performance.xml @@ -41,7 +41,7 @@ android:layout_height="wrap_content" android:gravity="center_vertical" android:orientation="horizontal" - android:weightSum="28"> + android:weightSum="24"> - - - - + android:weightSum="24"> - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/GSKMTOrange/src/main/res/layout/item_store_wise_performance.xml b/GSKMTOrange/src/main/res/layout/item_store_wise_performance.xml index 7bce5c2..5a9c05e 100644 --- a/GSKMTOrange/src/main/res/layout/item_store_wise_performance.xml +++ b/GSKMTOrange/src/main/res/layout/item_store_wise_performance.xml @@ -14,7 +14,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:weightSum="28"> + android:weightSum="24"> - - - المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ المواجهه لا يمكن ان تكون اكثر من او مساويه للكميه الواجب توافرها MBQ + + + + نوع العرض الترويجى + اسم المنافس + تعليق + تعليق + التواجد diff --git a/GSKMTOrange/src/main/res/values-ar-rEG/string.xml b/GSKMTOrange/src/main/res/values-ar-rEG/string.xml index 7602de1..0f7ee1f 100644 --- a/GSKMTOrange/src/main/res/values-ar-rEG/string.xml +++ b/GSKMTOrange/src/main/res/values-ar-rEG/string.xml @@ -200,28 +200,22 @@ تحميل صور جغرافية هل ترغب في الاستمرار؟ سيتم حذف البيانات الغير المحفوظة نعم - تحميل بيانات البلانوجرام الخاص بالمخزون - صور الفئة صور الفئة - رجاء املأ بيانات عدم امكانية التصوير الرف الموقع موجود بالفعل رجاء اختيار صنف واحد على الأقل أضف صنف لا يمكن ترك الرف فارغا - الرف/ الموقع موجود بالفعل - إضافة الرف الصنف إضافة إضافة منتج إلى الجرف صورة مقطعية المقتفي موقف بشأن الجرف - صوره الخروج من المتجر انقر فوق الصورة الامامية لمخزن الصورة @@ -229,6 +223,11 @@ -برجاء تعبئه المخزون بقيمه عدد او صفر أول تعبئة لقيمة المخزون المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ - المواجهه لا يمكن ان تكون اكثر من او مساويه للكميه الواجب توافرها MBQ + + نوع العرض الترويجى + اسم المنافس + تعليق + تعليق + التواجد diff --git a/GSKMTOrange/src/main/res/values-ar-rSA/string.xml b/GSKMTOrange/src/main/res/values-ar-rSA/string.xml index 7602de1..3547085 100644 --- a/GSKMTOrange/src/main/res/values-ar-rSA/string.xml +++ b/GSKMTOrange/src/main/res/values-ar-rSA/string.xml @@ -231,4 +231,11 @@ المخزون لا يمكن ان يكون مساوي او اكثر من الكميات التي يجب توافرها من الصنف MBQ المواجهه لا يمكن ان تكون اكثر من او مساويه للكميه الواجب توافرها MBQ + + + نوع العرض الترويجى + اسم المنافس + تعليق + تعليق + التواجد diff --git a/GSKMTOrange/src/main/res/values-ar/string.xml b/GSKMTOrange/src/main/res/values-ar/string.xml index 986222d..be964a7 100644 --- a/GSKMTOrange/src/main/res/values-ar/string.xml +++ b/GSKMTOrange/src/main/res/values-ar/string.xml @@ -335,4 +335,11 @@ زيارات التحصيل الغير مخطط لها + + نوع العرض الترويجى + اسم المنافس + تعليق + تعليق + التواجد + diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 1a608b5..c7097c0 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -317,6 +317,13 @@ Giriş/Çıkış yapmak için mağazada olmalısınız Mağazadan uzaklık + + نوع العرض الترويجى + اسم المنافس + تعليق + تعليق + التواجد + diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 8e84e07..1b73dc0 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -1,10 +1,8 @@ GSK MT Orange GSK Orange Stores - Open navigation drawer Close navigation drawer - Settings Sign in @@ -44,27 +42,19 @@ Delete Store Visited GSK MT ORANGE STORE - Click Store Front Image - Please select language Select Language - Store List - Geo Tag - - Daily Route Plan Daily Data Download Upload Data Geo Tag Data Export - Exit Settings Services - Visibility/T2P @@ -73,7 +63,6 @@ Daily Data Menu SKU Availability Stock and Facing - SKU Availability Stock and Facing Visibility/T2P @@ -81,11 +70,9 @@ Promo Compliance Competition Visibility Competition Promo - SKU Name MBQ Availability - Reference Image SKU Name Stock @@ -97,21 +84,16 @@ Store Uploaded Store Geo Data Uploaded Store Already Geotagged - Store Already Uploaded Store Data Uploaded Store Already Checkout Please Upload data again Store Closed Store Already Closed - Please checkout from current store Data already filled - Please Download Data First - Enter the values - Upload Data No Data For Upload First checkout of store @@ -127,7 +109,6 @@ Promo Announcer Running on POS Add - Period MSL SOS @@ -138,7 +119,6 @@ LTM MTD LSV - Store wise Performance @@ -147,7 +127,6 @@ Display Photo Additional Visibility - Are you sure you want to save Please Add Data Are you sure you want to add @@ -157,11 +136,9 @@ Click Yes To Delete! Please Select dropdown Please Take a image - Please fill sku data Please enter Quantity Do you want to save the data - Please click the image GPS IS DISABLED... Click ok to enable GPS. @@ -174,19 +151,15 @@ success Are you sure you want to Checkout No Network Connection. Please Check Your Internet Connection - Non Working Reason Close - Please click image Please fill SKU data Please fill GAP data Do you Want to proceed? Unsaved Data will be deleted. - Downloading Data Store Visited Click Store Front Image - Store Front Image Reason Select Reason @@ -195,7 +168,6 @@ Reference Image Settings - OK Are you sure you want to save Data has been saved @@ -211,36 +183,24 @@ Hello blank fragment Checkout Activity Checkout Success - Network Error , Data Not Uploaded , Display Name Click Yes To Add Data Remark Please fill Remark - Service - Data downloaded successfully Export Database Database Exported Successfully - Database Exported And Uploaded Successfully - Data Uploaded Successfully - Uploaded Data - Please Upload Previous Data First - This username is incorrect - Error Uploading - - Gallery Camera - Saved data will be lost - Do you want to continue? No data available Please download data @@ -389,6 +349,7 @@ Discount Percentage Please select Sub category Please select Brand + Please select Promotion Type Please select SKU Please enter discount percentage Please enter price @@ -396,7 +357,6 @@ Exists Price flasher available? Change Password - Do you want to download data Do you want to upload data Do you want to exit @@ -422,9 +382,12 @@ Incorrect MPin limit reached Need to reset MPin Counterfeit Products + Competition Promo Is there counterfeit products in Store? Please enter SKU name + Please enter comment Please enter Stock + Please select Competitor Forgot MPin @@ -442,16 +405,20 @@ Store Detail Additional Stores GSK - Competitor SOS Detail Stock Pricing - Price Please fill Stock Count Counterfeit Indicators - Additional Stores - Adhoc + + Promo Type + Competitor Name + Comment + Competition Promotion + + diff --git a/build.gradle b/build.gradle index 5bdf6a7..976b7df 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.5.0' // Add dependency classpath 'io.fabric.tools:gradle:1.26.1' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c5a25c6..11cf18c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue May 28 18:51:36 IST 2019 +#Tue Jan 07 11:36:04 IST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java index ff998d8..2a42394 100644 --- a/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java +++ b/library/build/generated/source/buildConfig/debug/com/androidbuts/multispinnerfilter/BuildConfig.java @@ -5,6 +5,11 @@ package com.androidbuts.multispinnerfilter; public final class BuildConfig { public static final boolean DEBUG = Boolean.parseBoolean("true"); + public static final String LIBRARY_PACKAGE_NAME = "com.androidbuts.multispinnerfilter"; + /** + * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME + */ + @Deprecated public static final String APPLICATION_ID = "com.androidbuts.multispinnerfilter"; public static final String BUILD_TYPE = "debug"; public static final String FLAVOR = ""; diff --git a/library/build/outputs/logs/manifest-merger-debug-report.txt b/library/build/outputs/logs/manifest-merger-debug-report.txt index 0fddadd..d643700 100644 --- a/library/build/outputs/logs/manifest-merger-debug-report.txt +++ b/library/build/outputs/logs/manifest-merger-debug-report.txt @@ -1,41 +1,41 @@ -- Merging decision tree log --- manifest -ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 package - ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49 - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:3:5-49 + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:versionName - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:versionCode - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:1-9:12 + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml xmlns:android - ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69 + ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:2:11-69 application -ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19 +ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:5-7:19 android:allowBackup - ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44 + ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml:5:18-44 uses-sdk -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml -INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml reason: use-sdk injection requested +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml +INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:targetSdkVersion - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml android:minSdkVersion - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml - ADDED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml - INJECTED from D:\GITHub\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + ADDED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml + INJECTED from F:\AndroidStudioProject\GSKORANGEV2\library\src\main\AndroidManifest.xml