diff --git a/.idea/modules.xml b/.idea/modules.xml
index cc87edb..16683d7 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -3,7 +3,6 @@
-
diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index ebe202e..52a63a9 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
android {
compileSdkVersion 24
- buildToolsVersion "24.0.1"
+ buildToolsVersion '25.0.0'
useLibrary 'org.apache.http.legacy'
@@ -15,8 +15,8 @@ android {
minSdkVersion 15
targetSdkVersion 22
- versionCode 6
- versionName "1.5"
+ versionCode 8
+ versionName "2.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
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 6d2ea5a..270eb9e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/T2PComplianceActivity.java
@@ -1294,6 +1294,7 @@ public class T2PComplianceActivity extends AppCompatActivity {
if (new File(str + planogram_image).exists()) {
String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image;
+ //String imagePath = "file://" + CommonString.FILE_PATH + "/" + "image_ref.png";
String html = "![](\"")
";
webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
index eda8b61..4a139fe 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_Availability_StockFacingActivity.java
@@ -2,12 +2,16 @@ package cpm.com.gskmtorange.gsk_dailyentry;
import android.annotation.SuppressLint;
import android.app.AlertDialog;
+import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
import android.content.res.Configuration;
import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
import android.graphics.Typeface;
import android.os.Bundle;
import android.preference.PreferenceManager;
@@ -18,10 +22,15 @@ import android.support.v7.widget.CardView;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.LayoutInflater;
+import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
+import android.view.Window;
+import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
+import android.webkit.WebView;
+import android.webkit.WebViewClient;
import android.widget.AbsListView;
import android.widget.BaseExpandableListAdapter;
import android.widget.CompoundButton;
@@ -33,6 +42,7 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.ToggleButton;
+import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -41,6 +51,7 @@ import java.util.Locale;
import cpm.com.gskmtorange.Database.GSKOrangeDB;
import cpm.com.gskmtorange.R;
import cpm.com.gskmtorange.constant.CommonString;
+import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_DataGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
import cpm.com.gskmtorange.xmlGetterSetter.StockFacing_PlanogramTrackerDataGetterSetter;
@@ -67,6 +78,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
boolean isDialogOpen = true;
private SharedPreferences preferences;
+ String str = "", _pathforcheck = "";
+
ArrayList planogramShelfHeaderDataList = new ArrayList<>();
ArrayList planogramSkuChildDataList;
HashMap> planogramHashMapListChildData = new HashMap<>();
@@ -119,6 +132,8 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
getSupportActionBar().setHomeButtonEnabled(true);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ str = CommonString.FILE_PATH ;
+
prepareList();
//Camera
@@ -249,6 +264,125 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
}
}
+ @Override
+ public boolean onCreateOptionsMenu(Menu menu) {
+ getMenuInflater().inflate(R.menu.planogram, menu);
+ return true;
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(MenuItem item) {
+ int id = item.getItemId();
+
+ if (id == android.R.id.home) {
+ AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
+ builder.setTitle(getResources().getString(R.string.dialog_title));
+ builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
+ .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
+ public void onClick(DialogInterface dialog, int id) {
+
+ if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
+ if (!camera_allow.equals("1")) {
+ db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
+ planogramShelfHeaderDataList, planogramHashMapListChildData);
+ }
+ }
+ finish();
+ }
+ })
+ .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+
+ }
+ });
+ AlertDialog alert = builder.create();
+ alert.show();
+ //finish();
+ }
+
+ //Planogram Dialog
+ if (id == R.id.action_planogram) {
+ expandableListView.clearFocus();
+
+ //final Dialog dialog = new Dialog(Stock_FacingActivity.this, android.R.style.Theme_Black_NoTitleBar_Fullscreen);
+ final Dialog dialog = new Dialog(MSL_Availability_StockFacingActivity.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 mappingPlanogramList = db.getMappingPlanogramData(categoryId);
+
+ //ImageView img_planogram = (ImageView) dialog.findViewById(R.id.img_planogram);
+ 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 = "";
+ if (mappingPlanogramList.size() > 0) {
+ planogram_image = mappingPlanogramList.get(0).getPLANOGRAM_IMAGE();
+ }
+ if (!planogram_image.equals("")) {
+ if (new File(str + planogram_image).exists()) {
+ Bitmap bmp = BitmapFactory.decodeFile(str + planogram_image);
+ // img_planogram.setRotation(90);
+ //img_planogram.setImageBitmap(bmp);
+ setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+
+ String imagePath = "file://" + CommonString.FILE_PATH + "/" + planogram_image;
+ String html = "";
+ webView.loadDataWithBaseURL("", html, "text/html", "utf-8", "");
+
+ dialog.show();
+ } /*else {
+ //webView.loadUrl(String.valueOf(R.drawable.sad_cloud));
+
+ //img_planogram.setBackgroundResource(R.drawable.sad_cloud);
+ }*/
+ }
+
+
+ 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();
+ }
+ });
+
+ //dialog.show();
+ return true;
+ }
+
+ return super.onOptionsItemSelected(item);
+ }
+
+ 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);
+ }
+ }
+
private void cameraMethod() {
/*cameraData = new Store_wise_camera_DataGetterSetter();
@@ -502,47 +636,6 @@ public class MSL_Availability_StockFacingActivity extends AppCompatActivity {
return checkflag;
}
- @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) {
- AlertDialog.Builder builder = new AlertDialog.Builder(MSL_Availability_StockFacingActivity.this);
- builder.setTitle(getResources().getString(R.string.dialog_title));
- builder.setMessage(getResources().getString(R.string.data_will_be_lost)).setCancelable(false)
- .setPositiveButton(getResources().getString(R.string.ok), new DialogInterface.OnClickListener() {
- public void onClick(DialogInterface dialog, int id) {
-
- if (!validateData(hashMapListHeaderData, hashMapListChildData)) {
- if (!camera_allow.equals("1")) {
- db.deletePlanogramListStoreAndCategorywise(store_id, categoryId,
- planogramShelfHeaderDataList, planogramHashMapListChildData);
- }
- }
- finish();
- }
- })
- .setNegativeButton(getResources().getString(R.string.cancel), new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
-
- }
- });
- AlertDialog alert = builder.create();
- alert.show();
- //finish();
- }
-
- //noinspection SimplifiableIfStatement
- if (id == R.id.action_settings) {
- return true;
- }
-
- return super.onOptionsItemSelected(item);
- }
@Override
public void onBackPressed() {
diff --git a/GSKMTOrange/src/main/res/drawable/image_ref.png b/GSKMTOrange/src/main/res/drawable/image_ref.png
new file mode 100644
index 0000000..bfedd60
Binary files /dev/null and b/GSKMTOrange/src/main/res/drawable/image_ref.png differ
diff --git a/build.gradle b/build.gradle
index 74b2ab0..b78a0b8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.android.tools.build:gradle:2.2.3'
+ classpath 'com.android.tools.build:gradle:2.3.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 04e285f..23c52b8 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Wed Apr 12 12:10:11 IST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip