Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| de5f4f881f | |||
| 0d1e462563 |
Generated
+1
@@ -1,6 +1,7 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="AppInsightsSettings">
|
<component name="AppInsightsSettings">
|
||||||
|
<option name="selectedTabId" value="Firebase Crashlytics" />
|
||||||
<option name="tabSettings">
|
<option name="tabSettings">
|
||||||
<map>
|
<map>
|
||||||
<entry key="Android Vitals">
|
<entry key="Android Vitals">
|
||||||
|
|||||||
Generated
+32
@@ -0,0 +1,32 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="WizardSettings">
|
||||||
|
<option name="children">
|
||||||
|
<map>
|
||||||
|
<entry key="vectorWizard">
|
||||||
|
<value>
|
||||||
|
<PersistentState>
|
||||||
|
<option name="children">
|
||||||
|
<map>
|
||||||
|
<entry key="vectorAssetStep">
|
||||||
|
<value>
|
||||||
|
<PersistentState>
|
||||||
|
<option name="values">
|
||||||
|
<map>
|
||||||
|
<entry key="assetSourceType" value="FILE" />
|
||||||
|
<entry key="outputName" value="social_media" />
|
||||||
|
<entry key="sourceFile" value="C:\Users\ravik\Downloads\social-media (1).svg" />
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</PersistentState>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</PersistentState>
|
||||||
|
</value>
|
||||||
|
</entry>
|
||||||
|
</map>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
Generated
+109
@@ -352,6 +352,18 @@
|
|||||||
<option name="screenX" value="1080" />
|
<option name="screenX" value="1080" />
|
||||||
<option name="screenY" value="2340" />
|
<option name="screenY" value="2340" />
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="a32" />
|
||||||
|
<option name="id" value="a32" />
|
||||||
|
<option name="labId" value="google" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy A32" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="36" />
|
<option name="api" value="36" />
|
||||||
<option name="brand" value="samsung" />
|
<option name="brand" value="samsung" />
|
||||||
@@ -568,6 +580,11 @@
|
|||||||
<option name="screenDensity" value="420" />
|
<option name="screenDensity" value="420" />
|
||||||
<option name="screenX" value="1080" />
|
<option name="screenX" value="1080" />
|
||||||
<option name="screenY" value="2410" />
|
<option name="screenY" value="2410" />
|
||||||
|
<option name="tags">
|
||||||
|
<list>
|
||||||
|
<option value="dda-default" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="32" />
|
<option name="api" value="32" />
|
||||||
@@ -665,6 +682,18 @@
|
|||||||
<option name="screenX" value="2076" />
|
<option name="screenX" value="2076" />
|
||||||
<option name="screenY" value="2152" />
|
<option name="screenY" value="2152" />
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="36" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="comet" />
|
||||||
|
<option name="id" value="comet" />
|
||||||
|
<option name="labId" value="google" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 9 Pro Fold" />
|
||||||
|
<option name="screenDensity" value="390" />
|
||||||
|
<option name="screenX" value="2076" />
|
||||||
|
<option name="screenY" value="2152" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="35" />
|
<option name="api" value="35" />
|
||||||
<option name="brand" value="motorola" />
|
<option name="brand" value="motorola" />
|
||||||
@@ -893,6 +922,18 @@
|
|||||||
<option name="screenX" value="2208" />
|
<option name="screenX" value="2208" />
|
||||||
<option name="screenY" value="1840" />
|
<option name="screenY" value="1840" />
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="36" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="felix" />
|
||||||
|
<option name="id" value="felix" />
|
||||||
|
<option name="labId" value="google" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel Fold" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="2208" />
|
||||||
|
<option name="screenY" value="1840" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="33" />
|
<option name="api" value="33" />
|
||||||
<option name="brand" value="google" />
|
<option name="brand" value="google" />
|
||||||
@@ -965,6 +1006,11 @@
|
|||||||
<option name="screenDensity" value="420" />
|
<option name="screenDensity" value="420" />
|
||||||
<option name="screenX" value="1080" />
|
<option name="screenX" value="1080" />
|
||||||
<option name="screenY" value="2424" />
|
<option name="screenY" value="2424" />
|
||||||
|
<option name="tags">
|
||||||
|
<list>
|
||||||
|
<option value="dda-default" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="34" />
|
<option name="api" value="34" />
|
||||||
@@ -1014,6 +1060,19 @@
|
|||||||
<option name="screenX" value="1200" />
|
<option name="screenX" value="1200" />
|
||||||
<option name="screenY" value="1920" />
|
<option name="screenY" value="1920" />
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="36" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="gts10pwifi" />
|
||||||
|
<option name="formFactor" value="Tablet" />
|
||||||
|
<option name="id" value="gts10pwifi" />
|
||||||
|
<option name="labId" value="google" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy Tab S10+" />
|
||||||
|
<option name="screenDensity" value="320" />
|
||||||
|
<option name="screenX" value="1752" />
|
||||||
|
<option name="screenY" value="2800" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="33" />
|
<option name="api" value="33" />
|
||||||
<option name="brand" value="samsung" />
|
<option name="brand" value="samsung" />
|
||||||
@@ -1292,6 +1351,11 @@
|
|||||||
<option name="screenDensity" value="390" />
|
<option name="screenDensity" value="390" />
|
||||||
<option name="screenX" value="1080" />
|
<option name="screenX" value="1080" />
|
||||||
<option name="screenY" value="2404" />
|
<option name="screenY" value="2404" />
|
||||||
|
<option name="tags">
|
||||||
|
<list>
|
||||||
|
<option value="dda-default" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="34" />
|
<option name="api" value="34" />
|
||||||
@@ -1389,6 +1453,11 @@
|
|||||||
<option name="screenDensity" value="450" />
|
<option name="screenDensity" value="450" />
|
||||||
<option name="screenX" value="1080" />
|
<option name="screenX" value="1080" />
|
||||||
<option name="screenY" value="2340" />
|
<option name="screenY" value="2340" />
|
||||||
|
<option name="tags">
|
||||||
|
<list>
|
||||||
|
<option value="dda-default" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="36" />
|
<option name="api" value="36" />
|
||||||
@@ -1402,6 +1471,11 @@
|
|||||||
<option name="screenDensity" value="450" />
|
<option name="screenDensity" value="450" />
|
||||||
<option name="screenX" value="1080" />
|
<option name="screenX" value="1080" />
|
||||||
<option name="screenY" value="2340" />
|
<option name="screenY" value="2340" />
|
||||||
|
<option name="tags">
|
||||||
|
<list>
|
||||||
|
<option value="dda-default" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="33" />
|
<option name="api" value="33" />
|
||||||
@@ -1427,6 +1501,18 @@
|
|||||||
<option name="screenX" value="1440" />
|
<option name="screenX" value="1440" />
|
||||||
<option name="screenY" value="3120" />
|
<option name="screenY" value="3120" />
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="36" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="q4qksx" />
|
||||||
|
<option name="id" value="q4qksx" />
|
||||||
|
<option name="labId" value="google" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy Z Fold4" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1812" />
|
||||||
|
<option name="screenY" value="2176" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="34" />
|
<option name="api" value="34" />
|
||||||
<option name="brand" value="samsung" />
|
<option name="brand" value="samsung" />
|
||||||
@@ -1597,6 +1683,11 @@
|
|||||||
<option name="screenDensity" value="390" />
|
<option name="screenDensity" value="390" />
|
||||||
<option name="screenX" value="2076" />
|
<option name="screenX" value="2076" />
|
||||||
<option name="screenY" value="2152" />
|
<option name="screenY" value="2152" />
|
||||||
|
<option name="tags">
|
||||||
|
<list>
|
||||||
|
<option value="dda-default" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="30" />
|
<option name="api" value="30" />
|
||||||
@@ -1609,6 +1700,11 @@
|
|||||||
<option name="screenDensity" value="440" />
|
<option name="screenDensity" value="440" />
|
||||||
<option name="screenX" value="1080" />
|
<option name="screenX" value="1080" />
|
||||||
<option name="screenY" value="2340" />
|
<option name="screenY" value="2340" />
|
||||||
|
<option name="tags">
|
||||||
|
<list>
|
||||||
|
<option value="default" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="34" />
|
<option name="api" value="34" />
|
||||||
@@ -1671,6 +1767,19 @@
|
|||||||
<option name="screenX" value="1600" />
|
<option name="screenX" value="1600" />
|
||||||
<option name="screenY" value="2560" />
|
<option name="screenY" value="2560" />
|
||||||
</PersistentDeviceSelectionData>
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="36" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="tangorpro" />
|
||||||
|
<option name="formFactor" value="Tablet" />
|
||||||
|
<option name="id" value="tangorpro" />
|
||||||
|
<option name="labId" value="google" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel Tablet" />
|
||||||
|
<option name="screenDensity" value="320" />
|
||||||
|
<option name="screenX" value="1600" />
|
||||||
|
<option name="screenY" value="2560" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="35" />
|
<option name="api" value="35" />
|
||||||
<option name="brand" value="google" />
|
<option name="brand" value="google" />
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ apply plugin: 'com.google.firebase.crashlytics'
|
|||||||
apply plugin: 'org.jetbrains.kotlin.android'
|
apply plugin: 'org.jetbrains.kotlin.android'
|
||||||
android {
|
android {
|
||||||
namespace("cpm.com.gskmtorange")
|
namespace("cpm.com.gskmtorange")
|
||||||
compileSdk(35)
|
compileSdk 36
|
||||||
|
|
||||||
lintOptions {
|
lintOptions {
|
||||||
checkReleaseBuilds false
|
checkReleaseBuilds false
|
||||||
@@ -126,6 +126,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
implementation 'androidx.activity:activity-ktx:1.13.0'
|
||||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||||
implementation files('libs/ksoap2-android-assembly-3.0.0-jar-with-dependencies.jar')
|
implementation files('libs/ksoap2-android-assembly-3.0.0-jar-with-dependencies.jar')
|
||||||
// implementation files('libs/ksoap2-android-assembly-3.6.4.jar')
|
// implementation files('libs/ksoap2-android-assembly-3.6.4.jar')
|
||||||
|
|||||||
BIN
Binary file not shown.
@@ -46,29 +46,33 @@
|
|||||||
android:icon="@mipmap/ic_launcher"
|
android:icon="@mipmap/ic_launcher"
|
||||||
android:label="@string/app_name"
|
android:label="@string/app_name"
|
||||||
android:largeHeap="true"
|
android:largeHeap="true"
|
||||||
|
android:networkSecurityConfig="@xml/network_security_config"
|
||||||
android:requestLegacyExternalStorage="true"
|
android:requestLegacyExternalStorage="true"
|
||||||
android:supportsRtl="false"
|
android:supportsRtl="false"
|
||||||
android:networkSecurityConfig="@xml/network_security_config"
|
|
||||||
android:theme="@style/AppTheme"
|
android:theme="@style/AppTheme"
|
||||||
android:usesCleartextTraffic="true"
|
android:usesCleartextTraffic="true"
|
||||||
tools:replace="android:supportsRtl">
|
tools:replace="android:supportsRtl">
|
||||||
|
<activity
|
||||||
|
android:name=".dailyentry.BannerActivity"
|
||||||
|
android:configChanges="screenSize|orientation|keyboardHidden"
|
||||||
|
android:screenOrientation="portrait"
|
||||||
|
android:theme="@style/AppTheme.NoActionBar"
|
||||||
|
android:windowSoftInputMode="adjustPan"
|
||||||
|
android:exported="false" />
|
||||||
<activity
|
<activity
|
||||||
android:name=".dailyentry.PD_Realtime_Report_Detail"
|
android:name=".dailyentry.PD_Realtime_Report_Detail"
|
||||||
android:configChanges="screenSize|orientation|keyboardHidden"
|
android:configChanges="screenSize|orientation|keyboardHidden"
|
||||||
android:screenOrientation="portrait"
|
android:screenOrientation="portrait"
|
||||||
android:theme="@style/AppTheme.NoActionBar"
|
android:theme="@style/AppTheme.NoActionBar"
|
||||||
android:windowSoftInputMode="adjustPan"
|
android:windowSoftInputMode="adjustPan"
|
||||||
tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".dailyentry.PD_Realtime_Report"
|
android:name=".dailyentry.PD_Realtime_Report"
|
||||||
android:configChanges="screenSize|orientation|keyboardHidden"
|
android:configChanges="screenSize|orientation|keyboardHidden"
|
||||||
android:screenOrientation="portrait"
|
android:screenOrientation="portrait"
|
||||||
android:theme="@style/AppTheme.NoActionBar"
|
android:theme="@style/AppTheme.NoActionBar"
|
||||||
android:windowSoftInputMode="adjustPan"
|
android:windowSoftInputMode="adjustPan"
|
||||||
tools:ignore="DiscouragedApi,LockedOrientationActivity"/>
|
tools:ignore="DiscouragedApi,LockedOrientationActivity" />
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".dailyentry.WebViewActivity"
|
android:name=".dailyentry.WebViewActivity"
|
||||||
android:configChanges="screenSize|orientation|keyboardHidden"
|
android:configChanges="screenSize|orientation|keyboardHidden"
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import android.database.sqlite.SQLiteOpenHelper;
|
|||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
@@ -69,6 +71,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
|
|||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
|
||||||
|
import cpm.com.gskmtorange.xmlGetterSetter.MasterDetailerGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
|
||||||
@@ -146,6 +149,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
db.execSQL(TableBean.getJourneyPlan());
|
db.execSQL(TableBean.getJourneyPlan());
|
||||||
db.execSQL(TableBean.getAdhocJourneyPlan());
|
db.execSQL(TableBean.getAdhocJourneyPlan());
|
||||||
//Gagan Start
|
//Gagan Start
|
||||||
|
db.execSQL(TableBean.getTable_MASTER_DETAILER());
|
||||||
db.execSQL(TableBean.getBrandMaster());
|
db.execSQL(TableBean.getBrandMaster());
|
||||||
db.execSQL(TableBean.getSkuMaster());
|
db.execSQL(TableBean.getSkuMaster());
|
||||||
db.execSQL(TableBean.getCategoryMaster());
|
db.execSQL(TableBean.getCategoryMaster());
|
||||||
@@ -193,6 +197,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
db.execSQL(CommonString.CREATE_TABLE_INSERT_STORE_CAMERA);
|
db.execSQL(CommonString.CREATE_TABLE_INSERT_STORE_CAMERA);
|
||||||
db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE_LIST);
|
db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE_LIST);
|
||||||
db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE);
|
db.execSQL(CommonString.CREATE_TABLE_INSERT_CATEGORY_PICTURE);
|
||||||
|
db.execSQL(CommonString.CREATE_TABLE_WEBVIEW_TIME_SPENT);
|
||||||
db.execSQL(TableBean.getMappingSubCategoryImageAllow());
|
db.execSQL(TableBean.getMappingSubCategoryImageAllow());
|
||||||
db.execSQL(TableBean.getMappingCategoryImageAllow());
|
db.execSQL(TableBean.getMappingCategoryImageAllow());
|
||||||
db.execSQL(TableBean.getSkugroupMaster());
|
db.execSQL(TableBean.getSkugroupMaster());
|
||||||
@@ -254,7 +259,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
e.fillInStackTrace();
|
e.fillInStackTrace();
|
||||||
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
|
Toast.makeText(context, "Error -" + e.toString(), Toast.LENGTH_SHORT).show();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -315,6 +319,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
db.delete(CommonString.TABLE_IRPD, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
|
db.delete(CommonString.TABLE_IRPD, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
|
||||||
db.delete(CommonString.TABLE_IRPD_POG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
|
db.delete(CommonString.TABLE_IRPD_POG, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
|
||||||
db.delete(CommonString.TABLE_IRPD_VISIBILITY, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
|
db.delete(CommonString.TABLE_IRPD_VISIBILITY, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
|
||||||
|
db.delete(CommonString.TABLE_WEBVIEW_TIME_SPENT, CommonString.KEY_STORE_ID + "='" + storeid + "'", null);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
@@ -338,7 +343,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE, null, null);
|
db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE, null, null);
|
||||||
db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, null, null);
|
db.delete(CommonString.TABLE_INSERT_PROMO_SKUWISE_EXISTS, null, null);
|
||||||
//Gagan end code
|
//Gagan end code
|
||||||
|
|
||||||
db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, null);
|
db.delete(CommonString.TABLE_INSERT_T2P_COMPLIANCE, null, null);
|
||||||
db.delete(CommonString.TABLE_INSERT_T2P_GAPS, null, null);
|
db.delete(CommonString.TABLE_INSERT_T2P_GAPS, null, null);
|
||||||
db.delete(CommonString.TABLE_INSERT_T2P_SKU, null, null);
|
db.delete(CommonString.TABLE_INSERT_T2P_SKU, null, null);
|
||||||
@@ -363,6 +367,7 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
db.delete(CommonString.TABLE_IRPD, null, null);
|
db.delete(CommonString.TABLE_IRPD, null, null);
|
||||||
db.delete(CommonString.TABLE_IRPD_POG, null, null);
|
db.delete(CommonString.TABLE_IRPD_POG, null, null);
|
||||||
db.delete(CommonString.TABLE_IRPD_VISIBILITY, null, null);
|
db.delete(CommonString.TABLE_IRPD_VISIBILITY, null, null);
|
||||||
|
db.delete(CommonString.TABLE_WEBVIEW_TIME_SPENT, null, null);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
@@ -375,14 +380,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
try {
|
try {
|
||||||
|
|
||||||
for (int i = 0; i < data.getSTORE_ID().size(); i++) {
|
for (int i = 0; i < data.getSTORE_ID().size(); i++) {
|
||||||
|
|
||||||
values.put("STORE_ID", data.getSTORE_ID().get(i));
|
values.put("STORE_ID", data.getSTORE_ID().get(i));
|
||||||
values.put("EMP_ID", data.getEMP_ID().get(i));
|
values.put("EMP_ID", data.getEMP_ID().get(i));
|
||||||
|
|
||||||
values.put("STORE_NAME", data.getSTORE_NAME().get(i));
|
values.put("STORE_NAME", data.getSTORE_NAME().get(i));
|
||||||
|
|
||||||
values.put("CITY", data.getCITY().get(i));
|
values.put("CITY", data.getCITY().get(i));
|
||||||
|
|
||||||
values.put("VISIT_DATE", data.getVISIT_DATE().get(i));
|
values.put("VISIT_DATE", data.getVISIT_DATE().get(i));
|
||||||
|
|
||||||
values.put("ADDRESS", data.getADDRESS().get(i));
|
values.put("ADDRESS", data.getADDRESS().get(i));
|
||||||
@@ -393,7 +394,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
|
|
||||||
values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
|
values.put("KEYACCOUNT_ID", data.getKEYACCOUNT_ID().get(i));
|
||||||
|
|
||||||
|
|
||||||
values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i));
|
values.put("STORETYPE_ID", data.getSTORETYPE_ID().get(i));
|
||||||
|
|
||||||
values.put("CHECKOUT_STATUS", data.getCHECKOUT_STATUS().get(i));
|
values.put("CHECKOUT_STATUS", data.getCHECKOUT_STATUS().get(i));
|
||||||
@@ -927,6 +927,80 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public ArrayList<MasterDetailerGetterSetter> getUploadedDetailerData(String storeid) {
|
||||||
|
|
||||||
|
ArrayList<MasterDetailerGetterSetter> list = new ArrayList<>();
|
||||||
|
Cursor dbcursor = null;
|
||||||
|
try {
|
||||||
|
|
||||||
|
String query = "SELECT * FROM "
|
||||||
|
+ CommonString.TABLE_WEBVIEW_TIME_SPENT
|
||||||
|
+ " WHERE STORE_ID = ?";
|
||||||
|
|
||||||
|
dbcursor = db.rawQuery(query, new String[]{storeid});
|
||||||
|
|
||||||
|
if (dbcursor != null && dbcursor.moveToFirst()) {
|
||||||
|
|
||||||
|
do {
|
||||||
|
|
||||||
|
MasterDetailerGetterSetter sb = new MasterDetailerGetterSetter();
|
||||||
|
|
||||||
|
sb.setStoreId(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("STORE_ID")));
|
||||||
|
|
||||||
|
sb.setVisitdate(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("VISIT_DATE")));
|
||||||
|
|
||||||
|
sb.setStart_time(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("START_TIME")));
|
||||||
|
|
||||||
|
sb.setEnd_time(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("END_TIME")));
|
||||||
|
|
||||||
|
sb.setDuration(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("DURATION")));
|
||||||
|
|
||||||
|
sb.setDetailerId(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("DETAILER_ID")));
|
||||||
|
|
||||||
|
sb.setUserId(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("USER_ID")));
|
||||||
|
|
||||||
|
sb.setCATEGORY_ID(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
|
||||||
|
|
||||||
|
sb.setDT_LEVEL(
|
||||||
|
dbcursor.getString(
|
||||||
|
dbcursor.getColumnIndexOrThrow("DT_LEVEL")));
|
||||||
|
|
||||||
|
list.add(sb);
|
||||||
|
|
||||||
|
} while (dbcursor.moveToNext());
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
|
||||||
|
Log.e("DB_ERROR", "getUploadedDetailerData : " + e.getMessage());
|
||||||
|
|
||||||
|
} finally {
|
||||||
|
|
||||||
|
if (dbcursor != null && !dbcursor.isClosed()) {
|
||||||
|
dbcursor.close();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
//insert MAPPING_DISPLAY_CHECKLIST
|
//insert MAPPING_DISPLAY_CHECKLIST
|
||||||
public void InsertMappingDisplayChecklist(MappingDisplayChecklistGetterSetter data) {
|
public void InsertMappingDisplayChecklist(MappingDisplayChecklistGetterSetter data) {
|
||||||
db.delete("MAPPING_DISPLAY_CHECKLIST", null, null);
|
db.delete("MAPPING_DISPLAY_CHECKLIST", null, null);
|
||||||
@@ -1364,7 +1438,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
dbcursor.moveToFirst();
|
dbcursor.moveToFirst();
|
||||||
while (!dbcursor.isAfterLast()) {
|
while (!dbcursor.isAfterLast()) {
|
||||||
CategoryGetterSetter cd = new CategoryGetterSetter();
|
CategoryGetterSetter cd = new CategoryGetterSetter();
|
||||||
|
|
||||||
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
|
cd.setCategory_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY_ID")));
|
||||||
cd.setCategory(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY")));
|
cd.setCategory(dbcursor.getString(dbcursor.getColumnIndexOrThrow("CATEGORY")));
|
||||||
cd.setCategory_img(-1);
|
cd.setCategory_img(-1);
|
||||||
@@ -7649,10 +7722,8 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
dbcursor.moveToFirst();
|
dbcursor.moveToFirst();
|
||||||
while (!dbcursor.isAfterLast()) {
|
while (!dbcursor.isAfterLast()) {
|
||||||
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
|
MSL_AvailabilityStockFacingGetterSetter cd = new MSL_AvailabilityStockFacingGetterSetter();
|
||||||
|
|
||||||
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
|
cd.setSub_category_id(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY_ID")));
|
||||||
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
|
cd.setSub_category(dbcursor.getString(dbcursor.getColumnIndexOrThrow("SUB_CATEGORY")));
|
||||||
|
|
||||||
list.add(cd);
|
list.add(cd);
|
||||||
dbcursor.moveToNext();
|
dbcursor.moveToNext();
|
||||||
}
|
}
|
||||||
@@ -8915,7 +8986,6 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
dbcursor = db.rawQuery("SELECT * from GEO_FENCING where COUNTRY_ID ='" + country_id + "'", null);
|
dbcursor = db.rawQuery("SELECT * from GEO_FENCING where COUNTRY_ID ='" + country_id + "'", null);
|
||||||
|
|
||||||
if (dbcursor != null) {
|
if (dbcursor != null) {
|
||||||
dbcursor.moveToFirst();
|
dbcursor.moveToFirst();
|
||||||
while (!dbcursor.isAfterLast()) {
|
while (!dbcursor.isAfterLast()) {
|
||||||
@@ -8936,13 +9006,10 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
dbcursor.close();
|
dbcursor.close();
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
Log.d("Excep get geofencing!", e.toString());
|
Log.d("Excep get geofencing!", e.toString());
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -11091,6 +11158,25 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public void InsertMasterDetailerData(MasterDetailerGetterSetter data) {
|
||||||
|
db.delete("MASTER_DETAILER", null, null);
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
try {
|
||||||
|
for (int i = 0; i < data.getDTID().size(); i++) {
|
||||||
|
values.put("DTID", data.getDTID().get(i));
|
||||||
|
values.put("DT_LEVEL", data.getDT_LEVEL().get(i));
|
||||||
|
values.put("DT_NAME", data.getDT_NAME().get(i));
|
||||||
|
values.put("CATEGORY_ID", data.getCATEGORY_ID().get(i));
|
||||||
|
values.put("DT_URL", data.getDT_URL().get(i));
|
||||||
|
values.put("DT_THUMBNAIL", data.getDT_THUMBNAIL().get(i));
|
||||||
|
db.insert("MASTER_DETAILER", null, values);
|
||||||
|
}
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.d("Exception ", "MASTER_DETAILER" + ex.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*public void InsertNoticeBoardData(NoticeboardGetterSetter data) {
|
/*public void InsertNoticeBoardData(NoticeboardGetterSetter data) {
|
||||||
db.delete("Mer_NoticeBoard", null, null);
|
db.delete("Mer_NoticeBoard", null, null);
|
||||||
ContentValues values = new ContentValues();
|
ContentValues values = new ContentValues();
|
||||||
@@ -11828,6 +11914,66 @@ public class GSKOrangeDB extends SQLiteOpenHelper {
|
|||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void insertWebViewTimeSpent(String storeId, String visitDate, String startTime, String endTime, String duration, String detailerId, String userId, String categoryId,String dt_level) {
|
||||||
|
db.delete(
|
||||||
|
CommonString.TABLE_WEBVIEW_TIME_SPENT,
|
||||||
|
"DETAILER_ID = ? AND VISIT_DATE = ? AND STORE_ID = ? AND CATEGORY_ID = ?",
|
||||||
|
new String[]{detailerId, visitDate, storeId, categoryId}
|
||||||
|
);
|
||||||
|
ContentValues values = new ContentValues();
|
||||||
|
try {
|
||||||
|
values.put("STORE_ID", storeId);
|
||||||
|
values.put("VISIT_DATE", visitDate);
|
||||||
|
values.put("START_TIME", startTime);
|
||||||
|
values.put("END_TIME", endTime);
|
||||||
|
values.put("DURATION", duration);
|
||||||
|
values.put("DETAILER_ID", detailerId);
|
||||||
|
values.put("USER_ID", userId);
|
||||||
|
values.put("CATEGORY_ID", categoryId);
|
||||||
|
values.put("DT_LEVEL", dt_level);
|
||||||
|
|
||||||
|
db.insert(CommonString.TABLE_WEBVIEW_TIME_SPENT, null, values);
|
||||||
|
|
||||||
|
} catch (Exception ex) {
|
||||||
|
Log.d("Exception ", " in " + CommonString.TABLE_WEBVIEW_TIME_SPENT + ex.toString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
public ArrayList<MasterDetailerGetterSetter> getMasterDetailerData(String tableName, @NotNull String storetype, String catId) {
|
||||||
|
ArrayList<MasterDetailerGetterSetter> list = new ArrayList<>();
|
||||||
|
try {
|
||||||
|
// String query = "SELECT * FROM " + tableName;
|
||||||
|
String query;
|
||||||
|
if ("STORE".equalsIgnoreCase(storetype)) {
|
||||||
|
query = "SELECT * FROM " + tableName + " WHERE CATEGORY_ID = '" + catId + "'";
|
||||||
|
} else if ("CATEGORY".equalsIgnoreCase(storetype)) {
|
||||||
|
query = "SELECT * FROM " + tableName + " WHERE CATEGORY_ID = '" + catId + "'";
|
||||||
|
} else {
|
||||||
|
query = "SELECT * FROM " + tableName;
|
||||||
|
}
|
||||||
|
try (Cursor cursor = db.rawQuery(query, null)) {
|
||||||
|
while (cursor != null && cursor.moveToNext()) {
|
||||||
|
MasterDetailerGetterSetter sb = new MasterDetailerGetterSetter();
|
||||||
|
sb.setDTID(cursor.getString(cursor.getColumnIndexOrThrow("DTID")));
|
||||||
|
sb.setDT_LEVEL(cursor.getString(cursor.getColumnIndexOrThrow("DT_LEVEL")));
|
||||||
|
sb.setCATEGORY_ID(cursor.getString(cursor.getColumnIndexOrThrow("CATEGORY_ID")));
|
||||||
|
sb.setDT_NAME(cursor.getString(cursor.getColumnIndexOrThrow("DT_NAME")));
|
||||||
|
sb.setDT_THUMBNAIL(cursor.getString(cursor.getColumnIndexOrThrow("DT_THUMBNAIL")));
|
||||||
|
sb.setDT_URL(cursor.getString(cursor.getColumnIndexOrThrow("DT_URL")));
|
||||||
|
list.add(sb);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
Log.e("DB_ERROR", "Error fetching MasterDetailer data", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
return list;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -656,12 +656,6 @@ public class GeoTagActivity extends AppCompatActivity implements OnMapReadyCallb
|
|||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* ATTENTION: This was auto-generated to implement the App Indexing API.
|
|
||||||
* See https://g.co/AppIndexing/AndroidStudio for more information.
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
public class GeoTagUpload extends AsyncTask<Void, Void, String> {
|
public class GeoTagUpload extends AsyncTask<Void, Void, String> {
|
||||||
|
|
||||||
|
|||||||
@@ -702,9 +702,9 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
editor.putString("NOTICEBOARD_DATA", noticeJson);
|
editor.putString("NOTICEBOARD_DATA", noticeJson);
|
||||||
editor.apply();
|
editor.apply();
|
||||||
|
|
||||||
} else {
|
} /*else {
|
||||||
return CommonString.KEY_FAILURE;
|
return CommonString.KEY_FAILURE;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
editor.putString(CommonString.KEY_USERNAME, userid);
|
editor.putString(CommonString.KEY_USERNAME, userid);
|
||||||
@@ -814,7 +814,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private String safe(ArrayList<String> list, int index) {
|
private String safe(ArrayList<String> list, int index) {
|
||||||
if (list == null || list.size() <= index || list.get(index) == null) {
|
if (list == null || list.size() <= index || list.get(index) == null) {
|
||||||
return "";
|
return "";
|
||||||
@@ -830,56 +829,12 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
|
.setPositiveButton("OK", new DialogInterface.OnClickListener() {
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
public void onClick(DialogInterface dialog, int id) {
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
AlertDialog alert = builder.create();
|
AlertDialog alert = builder.create();
|
||||||
alert.show();
|
alert.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private static String arabicToenglish(String number) {
|
|
||||||
char[] chars = new char[number.length()];
|
|
||||||
for (int i = 0; i < number.length(); i++) {
|
|
||||||
char ch = number.charAt(i);
|
|
||||||
if (ch >= 0x0660 && ch <= 0x0669)
|
|
||||||
ch -= 0x0660 - '0';
|
|
||||||
else if (ch >= 0x06f0 && ch <= 0x06F9)
|
|
||||||
ch -= 0x06f0 - '0';
|
|
||||||
chars[i] = ch;
|
|
||||||
}
|
|
||||||
return new String(chars);
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getCurrentTimeNotUsed() {
|
|
||||||
Calendar m_cal = Calendar.getInstance();
|
|
||||||
|
|
||||||
SimpleDateFormat formatter = new SimpleDateFormat("HH:mm:ss");
|
|
||||||
String cdate = formatter.format(m_cal.getTime());
|
|
||||||
|
|
||||||
if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KSA)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_UAE)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_JORDAN)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_KUWAIT)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_BAHRAIN)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_OMAN)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_QATAR)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LEBANON)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
} else if (preferences.getString(CommonString.KEY_LANGUAGE, "").equalsIgnoreCase(CommonString.KEY_LANGUAGE_ARABIC_LIBIYA)) {
|
|
||||||
cdate = arabicToenglish(cdate);
|
|
||||||
}
|
|
||||||
return cdate;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
private void setDataFromSharedPreferences(LoginGetterSetter lgs) {
|
private void setDataFromSharedPreferences(LoginGetterSetter lgs) {
|
||||||
Gson gson = new Gson();
|
Gson gson = new Gson();
|
||||||
String jsonCurProduct = gson.toJson(lgs);
|
String jsonCurProduct = gson.toJson(lgs);
|
||||||
@@ -890,7 +845,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
|
|
||||||
void checkAppPermission(String permission, int requestCode) {
|
void checkAppPermission(String permission, int requestCode) {
|
||||||
|
|
||||||
boolean permission_flag = false;
|
|
||||||
// Here, thisActivity is the current activity
|
// Here, thisActivity is the current activity
|
||||||
if (ContextCompat.checkSelfPermission(LoginActivity.this,
|
if (ContextCompat.checkSelfPermission(LoginActivity.this,
|
||||||
permission)
|
permission)
|
||||||
@@ -900,19 +854,12 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
// Should we show an explanation?
|
// Should we show an explanation?
|
||||||
if (ActivityCompat.shouldShowRequestPermissionRationale(LoginActivity.this,
|
if (ActivityCompat.shouldShowRequestPermissionRationale(LoginActivity.this,
|
||||||
permission)) {
|
permission)) {
|
||||||
// Show an explanation to the user *asynchronously* -- don't block
|
|
||||||
// this thread waiting for the user's response! After the user
|
|
||||||
// sees the explanation, try again to request the permission.
|
|
||||||
showOnPermissiondenied(Manifest.permission.CAMERA, MY_PERMISSIONS_REQUEST_CAMERA, 1);
|
showOnPermissiondenied(Manifest.permission.CAMERA, MY_PERMISSIONS_REQUEST_CAMERA, 1);
|
||||||
} else {
|
} else {
|
||||||
// No explanation needed; request the permission
|
// No explanation needed; request the permission
|
||||||
ActivityCompat.requestPermissions(LoginActivity.this,
|
ActivityCompat.requestPermissions(LoginActivity.this,
|
||||||
new String[]{permission},
|
new String[]{permission},
|
||||||
requestCode);
|
requestCode);
|
||||||
|
|
||||||
// MY_PERMISSIONS_REQUEST_READ_CONTACTS is an
|
|
||||||
// app-defined int constant. The callback method gets the
|
|
||||||
// result of the request.
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Permission has already been granted
|
// Permission has already been granted
|
||||||
@@ -962,13 +909,6 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
/* builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
|
|
||||||
@Override
|
|
||||||
public void onClick(DialogInterface dialog, int which) {
|
|
||||||
dialog.cancel();
|
|
||||||
finish();
|
|
||||||
}
|
|
||||||
});*/
|
|
||||||
builder.show();
|
builder.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1001,8 +941,8 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
if (ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
|
if (ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
|
||||||
&& ActivityCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
&& ContextCompat.checkSelfPermission(this, android.Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
|
||||||
ActivityCompat.requestPermissions(LoginActivity.this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION}, 1);
|
ActivityCompat.requestPermissions(LoginActivity.this, new String[]{android.Manifest.permission.ACCESS_FINE_LOCATION}, 1);
|
||||||
ActivityCompat.requestPermissions(LoginActivity.this, new String[]{android.Manifest.permission.ACCESS_COARSE_LOCATION}, 2);
|
ActivityCompat.requestPermissions(LoginActivity.this, new String[]{android.Manifest.permission.ACCESS_COARSE_LOCATION}, 2);
|
||||||
}
|
}
|
||||||
@@ -1017,8 +957,7 @@ public class LoginActivity extends AppCompatActivity implements GoogleApiClient.
|
|||||||
GooglePlayServicesUtil.getErrorDialog(resultCode, this,
|
GooglePlayServicesUtil.getErrorDialog(resultCode, this,
|
||||||
PLAY_SERVICES_RESOLUTION_REQUEST).show();
|
PLAY_SERVICES_RESOLUTION_REQUEST).show();
|
||||||
} else {
|
} else {
|
||||||
Toast.makeText(context, getResources().getString(R.string.notsuppoted), Toast.LENGTH_LONG)
|
Toast.makeText(context, getResources().getString(R.string.notsuppoted), Toast.LENGTH_LONG).show();
|
||||||
.show();
|
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ import com.google.gson.Gson;
|
|||||||
|
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
import java.net.URLEncoder;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
@@ -113,9 +114,11 @@ public class MainActivity extends AppCompatActivity
|
|||||||
webView.setWebViewClient(new MyWebViewClient());
|
webView.setWebViewClient(new MyWebViewClient());
|
||||||
webView.getSettings().setJavaScriptEnabled(true);
|
webView.getSettings().setJavaScriptEnabled(true);
|
||||||
|
|
||||||
String json = preferences.getString("NOTICEBOARD_DATA", null);
|
String json = preferences.getString("NOTICEBOARD_DATA", null) != null
|
||||||
|
? preferences.getString("NOTICEBOARD_DATA", null)
|
||||||
|
: "";
|
||||||
Log.d("noticejsondata",json);
|
Log.d("noticejsondata",json);
|
||||||
if (json != null) {
|
if (!json.isEmpty()) {
|
||||||
Gson gson = new Gson();
|
Gson gson = new Gson();
|
||||||
NoticeResponse response =
|
NoticeResponse response =
|
||||||
gson.fromJson(json, NoticeResponse.class);
|
gson.fromJson(json, NoticeResponse.class);
|
||||||
@@ -150,12 +153,6 @@ public class MainActivity extends AppCompatActivity
|
|||||||
});
|
});
|
||||||
viewPager.setClipToPadding(false);
|
viewPager.setClipToPadding(false);
|
||||||
viewPager.setClipChildren(false);
|
viewPager.setClipChildren(false);
|
||||||
// TabLayout tabLayout = findViewById(R.id.tabDots);
|
|
||||||
/*new TabLayoutMediator(tabLayout, viewPager,
|
|
||||||
(tab, position) -> {
|
|
||||||
// no title, just dots
|
|
||||||
}
|
|
||||||
).attach();*/
|
|
||||||
|
|
||||||
if (!url.isEmpty()) {
|
if (!url.isEmpty()) {
|
||||||
webView.loadUrl(url);
|
webView.loadUrl(url);
|
||||||
@@ -242,17 +239,19 @@ public class MainActivity extends AppCompatActivity
|
|||||||
|
|
||||||
String url = String.valueOf(item.getNoticeLink_FullPage());
|
String url = String.valueOf(item.getNoticeLink_FullPage());
|
||||||
String type = String.valueOf(item.getFullPageTarget());
|
String type = String.valueOf(item.getFullPageTarget());
|
||||||
Log.d("clickdata",url + ","+type);
|
// Log.d("clickdata",url + ","+type);
|
||||||
|
Log.e("clickdata", "URL = " + url);
|
||||||
|
System.out.println("FULL URL = " + url);
|
||||||
|
|
||||||
if (type == null) return;
|
if (type == null) return;
|
||||||
|
|
||||||
switch (type.toLowerCase()) {
|
switch (type.toLowerCase()) {
|
||||||
|
|
||||||
case "html-webview":
|
case "html-webview":
|
||||||
Log.d("itemdata", String.valueOf(item.getFullPageTarget()));
|
Log.d("itemdata", String.valueOf(item.getFullPageTarget()));
|
||||||
Intent webIntent = new Intent(this, WebViewActivity.class);
|
Intent webIntent = new Intent(this, WebViewActivity.class);
|
||||||
webIntent.putExtra("url", url);
|
webIntent.putExtra("url", url);
|
||||||
webIntent.putExtra("type", item.getFullPageTarget());
|
webIntent.putExtra("type", item.getFullPageTarget());
|
||||||
|
webIntent.putExtra("dt_level", "");
|
||||||
startActivity(webIntent);
|
startActivity(webIntent);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -264,6 +263,7 @@ public class MainActivity extends AppCompatActivity
|
|||||||
Intent videoIntent = new Intent(this, WebViewActivity.class);
|
Intent videoIntent = new Intent(this, WebViewActivity.class);
|
||||||
videoIntent.putExtra("url", url);
|
videoIntent.putExtra("url", url);
|
||||||
videoIntent.putExtra("type", item.getFullPageTarget());
|
videoIntent.putExtra("type", item.getFullPageTarget());
|
||||||
|
videoIntent.putExtra("dt_level", "");
|
||||||
startActivity(videoIntent);
|
startActivity(videoIntent);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -271,6 +271,7 @@ public class MainActivity extends AppCompatActivity
|
|||||||
Intent imageIntent = new Intent(this, WebViewActivity.class);
|
Intent imageIntent = new Intent(this, WebViewActivity.class);
|
||||||
imageIntent.putExtra("url", url);
|
imageIntent.putExtra("url", url);
|
||||||
imageIntent.putExtra("type", item.getFullPageTarget());
|
imageIntent.putExtra("type", item.getFullPageTarget());
|
||||||
|
imageIntent.putExtra("dt_level", "");
|
||||||
startActivity(imageIntent);
|
startActivity(imageIntent);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@@ -786,6 +787,32 @@ public class MainActivity extends AppCompatActivity
|
|||||||
return list != null ? list.size() : 0;
|
return list != null ? list.size() : 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Append storeid and merid to the provided URL as query parameters.
|
||||||
|
* If the URL already contains query params, append with '&', otherwise use '?'.
|
||||||
|
*/
|
||||||
|
private String appendStoreMerQuery(String url, String storeId, String merId) {
|
||||||
|
if (url == null) return null;
|
||||||
|
try {
|
||||||
|
StringBuilder sb = new StringBuilder(url);
|
||||||
|
String separator = url.contains("?") ? "&" : "?";
|
||||||
|
boolean appended = false;
|
||||||
|
if (storeId != null && !storeId.isEmpty()) {
|
||||||
|
sb.append(separator).append("storeid=").append(URLEncoder.encode(storeId, "UTF-8"));
|
||||||
|
separator = "&";
|
||||||
|
appended = true;
|
||||||
|
}
|
||||||
|
if (merId != null && !merId.isEmpty()) {
|
||||||
|
sb.append(separator).append("merid=").append(URLEncoder.encode(merId, "UTF-8"));
|
||||||
|
appended = true;
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1642,6 +1642,21 @@ public class CommonString {
|
|||||||
+ KEY_IRPD_VISIBILITY_IMAGES
|
+ KEY_IRPD_VISIBILITY_IMAGES
|
||||||
+ " VARCHAR)";
|
+ " VARCHAR)";
|
||||||
|
|
||||||
|
public static final String TABLE_WEBVIEW_TIME_SPENT = "WEBVIEW_TIME_SPENT";
|
||||||
|
public static final String CREATE_TABLE_WEBVIEW_TIME_SPENT = "CREATE TABLE IF NOT EXISTS "
|
||||||
|
+ TABLE_WEBVIEW_TIME_SPENT
|
||||||
|
+ " ("
|
||||||
|
+ "KEY_ID INTEGER PRIMARY KEY AUTOINCREMENT,"
|
||||||
|
+ "STORE_ID INTEGER,"
|
||||||
|
+ "VISIT_DATE VARCHAR,"
|
||||||
|
+ "START_TIME VARCHAR,"
|
||||||
|
+ "END_TIME VARCHAR,"
|
||||||
|
+ "DURATION VARCHAR,"
|
||||||
|
+ "DETAILER_ID INTEGER,"
|
||||||
|
+ "USER_ID VARCHAR,"
|
||||||
|
+ "DT_LEVEL VARCHAR,"
|
||||||
|
+ "CATEGORY_ID INTEGER)";
|
||||||
|
|
||||||
public static final String BACKUP_FOLDER_NAME = "HaleonMT_Backup";
|
public static final String BACKUP_FOLDER_NAME = "HaleonMT_Backup";
|
||||||
public static final String IMAGE_FOLDER_NAME = "HaleonMT_Images";
|
public static final String IMAGE_FOLDER_NAME = "HaleonMT_Images";
|
||||||
public static final String Download_IMAGE_FOLDER = "Downloaded_HaleonMT_Images";
|
public static final String Download_IMAGE_FOLDER = "Downloaded_HaleonMT_Images";
|
||||||
|
|||||||
@@ -0,0 +1,164 @@
|
|||||||
|
package cpm.com.gskmtorange.dailyentry
|
||||||
|
|
||||||
|
import android.content.Intent
|
||||||
|
import android.content.SharedPreferences
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.preference.PreferenceManager
|
||||||
|
import android.util.Log
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import android.widget.ImageView
|
||||||
|
import android.widget.TextView
|
||||||
|
import android.view.Menu
|
||||||
|
import android.view.MenuItem
|
||||||
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
|
import androidx.recyclerview.widget.RecyclerView
|
||||||
|
import com.bumptech.glide.Glide
|
||||||
|
import com.bumptech.glide.load.resource.bitmap.RoundedCorners
|
||||||
|
import cpm.com.gskmtorange.Database.GSKOrangeDB
|
||||||
|
import cpm.com.gskmtorange.R
|
||||||
|
import cpm.com.gskmtorange.constant.CommonFunctions
|
||||||
|
import cpm.com.gskmtorange.constant.CommonString
|
||||||
|
import cpm.com.gskmtorange.xmlGetterSetter.MasterDetailerGetterSetter
|
||||||
|
import java.net.URLEncoder
|
||||||
|
|
||||||
|
class BannerActivity : AppCompatActivity() {
|
||||||
|
private lateinit var recyclerView: RecyclerView
|
||||||
|
var bannerlistnew: ArrayList<MasterDetailerGetterSetter>? = ArrayList()
|
||||||
|
|
||||||
|
private lateinit var preferences: SharedPreferences
|
||||||
|
private lateinit var db: GSKOrangeDB
|
||||||
|
private lateinit var countryId: String
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
setContentView(R.layout.activity_banner)
|
||||||
|
|
||||||
|
val toolbar: androidx.appcompat.widget.Toolbar = findViewById(R.id.toolbar)
|
||||||
|
setSupportActionBar(toolbar)
|
||||||
|
supportActionBar?.title = "Banner Dashboard"
|
||||||
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
|
toolbar.setNavigationOnClickListener {
|
||||||
|
onBackPressedDispatcher.onBackPressed()
|
||||||
|
}
|
||||||
|
|
||||||
|
recyclerView = findViewById(R.id.recyclerView)
|
||||||
|
recyclerView.layoutManager = LinearLayoutManager(this)
|
||||||
|
|
||||||
|
preferences = PreferenceManager.getDefaultSharedPreferences(this)
|
||||||
|
CommonFunctions.updateLangResources(this, preferences.getString(CommonString.KEY_LANGUAGE, ""))
|
||||||
|
countryId = preferences.getString(CommonString.KEY_COUNTRY_ID, "") ?: ""
|
||||||
|
|
||||||
|
db = GSKOrangeDB(this)
|
||||||
|
db.open()
|
||||||
|
val storetype = intent.getStringExtra("DT_LEVEL") ?: ""
|
||||||
|
val categoryId = intent.getStringExtra("CategoryId") ?: ""
|
||||||
|
|
||||||
|
bannerlistnew = db.getMasterDetailerData("MASTER_DETAILER",storetype,categoryId)
|
||||||
|
/*if(!categoryId.equals("0")){
|
||||||
|
bannerlistnew = db.getMasterDetailerData("MASTER_DETAILER",storetype,categoryId)
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
bannerlistnew = db.getMasterDetailerData("MASTER_DETAILER",storetype,"0")
|
||||||
|
}*/
|
||||||
|
|
||||||
|
Log.d("bannerlistkotlin", bannerlistnew?.size.toString())
|
||||||
|
|
||||||
|
bannerlistnew?.let {
|
||||||
|
if (it.isNotEmpty()) {
|
||||||
|
recyclerView.adapter = BannerListAdapter(it) { item -> handleClick(item) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* override fun onCreateOptionsMenu(menu: Menu): Boolean {
|
||||||
|
menuInflater.inflate(R.menu.banner_menu, menu)
|
||||||
|
return true
|
||||||
|
}*/
|
||||||
|
|
||||||
|
/* override fun onOptionsItemSelected(item: MenuItem): Boolean {
|
||||||
|
if (item.itemId == R.id.action_social_media) {
|
||||||
|
// Handle social media icon click
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return super.onOptionsItemSelected(item)
|
||||||
|
}*/
|
||||||
|
|
||||||
|
private fun handleClick(item: MasterDetailerGetterSetter) {
|
||||||
|
val url = if (item.dT_URL.isNotEmpty()) item.dT_URL[0] else ""
|
||||||
|
val type = "html-webview" // Default type as not specified in MASTER_DETAILER metadata
|
||||||
|
Log.e("clickdata", "URL = $url")
|
||||||
|
|
||||||
|
val storeId = preferences.getString(CommonString.KEY_STORE_ID, "") ?: ""
|
||||||
|
val merId = if (item.dtid.isNotEmpty()) item.dtid[0] else ""
|
||||||
|
val categoryId = intent.getStringExtra("CategoryId") ?: ""
|
||||||
|
val finalUrl = appendStoreMerQuery(url, storeId, merId)
|
||||||
|
val storetype = intent.getStringExtra("DT_LEVEL") ?: ""
|
||||||
|
Log.d("finalurl", finalUrl)
|
||||||
|
|
||||||
|
val webIntent = Intent(this, WebViewActivity::class.java).apply {
|
||||||
|
putExtra("url", finalUrl)
|
||||||
|
putExtra("type", type)
|
||||||
|
putExtra("storeid", storeId)
|
||||||
|
putExtra("merid", merId)
|
||||||
|
putExtra("categoryId", categoryId)
|
||||||
|
putExtra("dt_level", storetype)
|
||||||
|
}
|
||||||
|
startActivity(webIntent)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun appendStoreMerQuery(url: String?, storeId: String?, merId: String?): String {
|
||||||
|
if (url == null) return ""
|
||||||
|
return try {
|
||||||
|
val sb = StringBuilder(url)
|
||||||
|
var separator = if (url.contains("?")) "&" else "?"
|
||||||
|
if (!storeId.isNullOrEmpty()) {
|
||||||
|
sb.append(separator).append("storeid=").append(URLEncoder.encode(storeId, "UTF-8"))
|
||||||
|
separator = "&"
|
||||||
|
}
|
||||||
|
if (!merId.isNullOrEmpty()) {
|
||||||
|
sb.append(separator).append("merid=").append(URLEncoder.encode(merId, "UTF-8"))
|
||||||
|
}
|
||||||
|
sb.toString()
|
||||||
|
} catch (e: Exception) {
|
||||||
|
e.printStackTrace()
|
||||||
|
url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inner class BannerListAdapter(
|
||||||
|
private val list: List<MasterDetailerGetterSetter>,
|
||||||
|
private val listener: (MasterDetailerGetterSetter) -> Unit
|
||||||
|
) : RecyclerView.Adapter<BannerListAdapter.ViewHolder>() {
|
||||||
|
|
||||||
|
inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
|
||||||
|
val image: ImageView = itemView.findViewById(R.id.imgThumbnail)
|
||||||
|
val name: TextView = itemView.findViewById(R.id.tvName)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
|
||||||
|
val view = LayoutInflater.from(parent.context).inflate(R.layout.item_banner_list, parent, false)
|
||||||
|
return ViewHolder(view)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onBindViewHolder(holder: ViewHolder, position: Int) {
|
||||||
|
val item = list[position]
|
||||||
|
// Accessing first element of internal list as per parinaam pattern
|
||||||
|
val url = if (item.dT_THUMBNAIL.isNotEmpty()) item.dT_THUMBNAIL[0] else ""
|
||||||
|
val displayName = if (item.dT_NAME.isNotEmpty()) item.dT_NAME[0] else ""
|
||||||
|
|
||||||
|
holder.name.text = displayName
|
||||||
|
|
||||||
|
Glide.with(holder.itemView.context)
|
||||||
|
.load(url)
|
||||||
|
.placeholder(R.mipmap.ic_launcher)
|
||||||
|
.transform(RoundedCorners(15))
|
||||||
|
.into(holder.image)
|
||||||
|
|
||||||
|
holder.itemView.setOnClickListener { listener(item) }
|
||||||
|
}
|
||||||
|
override fun getItemCount(): Int = list.size
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -119,7 +119,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
//temp
|
//temp
|
||||||
public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/";
|
public static final String FILE_PATH = Environment.getExternalStorageDirectory() + "/";
|
||||||
ProductAdapter productAdapter;
|
ProductAdapter productAdapter;
|
||||||
//ImageView bmImage;
|
|
||||||
RelativeLayout view;
|
RelativeLayout view;
|
||||||
RadioButton radio_yes,radio_no;
|
RadioButton radio_yes,radio_no;
|
||||||
RadioGroup radio_group;
|
RadioGroup radio_group;
|
||||||
@@ -133,7 +132,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
try {
|
try {
|
||||||
//setContentView(R.layout.activity_msl__availability_stock_facing);
|
|
||||||
setContentView(R.layout.activity_order_taking);
|
setContentView(R.layout.activity_order_taking);
|
||||||
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
|
||||||
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
|
expandableListView = (ExpandableListView) findViewById(R.id.expandableListView);
|
||||||
@@ -194,7 +192,7 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
//subcategory_list.clear();
|
//subcategory_list.clear();
|
||||||
//txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
|
//txt_mslAvailabilityName.setText(getResources().getString(R.string.title_activity_msl__availability));
|
||||||
addedCounterfeitProducts = db.getOrderTakingNewAfterData(store_id, categoryId);
|
addedCounterfeitProducts = db.getOrderTakingNewAfterData(store_id, categoryId);
|
||||||
if(addedCounterfeitProducts.size()>0){
|
if(!addedCounterfeitProducts.isEmpty()){
|
||||||
rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(context));
|
rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(context));
|
||||||
productAdapter = new ProductAdapter(addedCounterfeitProducts);
|
productAdapter = new ProductAdapter(addedCounterfeitProducts);
|
||||||
rec_added_counterfeit_product.setAdapter(productAdapter);
|
rec_added_counterfeit_product.setAdapter(productAdapter);
|
||||||
@@ -217,9 +215,7 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
podateET.setText(visit_date);
|
podateET.setText(visit_date);
|
||||||
prepareList();
|
prepareList();
|
||||||
|
|
||||||
fab_add.setOnClickListener(new View.OnClickListener() {
|
fab_add.setOnClickListener(view -> {
|
||||||
@Override
|
|
||||||
public void onClick(View view) {
|
|
||||||
Order_qty = editText_QTY.getText().toString();
|
Order_qty = editText_QTY.getText().toString();
|
||||||
ArrayList<MSL_AvailabilityStockFacingGetterSetter>finddetailbysku= new ArrayList<>();
|
ArrayList<MSL_AvailabilityStockFacingGetterSetter>finddetailbysku= new ArrayList<>();
|
||||||
finddetailbysku = db.getSkuDetails(String.valueOf(skuid));
|
finddetailbysku = db.getSkuDetails(String.valueOf(skuid));
|
||||||
@@ -230,12 +226,8 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
Snackbar.make(rec_added_counterfeit_product, R.string.add_different_sku,
|
Snackbar.make(rec_added_counterfeit_product, R.string.add_different_sku,
|
||||||
Snackbar.LENGTH_SHORT).show();
|
Snackbar.LENGTH_SHORT).show();
|
||||||
return;
|
return;
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
|
||||||
|
|
||||||
if (skuname.isEmpty()) {
|
if (skuname.isEmpty()) {
|
||||||
Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_sku, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(rec_added_counterfeit_product, R.string.pls_select_sku, Snackbar.LENGTH_SHORT).show();
|
||||||
} else if (Order_qty.isEmpty()) {
|
} else if (Order_qty.isEmpty()) {
|
||||||
@@ -254,7 +246,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(context));
|
rec_added_counterfeit_product.setLayoutManager(new LinearLayoutManager(context));
|
||||||
productAdapter = new ProductAdapter(addedCounterfeitProducts);
|
productAdapter = new ProductAdapter(addedCounterfeitProducts);
|
||||||
rec_added_counterfeit_product.setAdapter(productAdapter);
|
rec_added_counterfeit_product.setAdapter(productAdapter);
|
||||||
|
|
||||||
subcategory = "";
|
subcategory = "";
|
||||||
brand = "";
|
brand = "";
|
||||||
subcategory = "";
|
subcategory = "";
|
||||||
@@ -272,25 +263,19 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
setNewData();
|
setNewData();
|
||||||
isdata_added = true;
|
isdata_added = true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
|
final FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
|
||||||
|
|
||||||
poIV.setOnClickListener(new View.OnClickListener() {
|
poIV.setOnClickListener(v -> {
|
||||||
@Override
|
|
||||||
public void onClick(View v) {
|
|
||||||
_pathforcheck = store_id + categoryId + "POImage_" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
|
_pathforcheck = store_id + categoryId + "POImage_" + date.replace("/", "") + CommonFunctions.getCurrentTimeWithLanguage(context).replace(":", "") + ".jpg";
|
||||||
|
|
||||||
_path = CommonString.getImagesFolder(context) + _pathforcheck;
|
_path = CommonString.getImagesFolder(context) + _pathforcheck;
|
||||||
intime = CommonFunctions.getCurrentTimeWithLanguage(context);
|
intime = CommonFunctions.getCurrentTimeWithLanguage(context);
|
||||||
startCameraActivity();
|
startCameraActivity();
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
radio_group.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener() {
|
radio_group.setOnCheckedChangeListener((radioGroup, i) -> {
|
||||||
@Override
|
|
||||||
public void onCheckedChanged(RadioGroup radioGroup, int i) {
|
|
||||||
if (radio_yes.isChecked()) {
|
if (radio_yes.isChecked()) {
|
||||||
radio_yes.setBackground(getResources().getDrawable(R.mipmap.yes_green));
|
radio_yes.setBackground(getResources().getDrawable(R.mipmap.yes_green));
|
||||||
radio_no.setBackground(getResources().getDrawable(R.mipmap.no_white));
|
radio_no.setBackground(getResources().getDrawable(R.mipmap.no_white));
|
||||||
@@ -302,9 +287,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
pocamLL.setVisibility(View.GONE);
|
pocamLL.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
isExist="yes";
|
isExist="yes";
|
||||||
/*expListView.setVisibility(View.VISIBLE);
|
|
||||||
categoryobject.setIsChecked(1);
|
|
||||||
skuData.get(0).setIsChecked(1);*/
|
|
||||||
}
|
}
|
||||||
if (radio_no.isChecked()) {
|
if (radio_no.isChecked()) {
|
||||||
radio_no.setBackground(getResources().getDrawable(R.mipmap.no_red));
|
radio_no.setBackground(getResources().getDrawable(R.mipmap.no_red));
|
||||||
@@ -313,21 +295,15 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
pocamLL.setVisibility(View.GONE);
|
pocamLL.setVisibility(View.GONE);
|
||||||
isExist="no";
|
isExist="no";
|
||||||
img_str = "";
|
img_str = "";
|
||||||
/*expListView.setVisibility(View.GONE);
|
|
||||||
categoryobject.setIsChecked(0);
|
|
||||||
skuData.get(0).setIsChecked(0);*/
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
fab.setOnClickListener(new View.OnClickListener() {
|
fab.setOnClickListener(view -> {
|
||||||
@Override
|
|
||||||
public void onClick(final View view) {
|
|
||||||
expandableListView.clearFocus();
|
expandableListView.clearFocus();
|
||||||
adapter.notifyDataSetChanged();
|
adapter.notifyDataSetChanged();
|
||||||
storepo = storepoET.getText().toString();
|
storepo = storepoET.getText().toString();
|
||||||
if (addedCounterfeitProducts.size() == 0) {
|
if (addedCounterfeitProducts.isEmpty()) {
|
||||||
Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add, Snackbar.LENGTH_SHORT).show();
|
Snackbar.make(rec_added_counterfeit_product, R.string.title_activity_Want_add, Snackbar.LENGTH_SHORT).show();
|
||||||
} else {
|
} else {
|
||||||
Log.d("sysponumber",sys_po_number);
|
Log.d("sysponumber",sys_po_number);
|
||||||
@@ -460,7 +436,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
|
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
|
expandableListView.setOnScrollListener(new AbsListView.OnScrollListener() {
|
||||||
@@ -472,11 +447,11 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
int lastItem = firstVisibleItem + visibleItemCount;
|
int lastItem = firstVisibleItem + visibleItemCount;
|
||||||
|
|
||||||
if (firstVisibleItem == 0) {
|
if (firstVisibleItem == 0) {
|
||||||
fab.show();//.setVisibility(View.VISIBLE);
|
fab.show();
|
||||||
} else if (lastItem == totalItemCount) {
|
} else if (lastItem == totalItemCount) {
|
||||||
fab.hide();//setVisibility(View.INVISIBLE);
|
fab.hide();
|
||||||
} else {
|
} else {
|
||||||
fab.show();//setVisibility(View.VISIBLE);
|
fab.show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1132,12 +1107,10 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
AlertDialog.Builder builder = new AlertDialog.Builder(OrderTakingActivity.this);
|
AlertDialog.Builder builder = new AlertDialog.Builder(OrderTakingActivity.this);
|
||||||
builder.setMessage(getString(R.string.check_faceup))
|
builder.setMessage(getString(R.string.check_faceup))
|
||||||
.setCancelable(false)
|
.setCancelable(false)
|
||||||
.setPositiveButton(getString(R.string.ok), new DialogInterface.OnClickListener() {
|
.setPositiveButton(getString(R.string.ok), (dialog, id) -> {
|
||||||
public void onClick(DialogInterface dialog, int id) {
|
|
||||||
finalHolder1.facing.setText("");
|
finalHolder1.facing.setText("");
|
||||||
dialog.dismiss();
|
dialog.dismiss();
|
||||||
finalHolder2.facing.setText("");
|
finalHolder2.facing.setText("");
|
||||||
}
|
|
||||||
});
|
});
|
||||||
AlertDialog alert = builder.create();
|
AlertDialog alert = builder.create();
|
||||||
alert.show();
|
alert.show();
|
||||||
@@ -1160,10 +1133,8 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
faceup = "0";
|
faceup = "0";
|
||||||
} else {
|
} else {
|
||||||
faceup = edFaceup.replaceFirst("^0+(?!$)", "");
|
faceup = edFaceup.replaceFirst("^0+(?!$)", "");
|
||||||
//faceup = new DecimalFormat("##.#").format(Double.parseDouble(faceup));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// String str2 = PerfectDecimal(faceup, 3, 1);
|
|
||||||
childData.setFacing(faceup);
|
childData.setFacing(faceup);
|
||||||
} else {
|
} else {
|
||||||
childData.setFacing("");
|
childData.setFacing("");
|
||||||
@@ -1498,9 +1469,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
MSL_AvailabilityStockFacingGetterSetter tempValues = null;
|
MSL_AvailabilityStockFacingGetterSetter tempValues = null;
|
||||||
LayoutInflater inflater;
|
LayoutInflater inflater;
|
||||||
|
|
||||||
/*************
|
|
||||||
* CustomBrandAdapter Constructor
|
|
||||||
*****************/
|
|
||||||
public CustomSkuAdapter(
|
public CustomSkuAdapter(
|
||||||
OrderTakingActivity activitySpinner,
|
OrderTakingActivity activitySpinner,
|
||||||
int textViewResourceId,
|
int textViewResourceId,
|
||||||
@@ -1524,26 +1492,19 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
public View getView(int position, View convertView, ViewGroup parent) {
|
public View getView(int position, View convertView, ViewGroup parent) {
|
||||||
return getCustomView(position, convertView, parent);
|
return getCustomView(position, convertView, parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
// This funtion called for each row ( Called data.size() times )
|
|
||||||
public View getCustomView(int position, View convertView, ViewGroup parent) {
|
public View getCustomView(int position, View convertView, ViewGroup parent) {
|
||||||
|
|
||||||
/********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
|
/********** Inflate spinner_rows.xml file for each row ( Defined below ) ************/
|
||||||
View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
|
View row = inflater.inflate(R.layout.custom_spinner_item, parent, false);
|
||||||
|
|
||||||
/***** Get each Model object from Arraylist ********/
|
|
||||||
tempValues = null;
|
tempValues = null;
|
||||||
tempValues = (MSL_AvailabilityStockFacingGetterSetter) data.get(position);
|
tempValues = (MSL_AvailabilityStockFacingGetterSetter) data.get(position);
|
||||||
TextView label = (TextView) row.findViewById(R.id.tv_text);
|
TextView label = (TextView) row.findViewById(R.id.tv_text);
|
||||||
if (position == 0) {
|
if (position == 0) {
|
||||||
// Default selected Spinner item
|
// Default selected Spinner item
|
||||||
label.setText(getResources().getString(R.string.select));
|
label.setText(getResources().getString(R.string.select));
|
||||||
//sub.setText("");
|
|
||||||
} else {
|
} else {
|
||||||
// Set values for spinner each row
|
|
||||||
label.setText(tempValues.getSku());
|
label.setText(tempValues.getSku());
|
||||||
}
|
}
|
||||||
// label.setText(tempValues.getSku());
|
|
||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1583,7 +1544,6 @@ public class OrderTakingActivity extends AppCompatActivity implements DialogCall
|
|||||||
|
|
||||||
public ViewHolder(View view) {
|
public ViewHolder(View view) {
|
||||||
super(view);
|
super(view);
|
||||||
|
|
||||||
mView = view;
|
mView = view;
|
||||||
tv_brand = (TextView) mView.findViewById(R.id.tv_brand);
|
tv_brand = (TextView) mView.findViewById(R.id.tv_brand);
|
||||||
tv_order_qty = (TextView) mView.findViewById(R.id.tv_order_qty);
|
tv_order_qty = (TextView) mView.findViewById(R.id.tv_order_qty);
|
||||||
|
|||||||
@@ -1338,7 +1338,6 @@ public class StoreListActivity extends AppCompatActivity implements GoogleApiCli
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return flag_checked_in;
|
return flag_checked_in;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,10 +2,11 @@ package cpm.com.gskmtorange.dailyentry
|
|||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.content.Intent
|
import android.content.Intent
|
||||||
|
import android.content.SharedPreferences
|
||||||
import android.graphics.BitmapFactory
|
import android.graphics.BitmapFactory
|
||||||
import android.graphics.drawable.Drawable
|
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
|
import android.preference.PreferenceManager
|
||||||
import android.provider.MediaStore
|
import android.provider.MediaStore
|
||||||
import android.util.Base64
|
import android.util.Base64
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
@@ -16,23 +17,32 @@ import android.webkit.WebChromeClient
|
|||||||
import android.webkit.WebSettings
|
import android.webkit.WebSettings
|
||||||
import android.webkit.WebView
|
import android.webkit.WebView
|
||||||
import android.webkit.WebViewClient
|
import android.webkit.WebViewClient
|
||||||
import android.widget.ImageView
|
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.appcompat.widget.Toolbar
|
import androidx.appcompat.widget.Toolbar
|
||||||
import androidx.media3.common.MediaItem
|
import androidx.media3.common.MediaItem
|
||||||
import androidx.media3.exoplayer.ExoPlayer
|
import androidx.media3.exoplayer.ExoPlayer
|
||||||
import com.bumptech.glide.request.target.ViewTarget
|
import cpm.com.gskmtorange.Database.GSKOrangeDB
|
||||||
|
import cpm.com.gskmtorange.constant.CommonString
|
||||||
import cpm.com.gskmtorange.databinding.ActivityWebviewBinding
|
import cpm.com.gskmtorange.databinding.ActivityWebviewBinding
|
||||||
import org.json.JSONObject
|
import org.json.JSONObject
|
||||||
|
import java.text.SimpleDateFormat
|
||||||
|
import java.util.Date
|
||||||
|
import java.util.Locale
|
||||||
|
|
||||||
class WebViewActivity : AppCompatActivity() {
|
class WebViewActivity : AppCompatActivity() {
|
||||||
|
|
||||||
private lateinit var binding: ActivityWebviewBinding
|
private lateinit var binding: ActivityWebviewBinding
|
||||||
var toolbar: Toolbar? = null
|
var toolbar: Toolbar? = null
|
||||||
|
|
||||||
private lateinit var type : String
|
private lateinit var type : String
|
||||||
private var player: ExoPlayer? = null
|
private var player: ExoPlayer? = null
|
||||||
// private var player : ExoPlayer? = null
|
// private var player : ExoPlayer? = null
|
||||||
|
private var pageStartTime: Long = 0
|
||||||
|
private var pageEndTime: Long = 0
|
||||||
|
private lateinit var preferences: SharedPreferences
|
||||||
|
private lateinit var db: GSKOrangeDB
|
||||||
|
private var storeid: String = ""
|
||||||
|
private var detailerId: String = ""
|
||||||
|
private var categoryId: String = ""
|
||||||
|
private var dt_level: String = ""
|
||||||
|
|
||||||
@SuppressLint("SetJavaScriptEnabled")
|
@SuppressLint("SetJavaScriptEnabled")
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
@@ -40,56 +50,31 @@ class WebViewActivity : AppCompatActivity() {
|
|||||||
binding = ActivityWebviewBinding.inflate(layoutInflater)
|
binding = ActivityWebviewBinding.inflate(layoutInflater)
|
||||||
setContentView(binding.root)
|
setContentView(binding.root)
|
||||||
|
|
||||||
|
preferences = PreferenceManager.getDefaultSharedPreferences(this)
|
||||||
|
db = GSKOrangeDB(this)
|
||||||
|
db.open()
|
||||||
|
|
||||||
val url = intent.getStringExtra("url") ?: ""
|
val url = intent.getStringExtra("url") ?: ""
|
||||||
type = intent.getStringExtra("type") ?: "html-webview"
|
type = intent.getStringExtra("type") ?: "html-webview"
|
||||||
type = intent.getStringExtra("type") ?: "html-webview"
|
storeid = intent.getStringExtra("storeid") ?: ""
|
||||||
|
detailerId = intent.getStringExtra("merid") ?: ""
|
||||||
|
categoryId = intent.getStringExtra("categoryId") ?: ""
|
||||||
|
dt_level = intent.getStringExtra("dt_level") ?: ""
|
||||||
handleContent(type, url)
|
handleContent(type, url)
|
||||||
|
|
||||||
binding.toolbar.setTitle("Banner Detail")
|
binding.toolbar.setTitle("Banner Detail")
|
||||||
setSupportActionBar(binding.toolbar)
|
setSupportActionBar(binding.toolbar)
|
||||||
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
supportActionBar?.setDisplayHomeAsUpEnabled(true)
|
||||||
|
|
||||||
|
if(dt_level.isNotEmpty()){
|
||||||
|
pageStartTime = System.currentTimeMillis()
|
||||||
/* // ✅ SETTINGS
|
val formattedTime = SimpleDateFormat(
|
||||||
with(binding.webView.settings) {
|
"HH:mm:ss",
|
||||||
javaScriptEnabled = true
|
Locale.getDefault()
|
||||||
domStorageEnabled = true
|
).format(Date(pageStartTime))
|
||||||
javaScriptCanOpenWindowsAutomatically = true
|
Log.d("WEBVIEW_START_TIME", "Start time is :$formattedTime ")
|
||||||
setSupportMultipleWindows(true)
|
|
||||||
loadWithOverviewMode = true
|
|
||||||
useWideViewPort = true
|
|
||||||
mixedContentMode = WebSettings.MIXED_CONTENT_ALWAYS_ALLOW
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ✅ JS INTERFACE
|
|
||||||
binding.webView.addJavascriptInterface(WebAppInterface(), "Android")
|
|
||||||
|
|
||||||
// ✅ WEBVIEW CLIENT
|
|
||||||
binding.webView.webViewClient = object : WebViewClient() {
|
|
||||||
|
|
||||||
override fun onPageStarted(view: WebView?, url: String?, favicon: android.graphics.Bitmap?) {
|
|
||||||
super.onPageStarted(view, url, favicon)
|
|
||||||
injectJS(view) // 🔥 early injection
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onPageFinished(view: WebView?, url: String?) {
|
|
||||||
super.onPageFinished(view, url)
|
|
||||||
injectJS(view) // 🔥 safe injection again
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ✅ JS LOGS
|
|
||||||
binding.webView.webChromeClient = object : WebChromeClient() {
|
|
||||||
override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean {
|
|
||||||
Log.e("JS_LOG", consoleMessage?.message() ?: "")
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
binding.webView.loadUrl(url)
|
|
||||||
*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun handleContent(type: String, url: String) {
|
private fun handleContent(type: String, url: String) {
|
||||||
@@ -148,7 +133,6 @@ class WebViewActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
@SuppressLint("SetJavaScriptEnabled")
|
@SuppressLint("SetJavaScriptEnabled")
|
||||||
private fun setupWebView(url: String) {
|
private fun setupWebView(url: String) {
|
||||||
|
|
||||||
with(binding.webView.settings) {
|
with(binding.webView.settings) {
|
||||||
javaScriptEnabled = true
|
javaScriptEnabled = true
|
||||||
domStorageEnabled = true
|
domStorageEnabled = true
|
||||||
@@ -169,10 +153,19 @@ class WebViewActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
binding.webView.webViewClient = object : WebViewClient() {
|
binding.webView.webViewClient = object : WebViewClient() {
|
||||||
override fun onPageStarted(view: WebView?, url: String?, favicon: android.graphics.Bitmap?) {
|
override fun onPageStarted(view: WebView?, url: String?, favicon: android.graphics.Bitmap?) {
|
||||||
|
/* pageStartTime = System.currentTimeMillis()
|
||||||
|
val formattedTime = SimpleDateFormat(
|
||||||
|
"HH:mm:ss",
|
||||||
|
Locale.getDefault()
|
||||||
|
).format(Date(pageStartTime))*/
|
||||||
|
|
||||||
|
// println(formattedTime)
|
||||||
injectJS(view)
|
injectJS(view)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onPageFinished(view: WebView?, url: String?) {
|
override fun onPageFinished(view: WebView?, url: String?) {
|
||||||
|
pageStartTime = System.currentTimeMillis()
|
||||||
|
Log.d("WEBVIEW_TIME", " viewed for $pageStartTime sec")
|
||||||
injectJS(view)
|
injectJS(view)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -183,7 +176,6 @@ class WebViewActivity : AppCompatActivity() {
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.webView.loadUrl(url)
|
binding.webView.loadUrl(url)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -447,8 +439,60 @@ class WebViewActivity : AppCompatActivity() {
|
|||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
super.onPause()
|
super.onPause()
|
||||||
player?.pause()
|
player?.pause()
|
||||||
}
|
val visit_date = preferences.getString(CommonString.KEY_DATE, "") ?: ""
|
||||||
|
val user_id = preferences.getString(CommonString.KEY_USERNAME, "") ?: ""
|
||||||
|
if(dt_level.isNotEmpty()) {
|
||||||
|
pageEndTime = System.currentTimeMillis()
|
||||||
|
val start_time =
|
||||||
|
SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date(pageStartTime))
|
||||||
|
val end_time =
|
||||||
|
SimpleDateFormat("HH:mm:ss", Locale.getDefault()).format(Date(pageEndTime))
|
||||||
|
val spent = (pageEndTime - pageStartTime) / 1000
|
||||||
|
db.insertWebViewTimeSpent(
|
||||||
|
storeid,
|
||||||
|
visit_date,
|
||||||
|
start_time,
|
||||||
|
end_time,
|
||||||
|
spent.toString(),
|
||||||
|
detailerId,
|
||||||
|
user_id,
|
||||||
|
categoryId,
|
||||||
|
dt_level
|
||||||
|
)
|
||||||
|
// Log.d("WEBVIEW_END_TIME", "End time is :$end_time and viewed for $spent sec ")
|
||||||
|
/* var detailer_xml = ""
|
||||||
|
var onXML = ""
|
||||||
|
val detailerList = db.getUploadedDetailerData(storeid)
|
||||||
|
Log.d("detailersize", detailerList.size.toString());
|
||||||
|
if (!detailerList.isEmpty()) {
|
||||||
|
for (j in detailerList.indices) {
|
||||||
|
onXML =
|
||||||
|
"[DETAILER_DATA]" +
|
||||||
|
"[MID]" + 0 + "[/MID]" +
|
||||||
|
"[USERID]" + user_id + "[/USERID]" +
|
||||||
|
"[STORE_ID]" + storeid + "[/STORE_ID]" +
|
||||||
|
"[VISIT_DATE]" + detailerList.get(j)!!
|
||||||
|
.getVisitdate() + "[/VISIT_DATE]" +
|
||||||
|
"[START_TIME]" + detailerList.get(j)!!
|
||||||
|
.getStart_time() + "[/START_TIME]" +
|
||||||
|
"[END_TIME]" + detailerList.get(j)!!.getEnd_time() + "[/END_TIME]" +
|
||||||
|
"[DURATION]" + detailerList.get(j)!!.getDuration() + "[/DURATION]" +
|
||||||
|
"[DETAILER_ID]" + detailerList.get(j)!!
|
||||||
|
.getDetailerId() + "[/DETAILER_ID]" +
|
||||||
|
"[CATEGORY_ID]" + detailerList.get(j)!!
|
||||||
|
.getCATEGORY_ID().get(0) + "[/CATEGORY_ID]" +
|
||||||
|
"[DT_LEVEL]" + detailerList.get(j)!!.getDT_LEVEL().get(0) + "[/DT_LEVEL]" +
|
||||||
|
"[/DETAILER_DATA]"
|
||||||
|
|
||||||
|
detailer_xml = detailer_xml + onXML
|
||||||
|
}
|
||||||
|
val sos_xml = "[DATA]" + detailer_xml + "[/DATA]"
|
||||||
|
Log.e("detailer_xml_data", sos_xml)
|
||||||
|
|
||||||
|
Log.d("WEBVIEW_END_TIME", "End time is :$end_time and viewed for $spent sec ")
|
||||||
|
}*/
|
||||||
|
}
|
||||||
|
}
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
super.onDestroy()
|
super.onDestroy()
|
||||||
player?.release()
|
player?.release()
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MappingPromotionGetterSetter;
|
|||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingStockStorewiseGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingSubCategoryImageAllowGetterSetter;
|
||||||
|
import cpm.com.gskmtorange.xmlGetterSetter.MasterDetailerGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.Master_Storelist_PDA_GetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraLastVisitGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.NonT2pReasonGetterSetter;
|
||||||
@@ -145,6 +146,7 @@ public class DownloadActivity extends AppCompatActivity {
|
|||||||
Visit_Type_Master_GetterSetter visit_type_master_getterSetter;
|
Visit_Type_Master_GetterSetter visit_type_master_getterSetter;
|
||||||
Master_Storelist_PDA_GetterSetter masterStorelistPdaGetterSetter;
|
Master_Storelist_PDA_GetterSetter masterStorelistPdaGetterSetter;
|
||||||
NoticeboardGetterSetter noticeboardGetterSetter;
|
NoticeboardGetterSetter noticeboardGetterSetter;
|
||||||
|
MasterDetailerGetterSetter masterDetailerGetterSetter;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1910,9 +1912,9 @@ public class DownloadActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
|
|
||||||
//Mer_Noticeboard
|
//Mer_Noticeboard
|
||||||
/* request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
|
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_NAME_UNIVERSAL_DOWNLOAD);
|
||||||
request.addProperty("UserName", userId);
|
request.addProperty("UserName", userId);
|
||||||
request.addProperty("Type", "Mer_NoticeBoard");
|
request.addProperty("Type", "MASTER_DETAILER");
|
||||||
request.addProperty("cultureid", culture_id);
|
request.addProperty("cultureid", culture_id);
|
||||||
|
|
||||||
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
|
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
|
||||||
@@ -1930,23 +1932,22 @@ public class DownloadActivity extends AppCompatActivity {
|
|||||||
xpp.next();
|
xpp.next();
|
||||||
eventType = xpp.getEventType();
|
eventType = xpp.getEventType();
|
||||||
|
|
||||||
noticeboardGetterSetter = XMLHandlers.Noticeboard_XMLHandler(xpp, eventType);
|
masterDetailerGetterSetter = XMLHandlers.MasterDetailer_XMLHandler(xpp, eventType);
|
||||||
String stocktable = noticeboardGetterSetter.getTable_mer_noticeboard_detailer();
|
String stocktable = masterDetailerGetterSetter.getTable_MASTER_DETAILER();
|
||||||
if (stocktable != null) {
|
if (stocktable != null) {
|
||||||
resultHttp = CommonString.KEY_SUCCESS;
|
resultHttp = CommonString.KEY_SUCCESS;
|
||||||
TableBean.setNoticeboardData(stocktable);
|
TableBean.setTable_MASTER_DETAILER(stocktable);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (noticeboardGetterSetter.getNoticeBoardId().size() > 0) {
|
if (masterDetailerGetterSetter.getDTID().size() > 0) {
|
||||||
Log.d("mer_noticeboard","download");
|
Log.d("master_detailer","download");
|
||||||
data.value = 99;
|
data.value = 99;
|
||||||
data.name = "Mer_NoticeBoard" + getResources().getString(R.string.download_data);
|
data.name = "master_detailer" + getResources().getString(R.string.download_data);
|
||||||
} else {
|
} else {
|
||||||
// return "MAPPING_PHARMA_MSL";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
publishProgress(data);*/
|
}
|
||||||
|
}
|
||||||
|
publishProgress(data);
|
||||||
|
|
||||||
|
|
||||||
//Images DownLoads
|
//Images DownLoads
|
||||||
@@ -2182,6 +2183,7 @@ public class DownloadActivity extends AppCompatActivity {
|
|||||||
db.InsertCATEGORYWISE_SOS_TARGET(store_category_wiseGetterSetter);
|
db.InsertCATEGORYWISE_SOS_TARGET(store_category_wiseGetterSetter);
|
||||||
db.InsertMAPPING_SKU_PRICING_ENABLE(mapping_sku_pricing_enableGetterSetter);
|
db.InsertMAPPING_SKU_PRICING_ENABLE(mapping_sku_pricing_enableGetterSetter);
|
||||||
db.InsertMaster_Storelist_Pda(masterStorelistPdaGetterSetter);
|
db.InsertMaster_Storelist_Pda(masterStorelistPdaGetterSetter);
|
||||||
|
db.InsertMasterDetailerData(masterDetailerGetterSetter);
|
||||||
// db.InsertNoticeBoardData(noticeboardGetterSetter);
|
// db.InsertNoticeBoardData(noticeboardGetterSetter);
|
||||||
} catch (MalformedURLException e) {
|
} catch (MalformedURLException e) {
|
||||||
ResultFlag = false;
|
ResultFlag = false;
|
||||||
|
|||||||
+28
-14
@@ -36,18 +36,23 @@ import cpm.com.gskmtorange.GetterSetter.CategoryPictureGetterSetter;
|
|||||||
import cpm.com.gskmtorange.R;
|
import cpm.com.gskmtorange.R;
|
||||||
import cpm.com.gskmtorange.constant.CommonFunctions;
|
import cpm.com.gskmtorange.constant.CommonFunctions;
|
||||||
import cpm.com.gskmtorange.constant.CommonString;
|
import cpm.com.gskmtorange.constant.CommonString;
|
||||||
|
import cpm.com.gskmtorange.dailyentry.BannerActivity;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.AuditDataGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.CategoryGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
|
||||||
|
import cpm.com.gskmtorange.xmlGetterSetter.MasterDetailerGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.T2PGetterSetter;
|
||||||
|
|
||||||
public class CategoryListActivity extends AppCompatActivity {
|
public class CategoryListActivity extends AppCompatActivity {
|
||||||
private Context context;
|
private Context context;
|
||||||
RecyclerView recyclerView;
|
RecyclerView recyclerView;
|
||||||
ArrayList<CategoryGetterSetter> categoryList;
|
ArrayList<CategoryGetterSetter> categoryList;
|
||||||
|
|
||||||
|
ArrayList<MasterDetailerGetterSetter> bannerdatacheck;
|
||||||
|
|
||||||
CategoryListAdapter adapter;
|
CategoryListAdapter adapter;
|
||||||
GSKOrangeDB db;
|
GSKOrangeDB db;
|
||||||
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str, pog_type_id;
|
String store_id, visit_date, username, intime, date, keyAccount_id, class_id, storeType_id, camera_allow, country_id, store_flag_str, pog_type_id, mer_Id;
|
||||||
private SharedPreferences preferences;
|
private SharedPreferences preferences;
|
||||||
String visit_type_id = "";
|
String visit_type_id = "";
|
||||||
|
|
||||||
@@ -69,9 +74,9 @@ public class CategoryListActivity extends AppCompatActivity {
|
|||||||
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
|
keyAccount_id = preferences.getString(CommonString.KEY_KEYACCOUNT_ID, "");
|
||||||
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
|
class_id = preferences.getString(CommonString.KEY_CLASS_ID, "");
|
||||||
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
|
storeType_id = preferences.getString(CommonString.KEY_STORETYPE_ID, "");
|
||||||
|
mer_Id = preferences.getString(CommonString.KEY_MERCHANDISER_ID, "");
|
||||||
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
|
camera_allow = preferences.getString(CommonString.KEY_CAMERA_ALLOW, "");
|
||||||
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
|
country_id = preferences.getString(CommonString.KEY_COUNTRY_ID, null);
|
||||||
Log.d("countrydata",country_id);
|
|
||||||
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
|
store_flag_str = preferences.getString(CommonString.KEY_STORE_FLAG, null);
|
||||||
pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, "");
|
pog_type_id = preferences.getString(CommonString.KEY_POG_TYPE_ID, "");
|
||||||
preferences.getString(CommonString.KEY_VISIT_ID, "");
|
preferences.getString(CommonString.KEY_VISIT_ID, "");
|
||||||
@@ -80,6 +85,8 @@ public class CategoryListActivity extends AppCompatActivity {
|
|||||||
setSupportActionBar(toolbar);
|
setSupportActionBar(toolbar);
|
||||||
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
Objects.requireNonNull(getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
|
||||||
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
|
FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab_category);
|
||||||
|
|
||||||
|
bannerdatacheck = db.getMasterDetailerData("MASTER_DETAILER","", "0");
|
||||||
fab.setOnClickListener(view -> Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG).setAction("Action", null).show());
|
fab.setOnClickListener(view -> Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG).setAction("Action", null).show());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,6 +107,9 @@ public class CategoryListActivity extends AppCompatActivity {
|
|||||||
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, "MAPPING_STOCK");
|
categoryList = db.getCategoryListData(keyAccount_id, storeType_id, class_id, store_id, "MAPPING_STOCK");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Add a manual KPI tile for "Detailer" (manual usage without a DB category id)
|
||||||
|
// This will appear as an extra item in the grid. The id used is a reserved key
|
||||||
|
// "detailer_manual" and its images are mapped in getImageRes().
|
||||||
if (categoryList != null && !categoryList.isEmpty()) {
|
if (categoryList != null && !categoryList.isEmpty()) {
|
||||||
for (int i = 0; i < categoryList.size(); i++) {
|
for (int i = 0; i < categoryList.size(); i++) {
|
||||||
String category_id = categoryList.get(i).getCategory_id();
|
String category_id = categoryList.get(i).getCategory_id();
|
||||||
@@ -222,29 +232,27 @@ public class CategoryListActivity extends AppCompatActivity {
|
|||||||
return question_list;
|
return question_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
|
||||||
// Inflate the menu; this adds items to the action bar if it is present.
|
|
||||||
//getMenuInflater().inflate(R.menu.main, menu);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
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();
|
int id = item.getItemId();
|
||||||
if (id == android.R.id.home) {
|
if (id == android.R.id.home) {
|
||||||
finish();
|
finish();
|
||||||
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
|
overridePendingTransition(R.anim.activity_back_in, R.anim.activity_back_out);
|
||||||
}
|
}
|
||||||
|
if (id == R.id.action_social_media) {
|
||||||
|
Intent intent = new Intent(CategoryListActivity.this, BannerActivity.class);
|
||||||
|
intent.putExtra("StoreId", store_id);
|
||||||
|
intent.putExtra("MerId",mer_Id);
|
||||||
|
intent.putExtra("CategoryId", "0");
|
||||||
|
intent.putExtra("DT_LEVEL","STORE");
|
||||||
|
startActivity(intent);
|
||||||
|
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
|
||||||
|
}
|
||||||
//noinspection SimplifiableIfStatement
|
//noinspection SimplifiableIfStatement
|
||||||
if (id == R.id.action_settings) {
|
if (id == R.id.action_settings) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return super.onOptionsItemSelected(item);
|
return super.onOptionsItemSelected(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -280,6 +288,7 @@ public class CategoryListActivity extends AppCompatActivity {
|
|||||||
Log.e("CatImg--", "" + categoryData.getCategory_img());
|
Log.e("CatImg--", "" + categoryData.getCategory_img());
|
||||||
holder.categoryIcon.setImageResource(categoryData.getCategory_img());
|
holder.categoryIcon.setImageResource(categoryData.getCategory_img());
|
||||||
holder.lay_menu.setOnClickListener(view -> {
|
holder.lay_menu.setOnClickListener(view -> {
|
||||||
|
|
||||||
Intent intent = new Intent(CategoryListActivity.this, CategoryWisePerformanceActivity.class);
|
Intent intent = new Intent(CategoryListActivity.this, CategoryWisePerformanceActivity.class);
|
||||||
intent.putExtra("categoryName", categoryData.getCategory());
|
intent.putExtra("categoryName", categoryData.getCategory());
|
||||||
intent.putExtra("categoryId", categoryData.getCategory_id());
|
intent.putExtra("categoryId", categoryData.getCategory_id());
|
||||||
@@ -344,7 +353,6 @@ public class CategoryListActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//New MSL_Availability_StockFacing
|
|
||||||
if (country_id.equals("10") || country_id.equals("8")) {
|
if (country_id.equals("10") || country_id.equals("8")) {
|
||||||
flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
|
flag_mapping_stock = db.isMappingStockDataStockFacing(category_id, null, null, null, store_id, CommonString.TABLE_MAPPING_STOCK_STOREWISE);
|
||||||
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
|
} else if (store_flag_str.equalsIgnoreCase(CommonString.FROM_DEVIATION)) {
|
||||||
@@ -687,4 +695,10 @@ public class CategoryListActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
|
getMenuInflater().inflate(R.menu.banner_menu, menu);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+41
-8
@@ -44,6 +44,7 @@ import cpm.com.gskmtorange.constant.CommonUtils;
|
|||||||
import cpm.com.gskmtorange.dailyentry.AdditionalPromoSKUwiseActivity;
|
import cpm.com.gskmtorange.dailyentry.AdditionalPromoSKUwiseActivity;
|
||||||
import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
|
import cpm.com.gskmtorange.dailyentry.AdditionalVisibility;
|
||||||
import cpm.com.gskmtorange.dailyentry.AuditActivity;
|
import cpm.com.gskmtorange.dailyentry.AuditActivity;
|
||||||
|
import cpm.com.gskmtorange.dailyentry.BannerActivity;
|
||||||
import cpm.com.gskmtorange.dailyentry.CategoryPicture;
|
import cpm.com.gskmtorange.dailyentry.CategoryPicture;
|
||||||
import cpm.com.gskmtorange.dailyentry.CompetitionPromoActivity;
|
import cpm.com.gskmtorange.dailyentry.CompetitionPromoActivity;
|
||||||
import cpm.com.gskmtorange.dailyentry.CounterfeitProductsActivity;
|
import cpm.com.gskmtorange.dailyentry.CounterfeitProductsActivity;
|
||||||
@@ -477,16 +478,22 @@ public class DailyDataMenuActivity extends AppCompatActivity {
|
|||||||
} else {
|
} else {
|
||||||
data.setCategory_img(R.mipmap.competition);
|
data.setCategory_img(R.mipmap.competition);
|
||||||
}
|
}
|
||||||
|
|
||||||
data.setCategory_name(getString(R.string.title_activity_competition_promo));
|
data.setCategory_name(getString(R.string.title_activity_competition_promo));
|
||||||
categoryList.add(data);
|
categoryList.add(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//Detailer
|
||||||
|
/* data = new DailyDataMenuGetterSetter();
|
||||||
|
data.setCategory_name("Detailer");
|
||||||
|
data.setCategory_img(R.mipmap.oral_care);
|
||||||
|
categoryList.add(data);*/
|
||||||
|
|
||||||
|
if (categoryList.size() % 2 != 0) {
|
||||||
data = new DailyDataMenuGetterSetter();
|
data = new DailyDataMenuGetterSetter();
|
||||||
data.setCategory_img(R.mipmap.competition);
|
|
||||||
data.setCategory_name("");
|
data.setCategory_name("");
|
||||||
categoryList.add(data);
|
categoryList.add(data);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//IR Images
|
//IR Images
|
||||||
data = new DailyDataMenuGetterSetter();
|
data = new DailyDataMenuGetterSetter();
|
||||||
@@ -545,22 +552,29 @@ public class DailyDataMenuActivity extends AppCompatActivity {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCreateOptionsMenu(Menu menu) {
|
public boolean onCreateOptionsMenu(Menu menu) {
|
||||||
// Inflate the menu; this adds items to the action bar if it is present.
|
getMenuInflater().inflate(R.menu.banner_menu, menu);
|
||||||
//getMenuInflater().inflate(R.menu.main, menu);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onOptionsItemSelected(MenuItem item) {
|
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();
|
int id = item.getItemId();
|
||||||
|
|
||||||
if (id == android.R.id.home) {
|
if (id == android.R.id.home) {
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (id == R.id.action_social_media) {
|
||||||
|
Intent intent = new Intent(DailyDataMenuActivity.this, BannerActivity.class);
|
||||||
|
String merId = preferences.getString(CommonString.KEY_MERCHANDISER_ID, "");
|
||||||
|
intent.putExtra("StoreId", store_id);
|
||||||
|
intent.putExtra("MerId", merId);
|
||||||
|
intent.putExtra("CategoryId", categoryId);
|
||||||
|
intent.putExtra("DT_LEVEL", "CATEGORY");
|
||||||
|
startActivity(intent);
|
||||||
|
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
|
||||||
|
}
|
||||||
|
|
||||||
//noinspection SimplifiableIfStatement
|
//noinspection SimplifiableIfStatement
|
||||||
if (id == R.id.action_settings) {
|
if (id == R.id.action_settings) {
|
||||||
return true;
|
return true;
|
||||||
@@ -641,7 +655,13 @@ public class DailyDataMenuActivity extends AppCompatActivity {
|
|||||||
public void onBindViewHolder(final DailyDataMenuAdapter.MyViewHolder holder, int position) {
|
public void onBindViewHolder(final DailyDataMenuAdapter.MyViewHolder holder, int position) {
|
||||||
final DailyDataMenuGetterSetter dailyData = list.get(position);
|
final DailyDataMenuGetterSetter dailyData = list.get(position);
|
||||||
holder.categoryName.setText(dailyData.getCategory_name());
|
holder.categoryName.setText(dailyData.getCategory_name());
|
||||||
|
if (dailyData.getCategory_img() != -1) {
|
||||||
holder.categoryIcon.setImageResource(dailyData.getCategory_img());
|
holder.categoryIcon.setImageResource(dailyData.getCategory_img());
|
||||||
|
} else {
|
||||||
|
holder.categoryIcon.setImageResource(0);
|
||||||
|
}
|
||||||
|
holder.lay_menu.setVisibility(View.VISIBLE);
|
||||||
|
holder.categoryName.setVisibility(View.VISIBLE);
|
||||||
holder.irview.setVisibility(View.GONE);
|
holder.irview.setVisibility(View.GONE);
|
||||||
db.open();
|
db.open();
|
||||||
visittypelist = db.getInsertedVisitType(store_id, visit_date, "3");
|
visittypelist = db.getInsertedVisitType(store_id, visit_date, "3");
|
||||||
@@ -757,6 +777,9 @@ public class DailyDataMenuActivity extends AppCompatActivity {
|
|||||||
holder.categoryName.setTextColor(isPdPogIRMapping() != null && !isPdPogIRMapping().isEmpty() && camera_allow.equals("1")
|
holder.categoryName.setTextColor(isPdPogIRMapping() != null && !isPdPogIRMapping().isEmpty() && camera_allow.equals("1")
|
||||||
? ContextCompat.getColor(context, R.color.black) : ContextCompat.getColor(context, R.color.grey_background));
|
? ContextCompat.getColor(context, R.color.black) : ContextCompat.getColor(context, R.color.grey_background));
|
||||||
}*/
|
}*/
|
||||||
|
/* else if (dailyData.getCategory_name().equalsIgnoreCase("Detailer")) {
|
||||||
|
holder.categoryName.setTextColor(ContextCompat.getColor(context, R.color.black));
|
||||||
|
}*/
|
||||||
else{
|
else{
|
||||||
holder.irview.setVisibility(View.GONE);
|
holder.irview.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
@@ -827,6 +850,16 @@ public class DailyDataMenuActivity extends AppCompatActivity {
|
|||||||
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
|
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/* else if (dailyData.getCategory_name().equalsIgnoreCase("Detailer")) {
|
||||||
|
Intent intent = new Intent(DailyDataMenuActivity.this, BannerActivity.class);
|
||||||
|
String merId = preferences.getString(CommonString.KEY_MERCHANDISER_ID, "");
|
||||||
|
intent.putExtra("StoreId", store_id);
|
||||||
|
intent.putExtra("MerId", merId);
|
||||||
|
intent.putExtra("CategoryId", categoryId);
|
||||||
|
intent.putExtra("DT_LEVEL", "CATEGORY");
|
||||||
|
startActivity(intent);
|
||||||
|
overridePendingTransition(R.anim.activity_in, R.anim.activity_out);
|
||||||
|
}*/
|
||||||
else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_ir_image))) {
|
else if (dailyData.getCategory_name().equalsIgnoreCase(getResources().getString(R.string.title_activity_ir_image))) {
|
||||||
if (isPdIRMapping() != null && !isPdIRMapping().isEmpty() && camera_allow.equals("1")) {
|
if (isPdIRMapping() != null && !isPdIRMapping().isEmpty() && camera_allow.equals("1")) {
|
||||||
Intent intent = new Intent(DailyDataMenuActivity.this, PDimageActivity.class);
|
Intent intent = new Intent(DailyDataMenuActivity.this, PDimageActivity.class);
|
||||||
|
|||||||
@@ -598,9 +598,9 @@ public class MPinActivity extends AppCompatActivity implements BlurLockView.OnPa
|
|||||||
editor.putString("NOTICEBOARD_DATA", noticeJson);
|
editor.putString("NOTICEBOARD_DATA", noticeJson);
|
||||||
editor.apply();
|
editor.apply();
|
||||||
|
|
||||||
} else {
|
} /*else {
|
||||||
return CommonString.KEY_FAILURE;
|
return CommonString.KEY_FAILURE;
|
||||||
}
|
}*/
|
||||||
|
|
||||||
} catch (XmlPullParserException | IOException e) {
|
} catch (XmlPullParserException | IOException e) {
|
||||||
e.fillInStackTrace();
|
e.fillInStackTrace();
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.ImageGetterSetter;
|
|||||||
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MSL_AvailabilityStockFacingGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaQuestionGetterSetter;
|
||||||
|
import cpm.com.gskmtorange.xmlGetterSetter.MasterDetailerGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.NoCameraDataGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.POGGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.PharmaMSLInsertedGetterSetter;
|
||||||
@@ -1555,9 +1556,6 @@ public class UploadActivity extends AppCompatActivity {
|
|||||||
data.name = getString(R.string.ir_data_upload);
|
data.name = getString(R.string.ir_data_upload);
|
||||||
publishProgress(data);
|
publishProgress(data);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
////IRPDVisibility-Upload Data
|
////IRPDVisibility-Upload Data
|
||||||
/* String irPD_visi_xmlData = "";
|
/* String irPD_visi_xmlData = "";
|
||||||
onXML = "";
|
onXML = "";
|
||||||
@@ -1647,8 +1645,54 @@ public class UploadActivity extends AppCompatActivity {
|
|||||||
data.value = 72;
|
data.value = 72;
|
||||||
data.name = getString(R.string.visit_type_data_uploading);
|
data.name = getString(R.string.visit_type_data_uploading);
|
||||||
publishProgress(data);
|
publishProgress(data);
|
||||||
}
|
|
||||||
|
|
||||||
|
String detailer_xml = "";
|
||||||
|
onXML = "";
|
||||||
|
ArrayList<MasterDetailerGetterSetter> detailerList = db.getUploadedDetailerData(coverageList.get(i).getStoreId());
|
||||||
|
if (!detailerList.isEmpty()) {
|
||||||
|
for (int j = 0; j < detailerList.size(); j++) {
|
||||||
|
onXML =
|
||||||
|
"[DETAILER_DATA]" +
|
||||||
|
"[MID]" + mid + "[/MID]" +
|
||||||
|
"[USERID]" + userId + "[/USERID]" +
|
||||||
|
"[STORE_ID]" + coverageList.get(i).getStoreId() + "[/STORE_ID]" +
|
||||||
|
"[VISIT_DATE]" + detailerList.get(j).getVisitdate() + "[/VISIT_DATE]" +
|
||||||
|
"[START_TIME]" + detailerList.get(j).getStart_time() + "[/START_TIME]" +
|
||||||
|
"[END_TIME]" + detailerList.get(j).getEnd_time() + "[/END_TIME]" +
|
||||||
|
"[DURATION]" + detailerList.get(j).getDuration() + "[/DURATION]" +
|
||||||
|
"[DETAILER_ID]" + detailerList.get(j).getDetailerId() + "[/DETAILER_ID]" +
|
||||||
|
"[CATEGORY_ID]" + detailerList.get(j).getCATEGORY_ID().get(0) + "[/CATEGORY_ID]" +
|
||||||
|
"[DT_LEVEL]" + detailerList.get(j).getDT_LEVEL().get(0) + "[/DT_LEVEL]" +
|
||||||
|
"[/DETAILER_DATA]";
|
||||||
|
detailer_xml = detailer_xml + onXML;
|
||||||
|
}
|
||||||
|
final String sos_xml = "[DATA]" + detailer_xml + "[/DATA]";
|
||||||
|
Log.e("detailer_xml_data", sos_xml);
|
||||||
|
|
||||||
|
request = new SoapObject(CommonString.NAMESPACE, CommonString.METHOD_UPLOAD_STOCK_XML_DATA);
|
||||||
|
|
||||||
|
request.addProperty("XMLDATA", sos_xml);
|
||||||
|
request.addProperty("KEYS", "DETAILER_USAGE_TRACKER_XML");
|
||||||
|
request.addProperty("USERNAME", userId);
|
||||||
|
request.addProperty("MID", mid);
|
||||||
|
|
||||||
|
envelope = new SoapSerializationEnvelope(SoapEnvelope.VER11);
|
||||||
|
envelope.dotNet = true;
|
||||||
|
envelope.setOutputSoapObject(request);
|
||||||
|
|
||||||
|
androidHttpTransport = new OkHttpTransportSE(CommonString.URL);
|
||||||
|
androidHttpTransport.call(CommonString.SOAP_ACTION + CommonString.METHOD_UPLOAD_STOCK_XML_DATA, envelope);
|
||||||
|
|
||||||
|
result = envelope.getResponse();
|
||||||
|
|
||||||
|
if (!result.toString().equalsIgnoreCase(CommonString.KEY_SUCCESS)) {
|
||||||
|
return CommonString.METHOD_UPLOAD_STOCK_XML_DATA;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
data.value = 73;
|
||||||
|
data.name = getString(R.string.detailer_data_uploading);
|
||||||
|
publishProgress(data);
|
||||||
|
}
|
||||||
|
|
||||||
// SET COVERAGE STATUS
|
// SET COVERAGE STATUS
|
||||||
String final_xml = "";
|
String final_xml = "";
|
||||||
|
|||||||
+138
@@ -0,0 +1,138 @@
|
|||||||
|
package cpm.com.gskmtorange.xmlGetterSetter;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
public class MasterDetailerGetterSetter {
|
||||||
|
String Table_MASTER_DETAILER;
|
||||||
|
|
||||||
|
ArrayList<String> DTID = new ArrayList<>();
|
||||||
|
ArrayList<String> DT_LEVEL = new ArrayList<>();
|
||||||
|
ArrayList<String> DT_NAME = new ArrayList<>();
|
||||||
|
ArrayList<String> CATEGORY_ID = new ArrayList<>();
|
||||||
|
ArrayList<String> DT_URL = new ArrayList<>();
|
||||||
|
ArrayList<String> DT_THUMBNAIL = new ArrayList<>();
|
||||||
|
|
||||||
|
public String getTable_MASTER_DETAILER() {
|
||||||
|
return Table_MASTER_DETAILER;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTable_MASTER_DETAILER(String table_MASTER_DETAILER) {
|
||||||
|
Table_MASTER_DETAILER = table_MASTER_DETAILER;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getDTID() {
|
||||||
|
return DTID;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDTID(String DTID) {
|
||||||
|
this.DTID.add(DTID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getDT_LEVEL() {
|
||||||
|
return DT_LEVEL;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDT_LEVEL(String DT_LEVEL) {
|
||||||
|
this.DT_LEVEL.add(DT_LEVEL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getDT_NAME() {
|
||||||
|
return DT_NAME;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDT_NAME(String DT_NAME) {
|
||||||
|
this.DT_NAME.add(DT_NAME);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getCATEGORY_ID() {
|
||||||
|
return CATEGORY_ID;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCATEGORY_ID(String CATEGORY_ID) {
|
||||||
|
this.CATEGORY_ID.add(CATEGORY_ID);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getDT_URL() {
|
||||||
|
return DT_URL;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDT_URL(String DT_URL) {
|
||||||
|
this.DT_URL.add(DT_URL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArrayList<String> getDT_THUMBNAIL() {
|
||||||
|
return DT_THUMBNAIL;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDT_THUMBNAIL(String DT_THUMBNAIL) {
|
||||||
|
this.DT_THUMBNAIL.add(DT_THUMBNAIL);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getVisitdate() {
|
||||||
|
return visitdate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVisitdate(String visitdate) {
|
||||||
|
this.visitdate = visitdate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStart_time() {
|
||||||
|
return start_time;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStart_time(String start_time) {
|
||||||
|
this.start_time = start_time;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getEnd_time() {
|
||||||
|
return end_time;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setEnd_time(String end_time) {
|
||||||
|
this.end_time = end_time;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDuration() {
|
||||||
|
return duration;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDuration(String duration) {
|
||||||
|
this.duration = duration;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getStoreId() {
|
||||||
|
return storeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStoreId(String storeId) {
|
||||||
|
this.storeId = storeId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDetailerId() {
|
||||||
|
return detailerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDetailerId(String detailerId) {
|
||||||
|
this.detailerId = detailerId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDt_level() {
|
||||||
|
return dt_level;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDt_level(String dt_level) {
|
||||||
|
this.dt_level = dt_level;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getUserId() {
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserId(String userId) {
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
String visitdate,start_time,end_time,duration,storeId,detailerId,dt_level,userId;
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
@@ -76,8 +76,15 @@ public class TableBean {
|
|||||||
public static String Table_MAPPING_PLANOGRAM_STORE_WISE;
|
public static String Table_MAPPING_PLANOGRAM_STORE_WISE;
|
||||||
public static String Table_PROMOTION_TYPE_MASTER;
|
public static String Table_PROMOTION_TYPE_MASTER;
|
||||||
public static String Table_ORDER_RECEIVED_STATUS;
|
public static String Table_ORDER_RECEIVED_STATUS;
|
||||||
|
public static String Table_MASTER_DETAILER;
|
||||||
|
|
||||||
|
public static String getTable_MASTER_DETAILER() {
|
||||||
|
return Table_MASTER_DETAILER;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setTable_MASTER_DETAILER(String table_MASTER_DETAILER) {
|
||||||
|
Table_MASTER_DETAILER = table_MASTER_DETAILER;
|
||||||
|
}
|
||||||
|
|
||||||
public static String Table_Master_PDA_STORE_LIST;
|
public static String Table_Master_PDA_STORE_LIST;
|
||||||
|
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_ADDITIONAL_PROMOTION_MasterGe
|
|||||||
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_PLANOGRAM_MasterGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SKU_PRICING_ENABLEGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SKU_PRICING_ENABLEGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MAPPING_SOS_TARGET_MasterGetterSetter;
|
||||||
|
import cpm.com.gskmtorange.xmlGetterSetter.MasterDetailerGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingCategoryImageAllowGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingDisplayChecklistGetterSetter;
|
||||||
import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaMSLGetterSetter;
|
import cpm.com.gskmtorange.xmlGetterSetter.MappingPharmaMSLGetterSetter;
|
||||||
@@ -1914,6 +1915,46 @@ public class XMLHandlers {
|
|||||||
return noticeboardGetterSetter;
|
return noticeboardGetterSetter;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static MasterDetailerGetterSetter MasterDetailer_XMLHandler(XmlPullParser xpp,
|
||||||
|
int eventType) {
|
||||||
|
MasterDetailerGetterSetter masterDetailerGetterSetter = new MasterDetailerGetterSetter();
|
||||||
|
try {
|
||||||
|
while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
|
||||||
|
if (xpp.getEventType() == XmlPullParser.START_TAG) {
|
||||||
|
if (xpp.getName().equals("META_DATA")) {
|
||||||
|
masterDetailerGetterSetter.setTable_MASTER_DETAILER(xpp.nextText());
|
||||||
|
}
|
||||||
|
if (xpp.getName().equals("DTID")) {
|
||||||
|
masterDetailerGetterSetter.setDTID(xpp.nextText());
|
||||||
|
}
|
||||||
|
if (xpp.getName().equals("DT_LEVEL")) {
|
||||||
|
masterDetailerGetterSetter.setDT_LEVEL(xpp.nextText());
|
||||||
|
}
|
||||||
|
if (xpp.getName().equals("DT_NAME")) {
|
||||||
|
masterDetailerGetterSetter.setDT_NAME(xpp.nextText());
|
||||||
|
}
|
||||||
|
if (xpp.getName().equals("CATEGORY_ID")) {
|
||||||
|
masterDetailerGetterSetter.setCATEGORY_ID(xpp.nextText());
|
||||||
|
}
|
||||||
|
if (xpp.getName().equals("DT_URL")) {
|
||||||
|
masterDetailerGetterSetter.setDT_URL(xpp.nextText());
|
||||||
|
}
|
||||||
|
if (xpp.getName().equals("DT_THUMBNAIL")) {
|
||||||
|
masterDetailerGetterSetter.setDT_THUMBNAIL(xpp.nextText());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
xpp.next();
|
||||||
|
}
|
||||||
|
} catch (XmlPullParserException e) {
|
||||||
|
|
||||||
|
e.printStackTrace();
|
||||||
|
} catch (IOException e) {
|
||||||
|
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return masterDetailerGetterSetter;
|
||||||
|
}
|
||||||
|
|
||||||
// JCP XML HANDLER
|
// JCP XML HANDLER
|
||||||
public static PD_CONFIGURATION PDConfigXMLHandler(XmlPullParser xpp) {
|
public static PD_CONFIGURATION PDConfigXMLHandler(XmlPullParser xpp) {
|
||||||
PD_CONFIGURATION jcpGetterSetter = new PD_CONFIGURATION();
|
PD_CONFIGURATION jcpGetterSetter = new PD_CONFIGURATION();
|
||||||
|
|||||||
@@ -0,0 +1,151 @@
|
|||||||
|
<!--
|
||||||
|
~ Copyright (C) 2026 The Android Open Source Project
|
||||||
|
~
|
||||||
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
~ you may not use this file except in compliance with the License.
|
||||||
|
~ You may obtain a copy of the License at
|
||||||
|
~
|
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
~
|
||||||
|
~ Unless required by applicable law or agreed to in writing, software
|
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
~ See the License for the specific language governing permissions and
|
||||||
|
~ limitations under the License.
|
||||||
|
-->
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="512dp"
|
||||||
|
android:height="512dp"
|
||||||
|
android:viewportWidth="511.92"
|
||||||
|
android:viewportHeight="511.92">
|
||||||
|
<path
|
||||||
|
android:pathData="M195.33,356.65H20.18c-7,0 -12.68,-5.68 -12.68,-12.68V183.29c0,-7 5.68,-12.68 12.68,-12.68H195.33c7,0 12.68,5.68 12.68,12.68v160.68C208.01,350.97 202.33,356.65 195.33,356.65z"
|
||||||
|
android:fillColor="#FE93D3"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M195.33,170.61h-47.74l13.44,109.88c0.69,5.67 -3.73,10.68 -9.45,10.68h-1.09c-18.12,0 -32.81,14.69 -32.81,32.81v32.68h77.66c7,0 12.68,-5.68 12.68,-12.68V183.29C208.01,176.29 202.33,170.61 195.33,170.61z"
|
||||||
|
android:fillColor="#FE73C5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M7.5,320.8v23.17c0,7 5.68,12.68 12.68,12.68H195.33c7,0 12.68,-5.68 12.68,-12.68V183.29c0,-7 -5.68,-12.68 -12.68,-12.68H20.18c-7,0 -12.68,5.68 -12.68,12.68v108.51"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M104.73,237.21c1.82,1.26 4.23,1.26 6.05,0c3.45,-2.38 9.77,-5.64 18.54,-5.64c12.77,0 21.56,9.87 21.56,21.35c0,12.97 -11.41,28.26 -40.87,41.7c-1.43,0.65 -3.08,0.65 -4.51,0c-29.46,-13.44 -40.87,-28.73 -40.87,-41.7c0,-11.49 8.8,-21.35 21.56,-21.35C94.96,231.57 101.28,234.83 104.73,237.21z"
|
||||||
|
android:fillColor="#F9F7F8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M104.73,237.21c1.82,1.26 4.23,1.26 6.05,0c3.45,-2.38 9.77,-5.64 18.54,-5.64c12.77,0 21.56,9.87 21.56,21.35c0,12.97 -11.41,28.26 -40.87,41.7c-1.43,0.65 -3.08,0.65 -4.51,0c-29.46,-13.44 -40.87,-28.73 -40.87,-41.7c0,-11.49 8.8,-21.35 21.56,-21.35C94.96,231.57 101.28,234.83 104.73,237.21z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M415.03,320.8l-216.92,26.52c-4.77,0.58 -9.11,-2.81 -9.7,-7.58L154.34,61.08c-0.58,-4.77 2.81,-9.11 7.58,-9.7l216.92,-26.52c4.77,-0.58 9.11,2.81 9.7,7.58l34.07,278.65C423.2,315.88 419.8,320.22 415.03,320.8z"
|
||||||
|
android:fillColor="#F9F7F8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M378.85,24.87l-28.34,3.46c4.77,-0.58 9.11,2.81 9.7,7.58l34.07,278.65c0.58,4.77 -2.81,9.11 -7.58,9.7l28.34,-3.46c4.77,-0.58 8.17,-4.92 7.58,-9.7L388.54,32.45C387.96,27.68 383.62,24.28 378.85,24.87z"
|
||||||
|
android:fillColor="#EFEDEF"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M392.8,67.33l-4.26,-34.88c-0.58,-4.77 -4.92,-8.17 -9.7,-7.58L161.93,51.39c-4.77,0.58 -8.17,4.92 -7.58,9.7l34.07,278.65c0.58,4.77 4.92,8.17 9.7,7.58L415.03,320.8c4.77,-0.58 8.17,-4.92 7.58,-9.7L396.35,96.33"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M217.16,97.46L336.33,82.89"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M223.03,145.42L342.2,130.85"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M228.89,193.38L348.06,178.81"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M234.76,241.34L353.93,226.77"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M240.62,289.3L359.79,274.73"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M470.14,288.42l33.62,-92.69c2.07,-5.7 -0.88,-11.99 -6.57,-14.06l-157.66,-57.19c-5.7,-2.07 -11.99,0.88 -14.06,6.57l-30.97,85.38C403.75,199.2 386.75,280.08 470.14,288.42z"
|
||||||
|
android:fillColor="#C8EFFE"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M497.18,181.67l-23.82,-8.64c5.7,2.07 8.64,8.36 6.57,14.06l-34.78,95.88c7.24,2.59 15.45,4.5 24.98,5.45l33.62,-92.69C505.83,190.03 502.88,183.74 497.18,181.67z"
|
||||||
|
android:fillColor="#B3DAFE"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M470.14,288.42l33.62,-92.69c2.07,-5.7 -0.88,-11.99 -6.57,-14.06l-157.66,-57.19c-5.7,-2.07 -11.99,0.88 -14.06,6.57l-30.97,85.38C403.75,199.2 386.75,280.08 470.14,288.42z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M294.49,216.44l-32.32,89.11c-2.07,5.7 0.88,11.99 6.57,14.06l157.66,57.19c5.7,2.07 11.99,-0.88 14.06,-6.57l29.67,-81.8C386.75,280.08 403.75,199.2 294.49,216.44z"
|
||||||
|
android:fillColor="#9BE69D"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M445.16,282.97l-28.51,78.61c-2.07,5.7 -8.36,8.64 -14.06,6.57l23.82,8.64c5.7,2.07 11.99,-0.88 14.06,-6.57l29.67,-81.8C460.61,287.47 452.4,285.56 445.16,282.97z"
|
||||||
|
android:fillColor="#6FD7A3"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M294.49,216.44l-32.32,89.11c-2.07,5.7 0.88,11.99 6.57,14.06l157.66,57.19c5.7,2.07 11.99,-0.88 14.06,-6.57l29.67,-81.8C386.75,280.08 403.75,199.2 294.49,216.44z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M446.25,211.59m-15.18,0a15.18,15.18 0,1 1,30.37 0a15.18,15.18 0,1 1,-30.37 0"
|
||||||
|
android:fillColor="#FFE177"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M446.25,211.59m-15.18,0a15.18,15.18 0,1 1,30.37 0a15.18,15.18 0,1 1,-30.37 0"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M361.52,487.12H150.48c-7.07,0 -12.81,-5.73 -12.81,-12.81V323.97c0,-7.07 5.73,-12.81 12.81,-12.81h211.04c7.07,0 12.81,5.73 12.81,12.81v150.35C374.33,481.39 368.59,487.12 361.52,487.12z"
|
||||||
|
android:fillColor="#EB5569"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M361.52,311.16h-24.26c7.07,0 12.81,5.73 12.81,12.81v150.35c0,7.07 -5.73,12.81 -12.81,12.81h24.26c7.07,0 12.81,-5.73 12.81,-12.81V323.97C374.33,316.89 368.59,311.16 361.52,311.16z"
|
||||||
|
android:fillColor="#E53950"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280.82,392.63l-40.82,-27.66c-5.22,-3.54 -12.28,0.2 -12.28,6.51v55.33c0,6.31 7.05,10.05 12.28,6.51l40.82,-27.66C285.42,402.53 285.42,395.75 280.82,392.63z"
|
||||||
|
android:fillColor="#F9F7F8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280.82,392.63l-40.82,-27.66c-5.22,-3.54 -12.28,0.2 -12.28,6.51v55.33c0,6.31 7.05,10.05 12.28,6.51l40.82,-27.66C285.42,402.53 285.42,395.75 280.82,392.63z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M374.33,413.46v-89.5c0,-7.07 -5.73,-12.81 -12.81,-12.81H150.48c-7.07,0 -12.81,5.73 -12.81,12.81v150.35c0,7.07 5.73,12.81 12.81,12.81h211.04c7.07,0 12.81,-5.73 12.81,-12.81v-31.85"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,151 @@
|
|||||||
|
<!--
|
||||||
|
~ Copyright (C) 2026 The Android Open Source Project
|
||||||
|
~
|
||||||
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
~ you may not use this file except in compliance with the License.
|
||||||
|
~ You may obtain a copy of the License at
|
||||||
|
~
|
||||||
|
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
~
|
||||||
|
~ Unless required by applicable law or agreed to in writing, software
|
||||||
|
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
~ See the License for the specific language governing permissions and
|
||||||
|
~ limitations under the License.
|
||||||
|
-->
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="512dp"
|
||||||
|
android:height="512dp"
|
||||||
|
android:viewportWidth="511.92"
|
||||||
|
android:viewportHeight="511.92">
|
||||||
|
<path
|
||||||
|
android:pathData="M195.33,356.65H20.18c-7,0 -12.68,-5.68 -12.68,-12.68V183.29c0,-7 5.68,-12.68 12.68,-12.68H195.33c7,0 12.68,5.68 12.68,12.68v160.68C208.01,350.97 202.33,356.65 195.33,356.65z"
|
||||||
|
android:fillColor="#FE93D3"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M195.33,170.61h-47.74l13.44,109.88c0.69,5.67 -3.73,10.68 -9.45,10.68h-1.09c-18.12,0 -32.81,14.69 -32.81,32.81v32.68h77.66c7,0 12.68,-5.68 12.68,-12.68V183.29C208.01,176.29 202.33,170.61 195.33,170.61z"
|
||||||
|
android:fillColor="#FE73C5"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M7.5,320.8v23.17c0,7 5.68,12.68 12.68,12.68H195.33c7,0 12.68,-5.68 12.68,-12.68V183.29c0,-7 -5.68,-12.68 -12.68,-12.68H20.18c-7,0 -12.68,5.68 -12.68,12.68v108.51"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M104.73,237.21c1.82,1.26 4.23,1.26 6.05,0c3.45,-2.38 9.77,-5.64 18.54,-5.64c12.77,0 21.56,9.87 21.56,21.35c0,12.97 -11.41,28.26 -40.87,41.7c-1.43,0.65 -3.08,0.65 -4.51,0c-29.46,-13.44 -40.87,-28.73 -40.87,-41.7c0,-11.49 8.8,-21.35 21.56,-21.35C94.96,231.57 101.28,234.83 104.73,237.21z"
|
||||||
|
android:fillColor="#F9F7F8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M104.73,237.21c1.82,1.26 4.23,1.26 6.05,0c3.45,-2.38 9.77,-5.64 18.54,-5.64c12.77,0 21.56,9.87 21.56,21.35c0,12.97 -11.41,28.26 -40.87,41.7c-1.43,0.65 -3.08,0.65 -4.51,0c-29.46,-13.44 -40.87,-28.73 -40.87,-41.7c0,-11.49 8.8,-21.35 21.56,-21.35C94.96,231.57 101.28,234.83 104.73,237.21z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M415.03,320.8l-216.92,26.52c-4.77,0.58 -9.11,-2.81 -9.7,-7.58L154.34,61.08c-0.58,-4.77 2.81,-9.11 7.58,-9.7l216.92,-26.52c4.77,-0.58 9.11,2.81 9.7,7.58l34.07,278.65C423.2,315.88 419.8,320.22 415.03,320.8z"
|
||||||
|
android:fillColor="#F9F7F8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M378.85,24.87l-28.34,3.46c4.77,-0.58 9.11,2.81 9.7,7.58l34.07,278.65c0.58,4.77 -2.81,9.11 -7.58,9.7l28.34,-3.46c4.77,-0.58 8.17,-4.92 7.58,-9.7L388.54,32.45C387.96,27.68 383.62,24.28 378.85,24.87z"
|
||||||
|
android:fillColor="#EFEDEF"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M392.8,67.33l-4.26,-34.88c-0.58,-4.77 -4.92,-8.17 -9.7,-7.58L161.93,51.39c-4.77,0.58 -8.17,4.92 -7.58,9.7l34.07,278.65c0.58,4.77 4.92,8.17 9.7,7.58L415.03,320.8c4.77,-0.58 8.17,-4.92 7.58,-9.7L396.35,96.33"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M217.16,97.46L336.33,82.89"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M223.03,145.42L342.2,130.85"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M228.89,193.38L348.06,178.81"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M234.76,241.34L353.93,226.77"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M240.62,289.3L359.79,274.73"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M470.14,288.42l33.62,-92.69c2.07,-5.7 -0.88,-11.99 -6.57,-14.06l-157.66,-57.19c-5.7,-2.07 -11.99,0.88 -14.06,6.57l-30.97,85.38C403.75,199.2 386.75,280.08 470.14,288.42z"
|
||||||
|
android:fillColor="#C8EFFE"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M497.18,181.67l-23.82,-8.64c5.7,2.07 8.64,8.36 6.57,14.06l-34.78,95.88c7.24,2.59 15.45,4.5 24.98,5.45l33.62,-92.69C505.83,190.03 502.88,183.74 497.18,181.67z"
|
||||||
|
android:fillColor="#B3DAFE"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M470.14,288.42l33.62,-92.69c2.07,-5.7 -0.88,-11.99 -6.57,-14.06l-157.66,-57.19c-5.7,-2.07 -11.99,0.88 -14.06,6.57l-30.97,85.38C403.75,199.2 386.75,280.08 470.14,288.42z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M294.49,216.44l-32.32,89.11c-2.07,5.7 0.88,11.99 6.57,14.06l157.66,57.19c5.7,2.07 11.99,-0.88 14.06,-6.57l29.67,-81.8C386.75,280.08 403.75,199.2 294.49,216.44z"
|
||||||
|
android:fillColor="#9BE69D"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M445.16,282.97l-28.51,78.61c-2.07,5.7 -8.36,8.64 -14.06,6.57l23.82,8.64c5.7,2.07 11.99,-0.88 14.06,-6.57l29.67,-81.8C460.61,287.47 452.4,285.56 445.16,282.97z"
|
||||||
|
android:fillColor="#6FD7A3"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M294.49,216.44l-32.32,89.11c-2.07,5.7 0.88,11.99 6.57,14.06l157.66,57.19c5.7,2.07 11.99,-0.88 14.06,-6.57l29.67,-81.8C386.75,280.08 403.75,199.2 294.49,216.44z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M446.25,211.59m-15.18,0a15.18,15.18 0,1 1,30.37 0a15.18,15.18 0,1 1,-30.37 0"
|
||||||
|
android:fillColor="#FFE177"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M446.25,211.59m-15.18,0a15.18,15.18 0,1 1,30.37 0a15.18,15.18 0,1 1,-30.37 0"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M361.52,487.12H150.48c-7.07,0 -12.81,-5.73 -12.81,-12.81V323.97c0,-7.07 5.73,-12.81 12.81,-12.81h211.04c7.07,0 12.81,5.73 12.81,12.81v150.35C374.33,481.39 368.59,487.12 361.52,487.12z"
|
||||||
|
android:fillColor="#EB5569"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M361.52,311.16h-24.26c7.07,0 12.81,5.73 12.81,12.81v150.35c0,7.07 -5.73,12.81 -12.81,12.81h24.26c7.07,0 12.81,-5.73 12.81,-12.81V323.97C374.33,316.89 368.59,311.16 361.52,311.16z"
|
||||||
|
android:fillColor="#E53950"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280.82,392.63l-40.82,-27.66c-5.22,-3.54 -12.28,0.2 -12.28,6.51v55.33c0,6.31 7.05,10.05 12.28,6.51l40.82,-27.66C285.42,402.53 285.42,395.75 280.82,392.63z"
|
||||||
|
android:fillColor="#F9F7F8"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M280.82,392.63l-40.82,-27.66c-5.22,-3.54 -12.28,0.2 -12.28,6.51v55.33c0,6.31 7.05,10.05 12.28,6.51l40.82,-27.66C285.42,402.53 285.42,395.75 280.82,392.63z"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
<path
|
||||||
|
android:pathData="M374.33,413.46v-89.5c0,-7.07 -5.73,-12.81 -12.81,-12.81H150.48c-7.07,0 -12.81,5.73 -12.81,12.81v150.35c0,7.07 5.73,12.81 12.81,12.81h211.04c7.07,0 12.81,-5.73 12.81,-12.81v-31.85"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:strokeWidth="15"
|
||||||
|
android:fillColor="#00000000"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:strokeLineCap="round"/>
|
||||||
|
</vector>
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:orientation="vertical"
|
||||||
|
tools:context=".dailyentry.BannerActivity">
|
||||||
|
|
||||||
|
<androidx.appcompat.widget.Toolbar
|
||||||
|
android:id="@+id/toolbar"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="?attr/actionBarSize"
|
||||||
|
android:background="@color/white"
|
||||||
|
android:elevation="8dp"
|
||||||
|
app:theme="@style/ThemeOverlay.AppCompat.Light"
|
||||||
|
app:popupTheme="@style/AppTheme.PopupOverlay" />
|
||||||
|
|
||||||
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
|
android:id="@+id/recyclerView"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:padding="8dp"
|
||||||
|
android:clipToPadding="false" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<androidx.cardview.widget.CardView
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="8dp"
|
||||||
|
app:cardCornerRadius="12dp"
|
||||||
|
app:cardElevation="4dp">
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="110dp"
|
||||||
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
<!-- Red Vertical Strip -->
|
||||||
|
<View
|
||||||
|
android:layout_width="4dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="@color/colorPrimaryDark"/>
|
||||||
|
|
||||||
|
<!-- Content Area -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:layout_weight="1"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="12dp">
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvName"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:textSize="22sp"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:textColor="#000000"/>
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tvViewDetail"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:text="@string/view_detailer"
|
||||||
|
android:fontFamily="sans-serif-medium"
|
||||||
|
android:textSize="12sp"
|
||||||
|
android:textColor="@color/colorPrimary"/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<!-- Right Icon Area -->
|
||||||
|
<LinearLayout
|
||||||
|
android:layout_width="80dp"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:background="#E8FBE3"
|
||||||
|
android:gravity="center"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/imgThumbnail"
|
||||||
|
android:layout_width="70dp"
|
||||||
|
android:layout_height="90dp"
|
||||||
|
/>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
</androidx.cardview.widget.CardView>
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
<item
|
||||||
|
android:id="@+id/action_social_media"
|
||||||
|
android:icon="@drawable/social_media"
|
||||||
|
android:title="Social Media"
|
||||||
|
app:showAsAction="always" />
|
||||||
|
</menu>
|
||||||
@@ -220,6 +220,7 @@
|
|||||||
<string name="order_taking_data_uploading">Order Taking Data Uploading</string>
|
<string name="order_taking_data_uploading">Order Taking Data Uploading</string>
|
||||||
<string name="order_received_data_uploading">Order Received Data Uploading</string>
|
<string name="order_received_data_uploading">Order Received Data Uploading</string>
|
||||||
<string name="visit_type_data_uploading">Visit Type Data Uploading</string>
|
<string name="visit_type_data_uploading">Visit Type Data Uploading</string>
|
||||||
|
<string name="detailer_data_uploading">Detailer Data Uploading</string>
|
||||||
<string name="stock_data_uploading">Stock Data Uploading</string>
|
<string name="stock_data_uploading">Stock Data Uploading</string>
|
||||||
<string name="t2p_data_uploading">T2P Data Uploading</string>
|
<string name="t2p_data_uploading">T2P Data Uploading</string>
|
||||||
<string name="additional_data_uploading">Additional Visibility Data Uploading</string>
|
<string name="additional_data_uploading">Additional Visibility Data Uploading</string>
|
||||||
@@ -469,6 +470,7 @@
|
|||||||
<string name="please_enter_order_qty">Please enter order qty</string>
|
<string name="please_enter_order_qty">Please enter order qty</string>
|
||||||
<string name="add_different_sku">This SKU has already been added. Please add a different SKU.</string>
|
<string name="add_different_sku">This SKU has already been added. Please add a different SKU.</string>
|
||||||
<string name="order_details">Order Details</string>
|
<string name="order_details">Order Details</string>
|
||||||
|
<string name="view_detailer">View Detailer →</string>
|
||||||
|
|
||||||
|
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
-1
@@ -1 +0,0 @@
|
|||||||
{}
|
|
||||||
BIN
Binary file not shown.
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
#Thu May 14 13:16:57 IST 2026
|
#Thu Jun 18 11:00:06 IST 2026
|
||||||
com.androidbuts.multispinnerfilter.library-main-6\:/layout/activity_main.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/activity_main.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\activity_main.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-6\:/layout/alert_dialog_listview_search.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\alert_dialog_listview_search.xml
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/alert_dialog_listview_search.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\alert_dialog_listview_search.xml
|
||||||
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_multiple.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\item_listview_multiple.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_single.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\item_listview_single.xml
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_single.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\item_listview_single.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-6\:/layout/textview_for_spinner.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\textview_for_spinner.xml
|
com.androidbuts.multispinnerfilter.library-main-6\:/layout/textview_for_spinner.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\textview_for_spinner.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-6\:/layout/item_listview_multiple.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\debug\\packageDebugResources\\layout\\item_listview_multiple.xml
|
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
#Thu May 14 12:13:15 IST 2026
|
#Wed Jun 17 15:19:01 IST 2026
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/activity_main.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\activity_main.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/alert_dialog_listview_search.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\alert_dialog_listview_search.xml
|
||||||
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_multiple.xml
|
com.androidbuts.multispinnerfilter.library-main-5\:/layout/item_listview_multiple.xml=E\:\\Haleon_Egypt_PD\\library\\build\\intermediates\\packaged_res\\release\\packageReleaseResources\\layout\\item_listview_multiple.xml
|
||||||
|
|||||||
Reference in New Issue
Block a user