From 033f55adbc86306417fcda11b24866d368f15543 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Wed, 1 Feb 2017 12:22:19 +0530 Subject: [PATCH] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk # Conflicts: # GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java --- GSKMTOrange/build.gradle | 4 +- .../autoupdate/AutoUpdateActivity.java | 40 +++++++++++++++++-- .../dailyentry/NonWorkingReason.java | 4 +- .../dailyentry/StoreListActivity.java | 2 + .../gskmtorange/upload/UploadActivity.java | 3 +- GSKMTOrange/src/main/res/values-tr/string.xml | 10 +---- GSKMTOrange/src/main/res/values/strings.xml | 1 + 7 files changed, 48 insertions(+), 16 deletions(-) diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle index 213644a..1e0f249 100644 --- a/GSKMTOrange/build.gradle +++ b/GSKMTOrange/build.gradle @@ -14,8 +14,8 @@ android { applicationId "cpm.com.gskmtorange" minSdkVersion 15 targetSdkVersion 22 - versionCode 2 - versionName "1.1" + versionCode 4 + versionName "1.3" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java index 6137631..3df5b7e 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/autoupdate/AutoUpdateActivity.java @@ -7,6 +7,8 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.PackageManager; +import android.content.res.Configuration; +import android.content.res.Resources; import android.net.Uri; import android.os.AsyncTask; import android.os.Environment; @@ -24,6 +26,7 @@ import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; import java.text.DecimalFormat; +import java.util.Locale; import cpm.com.gskmtorange.LoginActivity; import cpm.com.gskmtorange.R; @@ -43,6 +46,8 @@ public class AutoUpdateActivity extends AppCompatActivity { ProgressBar progressBar; private boolean status; + private SharedPreferences preferences; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -51,11 +56,15 @@ public class AutoUpdateActivity extends AppCompatActivity { path = intent.getStringExtra(CommonString.KEY_PATH); + preferences = PreferenceManager.getDefaultSharedPreferences(this); + + updateResources(getApplicationContext(), preferences.getString(CommonString.KEY_LANGUAGE, "")); + AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setTitle("Parinaam"); - builder.setMessage("New Update Available.") + builder.setMessage(getString(R.string.new_update_available)) .setCancelable(false) - .setPositiveButton("OK", new DialogInterface.OnClickListener() { + .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { SharedPreferences preferences = PreferenceManager @@ -116,7 +125,7 @@ public class AutoUpdateActivity extends AppCompatActivity { versionCode = getPackageManager().getPackageInfo( getPackageName(), 0).versionName; - data.name = "Upgraditing Version : " + versionCode; + data.name = "Upgrading Version : " + versionCode; publishProgress(data); // download application @@ -280,4 +289,29 @@ public class AutoUpdateActivity extends AppCompatActivity { alert.show(); } + private static boolean updateResources(Context context, String language) { + + String lang; + + if (language.equalsIgnoreCase("English")) { + lang = "EN"; + } else if (language.equalsIgnoreCase("UAE")) { + lang = "AR"; + } else { + lang = "TR"; + } + + Locale locale = new Locale(lang); + Locale.setDefault(locale); + + Resources resources = context.getResources(); + + Configuration configuration = resources.getConfiguration(); + configuration.locale = locale; + + resources.updateConfiguration(configuration, resources.getDisplayMetrics()); + + return true; + } + } diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java index d0c0b04..24f3a0b 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/NonWorkingReason.java @@ -101,7 +101,9 @@ public class NonWorkingReason extends AppCompatActivity implements _UserId = preferences.getString(CommonString.KEY_USERNAME, ""); visit_date = preferences.getString(CommonString.KEY_DATE, null); - store_id = preferences.getString(CommonString.KEY_STORE_ID, ""); + + store_id = getIntent().getStringExtra(CommonString.KEY_STORE_ID); + //store_id = preferences.getString(CommonString.KEY_STORE_ID, ""); database = new GSKOrangeDB(this); database.open(); 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 1150229..66330b8 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -567,6 +567,7 @@ public class StoreListActivity extends AppCompatActivity { Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID()); startActivity(in); } @@ -587,6 +588,7 @@ public class StoreListActivity extends AppCompatActivity { Intent in = new Intent(StoreListActivity.this, NonWorkingReason.class); + in.putExtra(CommonString.KEY_STORE_ID,current.getSTORE_ID()); startActivity(in); } 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 fdd6098..01dcb75 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -1033,6 +1033,7 @@ public class UploadActivity extends AppCompatActivity { } } + return result.toString(); } catch (MalformedURLException e) { e.printStackTrace(); @@ -1044,7 +1045,7 @@ public class UploadActivity extends AppCompatActivity { e.printStackTrace(); } - return result.toString(); + return ""; } @Override diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 1858eb8..60628b3 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -228,15 +228,6 @@ Yükleme İçin Veri Yok Çıkış yapmak - - Kapsam yükleniyor - Bulunurluk verisi paylaşılıyor - Stok verisi paylaşılıyor - Kalıcı teşhir verisi paylaşılıyor - Ek teşhir verisi paylaşılıyor - Promosyon verisi paylaşılıyor - Yükleme İçin Veri Yok - Çıkış yapmak Verilerinizin yedeğini almak istediğinizden emin misiniz Veritabanı Başarıyla Gönderildi İlk depoyu coğrafi etiketle göster @@ -244,6 +235,7 @@ Lütfen GAP verilerini doldurun Değerleri girin + diff --git a/GSKMTOrange/src/main/res/values/strings.xml b/GSKMTOrange/src/main/res/values/strings.xml index b242244..5a6d88b 100644 --- a/GSKMTOrange/src/main/res/values/strings.xml +++ b/GSKMTOrange/src/main/res/values/strings.xml @@ -264,5 +264,6 @@ First geotag the store + New Update Available \n\n Yeni güncelleme var