From 92cf9904a8fe916a6e00bf91fb5fe090272aa2f2 Mon Sep 17 00:00:00 2001 From: yadavendras Date: Thu, 19 Jan 2017 15:03:32 +0530 Subject: [PATCH] T2P upload data newss --- .idea/misc.xml | 2 +- GSKMTOrange/src/main/AndroidManifest.xml | 23 ++++-- .../com/gskmtorange/Database/GSKOrangeDB.java | 6 -- .../dailyentry/StoreListActivity.java | 3 +- .../dailyentry/T2PComplianceActivity.java | 82 ++++++++++++++++++- .../CategoryWisePerformanceActivity.java | 1 + .../StoreWisePerformanceActivity.java | 1 + .../gskmtorange/upload/UploadActivity.java | 25 +++++- GSKMTOrange/src/main/res/values-tr/string.xml | 21 ----- GSKMTOrange/src/main/res/values/styles.xml | 1 + 10 files changed, 125 insertions(+), 40 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/AndroidManifest.xml b/GSKMTOrange/src/main/AndroidManifest.xml index 55b2049..95efc7b 100644 --- a/GSKMTOrange/src/main/AndroidManifest.xml +++ b/GSKMTOrange/src/main/AndroidManifest.xml @@ -31,7 +31,8 @@ + android:theme="@style/AppTheme.NoActionBar" + android:screenOrientation="portrait"/> + android:theme="@style/AppTheme.NoActionBar" + android:screenOrientation="portrait"/> @@ -89,19 +91,23 @@ android:name=".gsk_dailyentry.CategoryListActivity" android:configChanges="screenSize|orientation|keyboardHidden" android:theme="@style/AppTheme.NoActionBar" - android:windowSoftInputMode="adjustPan" /> + android:windowSoftInputMode="adjustPan" + android:screenOrientation="portrait"/> + android:windowSoftInputMode="adjustPan" + /> + + + android:theme="@style/AppTheme.NoActionBar" + android:screenOrientation="portrait"/> + android:theme="@style/AppTheme.NoActionBar" + android:screenOrientation="portrait"/> + android:theme="@style/AppTheme.NoActionBar" + android:screenOrientation="portrait"> \ No newline at end of file diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java index 50c98df..b5e8848 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java @@ -130,12 +130,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper { db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); - db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); - db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); - db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); - db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); - db.delete(CommonString.TABLE_COVERAGE_DATA, CommonString.KEY_STORE_ID + "='" + storeid + "'", null); - } public void deleteAllTables() { 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 1bf6f63..902f405 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/StoreListActivity.java @@ -52,6 +52,7 @@ import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.download.DownloadActivity; import cpm.com.gskmtorange.gsk_dailyentry.CategoryListActivity; +import cpm.com.gskmtorange.gsk_dailyentry.StoreWisePerformanceActivity; /** * Created by ashishc on 29-12-2016. @@ -469,7 +470,7 @@ public class StoreListActivity extends AppCompatActivity { overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); } else { - Intent in = new Intent(StoreListActivity.this, CategoryListActivity.class); + Intent in = new Intent(StoreListActivity.this, StoreWisePerformanceActivity.class); startActivity(in); overridePendingTransition(R.anim.activity_in, R.anim.activity_out); dialog.cancel(); diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java index 9990de6..9770fd1 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java @@ -7,10 +7,13 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.content.res.Configuration; import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Color; import android.graphics.Typeface; import android.graphics.drawable.ColorDrawable; @@ -33,6 +36,9 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.Window; +import android.view.WindowManager; +import android.webkit.WebView; +import android.webkit.WebViewClient; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.Button; @@ -59,8 +65,10 @@ import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; import cpm.com.gskmtorange.fonts.FontManager; import cpm.com.gskmtorange.fonts.TextDrawable; +import cpm.com.gskmtorange.gsk_dailyentry.Stock_FacingActivity; import cpm.com.gskmtorange.xmlGetterSetter.BrandMasterGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; +import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.SkuGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter; @@ -116,7 +124,7 @@ public class T2PComplianceActivity extends AppCompatActivity { rec_t2p = (RecyclerView) findViewById(R.id.rec_t2p); - FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); + final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { @@ -168,6 +176,16 @@ public class T2PComplianceActivity extends AppCompatActivity { } + rec_t2p.addOnScrollListener(new RecyclerView.OnScrollListener(){ + @Override + public void onScrolled(RecyclerView recyclerView, int dx, int dy){ + if (dy > 0) + fab.hide(); + else if (dy < 0) + fab.show(); + } + }); + } @Override @@ -253,7 +271,7 @@ public class T2PComplianceActivity extends AppCompatActivity { holder.btn_ref_img.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - + showPlanogram(mItem.getRef_image_url()); } }); @@ -978,4 +996,64 @@ public class T2PComplianceActivity extends AppCompatActivity { return true; } + + public void showPlanogram(String planogram_image){ + + final Dialog dialog = new Dialog(T2PComplianceActivity.this); + dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); + //dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + dialog.setContentView(R.layout.planogram_dialog_layout); + dialog.getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT); + dialog.setCancelable(false); + + //ArrayList mp = db.getMappingPlanogramData(""); + + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); + + WebView webView = (WebView) dialog.findViewById(R.id.webview); + webView.setWebViewClient(new MyWebViewClient()); + + webView.getSettings().setAllowFileAccess(true); + webView.getSettings().setJavaScriptEnabled(true); + webView.getSettings().setBuiltInZoomControls(true); + + //String planogram_image = mp.get(0).getPLANOGRAM_IMAGE(); + if (new File(str + planogram_image).exists()) { + + String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image; + String html = ""; + webView.loadDataWithBaseURL("", html, "text/html", "utf-8", ""); + + dialog.show(); + } + + ImageView cancel = (ImageView) dialog.findViewById(R.id.img_cancel); + cancel.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); + dialog.dismiss(); + } + }); + } + + private class MyWebViewClient extends WebViewClient { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return true; + } + + @Override + public void onPageFinished(WebView view, String url) { + super.onPageFinished(view, url); + view.clearCache(true); + } + + @Override + public void onPageStarted(WebView view, String url, Bitmap favicon) { + super.onPageStarted(view, url, favicon); + } + } } 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 a70b34d..b22b319 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 @@ -85,6 +85,7 @@ public class CategoryWisePerformanceActivity extends AppCompatActivity { intent.putExtra("categoryName", categoryName); intent.putExtra("categoryId", categoryId); startActivity(intent); + finish(); } }); } catch (Resources.NotFoundException e) { 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 893a3ea..5bc2700 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 @@ -103,6 +103,7 @@ public class StoreWisePerformanceActivity extends AppCompatActivity { public void onClick(View view) { Intent intent = new Intent(StoreWisePerformanceActivity.this, CategoryListActivity.class); startActivity(intent); + finish(); } }); } catch (Resources.NotFoundException e) { 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 f5eef55..9e271b6 100644 --- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java +++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java @@ -1,7 +1,9 @@ package cpm.com.gskmtorange.upload; +import android.app.AlertDialog; import android.app.Dialog; import android.content.Context; +import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.res.Configuration; import android.content.res.Resources; @@ -40,6 +42,7 @@ import cpm.com.gskmtorange.GetterSetter.CoverageBean; import cpm.com.gskmtorange.GetterSetter.StoreBean; import cpm.com.gskmtorange.R; import cpm.com.gskmtorange.constant.CommonString; +import cpm.com.gskmtorange.download.DownloadActivity; import cpm.com.gskmtorange.xmlGetterSetter.FailureGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.GapsChecklistGetterSetter; import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter; @@ -894,7 +897,7 @@ public class UploadActivity extends AppCompatActivity { } - ///////close store images + //T2p Images for (int m = 0; m < t2PGetterSetters.size(); m++) { @@ -984,7 +987,7 @@ public class UploadActivity extends AppCompatActivity { dialog.dismiss(); if (result.equals("")) { - finish(); + showAlert(getString(R.string.menu_upload_data)); } } } @@ -1022,4 +1025,22 @@ public class UploadActivity extends AppCompatActivity { return true; } + public void showAlert(String str) { + + AlertDialog.Builder builder = new AlertDialog.Builder(UploadActivity.this); + builder.setTitle("Parinaam"); + builder.setMessage(str).setCancelable(false) + .setPositiveButton("OK", new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int id) { + + /* Intent i = new Intent(activity, StorelistActivity.class); + activity.startActivity(i); + activity.finish();*/ + finish(); + + } + }); + AlertDialog alert = builder.create(); + alert.show(); + } } diff --git a/GSKMTOrange/src/main/res/values-tr/string.xml b/GSKMTOrange/src/main/res/values-tr/string.xml index 936fee2..8e8770d 100644 --- a/GSKMTOrange/src/main/res/values-tr/string.xml +++ b/GSKMTOrange/src/main/res/values-tr/string.xml @@ -126,27 +126,6 @@ Verileri silmek istiyor musun Silme için Evet tıklayın 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. - Please Take Image Before Save - This device is not supported. - Uploading Data - Uploading Geotag Data... - failure - Uploading Geotag Images - success - Are you sure you want to Checkout - No Network - - Please click image Veritabanı Aktar Servisler diff --git a/GSKMTOrange/src/main/res/values/styles.xml b/GSKMTOrange/src/main/res/values/styles.xml index 7d89834..9c26dc5 100644 --- a/GSKMTOrange/src/main/res/values/styles.xml +++ b/GSKMTOrange/src/main/res/values/styles.xml @@ -13,6 +13,7 @@ true +