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

Merge branch 'master' of https://git.dirt.kz/igor/ASDC

Browse Source
This commit is contained in:
igor
2025-02-09 09:51:20 +05:00
parent 7cba83664e 70d27c2e62
commit 9f9633c935
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -13,8 +13,8 @@ android {
defaultConfig {
applicationId "kz.istt.locust"
minSdkVersion 15
versionCode 101
versionName "3.0.0"
versionCode 102
versionName "3.0.1"
targetSdkVersion 34
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}

1
app/src/main/java/kz/istt/locust/LocustHealthListActivity.java
View File

@ -702,7 +702,6 @@ public class LocustHealthListActivity extends AppCompatActivity
btn = new MyButton(this);
}
btn.setOnClickListener(oclBtn);
btn.uid1 = cursor.getString(cursor.getColumnIndex("frmlocustdel_uid"));

25
app/src/main/java/kz/istt/locust/LocustListActivity.java
View File

@ -29,6 +29,7 @@ import androidx.appcompat.app.AppCompatActivity;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.io.File;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@ -57,7 +58,7 @@ public class LocustListActivity extends AppCompatActivity
}
};
public void alert(String text)
/*public void alert(String text)
{
AlertDialog.Builder adb = new AlertDialog.Builder(this,R.style.AlertDialogTheme);
adb.setTitle(getString(R.string.Warning));
@ -70,7 +71,7 @@ public class LocustListActivity extends AppCompatActivity
});
AlertDialog ad = adb.show();
ad.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(Color.BLACK);
}
}*/
@Override
protected void onCreate(Bundle savedInstanceState)
@ -623,9 +624,23 @@ public class LocustListActivity extends AppCompatActivity
btn.uid1 = cursor.getString(cursor.getColumnIndex("uid"));
long dv = cursor.getLong(cursor.getColumnIndex("date")) * (long) 1000; // its need to be in milisecond
Date df = new java.util.Date(dv);
String vv = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(df);
// Преобразует с учётом временой зоны (пример long dv = 946684800L * 1000L; //2000 ный по гринвичу дало 6 утра)
String vv = "";
String val = cursor.getString(cursor.getColumnIndex("date"));
try {
long dv = Long.parseLong(val) * (long) 1000;// its need to be in milisecond
Date df = new java.util.Date(dv);
vv = new SimpleDateFormat("dd.MM.yyyy").format(df);
} catch (NumberFormatException e) {
}
if(vv.isEmpty()) {
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date df = format.parse(val);
vv = new SimpleDateFormat("dd.MM.yyyy").format(df);
} catch (ParseException e) {
}
}
btn.setText(cursor.getString(cursor.getColumnIndex("terrain")) + " (" + vv + ")");