From 8a58f5fa64a5d1d37cd2b76c9766dbc378e31e12 Mon Sep 17 00:00:00 2001
From: yadavendras <yadavendra.singh@in.cpm-int.com>
Date: Fri, 1 Jun 2018 18:57:10 +0530
Subject: [PATCH] Deepak_commit_31_05_2018

---
 .idea/misc.xml                                   |  2 +-
 GSKMTOrange/build.gradle                         | 16 ++++++++--------
 .../dailyentry/POGQuestionsActivity.java         |  4 ++--
 .../com/gskmtorange/upload/UploadActivity.java   | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6bfc8f4..bd841ff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -31,7 +31,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/GSKMTOrange/build.gradle b/GSKMTOrange/build.gradle
index e9bf4e8..9b3f37f 100644
--- a/GSKMTOrange/build.gradle
+++ b/GSKMTOrange/build.gradle
@@ -24,18 +24,18 @@ android {
         /* versionCode 14
         versionName "2.6"*/
 
-        //For KSA
-        /*  versionCode 15
-        versionName "2.7"*/
-
-        //For Turkey
-        /* versionCode 15
-        versionName "2.7"*/
-
         //For UAE
         versionCode 15
         versionName "2.7"
 
+        //For Turkey
+        /*versionCode 15
+        versionName "2.7"*/
+
+        //For KSA
+       /* versionCode 16
+        versionName "2.8"*/
+
         multiDexEnabled true
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java
index 0ac19a2..0f7450e 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java
@@ -58,7 +58,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
     GSKOrangeDB db;
 
     List<MSL_AvailabilityStockFacingGetterSetter> headerDataList;
-    HashMap<MSL_AvailabilityStockFacingGetterSetter, List<POGGetterSetter>> hashMapListChildData;
+    HashMap<MSL_AvailabilityStockFacingGetterSetter, List<POGGetterSetter>> hashMapListChildData = new HashMap<>();
 
     ExpandableListAdapter adapter;
 
@@ -209,7 +209,7 @@ public class POGQuestionsActivity extends AppCompatActivity {
                     quizDataList = db.getPOGSubCategoryWise(headerDataList.get(i).getSub_category_id());
                 }
 
-                 hashMapListChildData = new HashMap<>();
+                 //hashMapListChildData = new HashMap<>();
                 ArrayList<POGGetterSetter> childListData = new ArrayList<>();
 
                 if (quizDataList.size() > 0) {
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 d436242..86b69be 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
@@ -1613,6 +1613,21 @@ public class UploadActivity extends AppCompatActivity {
                                     }
                                 }
 
+                                if (audit_data.get(m).getCAM_IMAGE2() != null && !audit_data.get(m).getCAM_IMAGE2().equals("")) {
+                                    if (new File(CommonString.FILE_PATH + audit_data.get(m).getCAM_IMAGE2()).exists()) {
+
+                                        try {
+                                            result = UploadImage(audit_data.get(m).getCAM_IMAGE2(), "AuditImages");
+                                            runOnUiThread(new Runnable() {
+                                                public void run() {
+                                                    message.setText("Audit Images Uploaded");
+                                                }
+                                            });
+                                        } catch (Exception e) {
+                                            e.printStackTrace();
+                                        }
+                                    }
+                                }
                             }
 
                             data.value = 90;