Merge branch 'master' of https://git.dirt.kz/igor/org.ccalm.asdc
This commit is contained in:
13
.idea/caches/deviceStreaming.xml
generated
13
.idea/caches/deviceStreaming.xml
generated
@ -282,19 +282,6 @@
|
|||||||
<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="34" />
|
|
||||||
<option name="brand" value="samsung" />
|
|
||||||
<option name="codename" value="gta7lite" />
|
|
||||||
<option name="formFactor" value="Tablet" />
|
|
||||||
<option name="id" value="gta7lite" />
|
|
||||||
<option name="labId" value="google" />
|
|
||||||
<option name="manufacturer" value="Samsung" />
|
|
||||||
<option name="name" value="Galaxy Tab A7 Lite" />
|
|
||||||
<option name="screenDensity" value="179" />
|
|
||||||
<option name="screenX" value="800" />
|
|
||||||
<option name="screenY" value="1340" />
|
|
||||||
</PersistentDeviceSelectionData>
|
|
||||||
<PersistentDeviceSelectionData>
|
<PersistentDeviceSelectionData>
|
||||||
<option name="api" value="33" />
|
<option name="api" value="33" />
|
||||||
<option name="brand" value="samsung" />
|
<option name="brand" value="samsung" />
|
||||||
|
|||||||
417
.idea/other.xml
generated
Normal file
417
.idea/other.xml
generated
Normal file
@ -0,0 +1,417 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="direct_access_persist.xml">
|
||||||
|
<option name="deviceSelectionList">
|
||||||
|
<list>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="27" />
|
||||||
|
<option name="brand" value="DOCOMO" />
|
||||||
|
<option name="codename" value="F01L" />
|
||||||
|
<option name="id" value="F01L" />
|
||||||
|
<option name="manufacturer" value="FUJITSU" />
|
||||||
|
<option name="name" value="F-01L" />
|
||||||
|
<option name="screenDensity" value="360" />
|
||||||
|
<option name="screenX" value="720" />
|
||||||
|
<option name="screenY" value="1280" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="OPPO" />
|
||||||
|
<option name="codename" value="OP573DL1" />
|
||||||
|
<option name="id" value="OP573DL1" />
|
||||||
|
<option name="manufacturer" value="OPPO" />
|
||||||
|
<option name="name" value="CPH2557" />
|
||||||
|
<option name="screenDensity" value="480" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="28" />
|
||||||
|
<option name="brand" value="DOCOMO" />
|
||||||
|
<option name="codename" value="SH-01L" />
|
||||||
|
<option name="id" value="SH-01L" />
|
||||||
|
<option name="manufacturer" value="SHARP" />
|
||||||
|
<option name="name" value="AQUOS sense2 SH-01L" />
|
||||||
|
<option name="screenDensity" value="480" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2160" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="Lenovo" />
|
||||||
|
<option name="codename" value="TB370FU" />
|
||||||
|
<option name="id" value="TB370FU" />
|
||||||
|
<option name="manufacturer" value="Lenovo" />
|
||||||
|
<option name="name" value="Tab P12" />
|
||||||
|
<option name="screenDensity" value="340" />
|
||||||
|
<option name="screenX" value="1840" />
|
||||||
|
<option name="screenY" value="2944" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="31" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="a51" />
|
||||||
|
<option name="id" value="a51" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy A51" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="akita" />
|
||||||
|
<option name="id" value="akita" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 8a" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="motorola" />
|
||||||
|
<option name="codename" value="arcfox" />
|
||||||
|
<option name="id" value="arcfox" />
|
||||||
|
<option name="manufacturer" value="Motorola" />
|
||||||
|
<option name="name" value="razr plus 2024" />
|
||||||
|
<option name="screenDensity" value="360" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="1272" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="b0q" />
|
||||||
|
<option name="id" value="b0q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy S22 Ultra" />
|
||||||
|
<option name="screenDensity" value="600" />
|
||||||
|
<option name="screenX" value="1440" />
|
||||||
|
<option name="screenY" value="3088" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="32" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="bluejay" />
|
||||||
|
<option name="id" value="bluejay" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 6a" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="caiman" />
|
||||||
|
<option name="id" value="caiman" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 9 Pro" />
|
||||||
|
<option name="screenDensity" value="360" />
|
||||||
|
<option name="screenX" value="960" />
|
||||||
|
<option name="screenY" value="2142" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="comet" />
|
||||||
|
<option name="id" value="comet" />
|
||||||
|
<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>
|
||||||
|
<option name="api" value="29" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="crownqlteue" />
|
||||||
|
<option name="id" value="crownqlteue" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy Note9" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="2220" />
|
||||||
|
<option name="screenY" value="1080" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="dm2q" />
|
||||||
|
<option name="id" value="dm2q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="S23 Plus" />
|
||||||
|
<option name="screenDensity" value="450" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2340" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="dm3q" />
|
||||||
|
<option name="id" value="dm3q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy S23 Ultra" />
|
||||||
|
<option name="screenDensity" value="600" />
|
||||||
|
<option name="screenX" value="1440" />
|
||||||
|
<option name="screenY" value="3088" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="e1q" />
|
||||||
|
<option name="id" value="e1q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy S24" />
|
||||||
|
<option name="screenDensity" value="480" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2340" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="e3q" />
|
||||||
|
<option name="id" value="e3q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy S24 Ultra" />
|
||||||
|
<option name="screenDensity" value="450" />
|
||||||
|
<option name="screenX" value="1440" />
|
||||||
|
<option name="screenY" value="3120" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="eos" />
|
||||||
|
<option name="id" value="eos" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Eos" />
|
||||||
|
<option name="screenDensity" value="320" />
|
||||||
|
<option name="screenX" value="384" />
|
||||||
|
<option name="screenY" value="384" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="felix" />
|
||||||
|
<option name="id" value="felix" />
|
||||||
|
<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>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="felix" />
|
||||||
|
<option name="id" value="felix" />
|
||||||
|
<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>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="felix_camera" />
|
||||||
|
<option name="id" value="felix_camera" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel Fold (Camera-enabled)" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="2208" />
|
||||||
|
<option name="screenY" value="1840" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="motorola" />
|
||||||
|
<option name="codename" value="fogona" />
|
||||||
|
<option name="id" value="fogona" />
|
||||||
|
<option name="manufacturer" value="Motorola" />
|
||||||
|
<option name="name" value="moto g play - 2024" />
|
||||||
|
<option name="screenDensity" value="280" />
|
||||||
|
<option name="screenX" value="720" />
|
||||||
|
<option name="screenY" value="1600" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="g0q" />
|
||||||
|
<option name="id" value="g0q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="SM-S906U1" />
|
||||||
|
<option name="screenDensity" value="450" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2340" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="gts8uwifi" />
|
||||||
|
<option name="id" value="gts8uwifi" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy Tab S8 Ultra" />
|
||||||
|
<option name="screenDensity" value="320" />
|
||||||
|
<option name="screenX" value="1848" />
|
||||||
|
<option name="screenY" value="2960" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="husky" />
|
||||||
|
<option name="id" value="husky" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 8 Pro" />
|
||||||
|
<option name="screenDensity" value="390" />
|
||||||
|
<option name="screenX" value="1008" />
|
||||||
|
<option name="screenY" value="2244" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="30" />
|
||||||
|
<option name="brand" value="motorola" />
|
||||||
|
<option name="codename" value="java" />
|
||||||
|
<option name="id" value="java" />
|
||||||
|
<option name="manufacturer" value="Motorola" />
|
||||||
|
<option name="name" value="G20" />
|
||||||
|
<option name="screenDensity" value="280" />
|
||||||
|
<option name="screenX" value="720" />
|
||||||
|
<option name="screenY" value="1600" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="komodo" />
|
||||||
|
<option name="id" value="komodo" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 9 Pro XL" />
|
||||||
|
<option name="screenDensity" value="360" />
|
||||||
|
<option name="screenX" value="1008" />
|
||||||
|
<option name="screenY" value="2244" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="lynx" />
|
||||||
|
<option name="id" value="lynx" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 7a" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="motorola" />
|
||||||
|
<option name="codename" value="maui" />
|
||||||
|
<option name="id" value="maui" />
|
||||||
|
<option name="manufacturer" value="Motorola" />
|
||||||
|
<option name="name" value="moto g play - 2023" />
|
||||||
|
<option name="screenDensity" value="280" />
|
||||||
|
<option name="screenX" value="720" />
|
||||||
|
<option name="screenY" value="1600" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="31" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="oriole" />
|
||||||
|
<option name="id" value="oriole" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 6" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="panther" />
|
||||||
|
<option name="id" value="panther" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 7" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="q5q" />
|
||||||
|
<option name="id" value="q5q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy Z Fold5" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1812" />
|
||||||
|
<option name="screenY" value="2176" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="samsung" />
|
||||||
|
<option name="codename" value="q6q" />
|
||||||
|
<option name="id" value="q6q" />
|
||||||
|
<option name="manufacturer" value="Samsung" />
|
||||||
|
<option name="name" value="Galaxy Z Fold6" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1856" />
|
||||||
|
<option name="screenY" value="2160" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="30" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="r11" />
|
||||||
|
<option name="id" value="r11" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel Watch" />
|
||||||
|
<option name="screenDensity" value="320" />
|
||||||
|
<option name="screenX" value="384" />
|
||||||
|
<option name="screenY" value="384" />
|
||||||
|
<option name="type" value="WEAR_OS" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="30" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="redfin" />
|
||||||
|
<option name="id" value="redfin" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 5" />
|
||||||
|
<option name="screenDensity" value="440" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2340" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="shiba" />
|
||||||
|
<option name="id" value="shiba" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 8" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2400" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
<PersistentDeviceSelectionData>
|
||||||
|
<option name="api" value="33" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="tangorpro" />
|
||||||
|
<option name="id" value="tangorpro" />
|
||||||
|
<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>
|
||||||
|
<option name="api" value="34" />
|
||||||
|
<option name="brand" value="google" />
|
||||||
|
<option name="codename" value="tokay" />
|
||||||
|
<option name="id" value="tokay" />
|
||||||
|
<option name="manufacturer" value="Google" />
|
||||||
|
<option name="name" value="Pixel 9" />
|
||||||
|
<option name="screenDensity" value="420" />
|
||||||
|
<option name="screenX" value="1080" />
|
||||||
|
<option name="screenY" value="2424" />
|
||||||
|
</PersistentDeviceSelectionData>
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -13,8 +13,8 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "kz.istt.locust"
|
applicationId "kz.istt.locust"
|
||||||
minSdkVersion 15
|
minSdkVersion 15
|
||||||
versionCode 105
|
versionCode 108
|
||||||
versionName "3.0.2"
|
versionName "3.0.5"
|
||||||
targetSdkVersion 34
|
targetSdkVersion 34
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
multiDexEnabled true
|
multiDexEnabled true
|
||||||
|
|||||||
@ -94,18 +94,11 @@ public class MainService extends Service
|
|||||||
String act=intent.getStringExtra(MainService.PARAM_ACTION);
|
String act=intent.getStringExtra(MainService.PARAM_ACTION);
|
||||||
if(act!=null)
|
if(act!=null)
|
||||||
{
|
{
|
||||||
if(act.equals("1"))
|
switch (act) {
|
||||||
{
|
case "1" -> timerTic(true);
|
||||||
timerTic(true);
|
case "2" -> m_pi = intent.getParcelableExtra(SetupActivity.PARAM_PINTENT); //Assigned the listener to the progress bar.
|
||||||
}else
|
case "3" -> m_pi = null; //Clear the progress bar listener.
|
||||||
if(act.equals("2")) //Присвоили слушателя прогресс бара
|
}
|
||||||
{
|
|
||||||
m_pi = intent.getParcelableExtra(SetupActivity.PARAM_PINTENT);
|
|
||||||
}else
|
|
||||||
if(act.equals("3")) //Очистить слушателя прогрес бара
|
|
||||||
{
|
|
||||||
m_pi = null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return super.onStartCommand(intent, flags, startId);
|
return super.onStartCommand(intent, flags, startId);
|
||||||
|
|||||||
@ -63,7 +63,7 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
ArrayList<Polygon> polygons=new ArrayList<Polygon>();
|
ArrayList<Polygon> polygons=new ArrayList<Polygon>();
|
||||||
Polygon polygon=null;
|
Polygon polygon=null;
|
||||||
|
|
||||||
String uid="";
|
String g_uid="";
|
||||||
private Marker marker=null;
|
private Marker marker=null;
|
||||||
private LocationManager lm;
|
private LocationManager lm;
|
||||||
|
|
||||||
@ -97,10 +97,10 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
.findFragmentById(R.id.map);
|
.findFragmentById(R.id.map);
|
||||||
mapFragment.getMapAsync(this);
|
mapFragment.getMapAsync(this);
|
||||||
|
|
||||||
|
|
||||||
Intent intent = getIntent();
|
Intent intent = getIntent();
|
||||||
points = intent.getParcelableArrayListExtra("LatLon");
|
points = intent.getParcelableArrayListExtra("LatLon");
|
||||||
uid = intent.getStringExtra("uid");
|
g_uid = intent.getStringExtra("uid");
|
||||||
|
if(g_uid==null) g_uid="";
|
||||||
|
|
||||||
// Чтоб слушать GPS
|
// Чтоб слушать GPS
|
||||||
lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
|
lm = (LocationManager) getSystemService(Context.LOCATION_SERVICE);
|
||||||
@ -131,7 +131,7 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
);
|
);
|
||||||
marker.setVisible(false);
|
marker.setVisible(false);
|
||||||
|
|
||||||
//Геозоны обследования саранчи
|
//Отобразить все геозоны кроме текущей, обследования саранчи (текущие ниже)
|
||||||
DbOpenHelper dboh = new DbOpenHelper(this);
|
DbOpenHelper dboh = new DbOpenHelper(this);
|
||||||
SQLiteDatabase rdb = null;
|
SQLiteDatabase rdb = null;
|
||||||
try {
|
try {
|
||||||
@ -139,12 +139,25 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
rdb = dboh.getReadableDatabase();
|
rdb = dboh.getReadableDatabase();
|
||||||
Cursor cursor=null;
|
Cursor cursor=null;
|
||||||
try {
|
try {
|
||||||
cursor = rdb.rawQuery("select frmlocust_uid,lat,lon from frmlocust_locations where frmlocust_uid!='" + uid + "' order by frmlocust_uid,pos;", null);
|
String sql = """
|
||||||
|
select
|
||||||
|
frmlocust_uid,
|
||||||
|
lat,
|
||||||
|
lon
|
||||||
|
from
|
||||||
|
frmlocust_locations
|
||||||
|
where
|
||||||
|
frmlocust_uid!=?
|
||||||
|
order by
|
||||||
|
frmlocust_uid,
|
||||||
|
pos
|
||||||
|
""";
|
||||||
|
cursor = rdb.rawQuery(sql, new String[]{g_uid});
|
||||||
if (cursor.moveToFirst()) {
|
if (cursor.moveToFirst()) {
|
||||||
String uid = "";
|
String uid = "";
|
||||||
PolygonOptions pOptions2 = new PolygonOptions();
|
PolygonOptions pOptions2 = new PolygonOptions();
|
||||||
do {
|
do {
|
||||||
if (!uid.equals(cursor.getString(0)) && pOptions2.getPoints().size() > 1) {
|
if (pOptions2.getPoints().size() > 1) {
|
||||||
Polygon polygon = mMap.addPolygon(pOptions2);
|
Polygon polygon = mMap.addPolygon(pOptions2);
|
||||||
polygons.add(polygon);
|
polygons.add(polygon);
|
||||||
polygon.setFillColor(0x7F0000FF);
|
polygon.setFillColor(0x7F0000FF);
|
||||||
@ -155,6 +168,7 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
}
|
}
|
||||||
pOptions2.add(new LatLng(cursor.getDouble(1), cursor.getDouble(2)));
|
pOptions2.add(new LatLng(cursor.getDouble(1), cursor.getDouble(2)));
|
||||||
} while (cursor.moveToNext());
|
} while (cursor.moveToNext());
|
||||||
|
|
||||||
if (pOptions2.getPoints().size() > 1) {
|
if (pOptions2.getPoints().size() > 1) {
|
||||||
Polygon polygon = mMap.addPolygon(pOptions2);
|
Polygon polygon = mMap.addPolygon(pOptions2);
|
||||||
polygons.add(polygon);
|
polygons.add(polygon);
|
||||||
@ -167,10 +181,23 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
if(cursor!=null){ cursor.close(); }
|
if(cursor!=null){ cursor.close(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
//Геозоны противосаначовой обработки
|
//Отобразить все геозоны кроме текущей, противосаначовой обработки (текущие ниже)
|
||||||
cursor=null;
|
cursor=null;
|
||||||
try {
|
try {
|
||||||
cursor = rdb.rawQuery("select frmlocustdel_uid,lat,lon from frmlocustdel_locations where frmlocustdel_uid!='" + uid + "' order by frmlocustdel_uid,pos;", null);
|
String sql = """
|
||||||
|
select
|
||||||
|
frmlocustdel_uid,
|
||||||
|
lat,
|
||||||
|
lon
|
||||||
|
from
|
||||||
|
frmlocustdel_locations
|
||||||
|
where
|
||||||
|
frmlocustdel_uid!=?
|
||||||
|
order by
|
||||||
|
frmlocustdel_uid,
|
||||||
|
pos
|
||||||
|
""";
|
||||||
|
cursor = rdb.rawQuery(sql, new String[]{g_uid});
|
||||||
if (cursor.moveToFirst()) {
|
if (cursor.moveToFirst()) {
|
||||||
String uid = "";
|
String uid = "";
|
||||||
PolygonOptions pOptions2 = new PolygonOptions();
|
PolygonOptions pOptions2 = new PolygonOptions();
|
||||||
@ -198,6 +225,40 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
if(cursor!=null){ cursor.close(); }
|
if(cursor!=null){ cursor.close(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Отображаю все центральные точки с анкет противосаранчовой обработки
|
||||||
|
cursor=null;
|
||||||
|
try {
|
||||||
|
String sql = """
|
||||||
|
select
|
||||||
|
uid,
|
||||||
|
lat_center,
|
||||||
|
lon_center
|
||||||
|
from
|
||||||
|
frmlocustdel
|
||||||
|
where
|
||||||
|
del = 0
|
||||||
|
and uid!=?
|
||||||
|
""";
|
||||||
|
cursor = rdb.rawQuery(sql, new String[]{g_uid});
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
do {
|
||||||
|
center = new LatLng(cursor.getDouble(1), cursor.getDouble(2));
|
||||||
|
mMap.addMarker(new MarkerOptions()
|
||||||
|
.position(center)
|
||||||
|
.title("Spray")
|
||||||
|
.icon(BitmapDescriptorFactory.fromBitmap(getMarker(R.drawable.ic_flag)))
|
||||||
|
);
|
||||||
|
} while (cursor.moveToNext());
|
||||||
|
}
|
||||||
|
}catch(Exception e){
|
||||||
|
e.printStackTrace();
|
||||||
|
}finally{
|
||||||
|
if(cursor!=null){ cursor.close(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}catch(Exception e){
|
}catch(Exception e){
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}finally{
|
}finally{
|
||||||
@ -205,7 +266,7 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
}
|
}
|
||||||
dboh.close();
|
dboh.close();
|
||||||
/**/
|
/**/
|
||||||
//Сreating a polygon. (The main polygon at the end since they overlap each)
|
//Create a geopolygon for the current survey. (The main polygon at the end since they overlap each)
|
||||||
PolygonOptions pOptions = new PolygonOptions();
|
PolygonOptions pOptions = new PolygonOptions();
|
||||||
|
|
||||||
for(int i=0;i<points.size();i++){
|
for(int i=0;i<points.size();i++){
|
||||||
@ -213,7 +274,7 @@ public class MapsActivity extends FragmentActivity implements OnMapReadyCallback
|
|||||||
pOptions.add(new LatLng(points.get(i).lat, points.get(i).lon));
|
pOptions.add(new LatLng(points.get(i).lat, points.get(i).lon));
|
||||||
}
|
}
|
||||||
|
|
||||||
if(pOptions.getPoints().size()>0) {
|
if(!pOptions.getPoints().isEmpty()) {
|
||||||
Polygon polygon = mMap.addPolygon(pOptions);
|
Polygon polygon = mMap.addPolygon(pOptions);
|
||||||
polygon.setFillColor(0x7F00FF00);
|
polygon.setFillColor(0x7F00FF00);
|
||||||
center = getPolygonCenterPoint(pOptions.getPoints());
|
center = getPolygonCenterPoint(pOptions.getPoints());
|
||||||
|
|||||||
@ -119,20 +119,24 @@ public class ScanActivity extends Activity {
|
|||||||
tvCountry = (TextView) findViewById(R.id.tvCountry);
|
tvCountry = (TextView) findViewById(R.id.tvCountry);
|
||||||
tvOrganization = (TextView) findViewById(R.id.tvOrganization);
|
tvOrganization = (TextView) findViewById(R.id.tvOrganization);
|
||||||
|
|
||||||
|
String serial = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
|
||||||
|
|
||||||
DbOpenHelper dboh = new DbOpenHelper(this);
|
DbOpenHelper dboh = new DbOpenHelper(this);
|
||||||
SQLiteDatabase rdb = null;
|
SQLiteDatabase rdb = null;
|
||||||
Cursor cursor = null;
|
Cursor cursor = null;
|
||||||
try {
|
try {
|
||||||
rdb = dboh.getReadableDatabase();
|
rdb = dboh.getReadableDatabase();
|
||||||
cursor = rdb.rawQuery("select " +
|
String sql = """
|
||||||
" cr.name as country_name," +
|
select
|
||||||
" cp.name as company_name," +
|
cr.name as country_name,
|
||||||
" t.name " +
|
cp.name as company_name,
|
||||||
"from " +
|
t.name
|
||||||
" terminals t " +
|
from
|
||||||
" left join countries cr on cr.id=t.country_id " +
|
terminals t
|
||||||
" left join companies cp on cp.id=t.company_id " +
|
left join countries cr on cr.id=t.country_id
|
||||||
"where t.del=0 and t.serial='"+Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID)+"';", null);
|
left join companies cp on cp.id=t.company_id
|
||||||
|
where t.del=0 and t.serial=?""";
|
||||||
|
cursor = rdb.rawQuery(sql, new String[]{serial});
|
||||||
if(cursor.moveToFirst())
|
if(cursor.moveToFirst())
|
||||||
{
|
{
|
||||||
tvCountry.setText(cursor.getString(cursor.getColumnIndex("country_name")));
|
tvCountry.setText(cursor.getString(cursor.getColumnIndex("country_name")));
|
||||||
@ -242,7 +246,7 @@ public class ScanActivity extends Activity {
|
|||||||
public void setJSONObject(JSONObject json)
|
public void setJSONObject(JSONObject json)
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
if(json.getInt("errorCode")==0) {
|
if(json.getInt("error_code")==0) {
|
||||||
tvName.setText(json.getString("name"));
|
tvName.setText(json.getString("name"));
|
||||||
tvCountry.setText(json.getString("country_name"));
|
tvCountry.setText(json.getString("country_name"));
|
||||||
tvOrganization.setText(json.getString("company_name"));
|
tvOrganization.setText(json.getString("company_name"));
|
||||||
@ -499,7 +503,6 @@ public class ScanActivity extends Activity {
|
|||||||
if (mResult != null)
|
if (mResult != null)
|
||||||
ScanActivity.this.setJSONObject(mResult);
|
ScanActivity.this.setJSONObject(mResult);
|
||||||
|
|
||||||
|
|
||||||
if (mErrmsg != null && !mErrmsg.equals("")) {
|
if (mErrmsg != null && !mErrmsg.equals("")) {
|
||||||
AlertDialog alertDialog = new AlertDialog.Builder(ScanActivity.this).create();
|
AlertDialog alertDialog = new AlertDialog.Builder(ScanActivity.this).create();
|
||||||
alertDialog.setTitle("Error");
|
alertDialog.setTitle("Error");
|
||||||
|
|||||||
@ -14,6 +14,7 @@ import android.graphics.BitmapFactory;
|
|||||||
import android.graphics.Color;
|
import android.graphics.Color;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.text.Editable;
|
import android.text.Editable;
|
||||||
|
import android.text.InputFilter;
|
||||||
import android.view.Menu;
|
import android.view.Menu;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
import android.view.View.OnClickListener;
|
import android.view.View.OnClickListener;
|
||||||
@ -32,6 +33,8 @@ import com.google.android.gms.vision.barcode.BarcodeDetector;
|
|||||||
|
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
|
import dbfields.InputFilterMinMax;
|
||||||
|
|
||||||
|
|
||||||
public class SetupActivity extends Activity {
|
public class SetupActivity extends Activity {
|
||||||
|
|
||||||
@ -344,6 +347,7 @@ public class SetupActivity extends Activity {
|
|||||||
});
|
});
|
||||||
|
|
||||||
edtSyncDays = (EditText) findViewById(R.id.edtSyncDays);
|
edtSyncDays = (EditText) findViewById(R.id.edtSyncDays);
|
||||||
|
edtSyncDays.setFilters(new InputFilter[]{ new InputFilterMinMax(1, 365) });
|
||||||
edtSyncDays.setText(String.valueOf(MySynchronizationOld.SyncDays));
|
edtSyncDays.setText(String.valueOf(MySynchronizationOld.SyncDays));
|
||||||
|
|
||||||
edtSyncDays.addTextChangedListener(new TextWatcher() {
|
edtSyncDays.addTextChangedListener(new TextWatcher() {
|
||||||
|
|||||||
23
app/src/main/res/drawable/ic_flag.xml
Normal file
23
app/src/main/res/drawable/ic_flag.xml
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="25dp"
|
||||||
|
android:height="32dp"
|
||||||
|
android:viewportWidth="25"
|
||||||
|
android:viewportHeight="32.091168">
|
||||||
|
|
||||||
|
<!-- Палка флага -->
|
||||||
|
<path
|
||||||
|
android:strokeWidth="1.90167"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:fillColor="#000000"
|
||||||
|
android:strokeLineCap="round"
|
||||||
|
android:pathData="M5.0213123,29.152388 V2.8006687" />
|
||||||
|
|
||||||
|
<!-- Полотнище флага -->
|
||||||
|
<path
|
||||||
|
android:strokeWidth="0.614869"
|
||||||
|
android:strokeColor="#000000"
|
||||||
|
android:fillColor="#2A2AFF"
|
||||||
|
android:strokeLineJoin="round"
|
||||||
|
android:pathData="M5.6552021,4.0684492 C11.994103,6.7851209 15.072998,6.6040094 21.774124,4.2495607 C19.872453,8.052901 19.872453,10.950685 21.774124,14.754026 C15.254111,17.017919 12.627995,17.017919 5.6552021,14.754026 Z" />
|
||||||
|
</vector>
|
||||||
@ -1,5 +1,9 @@
|
|||||||
<vector android:height="48dp" android:viewportHeight="128"
|
<vector
|
||||||
android:viewportWidth="128" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
android:height="48dp"
|
||||||
|
android:viewportHeight="128"
|
||||||
|
android:viewportWidth="128"
|
||||||
|
android:width="48dp"
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
<path android:fillColor="#2d3e50"
|
<path android:fillColor="#2d3e50"
|
||||||
android:pathData="M64.002,3.367c-25.749,0 -43.05,14.759 -43.05,36.725 0,29.112 37.015,81.601 37.383,82.011a7.603,7.603 0,0 0,11.323 0.006c0.374,-0.416 37.389,-52.905 37.389,-82.017C107.048,18.125 89.749,3.367 64.002,3.367ZM64,74.739a28.296,28.296 0,1 1,28.296 -28.296A28.296,28.296 0,0 1,64 74.739Z"
|
android:pathData="M64.002,3.367c-25.749,0 -43.05,14.759 -43.05,36.725 0,29.112 37.015,81.601 37.383,82.011a7.603,7.603 0,0 0,11.323 0.006c0.374,-0.416 37.389,-52.905 37.389,-82.017C107.048,18.125 89.749,3.367 64.002,3.367ZM64,74.739a28.296,28.296 0,1 1,28.296 -28.296A28.296,28.296 0,0 1,64 74.739Z"
|
||||||
android:strokeColor="#ffc6ff" android:strokeWidth="3.8"/>
|
android:strokeColor="#ffc6ff" android:strokeWidth="3.8"/>
|
||||||
|
|||||||
@ -281,7 +281,7 @@
|
|||||||
android:autofillHints=""
|
android:autofillHints=""
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
android:importantForAutofill="no"
|
android:importantForAutofill="no"
|
||||||
android:inputType="numberDecimal" />
|
android:inputType="number" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
|||||||
Reference in New Issue
Block a user