igor/org.ccalm.asdc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.0.6

Browse Source
This commit is contained in:
Igor I
2025-02-27 13:12:53 +05:00
parent ecb0ae8b15
commit 41d7f6b4d1
5 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.idea/caches/deviceStreaming.xml generated
View File

@ -64,6 +64,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="34" />
<option name="brand" value="samsung" />
<option name="codename" value="a35x" />
<option name="id" value="a35x" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="A35" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2340" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="31" /> <option name="api" value="31" />
<option name="brand" value="samsung" /> <option name="brand" value="samsung" />
@ -453,6 +465,18 @@
<option name="screenX" value="1080" /> <option name="screenX" value="1080" />
<option name="screenY" value="2400" /> <option name="screenY" value="2400" />
</PersistentDeviceSelectionData> </PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="t2q" />
<option name="id" value="t2q" />
<option name="labId" value="google" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S21 Plus" />
<option name="screenDensity" value="394" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData> <PersistentDeviceSelectionData>
<option name="api" value="33" /> <option name="api" value="33" />
<option name="brand" value="google" /> <option name="brand" value="google" />

4
.idea/deploymentTargetSelector.xml generated
View File

@ -4,10 +4,10 @@
<selectionStates> <selectionStates>
<SelectionState runConfigName="app"> <SelectionState runConfigName="app">
<option name="selectionMode" value="DROPDOWN" /> <option name="selectionMode" value="DROPDOWN" />
<DropdownSelection timestamp="2024-08-18T18:04:19.981174300Z"> <DropdownSelection timestamp="2025-02-20T05:47:11.559097100Z">
<Target type="DEFAULT_BOOT"> <Target type="DEFAULT_BOOT">
<handle> <handle>
<DeviceId pluginId="PhysicalDevice" identifier="serial=0123456789ABCDEF" /> <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\ivanov.i\.android\avd\Pixel_3a_API_34_extension_level_7_x86_64.avd" />
</handle> </handle>
</Target> </Target>
</DropdownSelection> </DropdownSelection>

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
defaultConfig { defaultConfig {
applicationId "kz.istt.locust" applicationId "kz.istt.locust"
minSdkVersion 15 minSdkVersion 15
versionCode 108 versionCode 109
versionName "3.0.5" versionName "3.0.6"
targetSdkVersion 34 targetSdkVersion 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true

3
app/src/main/java/kz/istt/locust/LocustHealthActivity.java
View File

@ -3073,7 +3073,8 @@ public class LocustHealthActivity extends FragmentActivity implements LocationLi
eFields = true; eFields = true;
} }
if(((selectDB)spiEffControl2).getValue().equals("1")){ String value=((selectDB)spiEffControl2).getValue();
if(value!=null && value.equals("1")){
if (!eFields && !isGONE(edtEffMortality2) && edtEffMortality2.getText().toString().isBlank()) if (!eFields && !isGONE(edtEffMortality2) && edtEffMortality2.getText().toString().isBlank())
{ {
scrollTo(edtEffMortality2); scrollTo(edtEffMortality2);

2
app/src/main/java/kz/istt/locust/MySynchronizationOld.java
View File

@ -663,6 +663,8 @@ public class MySynchronizationOld
TCTable tbl=new TCTable("",0); TCTable tbl=new TCTable("",0);
if(tbl.OpenTableH(is)) if(tbl.OpenTableH(is))
{ {
if(tbl.name.equals("terminals"))
Log.d("igor", "tbl.name = " + tbl.name);
result = dbOpenHelper.updateTable(tbl); result = dbOpenHelper.updateTable(tbl);
} }
}else if(type.equals("xml")) //Данные в виде XML файла }else if(type.equals("xml")) //Данные в виде XML файла