Locust

commit bf93c88af3417a7a47ef82e3c60b136c8e8def7c Author: Igor I Date: Mon Nov 6 11:50:11 2023 +0600 Первая diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5edb4ee --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml new file mode 100644 index 0000000..8495d3e --- /dev/null +++ b/.idea/assetWizardSettings.xml @@ -0,0 +1,327 @@ + + + + + + \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..e3d5a67 Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..5323176 Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..0d15693 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,134 @@ + + + + + + + + + + + +

+ + + + xmlns:android + + ^$ + + + +

+ + + + xmlns:.* + + ^$ + + + BY_NAME + +

+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +

+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +

+ + + + name + + ^$ + + + +

+ + + + style + + ^$ + + + +

+ + + + .* + + ^$ + + + BY_NAME + +

+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +

+ + + + .* + + .* + + + BY_NAME + +

+ + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..1431050 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,21 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..a5f05cd --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..8c8437c --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..45cf85c --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..e95a1e2 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,79 @@ +apply plugin: 'com.android.application' + +android { + signingConfigs { + config { + keyAlias 'ASDC' + keyPassword 'firstg@h0km' + storeFile file('O:/projects/Workspace_Android/Keystore/locustkeystore') + storePassword 'locustg@h0km' + } + } + compileSdkVersion 33 + defaultConfig { + applicationId "kz.istt.locust" + minSdkVersion 15 + targetSdkVersion 33 + versionCode 99 + versionName "2.4.3" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + debug { + signingConfig signingConfigs.config + } + } + packagingOptions { + resources { + excludes += ['META-INF/DEPENDENCIES', 'META-INF/LICENSE'] + } + } + + buildToolsVersion '30.0.3' + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + namespace 'kz.istt.locust' +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'com.google.android.material:material:1.4.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.navigation:navigation-fragment:2.0.0' + implementation 'androidx.navigation:navigation-ui:2.0.0' + implementation 'com.google.android.gms:play-services-maps:17.0.0' + implementation 'com.google.android.gms:play-services-vision:20.1.2' + implementation 'com.google.android.gms:play-services-auth:20.4.0' + implementation 'com.google.maps.android:android-maps-utils:1.0.2' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +/* + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.2' + implementation 'com.google.android.gms:play-services-maps:17.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' +*/ + + /*compile files('libs/commons-codec-1.6.jar') + compile files('libs/commons-logging-1.1.1.jar') + + compile files('libs/fluent-hc-4.5.2.jar') + compile files('libs/httpclient-4.5.2.jar') + compile files('libs/httpclient-cache-4.5.2.jar') + compile files('libs/httpcore-4.4.4.jar') + compile files('libs/httpmime-4.5.2.jar')*/ +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..f1b4245 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/release/app-release.apk b/app/release/app-release.apk new file mode 100644 index 0000000..6d392ee Binary files /dev/null and b/app/release/app-release.apk differ diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json new file mode 100644 index 0000000..272c17c --- /dev/null +++ b/app/release/output-metadata.json @@ -0,0 +1,20 @@ +{ + "version": 3, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "kz.istt.locust", + "variantName": "release", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "attributes": [], + "versionCode": 99, + "versionName": "2.4.3", + "outputFile": "app-release.apk" + } + ], + "elementType": "File" +} \ No newline at end of file diff --git a/app/src/androidTest/java/kz/istt/locust/ExampleInstrumentedTest.java b/app/src/androidTest/java/kz/istt/locust/ExampleInstrumentedTest.java new file mode 100644 index 0000000..149711e --- /dev/null +++ b/app/src/androidTest/java/kz/istt/locust/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package kz.istt.locust; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumented test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("kz.istt.locust", appContext.getPackageName()); + } +} diff --git a/app/src/debug/res/values/google_maps_api.xml b/app/src/debug/res/values/google_maps_api.xml new file mode 100644 index 0000000..7f2312d --- /dev/null +++ b/app/src/debug/res/values/google_maps_api.xml @@ -0,0 +1,24 @@ + + + AIzaSyA_tOZ-AUtAbt0GOkNgWUBtSbEZgTk4vXA + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..33bf1a5 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000..2313c8c Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..fbac213 Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/dbfields/AutoCompleteTextViewDB.java b/app/src/main/java/dbfields/AutoCompleteTextViewDB.java new file mode 100644 index 0000000..e5e2f03 --- /dev/null +++ b/app/src/main/java/dbfields/AutoCompleteTextViewDB.java @@ -0,0 +1,246 @@ +package dbfields; + +import android.content.Context; +import android.database.Cursor; +import android.os.Parcel; +import android.os.Parcelable; +import android.text.InputType; +import android.util.AttributeSet; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.AutoCompleteTextView; + +import java.util.ArrayList; +import java.util.List; + +import kz.istt.locust.DbOpenHelper; +import kz.istt.locust.LocustActivity; +import kz.istt.locust.R; + +import static android.widget.AdapterView.INVALID_POSITION; + +public class AutoCompleteTextViewDB extends AutoCompleteTextView implements selectDB { + private String m_Value = null; + private List m_lName = new ArrayList(); //Заголовки + private List m_lVal = new ArrayList(); //Значения + public ArrayAdapter dataAdapter = null; + private Context m_context = null; + + private List m_lChange = new ArrayList(); //Слушатели изменений + + /*private AdapterView.OnItemSelectedListener listener = new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView parentView, View selectedItemView, int position, long id) { + if (getSelectedItemPosition() != INVALID_POSITION && position != INVALID_POSITION) + AutoCompleteTextViewDB.this.setValue(m_lVal.get(getSelectedItemPosition())); + } + + @Override + public void onNothingSelected(AdapterView parentView) { + } + };*/ + + private AdapterView.OnItemClickListener listener = new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + int pos=getSelectedItemPosition(); + String val=m_lVal.get(pos); + AutoCompleteTextViewDB.this.setValue(val); + } + }; + + int getSelectedItemPosition() { + String str = this.getText().toString(); + int pos=INVALID_POSITION; + for(int i=0; i(m_context, R.layout.dropdown_item, m_lName); + dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + this.setAdapter(dataAdapter); + //setOnItemSelectedListener(listener); + setOnItemClickListener(listener); + + updatePosition(); //Чтоб установилось на существующее значение если оно есть + } + + public void clearFields() + { + m_lName.clear(); + m_lVal.clear(); + + //Обновляем список + //setOnItemSelectedListener(null); + setOnItemClickListener(null); + dataAdapter = new ArrayAdapter(m_context, R.layout.dropdown_item, m_lName); + dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + this.setAdapter(dataAdapter); + //setOnItemSelectedListener(listener); + setOnItemClickListener(listener); + } + + public void updateAdapter(Context context){ + //Обновляем список + setOnItemClickListener(null); + dataAdapter = new ArrayAdapter(context, R.layout.dropdown_item, m_lName); + dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + this.setAdapter(dataAdapter); + setOnItemClickListener(listener); + } + + + /** + * Обновить позицию вып списка в соответствии со значением + */ + public void updatePosition() + { + Boolean b=true; + for(int i=0;i CREATOR = new Parcelable.Creator() + { + public SavedState createFromParcel(Parcel in) + { + return new SavedState(in); + } + + public SavedState[] newArray(int size) + { + return new SavedState[size]; + } + }; + + private SavedState(Parcel in) + { + super(in); + value = in.readString(); + } + + } + + @Override + public Parcelable onSaveInstanceState() + { + SavedState st = new SavedState(super.onSaveInstanceState()); + st.value = getValue(); + if(st.value==null) st.value=""; + return st; + } + + @Override + public void onRestoreInstanceState(Parcelable state) + { + if (state == null || !(state instanceof SavedState)) + { + super.onRestoreInstanceState(state); + return; + } + + SavedState ss = (SavedState) state; + super.onRestoreInstanceState(ss.getSuperState()); + setValue(ss.value); + }; +*/ +} diff --git a/app/src/main/java/dbfields/DateInput.java b/app/src/main/java/dbfields/DateInput.java new file mode 100644 index 0000000..b98fbf9 --- /dev/null +++ b/app/src/main/java/dbfields/DateInput.java @@ -0,0 +1,246 @@ +package dbfields; + +import android.content.Context; +import android.os.Parcel; +import android.os.Parcelable; +import android.text.InputFilter; +import android.text.InputType; +import android.util.AttributeSet; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.LinearLayout; +import android.widget.TextView; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import kz.istt.locust.R; + +public class DateInput extends LinearLayout +{ + private EditText etD = null; + private TextView tv1 = null; //Разделитель дня и месяца + private EditText etM = null; + private EditText etY = null; + + //Задаёт видимость полей + public void setVisibleDMY(String val) + { + if(val.toLowerCase().indexOf("d")==-1) + { + etD.setVisibility(INVISIBLE); + if(etD.getParent()!=null) ((ViewGroup) etD.getParent()).removeView(etD); + if(tv1.getParent()!=null) ((ViewGroup) tv1.getParent()).removeView(tv1); + } else + { + etD.setVisibility(VISIBLE); + if(etD.getParent()==null) addView(etD); + if(tv1.getParent()==null) addView(tv1); + } + + if(val.toLowerCase().indexOf("m")==-1) + { + etM.setVisibility(INVISIBLE); + if(etM.getParent()!=null) + ((ViewGroup) etM.getParent()).removeView(etM); + if(tv1.getParent()!=null) + ((ViewGroup) tv1.getParent()).removeView(tv1); + } else + { + etM.setVisibility(VISIBLE); + if(etM.getParent()==null) addView(etM); + if(tv1.getParent()==null) addView(tv1); + } + } + + public DateInput(Context context, AttributeSet attr) + { + super(context, attr); + + int maxLength = 10; + InputFilter[] fArray = new InputFilter[1]; + fArray[0] = new InputFilter.LengthFilter(maxLength); + + LinearLayout.LayoutParams paramMessage = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + paramMessage.weight = (float) 1.0; + + etD = new EditText(context); + etD.setHint(context.getResources().getString(R.string.Day)); + etD.setInputType(InputType.TYPE_CLASS_NUMBER); + etD.setFilters(new InputFilter[] { new InputFilter.LengthFilter(2) }); // Почему-то не работает… + etD.setMaxEms(10); + etD.setFilters(fArray); + addView(etD, paramMessage); + + tv1 = new TextView(context); + tv1.setText("."); + addView(tv1); + + etM = new EditText(context); + etM.setHint(context.getResources().getString(R.string.Month)); + etM.setInputType(InputType.TYPE_CLASS_NUMBER); + etM.setFilters(new InputFilter[] { new InputFilter.LengthFilter(2) }); // Почему-то не работает… + etM.setMaxEms(10); + etM.setFilters(fArray); + addView(etM, paramMessage); + + TextView tv = new TextView(context); + tv.setText("."); + addView(tv); + + etY = new EditText(context); + etY.setHint(context.getResources().getString(R.string.Year)); + etY.setInputType(InputType.TYPE_CLASS_NUMBER); + etY.setFilters(new InputFilter[] { new InputFilter.LengthFilter(4) }); // Почему-то не работает… + etY.setMaxEms(10); + etY.setMinWidth(80); + etY.setFilters(fArray); + addView(etY, paramMessage); + } + + /** + * Секунд с начала 1970 года + */ + public void setDate(Long date) + { + if (date == null) + setDate((Date) null); + else + setDate(new Date(date * 1000L)); + } + + public void setDate(Date date) + { + if (date == null) + { + etD.setText(""); + etM.setText(""); + etY.setText(""); + } else + { + etD.setText(new SimpleDateFormat("dd").format(date)); + etM.setText(new SimpleDateFormat("MM").format(date)); + etY.setText(new SimpleDateFormat("yyyy").format(date)); + } + } + + /** + * Получить секунд с начала 1970 года по гринвичу + * + * @return + */ + public Long getDate() + { + Date d = null; + SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy"); + try + { + String day = etD.getText().toString(); + if(day.equals("") && etD.getVisibility() == INVISIBLE) day="01"; //Если не виден и не задан день то 1е число + if(!day.equals("")) + { + if(Integer.valueOf(day)<0 || Integer.valueOf(day)>31) return null; + } + String month = etM.getText().toString(); + if(month.equals("") && etM.getVisibility() == INVISIBLE) month="01"; //Если не виден и не задан день то 1е число + if(!month.equals("")) + { + if(Integer.valueOf(month)<0 || Integer.valueOf(month)>12) return null; + } + String year = etY.getText().toString(); + if(year.equals("") && etY.getVisibility() == INVISIBLE) year="1970"; + if(!year.equals("")) + { + if(Integer.valueOf(year)<1970 || Integer.valueOf(year)>2999) return null; + } + d = sdf.parse(day + "/" + month + "/" + year); + } catch (ParseException e) + { + return null; + } + return d.getTime() / 1000L; + } + + @Override + public String toString() + { + return String.valueOf(getDate()); + } + + @Override + public boolean isSaveEnabled() + { + return true; + } + + // Класс для сохранения изменений сделаных пользователем при повороте экрана + public static class SavedStateDI extends BaseSavedState + { + //Не может быть null почемуто вылетает! + String day = ""; + String month = ""; + String year = ""; + + SavedStateDI(Parcelable superState) + { + super(superState); + } + + @Override + public void writeToParcel(Parcel out, int flags) + { + super.writeToParcel(out, flags); + out.writeString(day); + out.writeString(month); + out.writeString(year); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() + { + public SavedStateDI createFromParcel(Parcel in) + { + return new SavedStateDI(in); + } + + public SavedStateDI[] newArray(int size) + { + return new SavedStateDI[size]; + } + }; + + private SavedStateDI(Parcel in) + { + super(in); + day = in.readString(); + month = in.readString(); + year = in.readString(); + } + } + + @Override + protected Parcelable onSaveInstanceState() + { + SavedStateDI st = new SavedStateDI(super.onSaveInstanceState()); + st.day = etD.getText().toString(); + st.month = etM.getText().toString(); + st.year = etY.getText().toString(); + return st; + } + + @Override + protected void onRestoreInstanceState(Parcelable state) + { + if (state == null || !(state instanceof SavedStateDI)) + { + super.onRestoreInstanceState(state); + return; + } + SavedStateDI ss = (SavedStateDI) state; + super.onRestoreInstanceState(ss.getSuperState()); + etD.setText(ss.day); + etM.setText(ss.month); + etY.setText(ss.year); + }; + +} diff --git a/app/src/main/java/dbfields/DateTimeTM.java b/app/src/main/java/dbfields/DateTimeTM.java new file mode 100644 index 0000000..25268e8 --- /dev/null +++ b/app/src/main/java/dbfields/DateTimeTM.java @@ -0,0 +1,109 @@ +package dbfields; + +import android.content.Context; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.AttributeSet; +import android.widget.EditText; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class DateTimeTM extends com.google.android.material.textfield.TextInputEditText implements fieldDB +{ + private String m_Value = null; + + public DateTimeTM(Context context) + { + super(context); + } + public DateTimeTM(Context context, AttributeSet attrs) + { + super(context,attrs); + } + + public String getValue(){ + return m_Value; + } + + //Передаётся в секундах с 1970 года по гринвичу но отображается в локальном времени 1579154400 отображается 16.01.2020 12:00 (в Алмате) + public void setValue(String val) + { + m_Value = val; + if(val!=null && !val.equals("")) + { + Date date = new Date(Long.parseLong(m_Value)*1000); + + SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm"); + //format.setTimeZone(TimeZone.getTimeZone("UTC")); + + String str = format.format(date); + setText(str); + }else + { + setText(""); + } + } + + // Класс для сохранения изменений сделаных пользователем при повороте экрана + public static class SavedStateTDTM extends BaseSavedState + { + String value = ""; //Не может быть null почемуто вылетает! + + SavedStateTDTM(Parcelable superState) + { + super(superState); + } + + @Override + public void writeToParcel(Parcel out, int flags) + { + super.writeToParcel(out, flags); + out.writeString(value); + } + + public static final Creator CREATOR = new Creator() + { + public SavedStateTDTM createFromParcel(Parcel in) + { + return new SavedStateTDTM(in); + } + + public SavedStateTDTM[] newArray(int size) + { + return new SavedStateTDTM[size]; + } + }; + + private SavedStateTDTM(Parcel in) + { + super(in); + value = in.readString(); + } + + } + + @Override + public Parcelable onSaveInstanceState() + { + SavedStateTDTM st = new SavedStateTDTM(super.onSaveInstanceState()); + st.value = getValue(); + if(st.value==null) st.value=""; + return st; + } + + @Override + public void onRestoreInstanceState(Parcelable state) + { + if (state == null || !(state instanceof SavedStateTDTM)) + { + super.onRestoreInstanceState(state); + return; + } + + SavedStateTDTM ss = (SavedStateTDTM) state; + super.onRestoreInstanceState(ss.getSuperState()); + setValue(ss.value); + }; + +} diff --git a/app/src/main/java/dbfields/DateTimeText.java b/app/src/main/java/dbfields/DateTimeText.java new file mode 100644 index 0000000..d457943 --- /dev/null +++ b/app/src/main/java/dbfields/DateTimeText.java @@ -0,0 +1,110 @@ +package dbfields; + +import android.content.Context; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.AttributeSet; +import android.widget.EditText; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class DateTimeText extends EditText implements fieldDB +{ + private String m_Value = null; + + public DateTimeText(Context context) + { + super(context); + } + public DateTimeText(Context context, AttributeSet attrs) + { + super(context,attrs); + } + + public String getValue(){ + return m_Value; + } + + //Передаётся в секундах с 1970 года по гринвичу но отображается в локальном времени 1579154400 отображается 16.01.2020 12:00 (в Алмате) + public void setValue(String val) + { + m_Value = val; + if(val!=null && !val.equals("")) + { + Date date = new Date(Long.parseLong(m_Value)*1000); + + SimpleDateFormat format = new SimpleDateFormat("dd.MM.yyyy HH:mm"); + //format.setTimeZone(TimeZone.getTimeZone("UTC")); + + String str = format.format(date); + setText(str); + }else + { + setText(""); + } + } + + + // Класс для сохранения изменений сделаных пользователем при повороте экрана + public static class SavedStateDTT extends BaseSavedState + { + String value = ""; //Не может быть null почемуто вылетает! + + SavedStateDTT(Parcelable superState) + { + super(superState); + } + + @Override + public void writeToParcel(Parcel out, int flags) + { + super.writeToParcel(out, flags); + out.writeString(value); + } + + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() + { + public SavedStateDTT createFromParcel(Parcel in) + { + return new SavedStateDTT(in); + } + + public SavedStateDTT[] newArray(int size) + { + return new SavedStateDTT[size]; + } + }; + + private SavedStateDTT(Parcel in) + { + super(in); + value = in.readString(); + } + + } + + @Override + public Parcelable onSaveInstanceState() + { + SavedStateDTT st = new SavedStateDTT(super.onSaveInstanceState()); + st.value = getValue(); + if(st.value==null) st.value=""; + return st; + } + + @Override + public void onRestoreInstanceState(Parcelable state) + { + if (state == null || !(state instanceof SavedStateDTT)) + { + super.onRestoreInstanceState(state); + return; + } + + SavedStateDTT ss = (SavedStateDTT) state; + super.onRestoreInstanceState(ss.getSuperState()); + setValue(ss.value); + }; + +} diff --git a/app/src/main/java/dbfields/InputFilterMinMax.java b/app/src/main/java/dbfields/InputFilterMinMax.java new file mode 100644 index 0000000..8d1dc63 --- /dev/null +++ b/app/src/main/java/dbfields/InputFilterMinMax.java @@ -0,0 +1,33 @@ +package dbfields; + +import android.text.InputFilter; +import android.text.Spanned; + +public class InputFilterMinMax implements InputFilter { + + private int min, max; + + public InputFilterMinMax(int min, int max) { + this.min = min; + this.max = max; + } + + public InputFilterMinMax(String min, String max) { + this.min = Integer.parseInt(min); + this.max = Integer.parseInt(max); + } + + @Override + public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) { + try { + int input = Integer.parseInt(dest.toString() + source.toString()); + if (isInRange(min, max, input)) + return null; + } catch (NumberFormatException nfe) { } + return ""; + } + + private boolean isInRange(int a, int b, int c) { + return b > a ? c >= a && c <= b : c >= b && c <= a; + } +} \ No newline at end of file diff --git a/app/src/main/java/dbfields/SpinnerDB.java b/app/src/main/java/dbfields/SpinnerDB.java new file mode 100644 index 0000000..62ee0c0 --- /dev/null +++ b/app/src/main/java/dbfields/SpinnerDB.java @@ -0,0 +1,213 @@ +package dbfields; + +import android.content.Context; +import android.os.Parcel; +import android.os.Parcelable; +import android.text.Editable; +import android.text.SpannableString; +import android.text.SpannableStringBuilder; +import android.util.AttributeSet; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.Spinner; + +import java.util.ArrayList; +import java.util.List; + +public class SpinnerDB extends Spinner implements selectDB +{ + private String m_Value = null; + private List m_lName = new ArrayList(); //Заголовки + private List m_lVal = new ArrayList(); //Значения + private Context m_context = null; + + private List m_lChange = new ArrayList(); //Слушатели изменений + + private OnItemSelectedListener listener = new OnItemSelectedListener() + { + @Override + public void onItemSelected(AdapterView parentView, View selectedItemView, int position, long id) + { + if(getSelectedItemPosition()!=INVALID_POSITION && position != INVALID_POSITION) + SpinnerDB.this.setValue(m_lVal.get(getSelectedItemPosition())); + } + @Override + public void onNothingSelected(AdapterView parentView) + { + } + }; + + /** + * Добавить слушателя смены значения (не клика) + * @param listener + */ + public void addOnChangeValueListener(OnClickListener listener) + { + m_lChange.add(listener); + } + + /** + * Удалить слушателя смены значений + * @param listener + */ + public void remOnChangeValueListener(OnClickListener listener) + { + m_lChange.remove(listener); + } + + public SpinnerDB(Context context, AttributeSet attrs) + { + super(context,attrs); + m_context = context; + setOnItemSelectedListener(listener); + } + + /** + * Получить значение + */ + public String getValue() + { + return m_Value; + } + + /** Присвоить значение полю и попытаться найти его в выподающем списке*/ + public void setValue(String value) + { + if(m_Value == value) return; + m_Value = value; + + updatePosition(); + + //Информируем слушателей о изменении значении + for(int i=0;i dataAdapter = new ArrayAdapter(m_context, android.R.layout.simple_spinner_item, m_lName); + dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + this.setAdapter(dataAdapter); + setOnItemSelectedListener(listener); + + updatePosition(); //Чтоб установилось на существующее значение если оно есть + } + + public void clearFields() + { + m_lName.clear(); + m_lVal.clear(); + + //Обновляем список + setOnItemSelectedListener(null); + ArrayAdapter dataAdapter = new ArrayAdapter(m_context, android.R.layout.simple_spinner_item, m_lName); + dataAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); + this.setAdapter(dataAdapter); + setOnItemSelectedListener(listener); + } + + /** + * Обновить позицию вып списка в соответствии со значением + */ + protected void updatePosition() + { + Boolean b=true; + for(int i=0;i CREATOR = new Parcelable.Creator() + { + public SavedStateSPNR createFromParcel(Parcel in) + { + return new SavedStateSPNR(in); + } + + public SavedStateSPNR[] newArray(int size) + { + return new SavedStateSPNR[size]; + } + }; + + private SavedStateSPNR(Parcel in) + { + super(in); + value = in.readString(); + } + + } + + @Override + public Parcelable onSaveInstanceState() + { + SavedStateSPNR st = new SavedStateSPNR(super.onSaveInstanceState()); + st.value = getValue(); + if(st.value==null) st.value=""; + return st; + } + + @Override + public void onRestoreInstanceState(Parcelable state) + { + if (state == null || !(state instanceof SavedStateSPNR)) + { + super.onRestoreInstanceState(state); + return; + } + + SavedStateSPNR ss = (SavedStateSPNR) state; + super.onRestoreInstanceState(ss.getSuperState()); + setValue(ss.value); + }; + +} diff --git a/app/src/main/java/dbfields/StringDB.java b/app/src/main/java/dbfields/StringDB.java new file mode 100644 index 0000000..f4edee4 --- /dev/null +++ b/app/src/main/java/dbfields/StringDB.java @@ -0,0 +1,27 @@ +package dbfields; + +public class StringDB implements fieldDB +{ + + private String value; + + public StringDB(String val) + { + value = val; + } + + public StringDB(){} + + @Override + public String getValue() + { + return value; + } + + @Override + public void setValue(String val) + { + value=val; + } + +} diff --git a/app/src/main/java/dbfields/TextViewHTML.java b/app/src/main/java/dbfields/TextViewHTML.java new file mode 100644 index 0000000..cbb0e9d --- /dev/null +++ b/app/src/main/java/dbfields/TextViewHTML.java @@ -0,0 +1,33 @@ +package dbfields; + +import android.content.Context; +import android.text.Html; +import android.util.AttributeSet; +import android.widget.TextView; + +public class TextViewHTML extends TextView +{ + public TextViewHTML(Context context, AttributeSet attrs, int defStyleAttr) + { + super(context, attrs, defStyleAttr); + init(); + } + + public TextViewHTML(Context context) + { + super(context); + init(); + } + + public TextViewHTML(Context context, AttributeSet attrs) + { + super(context, attrs); + init(); + } + + private void init() + { + setText(Html.fromHtml(getText().toString())); + } + +} diff --git a/app/src/main/java/dbfields/TimeInput.java b/app/src/main/java/dbfields/TimeInput.java new file mode 100644 index 0000000..0abdb50 --- /dev/null +++ b/app/src/main/java/dbfields/TimeInput.java @@ -0,0 +1,151 @@ +package dbfields; + +import android.content.Context; +import android.text.InputFilter; +import android.text.InputType; +import android.util.AttributeSet; +import android.view.ViewGroup; +import android.widget.EditText; +import android.widget.LinearLayout; +import android.widget.TextView; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; + +import kz.istt.locust.R; + +public class TimeInput extends LinearLayout { + + private EditText etH = null; + private TextView tv1 = null; + private EditText etM = null; + //private EditText etS = null; //Закоментил потому что секунды ненужны + + //Задаёт видимость полей + public void setVisibleHMS(String val) + { + if(val.toLowerCase().indexOf("h")==-1) + { + if(etH.getParent()!=null) + ((ViewGroup) etH.getParent()).removeView(etH); + if(tv1.getParent()!=null) + ((ViewGroup) tv1.getParent()).removeView(tv1); + } else + { + if(etH.getParent()==null) addView(etH); + if(tv1.getParent()==null) addView(tv1); + } + + if(val.toLowerCase().indexOf("m")==-1) + { + if(etM.getParent()!=null) + ((ViewGroup) etM.getParent()).removeView(etM); + if(tv1.getParent()!=null) + ((ViewGroup) tv1.getParent()).removeView(tv1); + } else + { + if(etM.getParent()==null) addView(etM); + if(tv1.getParent()==null) addView(tv1); + } + } + + public TimeInput(Context context, AttributeSet attr) { + super(context, attr); + + int maxLength = 10; + InputFilter[] fArray = new InputFilter[1]; + fArray[0] = new InputFilter.LengthFilter(maxLength); + + LinearLayout.LayoutParams paramMessage = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + paramMessage.weight = (float) 1.0; + + etH = new EditText(context); + + etH.setHint(context.getResources().getString(R.string.Hours)); + etH.setInputType(InputType.TYPE_CLASS_NUMBER); + etH.setFilters(new InputFilter[] {new InputFilter.LengthFilter(4)}); //Почему-то не работает… + etH.setMaxEms(10); + etH.setFilters(fArray); + addView(etH,paramMessage); + + tv1 = new TextView(context); + tv1.setText(":"); + addView(tv1); + + etM = new EditText(context); + etM.setHint(context.getResources().getString(R.string.Minutes)); + etM.setInputType(InputType.TYPE_CLASS_NUMBER); + etM.setFilters(new InputFilter[] {new InputFilter.LengthFilter(4)}); //Почему-то не работает… + etM.setMaxEms(10); + etM.setFilters(fArray); + addView(etM/*,paramMessage*/); +/* + tv = new TextView(context); + tv.setText(":"); + addView(tv); + + etS = new EditText(context); + etS.setHint(context.getResources().getString(R.string.Seconds)); + etS.setInputType(InputType.TYPE_CLASS_NUMBER); + etS.setFilters(new InputFilter[] {new InputFilter.LengthFilter(4)}); //Почему-то не работает… + etS.setMaxEms(10); + etS.setFilters(fArray); + addView(etS,paramMessage); +*/ + } + + + + /** + * Секунд с начала дня + */ + public void setTime(Long time) + { + if(time == null) setTime((Date)null); + else setTime(new Date(time * 1000L)); + } + + public void setTime(Date time) + { + if(time == null) + { + etH.setText(""); + etM.setText(""); + //etS.setText(""); + }else + { + etH.setText(new SimpleDateFormat("HH").format(time)); + etM.setText(new SimpleDateFormat("mm").format(time)); + //etS.setText(new SimpleDateFormat("ss").format(time)); + } + } + + /** + * Получить секунд с начала дня по гринвичу с учётом временой зоны + * @return + */ + public Long getTime() + { + Date d=null; + SimpleDateFormat sdf = new SimpleDateFormat("HH:mm:ss"); + sdf.setTimeZone(TimeZone.getDefault()); + try + { + //d = sdf.parse(etH.getText().toString()+":"+etM.getText().toString()+":"+etS.getText().toString()); + String h = etH.getText().toString(); + if(h=="") h="00"; + + String m = etM.getText().toString(); + if(m=="") m="00"; + //String s = etS.getText().toString(); + //if(s=="") s="00"; + + d = sdf.parse(h+":"+m+":00"); + } catch (ParseException e) { + return null; + } + return d.getTime() / 1000L; + } +} diff --git a/app/src/main/java/dbfields/fieldDB.java b/app/src/main/java/dbfields/fieldDB.java new file mode 100644 index 0000000..0d97d59 --- /dev/null +++ b/app/src/main/java/dbfields/fieldDB.java @@ -0,0 +1,13 @@ +package dbfields; + + +import android.view.View; + +import kz.istt.locust.LocustActivity; + +public interface fieldDB +{ + public String getValue(); + public void setValue(String val); +} + diff --git a/app/src/main/java/dbfields/selectDB.java b/app/src/main/java/dbfields/selectDB.java new file mode 100644 index 0000000..da3ec71 --- /dev/null +++ b/app/src/main/java/dbfields/selectDB.java @@ -0,0 +1,13 @@ +package dbfields; + +import android.text.Editable; +import android.view.View; + +import dbfields.fieldDB; + +public interface selectDB extends fieldDB { + public void addField(String name, String val); + public void clearFields(); //Clear all fields from drop down list + public Editable getText(); + public void setOnChangeValueListener(View.OnClickListener listener); +} \ No newline at end of file diff --git a/app/src/main/java/kz/istt/locust/DBGUITable.java b/app/src/main/java/kz/istt/locust/DBGUITable.java new file mode 100644 index 0000000..bfce264 --- /dev/null +++ b/app/src/main/java/kz/istt/locust/DBGUITable.java @@ -0,0 +1,284 @@ +package kz.istt.locust; + +//import android.content.Context; + +import android.content.ContentValues; +import android.content.Context; +import android.database.Cursor; +import android.database.sqlite.SQLiteDatabase; +import android.util.Log; +import android.widget.CheckBox; +import android.widget.EditText; +import android.widget.Spinner; + +import com.google.android.material.textfield.TextInputEditText; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +import dbfields.DateInput; +import dbfields.DateTimeText; +import dbfields.DateTimeTM; +import dbfields.SpinnerDB; +import dbfields.AutoCompleteTextViewDB; +import dbfields.StringDB; + +/* + * Соответствие GUI полей и полей базы данных + * Для сохранения значений и для их загрузки из базы +*/ + +public class DBGUITable +{ + private Context m_context; + + //private DbOpenHelper m_dboh; + //Для списка полей + private List

		" + getString(R.string.CONTROL_LOCATION) + "	" + getString(R.string.VEGETATION_DATA) + "	" + getString(R.string.INSECTICIDE_DATA) + "	" + getString(R.string.WEATHER_CONDITIONS) + "	" + getString(R.string.LOCUST_INFORMATION_INCLUDING_EGG_PODS) + "	" + getString(R.string.SPRAY_APPLICATION) + "	" + getString(R.string.EFFECTIVENESS) + "	" + getString(R.string.SAFETY_AND_ENVIRONMENT) + "
№	" + getString(R.string.Country) + "	" + getString(R.string.Region) + "	" + getString(R.string.Area) + "	" + getString(R.string.Rural_district) + "	" + getString(R.string.Name_of_survey_team_leader) + "	" + getString(R.string.Date) + "	" + getString(R.string.Village) + "	" + getString(R.string.Lat) + "	" + getString(R.string.Lon) + "	" + getString(R.string.Area_infested) + "	" + getString(R.string.Area_treated) + "	" + getString(R.string.Vegetation_type) + "	" + getString(R.string.Height_cm) + "	" + getString(R.string.Vegetation_crops) + "	" + getString(R.string.Vegetation_cover) + "	" + getString(R.string.Damage) + "	" + getString(R.string.Veg_damage_area) + "	" + getString(R.string.Trade_name) + "	" + getString(R.string.The_active_substance) + "	" + getString(R.string.Concentration) + "	" + getString(R.string.Formulation) + "	" + getString(R.string.Dose_rate) + "	" + getString(R.string.Rate_of_working_solution) + "	" + getString(R.string.Expiry_date) + "	" + getString(R.string.Is_insecticide_mixed_with_water_or_solvent) + "	" + getString(R.string.If_yes_what_solvent_and_mixing_name) + "	" + getString(R.string.If_yes_what_solvent_and_mixing_ratio) + "	" + getString(R.string.Time_start) + "	" + getString(R.string.Time_end) + "	" + getString(R.string.Temperature_start) + "	" + getString(R.string.Temperature_end) + "	" + getString(R.string.Relative_humidity_start) + "	" + getString(R.string.Relative_humidity_end) + "	" + getString(R.string.Wind_speed_start) + "	" + getString(R.string.Wind_speed_end) + "	" + getString(R.string.Wind_direction_start) + "	" + getString(R.string.Wind_direction_end) + "	" + getString(R.string.Spray_direction_start) + "	" + getString(R.string.Spray_direction_end) + "	" + getString(R.string.Species) + "	" + getString(R.string.Hoppers) + "	" + getString(R.string.Density) + "	" + getString(R.string.Kuliguli) + "	" + getString(R.string.Swarm) + "	" + getString(R.string.Del_Scattered) + "	" + getString(R.string.Phase) + "	" + getString(R.string.Spray_platform) + "	" + getString(R.string.Spray_platform_a) + "	" + getString(R.string.Spray_platform_g) + "	" + getString(R.string.Spray_platform_h) + "	" + getString(R.string.Spray_operator) + "	" + getString(R.string.Name_of_operator) + "	" + getString(R.string.Spray_manufacturer) + "	" + getString(R.string.Model_sprayer) + "	" + getString(R.string.Date_of_last_calibration) + "	" + getString(R.string.Atomizer_height_above_ground_m) + "	" + getString(R.string.Coverage_width) + "	" + getString(R.string.Spacing_between_the_sprayer) + "	" + getString(R.string.Barriers) + "	" + getString(R.string.Barrier_width) + "	" + getString(R.string.Spacing_of_barriers_m) + "	" + getString(R.string.Speed) + "	" + getString(R.string.Antenna_DGPS_used) + "	" + getString(R.string.Ground_marking) + "	" + getString(R.string.Biological_efficiency_of_treatment) + "	" + getString(R.string.Time_after_treatment_hours) + "	" + getString(R.string.Efficacy_mortality_method) + "	" + getString(R.string.Protective_clothing) + "	" + getString(R.string.Inform_abaut_spraying) + "	" + getString(R.string.Safety_non_target) + "	" + getString(R.string.Safety_non_target_effect) + "	" + getString(R.string.Comments) + "
" + n + "	" + Tools.getStringFromCursor(cursor, "country_name") + "	" + Tools.getStringFromCursor(cursor, "region_name") + "	" + Tools.getStringFromCursor(cursor, "area") + "	" + Tools.getStringFromCursor(cursor, "district") + "	" + Tools.getStringFromCursor(cursor, "observer") + "	" + Tools.getStringFromCursor(cursor, "date") + "	" + Tools.getStringFromCursor(cursor, "terrain") + "	" + Tools.getStringFromCursor(cursor, "lat") + "	" + Tools.getStringFromCursor(cursor, "lon") + "	" + Tools.getStringFromCursor(cursor, "infested_area") + "	" + Tools.getStringFromCursor(cursor, "treated_area") + "	" + Tools.getStringFromCursor(cursor, "vegetation_type") + "	" + Tools.getStringFromCursor(cursor, "vegetation_height") + "	" + Tools.getStringFromCursor(cursor, "vegetation_crop") + "	" + Tools.getStringFromCursor(cursor, "vegetation_cover") + "	" + Tools.getStringFromCursor(cursor, "vegetation_damage") + "	" + Tools.getStringFromCursor(cursor, "vegetation_damage_area") + "	" + Tools.getStringFromCursor(cursor, "insecticide_name") + "	" + Tools.getStringFromCursor(cursor, "insecticide_active_substance") + "	" + Tools.getStringFromCursor(cursor, "insecticide_concentration") + "	" + Tools.getStringFromCursor(cursor, "insecticide_formulation") + "	" + Tools.getStringFromCursor(cursor, "insecticide_dose") + "	" + Tools.getStringFromCursor(cursor, "insecticide_rate") + "	" + Tools.getStringFromCursor(cursor, "insecticide_expiry_date") + "	" + Tools.getStringFromCursor(cursor, "insecticide_mixed") + "	" + Tools.getStringFromCursor(cursor, "insecticide_mixed_name") + "	" + Tools.getStringFromCursor(cursor, "insecticide_mixed_ratio") + "	" + Tools.getStringFromCursor(cursor, "weather_time_start") + "	" + Tools.getStringFromCursor(cursor, "weather_time_end") + "	" + Tools.getStringFromCursor(cursor, "weather_temperature_start") + "	" + Tools.getStringFromCursor(cursor, "weather_temperature_end") + "	" + Tools.getStringFromCursor(cursor, "weather_humidity_start") + "	" + Tools.getStringFromCursor(cursor, "weather_humidity_end") + "	" + Tools.getStringFromCursor(cursor, "weather_wind_speed_start") + "	" + Tools.getStringFromCursor(cursor, "weather_wind_speed_end") + "	" + Tools.getStringFromCursor(cursor, "weather_direction_start") + "	" + Tools.getStringFromCursor(cursor, "weather_direction_end") + "	" + Tools.getStringFromCursor(cursor, "weather_spray_direction_start") + "	" + Tools.getStringFromCursor(cursor, "weather_spray_direction_end") + "	" + Tools.getStringFromCursor(cursor, "locust_speciese") + "	" + Tools.getStringFromCursor(cursor, "locust_hoppers") + "	" + Tools.getStringFromCursor(cursor, "locust_density") + "	" + Tools.getStringFromCursor(cursor, "locust_kuliguli") + "	" + Tools.getStringFromCursor(cursor, "locust_swarm") + "	" + Tools.getStringFromCursor(cursor, "locust_sparse") + "	" + Tools.getStringFromCursor(cursor, "locust_phase_name") + "	" + Tools.getStringFromCursor(cursor, "spray_platform") + "	" + Tools.getStringFromCursor(cursor, "spray_platform_a") + "	" + Tools.getStringFromCursor(cursor, "spray_platform_g") + "	" + Tools.getStringFromCursor(cursor, "spray_platform_h") + "	" + Tools.getStringFromCursor(cursor, "spray_operatortype_name") + "	" + Tools.getStringFromCursor(cursor, "spray_operator_name") + "	" + Tools.getStringFromCursor(cursor, "spray_manufacturer_name") + "	" + Tools.getStringFromCursor(cursor, "spray_model_name") + "	" + Tools.getStringFromCursor(cursor, "spray_date_calibration") + "	" + Tools.getStringFromCursor(cursor, "spray_height") + "	" + Tools.getStringFromCursor(cursor, "spray_width") + "	" + Tools.getStringFromCursor(cursor, "spray_spacing") + "	" + Tools.getStringFromCursor(cursor, "spray_barrier") + "	" + Tools.getStringFromCursor(cursor, "spray_barrier_width") + "	" + Tools.getStringFromCursor(cursor, "spray_barrier_space") + "	" + Tools.getStringFromCursor(cursor, "spray_speed") + "	" + Tools.getStringFromCursor(cursor, "spray_gps") + "	" + Tools.getStringFromCursor(cursor, "spray_marking") + "	" + Tools.getStringFromCursor(cursor, "efficacy_mortality") + "	" + Tools.getStringFromCursor(cursor, "efficacy_passed_time") + "	" + Tools.getStringFromCursor(cursor, "efficacy_mortality_method") + "	" + Tools.getStringFromCursor(cursor, "safety_clothing") + "	" + Tools.getStringFromCursor(cursor, "safety_inform") + "	"; + String dv=""; + if(Tools.getStringFromCursor(cursor, "safety_inform").indexOf("1") != -1) + { + html += dv + getString(R.string.Farmer); + dv = ", "; + } + if(Tools.getStringFromCursor(cursor, "safety_inform").indexOf("2") != -1) + { + html += dv + getString(R.string.Villager); + dv = ", "; + } + if(Tools.getStringFromCursor(cursor, "safety_inform").indexOf("3") != -1) + { + html += dv + getString(R.string.Official); + dv = ", "; + } + if(Tools.getStringFromCursor(cursor, "safety_inform").indexOf("4") != -1) + { + html += dv + getString(R.string.Beekeeper); + dv = ", "; + } + if(Tools.getStringFromCursor(cursor, "safety_inform").indexOf("5") != -1) + { + html += dv + getString(R.string.Other); + dv = ", "; + } + html += "	" + Tools.getStringFromCursor(cursor, "safety_non_target") + "	" + Tools.getStringFromCursor(cursor, "safety_non_target_effect") + "	" + Tools.getStringFromCursor(cursor, "description") + "

		" + getString(R.string.Identification_of_the_place) + "	" + getString(R.string.ECOLOGICAL_INFORMATION) + "	" + getString(R.string.LOCUST_INFORMATION_INCLUDING_EGG_PODS) + "	" + getString(R.string.Eggs) + "	" + getString(R.string.Hoppers) + "	" + getString(R.string.BANDS) + "	" + getString(R.string.Adults) + "	" + getString(R.string.Swarms) + "
№	" + getString(R.string.Country) + "	" + getString(R.string.Region) + "	" + getString(R.string.Area) + "	" + getString(R.string.Rural_district) + "	" + getString(R.string.Name_of_survey_team_leader) + "	" + getString(R.string.Date) + "	" + getString(R.string.Village) + "	" + getString(R.string.Lat) + "	" + getString(R.string.Lon) + "	" + getString(R.string.Surveyed_area_ha) + "	" + getString(R.string.Type_of_biotope) + "	" + getString(R.string.Vegetation) + "	" + getString(R.string.Vegetation_cover) + "	" + getString(R.string.Air_temperature) + "	" + getString(R.string.Wind) + "	" + getString(R.string.LOCUST_INFORMATION_INCLUDING_EGG_PODS) + "	" + getString(R.string.Locust_species) + "	" + getString(R.string.Area_infested) + "	" + getString(R.string.Egg_bed) + "	" + getString(R.string.Egg_pods)+ " .. "+ getString(R.string.to) + "	" + getString(R.string.Eggs_number) + "	" + getString(R.string.Eggs_viable) + "	" + getString(R.string.Natural_enemies) + "	" + getString(R.string.Hatching) + "	" + getString(R.string.Hopper_stages) + "	" + getString(R.string.Phase) + "	" + getString(R.string.Spatial_distribution) + "	" + getString(R.string.Hopper_density) + " .. " + getString(R.string.to) + "	" + getString(R.string.Band_stage) + "	" + getString(R.string.Band_density) + "	" + getString(R.string.Band_density_to) + "	" + getString(R.string.Band_sizes) + "	" + getString(R.string.Number_of_bands) + "	" + getString(R.string.Action) + "	" + getString(R.string.Fledging) + "	" + getString(R.string.Maturity) + "	" + getString(R.string.Phase) + "	" + getString(R.string.Spatial_distribution) + "	" + getString(R.string.Adult_density) + "	" + getString(R.string.Copulating) + "	" + getString(R.string.Laying) + "	" + getString(R.string.Flying) + "	" + getString(R.string.Swarm_maturity) + "	" + getString(R.string.Density_of_swarm) + "	" + getString(R.string.Swarm_size) + "	" + getString(R.string.Number_of_swarms) + "	" + getString(R.string.Copulating) + "	" + getString(R.string.Laying) + "	" + getString(R.string.Flying_direction) + "	" + getString(R.string.Flying_height) + "	" + getString(R.string.Comments) + "
" + n + "	" + Tools.getStringFromCursor(cursor, "country_name") + "	" + Tools.getStringFromCursor(cursor, "region_name") + "	" + Tools.getStringFromCursor(cursor, "area") + "	" + Tools.getStringFromCursor(cursor, "district") + "	" + Tools.getStringFromCursor(cursor, "observer") + "	" + Tools.getStringFromCursor(cursor, "date") + "	" + Tools.getStringFromCursor(cursor, "terrain") + "	" + Tools.getStringFromCursor(cursor, "lat1") + "	" + Tools.getStringFromCursor(cursor, "lon1") + "	" + Tools.getStringFromCursor(cursor, "bio_hectare") + "	" + Tools.getStringFromCursor(cursor, "bio_biotope_name") + "	" + Tools.getStringFromCursor(cursor, "bio_greenery") + "	" + Tools.getStringFromCursor(cursor, "bio_greenery_cover_name") + "	" + Tools.getStringFromCursor(cursor, "bio_temperature") + "	" + Tools.getStringFromCursor(cursor, "bio_wind") + "	" + Tools.getStringFromCursor(cursor, "locust_have") + "	" + Tools.getStringFromCursor(cursor, "locust_type_name") + "	" + Tools.getStringFromCursor(cursor, "locust_populated") + "	" + Tools.getStringFromCursor(cursor, "eggs_capsules_area") + "	" + Tools.getStringFromCursor(cursor, "eggs_capsules_density")+" .. "+Tools.getStringFromCursor(cursor, "eggs_capsules_density_to") + "	" + Tools.getStringFromCursor(cursor, "eggs_capsules") + "	" + Tools.getStringFromCursor(cursor, "eggs_live") + "	" + Tools.getStringFromCursor(cursor, "eggs_enemies") + "	" + Tools.getStringFromCursor(cursor, "larva_born_name") + "	" + Tools.getStringFromCursor(cursor, "larva_age") + "	" + Tools.getStringFromCursor(cursor, "larva_painting_name") + "	" + Tools.getStringFromCursor(cursor, "larva_behavior_name") + "	" + Tools.getStringFromCursor(cursor, "larva_density") + " .. " + Tools.getStringFromCursor(cursor, "larva_density_to") + "	" + Tools.getStringFromCursor(cursor, "kuliguli_age") + "	" + Tools.getStringFromCursor(cursor, "kuliguli_density") + "	" + Tools.getStringFromCursor(cursor, "kuliguli_density_to") + "	" + Tools.getStringFromCursor(cursor, "kuliguli_size") + "	" + Tools.getStringFromCursor(cursor, "kuliguli_count") + "	" + Tools.getStringFromCursor(cursor, "kuliguli_action_name") + "	" + Tools.getStringFromCursor(cursor, "imago_wing_name") + "	" + Tools.getStringFromCursor(cursor, "imago_maturity") + "	" + Tools.getStringFromCursor(cursor, "imago_phase") + "	" + Tools.getStringFromCursor(cursor, "imago_action") + "	" + Tools.getStringFromCursor(cursor, "imago_density") + "	" + Tools.getStringFromCursor(cursor, "imago_copulation") + "	" + Tools.getStringFromCursor(cursor, "imago_laying") + "	" + Tools.getStringFromCursor(cursor, "imago_flying") + "	" + Tools.getStringFromCursor(cursor, "swarm_maturity") + "	" + Tools.getStringFromCursor(cursor, "swarm_density_name") + "	" + Tools.getStringFromCursor(cursor, "swarm_size") + "	" + Tools.getStringFromCursor(cursor, "swarm_count") + "	" + Tools.getStringFromCursor(cursor, "swarm_copulation") + "	" + Tools.getStringFromCursor(cursor, "swarm_laying") + "	" + Tools.getStringFromCursor(cursor, "swarm_flying_direction_name") + "	" + Tools.getStringFromCursor(cursor, "swarm_height") + "	" + Tools.getStringFromCursor(cursor, "description") + "