From 783a8ed103db8bb2a4e689304986d69ba8cb0649 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 20 Jan 2017 13:44:46 +0530 Subject: [PATCH 1/5] newcode --- .../dailyentry/AdditionalVisibility.java | 32 +++++++++---------- .../src/main/res/layout/activity_geo_tag.xml | 4 +-- .../res/layout/additionalvisibilitylayout.xml | 2 +- GSKMTOrange/src/main/res/values/strings.xml | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index 10b63c5..a787601 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -301,10 +301,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_save_data)) + .setMessage(getResources().getString(R.string.title_activity_Want_save)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -355,10 +355,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_save)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_save_data)) + .setMessage(getResources().getString(R.string.title_activity_Want_save)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -419,10 +419,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_add)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.adddatatoclick)) + .setMessage(getResources().getString(R.string.title_activity_Want_to_add)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -501,10 +501,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -550,10 +550,10 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -612,11 +612,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder( AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -1288,11 +1288,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -1418,11 +1418,11 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl AdditionalVisibility.this); // set title - alertDialogBuilder.setTitle(getResources().getString(R.string.title_activity_Want_to_delete1)); + alertDialogBuilder.setTitle(getResources().getString(R.string.dialog_title)); // set dialog message alertDialogBuilder - .setMessage(getResources().getString(R.string.title_activity_click_delete)) + .setMessage(getResources().getString(R.string.data_will_be_lost)) .setCancelable(false) .setPositiveButton(getResources().getString(R.string.yes), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { diff --git a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml index bf1afd1..c68fe9e 100644 --- a/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml +++ b/GSKMTOrange/src/main/res/layout/activity_geo_tag.xml @@ -30,7 +30,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" app:srcCompat="@android:drawable/ic_menu_save" - app:backgroundTint="@color/colorPrimary" + app:backgroundTint="@color/colorAccent" /> diff --git a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml index cd601f1..3234393 100644 --- a/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml +++ b/GSKMTOrange/src/main/res/layout/additionalvisibilitylayout.xml @@ -16,7 +16,7 @@ android:layout_gravity="bottom|end" android:layout_margin="@dimen/fab_margin" app:srcCompat="@android:drawable/ic_menu_save" - app:backgroundTint="@color/colorPrimary" + app:backgroundTint="@color/colorAccent" /> diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index eb0a1b5..1ab6d91 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -165,7 +165,7 @@ Please click the image GPS IS DISABLED... Click ok to enable GPS. - Please Take Image Before Save + Please Take Image This device is not supported. Uploading Data Uploading Geotag Data... From fb0718e5e219d83494b72064d8a219899b37a63c Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 20 Jan 2017 15:52:16 +0530 Subject: [PATCH 2/5] newcode --- .idea/misc.xml | 2 +- .../cpm/com/gskmtorange/MainActivity.java | 5 ++++- .../dailyentry/AdditionalVisibility.java | 2 +- .../gskmtorange/upload/UploadActivity.java | 21 ++++++++++++++----- GSKMTOrange/src/main/res/values-tr/string.xml | 8 +++---- GSKMTOrange/src/main/res/values/strings.xml | 2 +- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index b15ecee..b8dc4d6 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -41,7 +41,7 @@ - + diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java index 8325d9c..4e9d76f 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java @@ -15,6 +15,7 @@ import android.os.Environment; import android.preference.PreferenceManager; import android.support.design.widget.NavigationView; import android.support.design.widget.Snackbar; +import android.support.v4.app.ActivityCompat; import android.support.v4.view.GravityCompat; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBarDrawerToggle; @@ -274,7 +275,9 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_exit) { - finish(); + // finish(); + ActivityCompat.finishAffinity(this); + overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out); } else if (id == R.id.nav_setting) { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java index a787601..ddc0aff 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/AdditionalVisibility.java @@ -1146,7 +1146,7 @@ public class AdditionalVisibility extends AppCompatActivity implements View.OnCl brand_id = brandList.get(position).getBRAND_ID().get(0); brand_name = brandList.get(position).getBRAND().get(0); - sku_list = db.getSkuT2PData("1", "1", "1", brand_id); + sku_list = db.getSkuT2PData(store_type_id, class_id, key_account_id, brand_id); SkuGetterSetter select = new SkuGetterSetter(); select.setSKU(getResources().getString(R.string.select)); sku_list.add(0, select); 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 37d6a06..4bdfb47 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -29,6 +29,7 @@ import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; import java.io.StringReader; +import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Locale; @@ -76,6 +77,7 @@ public class UploadActivity extends AppCompatActivity { private FailureGetterSetter failureGetterSetter = null; private SharedPreferences preferences; private int factor, k = 0; + Object result = ""; @Override protected void onCreate(Bundle savedInstanceState) { @@ -148,7 +150,7 @@ public class UploadActivity extends AppCompatActivity { HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_IMAGE, envelope); - Object result = envelope.getResponse(); + result = envelope.getResponse(); if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) { if (result.toString().equalsIgnoreCase(CommonString.KEY_FALSE)) { @@ -269,7 +271,7 @@ public class UploadActivity extends AppCompatActivity { HttpTransportSE androidHttpTransport = new HttpTransportSE(CommonString.URL); androidHttpTransport.call(CommonString.SOAP_ACTION_UPLOAD_STORE_COVERAGE, envelope); - Object result = envelope.getResponse(); + result = envelope.getResponse(); datacheck = result.toString(); words = datacheck.split("\\;"); @@ -1028,13 +1030,19 @@ public class UploadActivity extends AppCompatActivity { } } } + + + } catch (MalformedURLException e) { + e.printStackTrace(); } catch (IOException e) { e.printStackTrace(); } catch (XmlPullParserException e) { e.printStackTrace(); + }catch (Exception e) { + e.printStackTrace(); } - return ""; + return result.toString(); } @Override @@ -1042,12 +1050,15 @@ public class UploadActivity extends AppCompatActivity { super.onPostExecute(result); dialog.dismiss(); - db.deleteAllTables(); - if (result.equals("")) { + if (result.contains(CommonString.KEY_SUCCESS)) { + db.deleteAllTables(); showAlert(getString(R.string.menu_upload_data)); + } else { + showAlert(getString(R.string.error) + result.toString()); } + } } diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 568435c..07734f6 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -166,12 +166,12 @@ Veri Eklemek İçin Evet tıklayın Teşhir Türü - Click Store Front Image - Brand Name - SKU Name + Mağaza girişinin fotoğrafını çekiniz + Marka + Ürünler Teşhir Sayısı Coğrafi Konum - Store List + Mağazalar Remark Please fill Remark diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 1ab6d91..4737684 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -225,5 +225,5 @@ Export Database Database Exported Successfully Please Upload Previous Data First - + error From 0d28ef8f8dcfbbf6c0a4f3e46cfdb57f48a2d5b7 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 20 Jan 2017 15:56:53 +0530 Subject: [PATCH 3/5] newcode --- GSKMTOrange/src/main/res/values-tr/string.xml | 2 +- GSKMTOrange/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 07734f6..af752d5 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -190,7 +190,7 @@ Lütfen Önceki Verileri Paylaşın - + Hata! paylaşılıyor diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index 4737684..926d5d8 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -225,5 +225,5 @@ Export Database Database Exported Successfully Please Upload Previous Data First - error + Error Uploading From 3ac64149a9c80dbb0781c9658bb9ded583009a9c Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 20 Jan 2017 16:35:24 +0530 Subject: [PATCH 4/5] newcode --- GSKMTOrange/src/main/res/values-tr/string.xml | 5 +++-- GSKMTOrange/src/main/res/values/dimens.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index af752d5..a21e1a6 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -78,7 +78,7 @@ Örnek Fotoğraf Ürün Adı - Stock + Stok Önyüz Raf Payı Hedefi Raf Payi @@ -110,7 +110,7 @@ Mağaza Performansı - Stock + Stok Ek Teşhir Teşhir Türü Fotoğraf @@ -191,6 +191,7 @@ Lütfen Önceki Verileri Paylaşın Hata! paylaşılıyor + Want to proceed usaved data will be deleted diff --git a/GSKMTOrange/src/main/res/values/dimens.xml b/GSKMTOrange/src/main/res/values/dimens.xml index 46979ce..e96451e 100644 --- a/GSKMTOrange/src/main/res/values/dimens.xml +++ b/GSKMTOrange/src/main/res/values/dimens.xml @@ -12,7 +12,7 @@ 20sp 16sp - 20sp + 15sp 12sp From 648a3c21d217b178f3e20c198893a3b9a1897661 Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 20 Jan 2017 16:48:35 +0530 Subject: [PATCH 5/5] newcode --- GSKMTOrange/src/main/res/values-tr/string.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 83cc013..b1d3ffd 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -21,9 +21,9 @@ //changes after - Store Uploaded - Store Geo Data Uploaded - Store Already Geotagged + Mağaza Verileri Paylaşıldı + Store Geotag Data Shared + Mağaza Zaten Coğrafi Etiketlendi GSK Turuncu Mağaza Sakla @@ -125,7 +125,7 @@ Mağazalar Verileri silmek istiyor musun Silme için Evet tıklayın - Please Select dropdown + Tüm alanlari doldurunuz Veritabanı Aktar Servisler @@ -156,7 +156,7 @@ Paylaşılan mağaza Paylaşılan mağaza Mağaza zaten çıkılmış - Please Store data again Uploaded + Lütfen Mağaza Verilerini tekrar paylaşın Lütfen önce mağazadan çık Doldurulmuş veriler Bağlantı kurulamıyor @@ -172,8 +172,8 @@ Teşhir Sayısı Coğrafi Konum Mağazalar - Remark - Please fill Remark + Yorum + Lütfen Yorum doldurun @@ -191,7 +191,7 @@ Lütfen Önceki Verileri Paylaşın Hata! paylaşılıyor - Want to proceed usaved data will be deleted + Veri kaydedilmedi. İlerlemek