From dd345a1b3114a45164cdb6b907746f170cbf182f Mon Sep 17 00:00:00 2001 From: chandrashekhar reddy Date: Mon, 15 Jul 2024 20:29:39 +0530 Subject: [PATCH] new 125 version, changes in HemoCubeFragment Ip address in home, led1Average at line 1004 change if condition, in home download csv for all. --- app/release/output-metadata.json | 19 +++++++++- .../presentation/dashboard/HomeFragment.kt | 35 +++++++++++++++---- .../dashboard/ui/LoginFragment.kt | 19 ++++++++-- app/src/main/res/layout/fragment_login.xml | 4 +-- 4 files changed, 64 insertions(+), 13 deletions(-) diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 634736d..bff4a34 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -16,5 +16,22 @@ "outputFile": "app-release.apk" } ], - "elementType": "File" + "elementType": "File", + "baselineProfiles": [ + { + "minApi": 28, + "maxApi": 30, + "baselineProfiles": [ + "baselineProfiles/1/app-release.dm" + ] + }, + { + "minApi": 31, + "maxApi": 2147483647, + "baselineProfiles": [ + "baselineProfiles/0/app-release.dm" + ] + } + ], + "minSdkVersionForDexing": 21 } \ No newline at end of file diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt index 2d087f9..a96bd26 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/HomeFragment.kt @@ -24,6 +24,8 @@ import android.content.DialogInterface import android.content.Intent import android.content.IntentFilter import android.content.SharedPreferences +import android.net.ConnectivityManager +import android.net.NetworkCapabilities import android.net.Uri import android.os.BatteryManager import android.os.Build @@ -259,12 +261,14 @@ class HomeFragment : Fragment() { } private fun getLocationIP() { - getPublicIpAddr { ipAddress -> - if(ipAddress != "fail"){ - DataHolder.ipAddress = ipAddress - with(sharedPreference.edit()) { - putString(Constants.IP_ADDRESS, ipAddress) - apply() + if(isInternetAvailable(requireContext())) { + getPublicIpAddr { ipAddress -> + if(ipAddress != "fail"){ + DataHolder.ipAddress = ipAddress + with(sharedPreference.edit()) { + putString(Constants.IP_ADDRESS, ipAddress) + apply() + } } } } @@ -1582,7 +1586,24 @@ class HomeFragment : Fragment() { return diffMillis / (60 * 1000) // Convert milliseconds to minutes } - + fun isInternetAvailable(context: Context): Boolean { + val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + val network = connectivityManager.activeNetwork ?: return false + val activeNetwork = connectivityManager.getNetworkCapabilities(network) ?: return false + return when { + activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) -> true + activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) -> true + activeNetwork.hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET) -> true + else -> false + } + } else { + @Suppress("DEPRECATION") + val networkInfo = connectivityManager.activeNetworkInfo ?: return false + @Suppress("DEPRECATION") + return networkInfo.isConnected + } + } } diff --git a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt index 914c1bb..53dccbe 100644 --- a/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt +++ b/app/src/main/java/com/example/hpostesting/presentation/dashboard/ui/LoginFragment.kt @@ -30,6 +30,7 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.widget.ArrayAdapter import android.widget.Toast import androidx.annotation.RequiresApi import androidx.fragment.app.Fragment @@ -75,21 +76,35 @@ class LoginFragment : Fragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) init() + if(isInternetAvailable()){ getPublicIpAddr { ipAddress -> DataHolder.ipAddress = ipAddress } Log.d("ipaddress",DataHolder.ipAddress) } - + setupAutoCompleteTextView() //checkLocation() } + override fun onResume() { + super.onResume() + setupAutoCompleteTextView() + } + private fun setupAutoCompleteTextView() { + val districts = resources.getStringArray(R.array.district) + val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_dropdown_item_1line, districts) + binding.etDistrict.setAdapter(adapter) + + // Only set the default text if it's empty to avoid resetting user selection + if (binding.etDistrict.text.isEmpty()) { + binding.etDistrict.setText("Other", false) + } + } private fun init() { if (isUserLoggedIn()) { navigateToHomeFragment() return } - binding.btnLogin.setOnClickListener { // Toast.makeText(requireContext(), "$latitude/$longitude",Toast.LENGTH_SHORT).show() val loginId = binding.loginId.text.toString().trim() diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml index b8d4c7c..756ab1a 100644 --- a/app/src/main/res/layout/fragment_login.xml +++ b/app/src/main/res/layout/fragment_login.xml @@ -130,9 +130,7 @@ android:layout_height="wrap_content" android:hint="@string/district" android:inputType="none" - android:text="Mysuru" - android:labelFor="@id/til_district" - app:simpleItems="@array/district" /> + />