AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deepak_commit_31_05_2018

Browse Source
This commit is contained in:
yadavendras
2018-06-01 18:57:10 +05:30
parent 2d25c22137
commit 8a58f5fa64
4 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/misc.xml
Generated
+1 -1
View File
@@ -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">
GSKMTOrange/build.gradle
+8 -8
View File
@@ -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"
GSKMTOrange/src/main/java/cpm/com/gskmtorange/dailyentry/POGQuestionsActivity.java
+2 -2
View File
@@ -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) {
GSKMTOrange/src/main/java/cpm/com/gskmtorange/upload/UploadActivity.java
+15
View File
@@ -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;