From fb0718e5e219d83494b72064d8a219899b37a63c Mon Sep 17 00:00:00 2001 From: ashishandroid Date: Fri, 20 Jan 2017 15:52:16 +0530 Subject: [PATCH] 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