diff --git a/app/build.gradle b/app/build.gradle index df720e4e89..8949654103 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,7 +109,7 @@ android { defaultConfig { multiDexEnabled true versionCode 1500 - version "3.0.0.1-dev-b" + version "3.0.0.1-dev-c" buildConfigField "String", "VERSION", '"' + version + '"' buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"' buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"' diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js index 020cd1b85b..f7d952f141 100644 --- a/app/src/main/assets/OpenAPSSMB/determine-basal.js +++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js @@ -287,7 +287,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ } //console.log(" (autosens ratio "+sensitivityRatio+")"); } - console.error("; CR:",profile.carb_ratio); + console.error("CR:",profile.carb_ratio); // compare currenttemp to iob_data.lastTemp and cancel temp if they don't match var lastTempAge; @@ -298,7 +298,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ } //console.error("currenttemp:",currenttemp,"lastTemp:",JSON.stringify(iob_data.lastTemp),"lastTempAge:",lastTempAge,"m"); var tempModulus = (lastTempAge + currenttemp.duration) % 30; - console.error("currenttemp:",currenttemp,"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m"); + console.error("currenttemp:",round(currenttemp.rate,2),"lastTempAge:",lastTempAge,"m","tempModulus:",tempModulus,"m"); rT.temp = 'absolute'; rT.deliverAt = deliverAt; if ( microBolusAllowed && currenttemp && iob_data.lastTemp && currenttemp.rate !== iob_data.lastTemp.rate && lastTempAge > 10 && currenttemp.duration ) { diff --git a/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js b/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js index 13d66a859f..82ec399ec9 100644 --- a/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js +++ b/app/src/main/assets/OpenAPSSMBDynamicISF/determine-basal.js @@ -286,7 +286,7 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ } console.error(" "); console.error("++++++++++++++++++++++++++++++++++++++++++++++++++++++"); - console.error("++ Dynamic ISF Beta 1.3 - Based on rolling 24 hours ++"); + console.error("++ Dynamic ISF Beta 1.4 - Linear Extrapolation/TDD7 ++"); console.error("++++++++++++++++++++++++++++++++++++++++++++++++++++++"); console.error(" "); @@ -306,24 +306,28 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ var tdd_24 = (( basal * 24 ) * 2.8); } - var TDD = (tdd7 * 0.3) + (tdd_24 * 0.7); + if (meal_data.TDDPUMP){ + var tdd_pump = ( (meal_data.TDDPUMP / now ) * 24); + } + else { + var tdd_pump = (( basal * 24 ) * 2.8); + } + var TDD = (tdd7 * 0.4) + (tdd_pump * 0.6); - console.error("Rolling 24 hour TDD = "+tdd_24+"; "); - console.error(" "); - console.error("Weighted Average TDD = "+TDD+"; "); - console.error(" "); + console.error("Pump extrapolated TDD = "+tdd_pump+"; "); //if (tdd7 > 0){ - /*if ( tdd_pump > tdd7 && now < 5 || now < 7 && TDD < ( 0.8 * tdd7 ) ){ + if ( tdd_pump > tdd7 && now < 5 || now < 7 && TDD < ( 0.8 * tdd7 ) ){ TDD = ( 0.8 * tdd7 ); console.log("Excess or too low insulin from pump so TDD set to "+TDD+" based on 75% of TDD7; "); rT.reason += "TDD: " +TDD+ " due to low or high tdd from pump; "; } - else if (tdd_pump > (1.75 * tdd7)) { - TDD = tdd7; - console.error("TDD set to TDD7 due to high pump usage reported. TDD = "+TDD+"; "); - rT.reason += "TDD set to TDD7 due to high pump usage reported. TDD = "+TDD+"; "; - } + else if (tdd_pump > (1.75 * tdd7)){ + TDD = tdd7; + console.error("TDD set to TDD7 due to high pump usage reported. TDD = "+TDD+"; "); + rT.reason += "TDD set to TDD7 due to high pump usage reported. TDD = "+TDD+"; "; + } + else if (tdd_pump < (0.33 * tdd7)){ TDD = (tdd7 * 0.25) + (tdd_pump * 0.75); @@ -332,9 +336,11 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ } else { - console.log("TDD 7 ="+tdd7+", TDD Pump ="+tdd_pump+" and TDD = "+TDD+";"); + console.log("TDD = " +TDD+ " based on standard pump 60/tdd7 40 split; "); rT.reason += "TDD: " +TDD+ " based on standard pump 60/tdd7 40 split; "; - }*/ + } + + console.error(" "); var variable_sens = (277700 / (TDD * bg)); @@ -1247,4 +1253,4 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_ }; -module.exports = determine_basal; +module.exports = determine_basal; \ No newline at end of file diff --git a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt index 01e9459fda..f88ac370e7 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainActivity.kt @@ -56,8 +56,8 @@ import info.nightscout.androidaps.utils.tabs.TabPageAdapter import info.nightscout.androidaps.utils.ui.UIRunnable import info.nightscout.shared.logging.LTag import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.* import javax.inject.Inject import kotlin.system.exitProcess diff --git a/app/src/main/java/info/nightscout/androidaps/MainApp.kt b/app/src/main/java/info/nightscout/androidaps/MainApp.kt index dbebf4e635..781ab707c3 100644 --- a/app/src/main/java/info/nightscout/androidaps/MainApp.kt +++ b/app/src/main/java/info/nightscout/androidaps/MainApp.kt @@ -39,10 +39,10 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.locale.LocaleHelper import info.nightscout.androidaps.utils.protection.PasswordCheck import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.exceptions.UndeliverableException -import io.reactivex.plugins.RxJavaPlugins -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.exceptions.UndeliverableException +import io.reactivex.rxjava3.kotlin.plusAssign +import io.reactivex.rxjava3.plugins.RxJavaPlugins import net.danlew.android.joda.JodaTimeAndroid import java.io.IOException import java.net.SocketException diff --git a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt index 0b1625613c..3cf77eaf74 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/HistoryBrowseActivity.kt @@ -42,8 +42,8 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.LTag import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.* import javax.inject.Inject import kotlin.math.min diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt index 62435f5d19..8770925cb5 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt @@ -123,9 +123,11 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang override fun onDestroy() { super.onDestroy() - PreferenceManager - .getDefaultSharedPreferences(context) - .unregisterOnSharedPreferenceChangeListener(this) + context?.let { context -> + PreferenceManager + .getDefaultSharedPreferences(context) + .unregisterOnSharedPreferenceChangeListener(this) + } } private fun addPreferencesFromResourceIfEnabled(p: PluginBase?, rootKey: String?, enabled: Boolean) { @@ -139,9 +141,11 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - PreferenceManager - .getDefaultSharedPreferences(context) - .registerOnSharedPreferenceChangeListener(this) + context?.let { context -> + PreferenceManager + .getDefaultSharedPreferences(context) + .registerOnSharedPreferenceChangeListener(this) + } } override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { @@ -263,19 +267,19 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang @SuppressLint("RestrictedApi") private fun addPreferencesFromResource(@XmlRes preferencesResId: Int, key: String?) { - val xmlRoot = preferenceManager.inflateFromResource(context, - preferencesResId, null) - val root: Preference? - if (key != null) { - root = xmlRoot.findPreference(key) - if (root == null) return - require(root is PreferenceScreen) { - ("Preference object with key " + key - + " is not a PreferenceScreen") + context?.let { context -> + val xmlRoot = preferenceManager.inflateFromResource(context, preferencesResId, null) + val root: Preference? + if (key != null) { + root = xmlRoot.findPreference(key) + if (root == null) return + require(root is PreferenceScreen) { + ("Preference object with key $key is not a PreferenceScreen") + } + preferenceScreen = root + } else { + addPreferencesFromResource(preferencesResId) } - preferenceScreen = root - } else { - addPreferencesFromResource(preferencesResId) } } @@ -305,15 +309,9 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang p.initialExpandedChildrenCount = Int.MAX_VALUE } } else { - if (p.key != null) { - visible = visible || p.key.contains(filter, true) - } - if (p.title != null) { - visible = visible || p.title.contains(filter, true) - } - if (p.summary != null) { - visible = visible || p.summary.contains(filter, true) - } + visible = visible || p.key?.contains(filter, true) == true + visible = visible || p.title?.contains(filter, true) == true + visible = visible || p.summary?.contains(filter, true) == true } p.isVisible = visible @@ -393,32 +391,30 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang // We use Preference and custom editor instead of EditTextPreference // to hash password while it is saved and never have to show it, even hashed - override fun onPreferenceTreeClick(preference: Preference?): Boolean { + override fun onPreferenceTreeClick(preference: Preference): Boolean { context?.let { context -> - if (preference != null) { - if (preference.key == rh.gs(R.string.key_master_password)) { - passwordCheck.queryPassword(context, R.string.current_master_password, R.string.key_master_password, { - passwordCheck.setPassword(context, R.string.master_password, R.string.key_master_password) - }) - return true - } - if (preference.key == rh.gs(R.string.key_settings_password)) { - passwordCheck.setPassword(context, R.string.settings_password, R.string.key_settings_password) - return true - } - if (preference.key == rh.gs(R.string.key_bolus_password)) { - passwordCheck.setPassword(context, R.string.bolus_password, R.string.key_bolus_password) - return true - } - if (preference.key == rh.gs(R.string.key_application_password)) { - passwordCheck.setPassword(context, R.string.application_password, R.string.key_application_password) - return true - } - // NSClient copy settings - if (preference.key == rh.gs(R.string.key_statuslights_copy_ns)) { - nsSettingStatus.copyStatusLightsNsSettings(context) - return true - } + if (preference.key == rh.gs(R.string.key_master_password)) { + passwordCheck.queryPassword(context, R.string.current_master_password, R.string.key_master_password, { + passwordCheck.setPassword(context, R.string.master_password, R.string.key_master_password) + }) + return true + } + if (preference.key == rh.gs(R.string.key_settings_password)) { + passwordCheck.setPassword(context, R.string.settings_password, R.string.key_settings_password) + return true + } + if (preference.key == rh.gs(R.string.key_bolus_password)) { + passwordCheck.setPassword(context, R.string.bolus_password, R.string.key_bolus_password) + return true + } + if (preference.key == rh.gs(R.string.key_application_password)) { + passwordCheck.setPassword(context, R.string.application_password, R.string.key_application_password) + return true + } + // NSClient copy settings + if (preference.key == rh.gs(R.string.key_statuslights_copy_ns)) { + nsSettingStatus.copyStatusLightsNsSettings(context) + return true } } return super.onPreferenceTreeClick(preference) diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt index 1323b23113..1c569a78a6 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsBolusCarbsFragment.kt @@ -49,10 +49,10 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.Completable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign +import io.reactivex.rxjava3.kotlin.subscribeBy import java.util.concurrent.TimeUnit import javax.inject.Inject @@ -471,7 +471,7 @@ class TreatmentsBolusCarbsFragment : DaggerFragment() { if (selectedItems.size() > 0) activity?.let { activity -> OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord), getConfirmationText(), Runnable { - selectedItems.forEach {key, ml -> + selectedItems.forEach { _, ml -> ml.bolus?.let { bolus -> uel.log( Action.BOLUS_REMOVED, Sources.Treatments, diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt index d2069a504b..6e0bfcf4a7 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsCareportalFragment.kt @@ -37,10 +37,10 @@ import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.Completable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign +import io.reactivex.rxjava3.kotlin.subscribeBy import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt index 57e766dc54..e1d8d4b34d 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsExtendedBolusesFragment.kt @@ -37,9 +37,9 @@ import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import info.nightscout.shared.logging.LTag -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt index b6aaeebca0..08d4e20240 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsProfileSwitchFragment.kt @@ -42,10 +42,10 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.Completable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign +import io.reactivex.rxjava3.kotlin.subscribeBy import javax.inject.Inject class TreatmentsProfileSwitchFragment : DaggerFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt index 2144feb13e..777a61a932 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTempTargetFragment.kt @@ -45,10 +45,10 @@ import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHi import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.Completable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign +import io.reactivex.rxjava3.kotlin.subscribeBy import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt index babd7f64c4..d5538f3a41 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsTemporaryBasalsFragment.kt @@ -43,8 +43,8 @@ import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit import javax.inject.Inject import kotlin.math.abs diff --git a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt index 071054d79c..ac8c3b68e1 100644 --- a/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/activities/fragments/TreatmentsUserEntryFragment.kt @@ -27,8 +27,8 @@ import info.nightscout.androidaps.utils.userEntry.UserEntryPresentationHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt b/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt index d0ec64cbdc..fb1136bc3e 100644 --- a/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt +++ b/app/src/main/java/info/nightscout/androidaps/db/CompatDBHelper.kt @@ -7,7 +7,7 @@ import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.plugins.iob.iobCobCalculator.events.EventNewHistoryData -import io.reactivex.disposables.Disposable +import io.reactivex.rxjava3.disposables.Disposable import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt index e6635ac1fb..60835562dd 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt @@ -28,8 +28,8 @@ import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.* import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat import java.util.* import java.util.concurrent.TimeUnit @@ -72,7 +72,7 @@ class CarbsDialog : DialogFragmentWithDate() { private fun validateInputs() { val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble() val time = binding.time.value.toInt() - if (time > 12 * 60 || time < -12 * 60) { + if (time > 12 * 60 || time < -7 * 24 * 60) { binding.time.value = 0.0 ToastUtils.showToastInUiThread(ctx, rh.gs(R.string.constraintapllied)) } @@ -125,7 +125,7 @@ class CarbsDialog : DialogFragmentWithDate() { val maxCarbs = constraintChecker.getMaxCarbsAllowed().value().toDouble() binding.time.setParams( savedInstanceState?.getDouble("time") - ?: 0.0, -12 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher + ?: 0.0, -7 * 24 * 60.0, 12 * 60.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher ) binding.duration.setParams( diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt index 94b9cf1f38..03cb215a7f 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/CareDialog.kt @@ -31,8 +31,8 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.extensions.fromConstant import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.utils.resources.ResourceHelper -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt index 7f94aab493..54b222ce2c 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt @@ -29,8 +29,8 @@ import info.nightscout.shared.SafeParse import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.* import javax.inject.Inject import kotlin.math.abs diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt index b785861b5b..21eb81ebce 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt @@ -30,8 +30,8 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.extensions.toSignedString import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.SafeParse -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat import java.util.* import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt index 0420afc6c3..8e67a0ed6e 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt @@ -40,8 +40,8 @@ import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class LoopDialog : DaggerDialogFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt index 0bed01e852..70ed31b8bc 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt @@ -32,8 +32,8 @@ import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat import java.util.* import java.util.concurrent.TimeUnit @@ -143,7 +143,7 @@ class ProfileSwitchDialog : DialogFragmentWithDate() { binding.reusebutton.text = rh.gs(R.string.reuse_profile_pct_hours, profile.value.originalPercentage, T.msecs(profile.value.originalTimeshift).hours().toInt()) binding.reusebutton.setOnClickListener { binding.percentage.value = profile.value.originalPercentage.toDouble() - binding.timeshift.value = profile.value.originalTimeshift.toDouble() + binding.timeshift.value = T.msecs(profile.value.originalTimeshift).hours().toDouble() } } } diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt index 7e449950e2..c1ed8faf5b 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt @@ -28,8 +28,8 @@ import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat import java.util.* import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt index 46b97a3f0a..0e8a509517 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt @@ -31,8 +31,8 @@ import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DecimalFormat import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt index a9c60573ef..fbfc23c17b 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt @@ -33,7 +33,7 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP import info.nightscout.androidaps.utils.wizard.BolusWizard -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import java.text.DecimalFormat import java.util.* import javax.inject.Inject @@ -148,7 +148,7 @@ class WizardDialog : DaggerDialogFragment() { if (correctionPercent) { calculatedPercentage = sp.getInt(R.string.key_boluswizard_percentage, 100).toDouble() - binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher) + binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher) binding.correctionInput.value = calculatedPercentage binding.correctionUnit.text = "%" } else { @@ -215,7 +215,7 @@ class WizardDialog : DaggerDialogFragment() { binding.correctionUnit.text = if (isChecked) "%" else rh.gs(R.string.insulin_unit_shortname) correctionPercent = binding.correctionPercent.isChecked if (correctionPercent) { - binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 1.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher) + binding.correctionInput.setParams(calculatedPercentage, 10.0, 200.0, 5.0, DecimalFormat("0"), false, binding.okcancel.ok, textWatcher) binding.correctionInput.customContentDescription = rh.gs(R.string.a11_correction_percentage) } else { binding.correctionInput.setParams( diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt index c7cfe5b969..1a1ec6fae5 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopFragment.kt @@ -19,8 +19,8 @@ import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class LoopFragment : DaggerFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt index 09e4896525..e43c353d87 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt @@ -59,8 +59,8 @@ import info.nightscout.androidaps.plugins.aps.events.EventLoopInvoked import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import javax.inject.Singleton import kotlin.math.abs diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt index d9d8dd2c0b..8ec075f1a9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSAMA/OpenAPSAMAFragment.kt @@ -18,8 +18,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.JSONFormatter import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONArray import org.json.JSONException import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt index 785066e695..8289e60f7c 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/OpenAPSSMBFragment.kt @@ -20,8 +20,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONArray import org.json.JSONException import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt index 528b89f683..0bf7dcfc30 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ConfigBuilderFragment.kt @@ -19,13 +19,13 @@ import info.nightscout.androidaps.interfaces.* import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.plugins.configBuilder.events.EventConfigBuilderUpdateGui import info.nightscout.androidaps.utils.FabricPrivacy -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.kotlin.plusAssign import info.nightscout.androidaps.extensions.toVisibility import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.protection.ProtectionCheck import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt index 405daabc9e..63e03478dc 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt @@ -22,8 +22,8 @@ import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt index 74ab3aef5e..800994fe03 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/bgQualityCheck/BgQualityCheckPlugin.kt @@ -12,8 +12,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import javax.inject.Singleton import kotlin.math.abs diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt index f1f83e5603..d4d0c628a9 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/ObjectivesFragment.kt @@ -37,11 +37,11 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.SntpClient import info.nightscout.androidaps.utils.alertDialogs.OKDialog -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.kotlin.plusAssign import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject class ObjectivesFragment : DaggerFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt index 111df21369..dc5805cfd1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt @@ -49,8 +49,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP import info.nightscout.androidaps.utils.ui.SingleClickButton import info.nightscout.androidaps.utils.ui.UIRunnable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.* import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt index 5b10d02649..035c3a13a1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/dataBroadcaster/DataBroadcastPlugin.kt @@ -25,7 +25,7 @@ import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt index 4507d85ab3..eae7c2b177 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt @@ -36,10 +36,10 @@ import info.nightscout.androidaps.utils.protection.ProtectionCheck import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.ui.UIRunnable -import io.reactivex.Completable -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxjava3.core.Completable +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign +import io.reactivex.rxjava3.kotlin.subscribeBy import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt index b39883538b..8d6cc9c91b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/maintenance/MaintenanceFragment.kt @@ -29,9 +29,9 @@ import info.nightscout.androidaps.plugins.pump.omnipod.eros.history.database.Ero import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.Completable.fromAction -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxjava3.core.Completable.fromAction +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.subscribeBy import javax.inject.Inject class MaintenanceFragment : DaggerFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt index 78f69cf5de..7c01449ba6 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientAddUpdateWorker.kt @@ -310,7 +310,7 @@ class NSClientAddUpdateWorker( } ?: aapsLogger.error("Error parsing TherapyEvent json $json") } eventType == TherapyEvent.Type.COMBO_BOLUS.text -> - if (config.NSCLIENT) { + if (buildHelper.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT) { extendedBolusFromJson(json)?.let { extendedBolus -> repository.runTransactionForResult(SyncNsExtendedBolusTransaction(extendedBolus)) .doOnError { @@ -356,7 +356,7 @@ class NSClientAddUpdateWorker( } ?: aapsLogger.error("Error parsing ExtendedBolus json $json") } eventType == TherapyEvent.Type.TEMPORARY_BASAL.text -> - if (config.NSCLIENT) { + if (buildHelper.isEngineeringMode() && sp.getBoolean(R.string.key_ns_receive_tbr_eb, false) || config.NSCLIENT) { temporaryBasalFromJson(json)?.let { temporaryBasal -> repository.runTransactionForResult(SyncNsTemporaryBasalTransaction(temporaryBasal)) .doOnError { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt index 13b5469d01..63351dc7ba 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientFragment.kt @@ -21,8 +21,8 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class NSClientFragment : DaggerFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt index 540ce3e628..d63cf23512 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/NSClientPlugin.kt @@ -38,7 +38,7 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import java.util.* import javax.inject.Inject import javax.inject.Singleton @@ -159,6 +159,7 @@ class NSClientPlugin @Inject constructor( // preferenceFragment.findPreference(rh.gs(R.string.key_ns_receive_carbs))?.isVisible = buildHelper.isEngineeringMode() // preferenceFragment.findPreference(rh.gs(R.string.key_ns_receive_temp_target))?.isVisible = buildHelper.isEngineeringMode() } + preferenceFragment.findPreference(rh.gs(R.string.key_ns_receive_tbr_eb))?.isVisible = buildHelper.isEngineeringMode() } private val mConnection: ServiceConnection = object : ServiceConnection { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt index 040fe82453..970b047ddb 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/services/NSClientService.kt @@ -49,7 +49,7 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import io.socket.client.IO import io.socket.client.Socket import io.socket.emitter.Emitter diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt index 67f6c4e13b..a3b4f11b15 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.kt @@ -78,8 +78,8 @@ import info.nightscout.shared.sharedPreferences.SP import info.nightscout.androidaps.utils.ui.SingleClickButton import info.nightscout.androidaps.utils.ui.UIRunnable import info.nightscout.androidaps.utils.wizard.QuickWizard -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.* import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt index f9c34a49b1..8685abdbe3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewPlugin.kt @@ -24,8 +24,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONObject import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt index 25865c4afb..c3e3fd1b9f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/activities/QuickWizardListActivity.kt @@ -32,8 +32,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.wizard.QuickWizard import info.nightscout.androidaps.utils.wizard.QuickWizardEntry import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class QuickWizardListActivity : DaggerAppCompatActivityWithResult() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt index fe0d90116a..e6651412ae 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/DummyService.kt @@ -13,7 +13,7 @@ import info.nightscout.shared.logging.LTag import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject /** diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt index 555dba3239..3bd76dab56 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/persistentNotification/PersistentNotificationPlugin.kt @@ -20,8 +20,8 @@ import info.nightscout.androidaps.utils.DecimalFormatter import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt index 6f422dad47..666097d017 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorFragment.kt @@ -11,9 +11,9 @@ import info.nightscout.androidaps.plugins.general.smsCommunicator.events.EventSm import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.HtmlHelper -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.kotlin.plusAssign import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import java.util.* import javax.inject.Inject import kotlin.math.max diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt index 4f733dded3..d2c12037ce 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/smsCommunicator/SmsCommunicatorPlugin.kt @@ -48,8 +48,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP import info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference import info.nightscout.shared.SafeParse -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.apache.commons.lang3.StringUtils import org.joda.time.DateTime import java.text.Normalizer @@ -67,7 +67,7 @@ class SmsCommunicatorPlugin @Inject constructor( injector: HasAndroidInjector, aapsLogger: AAPSLogger, rh: ResourceHelper, - private val smsManager: SmsManager, + private val smsManager: SmsManager?, private val aapsSchedulers: AapsSchedulers, private val sp: SP, private val constraintChecker: ConstraintChecker, @@ -165,7 +165,7 @@ class SmsCommunicatorPlugin @Inject constructor( override fun updatePreferenceSummary(pref: Preference) { super.updatePreferenceSummary(pref) if (pref is EditTextPreference) { - if (pref.getKey().contains("smscommunicator_allowednumbers") && (pref.text == null || TextUtils.isEmpty(pref.text.trim { it <= ' ' }))) { + if (pref.getKey().contains("smscommunicator_allowednumbers") && (TextUtils.isEmpty(pref.text?.trim { it <= ' ' }))) { pref.setSummary(rh.gs(R.string.smscommunicator_allowednumbers_summary)) } } @@ -1100,10 +1100,10 @@ class SmsCommunicatorPlugin @Inject constructor( sms.text = stripAccents(sms.text) try { aapsLogger.debug(LTag.SMS, "Sending SMS to " + sms.phoneNumber + ": " + sms.text) - if (sms.text.toByteArray().size <= 140) smsManager.sendTextMessage(sms.phoneNumber, null, sms.text, null, null) + if (sms.text.toByteArray().size <= 140) smsManager?.sendTextMessage(sms.phoneNumber, null, sms.text, null, null) else { - val parts = smsManager.divideMessage(sms.text) - smsManager.sendMultipartTextMessage(sms.phoneNumber, null, parts, + val parts = smsManager?.divideMessage(sms.text) + smsManager?.sendMultipartTextMessage(sms.phoneNumber, null, parts, null, null) } messages.add(sms) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt index 1daf65abc4..db3ba0ba7f 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolFragment.kt @@ -14,10 +14,10 @@ import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolD import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolResetData import info.nightscout.androidaps.plugins.general.tidepool.events.EventTidepoolUpdateGUI import info.nightscout.androidaps.utils.FabricPrivacy -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.kotlin.plusAssign import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject class TidepoolFragment : DaggerFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt index 045f638e6a..05d0dfbc23 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/tidepool/TidepoolPlugin.kt @@ -30,11 +30,11 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.ToastUtils -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.kotlin.plusAssign import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import java.util.* import javax.inject.Inject import javax.inject.Singleton @@ -68,6 +68,7 @@ class TidepoolPlugin @Inject constructor( private val listLog = ArrayList() var textLog: Spanned = HtmlHelper.fromHtml("") + @Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS", "UNNECESSARY_NOT_NULL_ASSERTION") override fun onStart() { super.onStart() disposable += rxBus diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt index 124f00e4ac..481e904868 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/ActionStringHandler.kt @@ -42,8 +42,8 @@ import info.nightscout.shared.sharedPreferences.SP import info.nightscout.androidaps.utils.wizard.BolusWizard import info.nightscout.androidaps.utils.wizard.QuickWizard import info.nightscout.shared.SafeParse -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.text.DateFormat import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt index b43775cdaa..d6be8f54cd 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/wear/WearPlugin.kt @@ -20,7 +20,7 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt index aa41940fd6..825ae8ad5a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/xdripStatusline/StatusLinePlugin.kt @@ -15,8 +15,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt index 6f623266ca..d7991a6707 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt @@ -34,8 +34,8 @@ import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONArray import java.util.concurrent.Executors import java.util.concurrent.ScheduledFuture diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt index 78a31caa92..3a81af67d3 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt @@ -34,8 +34,8 @@ import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.androidaps.utils.ui.TimeListEdit import info.nightscout.shared.SafeParse import info.nightscout.shared.logging.AAPSLogger -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.math.RoundingMode import java.text.DecimalFormat import javax.inject.Inject @@ -61,7 +61,7 @@ class LocalProfileFragment : DaggerFragment() { private val save = Runnable { doEdit() basalView?.updateLabel(rh.gs(R.string.basal_label) + ": " + sumLabel()) - localProfilePlugin.profile?.getSpecificProfile(binding.profileList.text.toString())?.let { + localProfilePlugin.getEditedProfile()?.let { binding.basalGraph.show(ProfileSealed.Pure(it)) binding.icGraph.show(ProfileSealed.Pure(it)) binding.isfGraph.show(ProfileSealed.Pure(it)) @@ -81,7 +81,7 @@ class LocalProfileFragment : DaggerFragment() { } private fun sumLabel(): String { - val profile = localProfilePlugin.getEditProfile() + val profile = localProfilePlugin.getEditedProfile() val sum = profile?.let { ProfileSealed.Pure(profile).baseBasalSum() } ?: 0.0 return " ∑" + DecimalFormatter.to2Decimal(sum) + rh.gs(R.string.insulin_unit_shortname) } @@ -237,10 +237,7 @@ class LocalProfileFragment : DaggerFragment() { localProfilePlugin.currentProfileIndex = position localProfilePlugin.isEdited = false build() - }, { - val selection = localProfilePlugin.currentProfileIndex - if (selection in 0 until (binding.profileList.adapter?.count ?: -1)) binding.profileList.setSelection(selection) - } + }, null ) } } else { @@ -248,7 +245,7 @@ class LocalProfileFragment : DaggerFragment() { build() } } - localProfilePlugin.profile?.getSpecificProfile(binding.profileList.text.toString())?.let { + localProfilePlugin.getEditedProfile()?.let { binding.basalGraph.show(ProfileSealed.Pure(it)) binding.icGraph.show(ProfileSealed.Pure(it)) binding.isfGraph.show(ProfileSealed.Pure(it)) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt index cce7fc55d0..f131a22122 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfilePlugin.kt @@ -170,7 +170,7 @@ class LocalProfilePlugin @Inject constructor( } @Synchronized - fun getEditProfile(): PureProfile? { + fun getEditedProfile(): PureProfile? { val profile = JSONObject() with(profiles[currentProfileIndex]) { profile.put("dia", dia) diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt index 382efc02cc..1eb807dbfc 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpFragment.kt @@ -21,8 +21,8 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class VirtualPumpFragment : DaggerFragment() { diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt index d4a0ba1687..f900d942da 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/virtual/VirtualPumpPlugin.kt @@ -28,8 +28,8 @@ import info.nightscout.androidaps.utils.TimeChangeType import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONException import org.json.JSONObject import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt index 901bed4b26..d285db5f0a 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/BGSourceFragment.kt @@ -34,8 +34,8 @@ import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt index c65691dfbe..818951fff1 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/GlunovoPlugin.kt @@ -26,7 +26,7 @@ import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.XDripBroadcast import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt index 82d353a095..9f149f7a7b 100644 --- a/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt +++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/RandomBgPlugin.kt @@ -18,8 +18,8 @@ import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.XDripBroadcast import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.* import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt index 5315d15713..1bf2891a81 100644 --- a/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt +++ b/app/src/main/java/info/nightscout/androidaps/queue/CommandQueueImplementation.kt @@ -41,9 +41,9 @@ import info.nightscout.androidaps.utils.buildHelper.BuildHelper import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign -import io.reactivex.rxkotlin.subscribeBy +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign +import io.reactivex.rxjava3.kotlin.subscribeBy import java.util.* import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt index 5f99519df1..3bf816ade2 100644 --- a/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt +++ b/app/src/main/java/info/nightscout/androidaps/queue/QueueThread.kt @@ -52,7 +52,7 @@ class QueueThread internal constructor( val secondsElapsed = (System.currentTimeMillis() - connectionStartTime) / 1000 val pump = activePlugin.activePump // Manifest.permission.BLUETOOTH_CONNECT - if (config.PUMPDRIVERS && Build.VERSION.SDK_INT >= /*Build.VERSION_CODES.S*/31) + if (config.PUMPDRIVERS && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) if (androidPermission.permissionNotGranted(context, "android.permission.BLUETOOTH_CONNECT")) { aapsLogger.debug(LTag.PUMPQUEUE, "no permission") rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTING)) diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt index 2b4d667758..c1cfb270aa 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SWEventListener.kt @@ -8,7 +8,7 @@ import dagger.android.HasAndroidInjector import info.nightscout.androidaps.events.EventStatus import info.nightscout.androidaps.setupwizard.elements.SWItem import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject class SWEventListener constructor( diff --git a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt index eef7197a7b..090b9ae07d 100644 --- a/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt +++ b/app/src/main/java/info/nightscout/androidaps/setupwizard/SetupWizardActivity.kt @@ -24,7 +24,7 @@ import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.locale.LocaleHelper.update import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject import kotlin.math.max import kotlin.math.min diff --git a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt index e69156470b..3ccd6d6900 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/AndroidPermission.kt @@ -97,7 +97,7 @@ class AndroidPermission @Inject constructor( @Synchronized fun notifyForBtConnectPermission(activity: FragmentActivity) { - if (Build.VERSION.SDK_INT >= /*Build.VERSION_CODES.S*/31) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { // Manifest.permission.BLUETOOTH_CONNECT if (permissionNotGranted(activity, "android.permission.BLUETOOTH_CONNECT") || permissionNotGranted(activity, "android.permission.BLUETOOTH_SCAN")) { val notification = NotificationWithAction(injector, Notification.PERMISSION_BT, rh.gs(R.string.needconnectpermission), Notification.URGENT) diff --git a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt index 2f1ea9e990..063fd3137e 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/LocalAlertUtils.kt @@ -22,8 +22,8 @@ import info.nightscout.androidaps.plugins.general.overview.notifications.Notific import info.nightscout.androidaps.plugins.general.smsCommunicator.SmsCommunicatorPlugin import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import javax.inject.Singleton import kotlin.math.min diff --git a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt index de30b2f565..dca32f246a 100644 --- a/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt +++ b/app/src/main/java/info/nightscout/androidaps/utils/wizard/BolusWizard.kt @@ -33,8 +33,8 @@ import info.nightscout.androidaps.utils.* import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import java.util.* import javax.inject.Inject import kotlin.math.abs diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 3b061e3422..3ab37f5e88 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -129,7 +129,6 @@ Eindverbruiker Lisensie Ooreenkoms MOET NIE GEBRUIK WORD OM MEDIESE BESLUITE TE MAAK NIE. DAAR IS GEEN WAARBORG DAT DIE PROGRAM, ONDERWORPE AAN TOEPASSELIKE WETTE EN WETGEWING. TENSY ANDERS GEMELD IN TEKS VOORSIEN DIE KOPIEREG-HOUERS EN / OF ANDER PARTYE DIE PROGRAM \"AS IS\" SONDER ËNIGE WAARBORG VAN ENIGE ORDE, UITDRUKKELIK OF IMPLISIET, INKLUSIEF, MAAR NIE BEPERK TOT DIE IMPLISIETE WAARBORG VAN TOEPAASBAARHEID OF NUT VIR EEN SPESIFIEKE DOEL. DIE TOTALE EN ALLE RISIKOVIR DIE KWALITEIT EN PRESTASIE VAN DIE PROGRAM RUS MET JOUSELF. VIR ENIGE PROGRAM DEFEKTIEWE OF FALINGS MOET JY PERSOONLIK DIE KOSTE EN REGSAANSPREEKLIKHEID DRA VAN ALLE NODIGE AKSIES, DIENS, REPARASIES OF KORREKSIES VIR USELF OF ENIGE DERDE PARTYE EN/OF AKSIES, DIENS, REPARASIES OF KORREKSIES WAT DEUR DIE PROGRAM GEDOEN WAS. EK VERSTAAN en STEM IN - Stoor Herlaai profiel SMS Communicator Toegelate telefoon nommers @@ -310,8 +309,6 @@ Verhoed dat Android skerm afskakel. Dit sal baie meer energie vereis wanneer nie in krag prop is nie. Deur Autosense aan te skakel onthou om alle koolhidrate in te voer Andersins sal koolhidrate dwalinge verkeerdelik geïdentifiseer word as sensitiwiteit veranderinge!! Sensitiwiteit GeweegdeGemiddelde - OK - Kanselleer Nie alle profiele gelaai! Waardes nie gestoor! Aktiveer plaaslike Uitsaai. diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 822b19d7ad..4e846535f4 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -160,7 +160,6 @@ Лицензионно споразумение с краен потребител НЕ ТРЯБВА ДА СЕ ИЗПОЛЗВА ЗА ВЗЕМАНЕ НА МЕДИЦИНСКИ РЕШЕНИЯ. НЯМА ГАРАНЦИЯ ЗА ПРОГРАМАТА, ДО СТЕПЕНТА, ПОЗВОЛЕНА ОТ ПРИЛОЖИМОТО ПРАВО. ОСВЕН КОГАТО Е ПОСОЧЕНО ДРУГО В ПИСМЕН ВИД, ПРИТЕЖАТЕЛИТЕ НА АВТОРСКОТО ПРАВО И/ИЛИ ДРУГИ СТРАНИ ПРЕДОСТАВЯТ ПРОГРАМАТА \"КАКТО Е\", БЕЗ ГАРАНЦИИ ОТ ВСЯКАКЪВ ВИД, ИЗРАЗЕНИ ИЛИ ПОДРАЗБИРАЩИ СЕ, ВКЛЮЧИТЕЛНО, НО НЕ САМО, ПОДРАЗБИРАЩИ СЕ ГАРАНЦИИ ЗА ПРОДАВАЕМОСТ И ПРИГОДНОСТ ЗА КОНКРЕТНА ЦЕЛ. ЦЕЛИЯ РИСК ПО ОТНОШЕНИЕ НА КАЧЕСТВОТО И ЕФЕКТИВНОСТТА НА ПРОГРАМАТА Е САМО ВАШ. АКО ПРОГРАМАТА НЕ СРАБОТИ, ВИЕ ПОЕМАТЕ ВСИЧКИ НЕОБХОДИМИ РАЗХОДИ ЗА ОБСЛУЖВАНЕ, РЕМОНТ ИЛИ КОРЕКЦИЯ. Разбирам и приемам - Съхрани Презареди профил SMS комуникатор Разрешени телефонни номера @@ -424,8 +423,6 @@ Предотвратяване на андроид да изключва екрана. Това ще доведе до консумацията на много енергия, когато устройството не е включено в контакта. Когато включите Autosense feature трябва да въвеждате ВСИЧКИ въглехидрати. В противен случай те ще се изчисляват грешно като повишена чувствителност!! чрез Среднопретеглената стойност - ОК - Откажи Не всички профили са заредени! Стойностите не са запазени! Активира предаване на данни към други приложения (като xDrip+). Не активирайте, ако имате повече от един AAPS или имате инсталиран NSClient! diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index e8e60f272d..440591b5b6 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -156,7 +156,6 @@ Acord de llicència per a l\'usuari final NO S\'HA D\'UTILITZAR PER A PRENDRE DECISIONS MÈDIQUES. EL PROGRAMA NO TÉ GARANTIA, EN LA MESURA QUE HO PERMET LA LLEI APLICABLE. EXCEPTE QUAN S\'INDIQUI EL CONTRARI PER ESCRIT, ELS PROPIETARIS DEL COPYRIGHT I/O ALTRES PARTS PROPORCIONEN EL PROGRAMA \"TAL QUAL\" SENSE CAP MENA DE GARANTIA, NI IMPLÍCITA NI EXPLÍCITA, INCLOENT, PERÒ SENSE ESTAR LIMITADES A, LES GARANTIES IMPLÍCITES DE COMERCIALITZACIÓ I ADEQUACIÓ A UN OBJECTIU PARTICULAR. US FEU RESPONSABLES TOTALMENT DELS RISCOS EN QUANT A LA QUALITAT I EL RENDIMENT DEL PROGRAMA. SI EL PROGRAMA FOS DEFECTUÓS, VOSALTRES ASSUMIU EL COST DE TOT SERVEI, REPARACIÓ O CORRECCIÓ. ENTENC I ACCEPTO - Desar Recarregar perfil Comunicador SMS Nrs. de telèfon permesos diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 1d36292713..7ec43738a1 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -162,7 +162,6 @@ Licenční ujednání MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ROZUMÍM A POTVRZUJI - Uložit Obnovit profil SMS komunikátor Povolená tel. čísla @@ -429,14 +428,12 @@ Zabránit Androidu ve zhasínání obrazovky. Bez připojení do nabíječky vybije velice rychle baterii! Při zapnuté detekci sensitivity nezapomeňte vkládat všechny sacharidy. Jinak budou odchylky mylně vyhodnocovány jako změna sensitivity !! Sensitivita vážený průměr - OK - Zrušit Všechny profily nenačteny! Hodnoty nejsou uloženy! Povolit vysílání do jiných aplikací (například xDrip+). Nepovolujte, pokud máte instalovánu více než jednu instanci AAPS nebo NSClient! Povolení odesílaní OpenAPS SMB - OpenAPS SMB s dynamickým ISF + Dynamická ISF Povolit UAM Povolit SMB Použít super mikro bolusy místo dočasných bazálů pro zrychlení účinku @@ -666,6 +663,9 @@ Citlivost zvyšuje cíl Je-li zjištěna vyšší citlivost, zvýší nastavenou cílovou glykémii Vyčistit události \"AndroidAPS restartován\" + Zobrazit neplatné + Skrýt zneplatněné + Odstranit položky Nalezeno uložené nastavení POZOR: Pokud aktivuje a připojíte skutečnou pumpu, AndroidAPS nakopíruje (a bude udržovat) nastavení bazálu z aktivního profilu do pumpy. Nastavení bazálu v pumpě bude přepsáno. Pokud si nejste jistí nebo nechcete přepsat bazály v pumpě, stiskněte Zrušit a opakujte přepnutí na jinou pumpu později. Data ošetření neúplná @@ -882,6 +882,8 @@ Přijmout přepnutí profilu zadané prostřednictvím NS nebo NSClienta Přijímat události APS offline Přijmout APS offline události zadané prostřednictvím NS nebo NSClienta + Přijímat dočasný bazál a kombinovany bolus + Přijmout dočasný bazál a kombo bolus zadaný přes jinou instanci Přijímat inzulín Přijmout inzulín vložený přes NS nebo NSClient (není dodán, pouze započítán do IOB) Přijímat sacharidy @@ -974,4 +976,15 @@ Neznámý příkaz k akci: Procentní podíl Výchozí nastavení aplikace + Vyberte profil pro úpravu + Obnovit z Nightscoutu + Odstranit zvolené položky + Vyberte pro odstranění + Změny profilu + Dočasné cíle + Sacharidy a bolusy + Opravdu chcete odstranit %1$d položku(y) + Skrýt smyčku + Zobrazit smyčku + Vybráno: %1$d diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index 2ba454c6ed..0c0e2574ad 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -161,7 +161,6 @@ Slutbrugerlicensaftale MÅ IKKE BRUGES TIL AT TRÆFFE MEDICINSKE BESLUTNINGER. DER ER INGEN GARANTI FOR PROGRAMMET, I DET OMFANG GÆLDENDE LOV TILLADER DET. UNDTAGEN NÅR DET ELLERS ER ANFØRT SKRIFTLIGT, AT RETTIGHEDSHAVERE OG / ELLER ANDRE PARTER LEVERER PROGRAMMET \"SOM BESET\" UDEN NOGEN FORM FOR GARANTI, HVERKEN UDTRYKT ELLER UNDERFORSTÅET, HERUNDER, MEN IKKE BEGRÆNSET TIL, DE UNDERFORSTÅELIGHEDER, DER ER FORBUNDET MED EGNETHED OG EGNETHED TIL ET BESTEMT FORMÅL. HELE RISIKOEN MED HENSYN TIL KVALITETEN OG YDEEVNEN AF PROGRAMMET ER DIN. HVIS PROGRAMMET VISER SIG AT VÆRE DEFEKT, BÆRER DU SELV OMKOSTNINGERNE VED ALLE NØDVENDIGE SERVICER, REPARATIONER ELLER KORREKTIONER SOM ER NØDVENDIGE. JEG FORSTÅR OG ER ENIG - Gem Genindlæs profil SMS Kommunikator Tilladte telefonnumre @@ -426,8 +425,6 @@ Forhindrer Android i at slukke for skærmen. Det vil forbruge meget energi, når den ikke er tilsluttet stikkontakt. Ved at slå funktionen Autosense til husk at indtaste alle spiste kulhydrater. Ellers vil kulhydrat afvigelser blive identificeret forkert som følsomheds ændring !! Følsomhed Vægtet Gennemsnit - OK - Annuller Ikke alle profiler er indlæst! Værdier ikke gemt! Aktiver udsendelse til andre apps (såsom xDrip+). Aktiver ikke hvis du har mere end én version af AAPS eller NSClient installeret! diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index b393ee8e2a..8880340e68 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -161,7 +161,6 @@ Endbenutzervereinbarung DAS PROGRAMM DARF NICHT FÜR MEDIZINISCHE ENTSCHEIDUNGEN BENUTZT WERDEN. ES GIBT IN DIESEM PROJEKT KEINE GEWÄHRLEISTUNG ODER GARANTIERTE UNTERSTÜTZUNG IN IRGENDEINER ART. WENN DU DICH ENTSCHEIDEST, ES ZU NUTZEN, HÄNGT DIE QUALITÄT UND LEISTUNGSFÄHIGKEIT DIESES PROJEKTES VON DIR SELBST AB. ES WIRD \"WIE BESEHEN\" ZUR VERFÜGUNG GESTELLT. SOLLTE SICH DAS PROGRAMM ALS FEHLERHAFT ERWEISEN, ÜBERNIMMST DU ALLE NOTWENDIGEN KRANKHEITSKOSTEN, SERVICELEISTUNGEN, REPARATUREN ODER KORREKTUREN. Ich verstehe und stimme zu. - Speichern Profil neuladen SMS-Kommunikator Erlaubte Telefonnummern @@ -427,8 +426,6 @@ Hindere Android daran, den Bildschirm abzuschalten. Dies erhöht den Energieverbrauch, wenn das Gerät nicht an einem Ladegerät angeschlossen ist. Stelle bei aktivierter Autosens-Funktion sicher, dass du alle eingenommenen Kohlenhydrate eingibst. Ansonsten können die Kohlenhydrat-Abweichungen zu falschen Sensitivitätswerten führen! Durchschnittliche Sensitivität - OK - Abbrechen Es sind nicht alle Profile geladen! Werte nicht gespeichert! Aktiviere die Datenübertragung zu anderen Apps (z.B. xDrip+). Nicht aktivieren, falls Du mehr als eine Instanz von AAPS oder NSClient installiert hast! diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 65cd30fa60..741161adfa 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -131,7 +131,6 @@ Άδεια χρήσης τελικού χρήστη ΔΕΝ ΠΡΕΠΕΙ ΝΑ ΧΡΗΣΙΜΟΠΟΙΗΘΕΙ ΓΙΑ ΝΑ ΚΑΝΕΤΕ ΙΑΤΡΙΚΗ ΑΠΟΦΑΣΗ. ΔΕΝ ΥΠΑΡΧΕΙ ΕΓΓΥΗΣΗ ΓΙΑ ΤΟ ΠΡΟΓΡΑΜΜΑ, ΣΤΟ ΒΑΘΜΟ ΠΟΥ ΕΠΙΤΡΕΠΕΤΑΙ ΑΠΟ ΤΟ ΕΦΑΡΜΟΣΤΕΟ ΔΙΚΑΙΟ. ΕΚΤΟΣ ΟΠΟΙΑΣΔΗΠΟΤΕ ΔΙΑΒΑΘΜΙΣΜΕΝΗ ΚΑΤΑ ΤΗΝ ΕΓΓΡΑΦΗ ΤΩΝ ΚΑΤΟΧΟΙ ΠΝΕΥΜΑΤΙΚΩΝ ΔΙΚΑΙΩΜΑΤΩΝ ΚΑΙ/Ή ΑΛΛΑ ΜΕΡΗ ΠΑΡΕΧΟΝΤΑΙ ΤΟ ΠΡΟΓΡΑΜΜΑ \"ΩΣ ΕΧΕΙ\" ΧΩΡΙΣ ΕΓΓΥΗΣΗ ΟΠΟΙΟΥΔΗΠΟΤΕ ΕΙΔΟΥΣ, ΕΞΑΙΡΟΥΜΕΝΕΣ Ή ΣΙΩΠΗΡΕΣ, ΣΥΜΠΕΡΙΛΑΜΒΑΝΟΜΕΝΩΝ, ΕΝΔΕΙΚΤΙΚΑ, ΤΩΝ ΣΙΩΠΗΡΩΝ ΕΓΓΥΗΣΕΩΝ ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ΚΑΙ ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Ο ΟΛΟΚΛΗΡΩΜΕΝΟΣ ΚΙΝΔΥΝΟΣ ΟΣΟΝ ΑΦΟΡΑ ΤΗΝ ΠΟΙΟΤΗΤΑ ΚΑΙ ΤΗΝ ΑΠΟΔΟΣΗ ΤΟΥ ΠΡΟΓΡΑΜΜΑΤΟΣ ΕΙΝΑΙ ΔΙΚΟ ΣΑΣ. ΕΑΝ ΤΟ ΠΡΟΓΡΑΜΜΑ ΔΕΝ ΕΙΝΑΙ ΕΛΑΤΤΩΜΑΤΙΚΟ, ΠΡΕΠΕΙ ΝΑ ΕΞΕΤΑΣΤΕ ΤΟ ΚΟΣΤΟΣ ΟΛΩΝ ΤΩΝ ΑΠΑΡΑΙΤΗΤΩΝ ΣΥΝΤΗΡΗΣΕΩΝ, ΕΠΙΣΚΕΥΩΝ Ή ΔΙΟΡΘΩΣΕΩΝ. ΚΑΤΑΛΑΒΑ ΚΑΙ ΣΥΜΦΩΝΩ - Αποθήκευση Ξαναφορτώστε το προφίλ SMS Επικοινωνία Επιτρεπτά τηλεφωνικά νούμερα @@ -312,8 +311,6 @@ Αποτρέψετε το Android να απενεργοποιήσει την οθόνη. Χωρίς σύνδεση με το φορτιστή, αποφορτίζει πολύ γρήγορα την μπαταρία. Ενεργοποιώντας το autosense θυμηθείτε να εισάγετε όλους τους υδατάνθρακες. Διαφορετικά, οι αποκλίσεις των υδατανθράκων θα εντοπιστούν λανθασμένα ως αλλαγή ευαισθησίας!! Ευαισθησία WeightedAverage - ΟΚ - Ακύρωση Δεν έχουν φορτωθεί όλα τα προφίλ! Οι τιμές δεν αποθηκεύτηκαν! Ενεργοποιήστε τις τοπικές αποστολές. diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 826b04dfd7..a055bacc37 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -162,7 +162,6 @@ Acuerdo de licencia de usuario final NO DEBE UTILIZARSE PARA TOMAR DECISIONES MÉDICAS. NO HAY NINGUNA GARANTÍA EN EL PROGRAMA, EN LA MEDIDA PERMITIDA POR LA LEY APLICABLE. EXCEPTO CUANDO SE INDIQUE LO CONTRARIO POR ESCRITO, LOS TITULARES DE LOS DERECHOS DE AUTOR Y/O OTRAS PARTES, PROPORCIONAN EL PROGRAMA \"TAL CUAL\", SIN GARANTÍA DE NINGÚN TIPO, YA SEA EXPRESA O IMPLÍCITA, INCLUIDAS, ENTRE OTRAS, LAS GARANTÍAS IMPLÍCITAS DE COMERCIABILIDAD Y ADECUACIÓN PARA UN PROPÓSITO EN PARTICULAR. TODO EL RIESGO EN CUANTO A LA CALIDAD Y EL RENDIMIENTO DEL PROGRAMA ES SUYA. SI EL PROGRAMA TUVIERA UN ERROR, USTED ASUME EL COSTE DE TODOS LOS SERVICIOS, REPARACIONES O CORRECCIONES NECESARIAS. LO ENTIENDO Y ACEPTO - Guardar Recargar Perfil Comunicador SMS Números de teléfono permitidos @@ -429,14 +428,12 @@ Evita que Android apague la pantalla. Consume mucha batería cuando el teléfono no está conectado al cargador Al activar Autosens, recuerda introducir todos carbohidratos que has comido, sino, las desviaciones de carbohidratos serán identificados incorrectamente, como un cambio de sensibilidad Sensibilidad promedio ponderada - Ok - Cancelar Faltan perfiles por cargar! Valores no guardados! Habilita las transmisiones a otras aplicaciones (como xDrip+). ¡No lo habilites si tienes más de una instancia de AAPS o NSClient instaladas! Habilitar la emisión de mensajes localmente. OpenAPS SMB - OpenAPS SMB ISF Dinámico + ISF Dinámico Activar UAM Activar SMB Usar microbolos en lugar de basales temporales, para corregir más rápidamente @@ -666,6 +663,9 @@ Sensibilidad aumenta el objetivo Cuando se detecta sensibilidad a la insulina, aumenta el objetivo de glucosa Comenzar la limpieza de AndroidAPS + Mostrar invalidados + Ocultar invalidados + Eliminar elementos Encontrados ajustes de configuración Atención: si activas y conectas la bomba con AndroidAPS, AndroidAPS sobrescribirá los ajustes de basales del perfil de la bomba, con los establecidos en el perfil de AndroidAPS. Comprueba que tengas el perfil basal correcto en AndroidAPS. Si no estás seguro, o no quieres sobrescribir los ajustes basales en la bomba, presiona cancelar y repite la vinculación más adelante. Datos de tratamiento incompletos @@ -882,6 +882,8 @@ Aceptar cambios de perfil registrados mediante Nightscout o NSClient Recibir eventos de desconexión de APS Aceptar eventos de desconexión de APS registrados mediante Nightscout o NSClient + Recibir TBR y EB + Aceptar TBR y EB ingresados mediante otra instancia Recibir insulina Aceptar insulina registrada mediante Nightscout o NSClient (no se entrega, sólo se calcula para IOB) Recibir carbohidratos @@ -974,4 +976,15 @@ Comando de acción desconocido: Porcentaje Aplicación por defecto + Seleccione el perfil a editar + Actualizar de Nightscout + Borrar elementos seleccionados + Selecciona para eliminar + Cambios de perfil + Objetivos temporales + Carbohidratos y bolos + ¿Está seguro de que quiere eliminar %1$d elementos? + Ocultar bucle + Mostrar bucle + %1$d selecionado diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index c71b5a031a..61c4c69df0 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -25,6 +25,7 @@ Synchronise vos données avec Nightscout État de l’algorithme en 2017 Algorithme le plus récent pour les utilisateurs avancés + Algorithme le plus récent pour les utilisateurs avancés avec SI dynamique/automatique Affiche l’état actuel de votre Boucle et des boutons d’actions les plus courantes Affiche une notification en cours avec un bref aperçu de ce que fait votre Boucle Définissez un profil qui est disponible hors ligne. @@ -162,7 +163,6 @@ NE DOIT PAS ÊTRE UTILISÉ POUR PRENDRE DES DÉCISIONS MÉDICALES. IL N\'Y A AUCUNE GARANTIE POUR LE PROGRAMME, DANS LA LIMITE PERMISE PAR LA LOI APPLICABLE. SAUF S\'IL EST INDIQUÉ LE CONTRAIRE PAR ÉCRIT. LES TITULAIRES DU DROIT D\'AUTEUR ET / OU D\'AUTRES PARTIES FOURNISSENT LE PROGRAMME «EN L\'ÉTAT» SANS GARANTIE D\'AUCUNE SORTE, EXPLICITE OU IMPLICITE, Y COMPRIS MAIS NON SEULEMENT AUX GARANTIES IMPLICITES DE QUALITÉ MARCHANDE ET D\'ADÉQUATION À UN USAGE PARTICULIER L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME SONT DE VOTRE RESPONSABILITÉ. SI LE PROGRAMME EST DÉFECTUEUX, VOUS ASSUMEZ LE COÛT DE TOUS LES SERVICES, RÉPARATIONS OU CORRECTIONS NÉCESSAIRES. JE COMPRENDS ET J\'ACCEPTE LES CONDITIONS DU CONTRAT - Sauvegarder Actualiser le profil Communicateur SMS Numéros de tél autorisés @@ -268,6 +268,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S CONF BOUCLE OAPS + DynSI PL ACCUEIL POMPEV @@ -428,13 +429,12 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Empêcher Android d\'éteindre l\'écran. Ceci consommera beaucoup de batterie lorsque vous n’êtes pas connecté à une prise de courant. En activant la fonction Autosens, n’oubliez pas de rentrer tous les glucides consommés. Sinon les déviations de glucides seront incorrectement identifiées pour les changements de sensibilité !! Sensibilité avec moyenne pondérée - OK - Annuler Les profils ne sont pas tous téléchargés ! Valeurs non enregistrées ! Active les diffusions vers d\'autres applications (comme xDrip+). Ne pas activer si plusieurs instances d\'AAPS ou de NSClient sont installées ! Activer les transmissions locales OpenAPS SMB + SI dynamique Activer RNS Activer SMB Utiliser les Super Micro Bolus au lieu des débits de base temporaires pour une action rapide @@ -664,6 +664,9 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Sensibilité augmente la cible Quand une sensibilité est détectée, augmentation de la glycémie cible Réinitialiser AndroidAPS + Montrer les entrées invalides + Masquer les entrées invalides + Supprimer des entrées Paramètres sauvegardés trouvés ATTENTION : Si vous activez et connectez à une vraie pompe, AndroidAPS copiera les paramètres Basals du profil vers la pompe, écrasant le taux basal existant stocké sur la pompe. Assurez-vous d\'avoir correctement saisi et réglé les paramètres Basal dans AndroidAPS. Si vous ne savez pas ou si ne voulez pas écraser les paramètres Basal sur votre pompe, appuyez sur Annuler et reporter le passage à la pompe à une date ultérieure. Données de traitement incomplètes @@ -971,4 +974,15 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S Commande inconnue : Pourcentage Application par défaut + Sélectionnez le profil à modifier + Rafraîchir à partir de Nightscout + Supprimer les entrées sélectionnées + Sélectionner pour suppression + Changements de profil + Cibles Temp + Glucides et bolus + Êtes-vous sûr de vouloir supprimer %1$d entrée(s) + Masquer la boucle + Afficher les entrées boucle + %1$d sélectionnée(s) diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml index e8366c934a..cb138eb538 100644 --- a/app/src/main/res/values-ga-rIE/strings.xml +++ b/app/src/main/res/values-ga-rIE/strings.xml @@ -60,7 +60,6 @@ Socruithe Easpórtáil Socruithe Iompórtáil Iompórtáil - Sábháil Athlódáil próifíl Is lúb díchumasaithe Is lúb cumasaithe @@ -140,8 +139,6 @@ OpenAPS OAPS BUN - Ceart go leor - Cuir ar ceal OpenAPS SMB Rapid-Acting Oref Lyumjev diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index a8da25a5d0..d1a13a73f7 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -25,6 +25,7 @@ Sincronizza i tuoi dati con Nightscout Stato dell\'algoritmo nel 2017 Algoritmo più recente per utenti avanzati + Algoritmo più recente per utenti avanzati con ISF dinamico/automatico Visualizza lo stato corrente del tuo loop e i tasti per le azioni più comuni Mostra una notifica persistente con una breve panoramica di ciò che sta facendo il tuo loop Definisci un profilo che è disponibile offline. @@ -161,7 +162,6 @@ Contratto di licenza per l\'utente NON DEVE ESSERE USATO PER PRENDERE DECISIONI MEDICHE. NON ESISTE ALCUNA GARANZIA PER IL PROGRAMMA, NELLA MISURA CONSENTITA DALLA LEGGE APPLICABILE. TRANNE QUANDO DIVERSAMENTE INDICATO PER ISCRITTO, I DETENTORI DEL COPYRIGHT E/O ALTRE PARTI FORNISCONO IL PROGRAMMA \"COSÌ COM\'È\" SENZA GARANZIA DI ALCUN TIPO, ESPLICITA O IMPLICITA, INCLUSE, MA NON LIMITATAMENTE A, GARANZIE IMPLICITE DI COMMERCIABILITÀ E IDONEITÀ PER UN SCOPO PARTICOLARE. L\'INTERO RISCHIO RIGUARDO LA QUALITÀ E LE PRESTAZIONI DEL PROGRAMMA È TUO. SE IL PROGRAMMA DOVESSE RISULTARE DIFETTOSO, TI ASSUMI IL COSTO DI TUTTE LE NECESSARIE MANUTENZIONI, RIPARAZIONI O CORREZIONI. COMPRENDO E ACCETTO - Salva Ricarica profilo Comunicazioni SMS Numeri di telefono consentiti @@ -246,6 +246,7 @@ Smartwatch Invia di nuovo tutti i dati Apri impostazioni sullo smartwatch + Velocità basale Valore basale inferiore al minimo. Profilo non impostato! BG: Ultimo BG: @@ -426,13 +427,12 @@ Evita che Android spenga lo schermo. Consumerà molta energia quando non è collegato alla presa di corrente. Attivando la funzione Autosense, ricorda di inserire tutti i carboidrati assunti. Altrimenti le deviazioni di glicemia dovute ai carboidrati saranno identificate erroneamente come variazione di sensibilità !! Sensibilità WeightedAverage - OK - Annulla Non tutti i profili caricati! Valori non memorizzati! Abilita trasmissioni ad altre app (come xDrip+). Non abilitare se hai installato più di un\'istanza di AAPS o NSClient! Abilita trasmissioni locali OpenAPS SMB + ISF Dinamico Abilita UAM Abilita SMB Usa super-micro-boli al posto della basale temporanea per un\'azione più veloce @@ -661,6 +661,8 @@ La sensibilità aumenta il target Quando viene rilevata sensibilità, aumentare la glicemia target Rimuovi gli eventi \"AndroidAPS avviato\" + Mostra invalidato + Nascondi invalidato Trovate impostazioni memorizzate Attenzione: se attivi e connetti un micro, AndroidAPS copierà le impostazioni della basale dal profilo al micro, sovrascrivendo la velocità basale esistente memorizzata sul micro. Assicurati di avere la giusta impostazione della basale in AndroidAPS. Se non sei sicuro o non vuoi sovrascrivere le impostazioni della basale sul micro, premi annulla e ripeti il processo in un altro momento. Dati trattamento incompleti @@ -756,6 +758,8 @@ Il nome profilo contiene dei punti.\nQuesto non è supportato da NS.\nIl profilo non viene caricato in NS. Valore più basso per l\'intervallo di visualizzazione dell\'area \"in range\" Valore più alto per l\'intervallo di visualizzazione dell\'area \"in range\" + Età + Peso ID: Invia Profilo più comune: @@ -901,6 +905,34 @@ BG troppo vicino:\n%1$s\n%2$s Identificazione (email, nick Discord o FB, etc) Identificazione non impostata in modalità dev + dialogo + glicemia corrente Non disponibile + alto + in range + basso + stabile + sconosciuto + grafico + qualità glicemia + ricalcolato + insulina + glicemia + CHO: %1$.2fU + COB: %1$.0fg %2$.2fU + BG: %1$.2fU + IOB da basale: %1$.2fU + IOB da bolo: %1$.2fU + Superbolo: %1$.2fU + Percentuale: %1$.2fU x %2$d%% ≈ %3$.2fU + TempT: %1$s + %1$s a %2$s + Nessun micro disponibile! + Percentuale + Rimuovi elementi selezionati + Seleziona per la rimozione + Modifiche al profilo + Nascondi loop + Mostra loop diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index be7004a3b6..3f17d4e3a8 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -162,7 +162,6 @@ הסכם רישיון למשתמש לא מיועד לשימוש למטרת קבלת החלטות רפואיות. בעלי הזכויות מספקים את התוכנית כפי שהיא - \"AS IS\", ללא אחריות מכל סוג שהוא. כל סיכון הנובע מאיכות ו\\או ביצועי התוכנה הוא באחריותך בלבד. במידה ותימצא תקלה בתוכנית, אתם תשאו בכל עלויות שיגרמו לך בשל התקלה. אני מבין\\ה ומסכים\\ה - שמור טעינה מחדש של הפרופיל תקשורת SMS מספרי טלפון מורשים @@ -428,14 +427,11 @@ מניעת כיבוי המסך. הדבר צורך הרבה כח סוללה. בהפעלת פונקציית ה-Autosens יש לזכור שחייבים להזין למערכת את כל הפחמימות שנאכלו. אחרת פחמימות לא יזוהו נכון כשינוי ברגישות! רגישות משוקללת ממוצעת - אישור - ביטול לא כל הפרופילים נטענו! הערכים לא נשמרו אפשר הפצה לאפליקציות אחרות (כגון xDrip). אין להפעיל אם מותקן לכם יותר ממופע אחד של AAPS או NSClient! אפשר שידורים מקומיים. OpenAPS SMB - OpenAPS SMB רגישות דינאמית הפעלת UAM אפשר SMB השתמש בסופר מיקרו בולוסים במקום בבזאלי זמני לפעילות מהירה יותר diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index c90ae33577..cc3ee2036f 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -157,7 +157,6 @@ 최종 사용자 라이선스 동의서 이 프로그램을 의학적 결정을 내리는 데 사용해서는 안되며, 여기에 대한 어떠한 보증도 없습니다. 이 프로그램의 품질과 성능에 관한 모든 위험은 사용자에게 있습니다.\nMUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 모두 이해하였고 동의합니다. - 저장 프로파일 새로고침 SMS 통신기 허가된 전화번호 @@ -420,8 +419,6 @@ 안드로이드의 화면이 꺼지는 것을 방지합니다. 전원이 공급되어 있지 않으면 전력소모가 큽니다. Autosense 기능을 켜면 모든 섭취된 탄수화물양을 입력하십시오. 그렇지 않으면 탄수화물 편차(deviations)가 민감도 변화로 잘못 인식될것입니다!! 민감도 가중평균 - 네 - 취소 모든 프로파일이 로드되지 않았습니다. 값이 저장되지 않았습니다! 다른 앱 (예: xDrip)으로 데이터 전송을 활성화합니다. AAPS 또는 NSClient를 두 개 이상 설치 한 경우 활성화하지 마세요! diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index cfb0725dcb..c85b7961b9 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -161,7 +161,6 @@ Licencinė sutartis su vartotoju PROGRAMA NEGALI BŪTI NAUDOJAMA GYDYMO SPRENDIMAMS PRIIMTI. PAGAL GALIOJANČIUS ĮSTATYMUS PROGRAMA NESUTEIKIA JOKIŲ GARANTIJŲ VARTOTOJUI. JEI RAŠTU NENURODYTA KITAIP, PROGRAMOS AUTORINIŲ TEISIŲ TURĖTOJAS IR/AR KITOS ŠALYS PATEIKIA PROGRAMĄ \"KAIP YRA\" BE JOKIŲ GARANTIJŲ, TIEK AKIVAIZDŽIŲ, TIEK NUMANOMŲ, ĮSKAITANT, BET NEAPSIRIBOJANT GALIMYBĘ NAUDOTI PROGRAMĄ KOMERCINIAMS AR KITOKIEMS DALINIAMS TIKSLAMS. RIZIKĄ, KYLANČIĄ NAUDOJANT PROGRAMĄ PRISIIMA PATS VARTOTOJAS. JEI PROGRAMA VEIKIA NETINKAMAI, IŠLAIDOS, SUSIJUSIOS SU PROGRAMOS SERVISU, TAISYMU AR KOREGAVIMU, TENKA VARTOTOJUI. SUPRATAU IR SUTINKU - Išsaugoti Atnaujinti profilį SMS komunikatorius Leidžiami telefono numeriai @@ -426,8 +425,6 @@ Neleidžia Android sistemai išjungti ekrano. Naudojama daug energijos, jei telefonas neprijungtas prie maitinimo šaltinio. Įjungę Autosens funkciją nepamirškite įvedinėti visus valgomus angliavandenius. To nedarant, angliavandenių sukeliami gliukozės svyravimai bus klaidingai identifikuojami kaip jautrumo pasikeitimai! Jautrumas pagal svertinį vidurkį - OK - Atšaukti Ne visi profiliai įkelti! Reikšmės neišsaugotos! Įgalinti perdavimą į kitas programas (pvz., xDrip+). Neįgalinkite, jei įdiegta daugiau nei vienas AAPS arba NSClient egzempliorius! diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 69ce798126..aa041e386c 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -162,7 +162,6 @@ Eind gebruiker overeenkomst MUST NOT BE USED TO MAKE MEDICAL DECISIONS. THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. Begrepen en goedgekeurd - Opslaan Herlaad profiel SMS Commando\'s Geautoriseerde telefoon nummers @@ -268,6 +267,7 @@ CONF LOOP OAPS + DYNISF LP OVZ VPUMP @@ -428,14 +428,12 @@ Voorkomen dat Android het scherm uitschakelt. Dit kost veel accuvoeding als je de telefoon niet aan de oplader hebt. Bij het gebruik van Autosense, vergeet niet alle opgenomen koolhydraten in te geven. Anders zullen BG wijzigingen door maaltijden foutief geïnterpreteerd worden !! Gemiddelde gevoeligheid - OK - Afbreken Niet alle profielen zijn geladen! Waarden niet opgeslagen! Schakel lokaal data delen met andere apps (zoals xDrip) in. Schakel dit niet in als er meer dan één installatie van AAPS of NSClient zijn geinstalleerd! Activeer locaal delen. OpenAPS SMB - OpenAPS SMB Dynamische ISF + Dynamische ISF Activeer UAM Activeer SMB SMB in plaats van tijdelijke basalen voor snellere reactie @@ -665,6 +663,9 @@ Gevoeligheid verhoogt het doel Wanneer insulinegevoeligheid wordt gedetecteerd, wordt het BG streefdoel verhoogd Verwijder AndroidAPS start-meldingen + Toon ongeldig + Verberg ongeldig + Items verwijderen Opgeslagen instellingen gevonden Let op: als u activeert en verbinding maakt met een hardwarepomp, kopieert AndroidAPS de basale instellingen van het profiel naar de pomp en overschrijft de bestaande basaal snelheid die op de pomp is opgeslagen. Zorg ervoor dat u de juiste basaal instelling hebt in AndroidAPS. Als u niet zeker weet of niet wilt dat de basaal instellingen op uw pomp worden overschreven, drukt u op Annuleren en herhaalt u het overschakelen naar de pomp op een later tijdstip. Behandelingen data incompleet @@ -881,6 +882,8 @@ Accepteer profielwissels zoals ingevoerd in NS of NSClient Ontvang APS offline gebeurtenissen Accepteer APS offline gebeurtenissen die zijn ingevoerd via NS of NSClient + Ontvang TBR en EB + Accepteer TBR en EB ingevoerd vanaf een andere bron Ontvang insuline Accepteer insuline zoals ingevoerd in NS of NSClient (insuline wordt niet toegediend, het wordt alleen in IOB calculatie meegenomen) Ontvang koolhydraten @@ -973,4 +976,15 @@ Onbekend actie commando: Percentage Applicatie standaardwaarden + Kies profiel om te bewerken + Vernieuw vanaf Nightscout + Geselecteerde items verwijderen + Selecteer om te verwijderen + Profiel wijzigingen + Tijdelijke streefdoelen + Koolhydraten en bolus + Weet je zeker dat je %1$d items wilt verwijderen + Verberg loop + Toon loop + %1$d geselecteerd diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 0732ae1dbd..b87b314a57 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -162,7 +162,6 @@ Sluttbrukeravtale MÅ IKKE BENYTTES TIL Å TA MEDISINSKE BESLUTNINGER. DET FINNES INGEN GARANTI FOR PROGRAMMET I DEN UTSTREKNING SOM TILLATES AV GJELDENDE LOV. SÅFREMT IKKE ANNET ER ANGITT SKRIFTLIG LEVERES PROGRAMMET HELT UTEN GARANTIER I NOEN SOM HELST FORM, VERKEN UTTRYKT ELLER INNEFORSTÅTT, INKLUSIV MEN IKKE BEGRENSET TIL SALGBARHET ELLER EGNETHET TIL VISSE FORMÅL. ALL RISIKO KNYTTET TIL KVALITET AV PROGRAMMETS FUNKSJONALITET ER HOS DEG SOM BRUKER. OM PROGRAMMET VISER SEG Å VÆRE DEFEKT, ER DET BRUKEREN SOM MÅ TA ALT ANSVAR FOR KOSTNADER KNYTTET TIL ALL SERVICE, REPERASJON ELLER RETTELSE. JEG FORSTÅR OG GODTAR - Lagre Les inn profil på nytt SMS tjeneste Godkjente mobilnumre @@ -429,14 +428,11 @@ Forhindre Android å slå av skjermen. Mobil vil bruke mye batteri hvis den ikke plugges til strømledning. Hvis du slår på Autosense funksjonen må du huske å angi alle spiste karbohydrater. Ellers vil KH avvik gi feil i sensitivitetsberegningen !! Sensitivitet vektet middelverdi - OK - Avbryt Ikke alle profiler ble lastet! Verdier ikke lagret! Aktiver kringkasting til andre apper (som xDrip+). Ikke aktiver dette hvis du har mer enn en AAPS eller NSClient installert! Aktiver lokale sendinger. OpenAPS SMB - OpenAPS SMB dynamisk ISF Aktiver UAM Aktiver SMB Bruk Super Mikro Solen i stedet for temp basal for raskere resultat diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index 55b0b01565..d77d6fe7cf 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -161,7 +161,6 @@ Umowa licencyjna użytkownika końcowego NIE MOŻE BY WYKORZYSTYWANY DO PODEJMOWANIA DECYZJI MEDYCZNYCH. NIE MA ŻADNEJ GWARANCJI NA PROGRAM, W ZAKRESIE DOZWOLONYM PRZEZ OBOWIĄZUJĄCE PRAWO. Z WYJĄTKIEM PRZYPADKÓW, GDY W INNY SPOSÓB PISMO OŚWIADCZENIA PRAW AUTORSKICH I / LUB INNYCH STRON, PRZEDSTAWIAĆ PROGRAM \"W STANIE TAKIM, W JAKIM SIĘ ZNAJDUJE\" BEZ JAKIEJKOLWIEK GWARANCJI, WYRAŹNEJ LUB DOMNIEMANEJ, W TYM MIĘDZY INNYMI DOMNIEMANYCH GWARANCJI PRZYDATNOŚCI HANDLOWEJ I PRZYDATNOŚCI DO OKREŚLONEGO CELU. CAŁKOWITE RYZYKO ZWIĄZANE Z JAKOŚCIĄ I WYNIKIEM PROGRAMU JEST PO PAŃSTWA STRONIE. W PRZYPADKU USZKODZENIA PROGRAMU UŻYTKOWNIK PONOSI KOSZT CAŁEGO NIEZBĘDNEGO SERWISU, NAPRAWY LUB POPRAWEK. W PRZYPADKU NIEPOROZUMIEŃ ZASTOSOWANIE PRAWNE MA UMOWA W ANGIELSKIEJ WERSJI JĘZYKOWEJ!!! ROZUMIEM I WYRAŻAM ZGODĘ - ZACHOWAJ Załaduj profil ponownie Komunikator SMS Dozwolone numery telefonów @@ -426,8 +425,6 @@ Nie pozwól, aby system Android wyłączał ekran. Zwiększy to zużycie energii, gdy zasilanie sieciowe jest wyłączone. Przy włączonej funkcji Autosens pamiętaj, żeby wprowadzać wszystkie węglowodany. W innym wypadku odchylenia węglowodanów będą błędnie identyfikowane jako zmiany wrażliwości !! Wrażliwość ŚredniaWażona - OK - Anuluj Nie wszystkie profile zostały załadowane! Wartości nie są przechowywane! Włącz rozgłaszanie do innych aplikacji (takich jak xDrip+). Nie należy włączać, jeśli zainstalowana jest więcej niż jedna instancja AAPS lub NSClient! diff --git a/app/src/main/res/values-pt-rBR/exam.xml b/app/src/main/res/values-pt-rBR/exam.xml index a41cf854b0..ce8822454e 100644 --- a/app/src/main/res/values-pt-rBR/exam.xml +++ b/app/src/main/res/values-pt-rBR/exam.xml @@ -1,10 +1,14 @@ - O que é verdade sobre o DIA? - Duração da Atividade da Insulina (DIA) + O que é verdade sobre o DAI? + Duração da Atividade da Insulina (DAI) + Você deve definir o valor para a DAI no seu perfil. + A menor duração permitida é de 5 horas. https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin Se você estiver satisfeito com um valor da DIA que funcionava bem na sua bomba antes do AndroidAPS, não há necessidade de modificar esse valor quando você começa o loop. Você deve determinar por si mesmo o valor apropriado para a DIA. + Alvo Temporário para hipoglicemia + Qual é a razão principal para definir um alvo temporário de hipoglicemia? Corrigir hipoglicemias causadas por configurações incorretas da dose basal. Evitar que o AndroidAPS corrija excessivamente um aumento de glicose causado pelos carboidratos de ação rápida que trataram a hipoglicemia. Corrigir uma hipoglicemia causada por exercícios físicos. @@ -32,8 +36,115 @@ Seu arquivo de configurações foi encontrado no armazenamento interno/AAPS/preferências do seu telefone. Copie seu arquivo de preferências para um local seguro fora de seu telefone (por exemplo, usando uma unidade na nuvem, conectando um cabo a um computador, e-mail, etc.) Se seu telefone ficar danificado ou se você perder-lo, existem maneiras fáceis de recuperar suas configurações remotamente sem um backup local. + https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me Leituras do CGM imprecisas O que deve ser feito se os dados do CGM são irregulares? + Nada, AndroidAPS vai lidar com isso. + Desative o loop fechado para evitar uma possível dosagem maior ou menor que a necessária. + Troque sensores que apresentam erros ou medições imprecisas. + Verifique se seu aplicativo CGM fornece dados suavizados. + https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data + Exercício e Perfis + Como seria a melhor forma de usar os perfis para ajudar o sistema a lidar com exercício aeróbico? + Altere o perfil para menos de 100%. + Altere o perfil para mais de 100%. + Deixe seu perfil em 100%. + Suspenda o loop. + https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target + Exercício e Alvos Temporários + Como seria a melhor forma de usar os alvos temporários para ajudar o sistema a lidar com exercício aeróbico? + Alguns minutos antes de iniciar o exercício, defina um alvo de glicemia. + Defina uma meta de glicemia após o término do exercício. + Não altere o seu alvo de glicemia. + Aguarde até que a glicemia fique abaixo do seu alvo temporário de hipoglicemia e coma 15g de carbos de ação rápida. + https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target + Loop Desativado/Suspenso + Eu recebo insulina quando o loop estiver desactivado/suspenso? + Sim, a insulina basal continua sendo administrada. + Não, a administração da insulina será interrompida. + Testando a basal, FS e Relação I:C + Quando esses valores deveriam ser avaliados? + Antes de iniciar o looping. + Quando ocorrerem hipoglicemias e hiperglicemias frequentes. + Pelo menos uma vez por semana. + Uma vez definido e validado, estes valores não deveriam mudar ao longo do tempo. + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings + Pré-requisitos + O que é essencial para configurar e usar o AndroidAPS? + Informações do perfil validadas (Basal, IC, FS, DAI). + Um computador com o Android Studio instalado e configurado. + Um telefone compatível. + Uma bomba de insulina compatível se você pretender usar o loop fechado. + Nightscout, para manter um registro de todos os dados e revisar configurações. + Uma conta do Tidepool. + Uma conta Google. + Uma conta do Github. + Experiência na programação ou editação de código. + Uma bomba MiniMed 670G. + https://androidaps.readthedocs.io/en/latest/EN/Module/module.html + Um Smartwatch. + Um CGM compatível. + Pré-requisitos + O que é essencial para configurar e usar o AndroidAPS? + Informações validadas para configurar um perfil (razão FS, I:C, taxas de basal, DAI etc.). + Um dispositivo Android compatível (por exemplo, celular/celular, relógio Android completo ou tablet). + O AndroidAPS requer uma conexão com a internet para ser executado em loop fechado. + Um CGM compatível com um app apropriado para receber os valores de glicose no telefone/dispositivo. + https://androidaps.readthedocs.io/en/latest/EN/Module/module.html + Tópico: Atualização do AndroidAPS + Marque todas as respostas corretas. + Você precisa ter o Git instalado e configurado no seu computador. + Quando atualizações do AndroidAPS são lançadas, as versões anteriores podem ser remotamente limitadas após um tempo especificado. + Você deveria salvar e anotar o local da sua chave de assinatura e usar a mesma chave de assinatura das versões anteriores para as atualizações. + Nunca atualize se o sistema estiver funcionando bem. + Se você tiver dificuldades criando o apk, você pode instalar um apk que foi criado por um amigo. + https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch + Resolução de problemas + Onde você pode procurar ajuda com AndroidAPS? + Você pode pedir conselhos no grupo \"AndroidAPS Users\" do Facebook. + Você deveria ler (e ler mais uma vez) a documentação do AndroidAPS. + Você pode pedir conselhos e registrar problemas técnicos ou problemas no \"Android APS Gitter room\". + Você deveria pedir/perguntar à sua clínica de diabetes/endocrinologista. + https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting + https://www.facebook.com/groups/AndroidAPSUsers/ + https://gitter.im/MilosKozak/AndroidAPS + Plugins de Insulina + Qual insulina você deveria usar com o plugin \"Oref Ultra-Rapid\"? + Fiasp® + NovoRapid®/Novolog® + Humalog ® + Actrapid®/Humalin R®/\"regular\" insulina humana. + https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin + Tópico: Plugins de Sensibilidade + Marque todas as respostas corretas. + Plugins de sensibilidade permitem que o AndroidAPS se ajuste para mudanças temporárias ou de curta duração na sensibilidade à insulina (por exemplo, alterações hormonais ou problemas de absorção no local de infusão). + Plug-ins de sensibilidade fornecem ao usuário alterações sugeridas nas taxas de basal, relação I:C e FS que podem ser usados para editar o perfil. + Registrar uma troca de cannula irá redefinir a taxa de Autosens de volta para 100%. + Algumas opções de plugin têm intervalos de tempo que podem ser configurados pelo usuário. + https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html + Tópico: Erros de Entrada de Carboidratos + O que deve fazer se tiver feito uma entrada incorreta de carboidratos? + Exclua a entrada incorreta em Tratamentos e insira o novo valor de carboidratos correto. + Dê um bólus com insulina usando o menu ações -> purgar/preencher. + Não faça nada – o AndroidAPS fará os ajustes apropriados. + Dê um Bolus com insulina usando o botão Insulina (bolus) no menu Visão Geral. + Tópico: Erros de entrada/administração de insulina + O que você deveria fazer se você receber menos insulina do que o histórico da bomba sugere por exemplo, devido a uma oclusão, um canula falhada ou esquecendo de reconectar a bomba após um banho? + Exclua dados de insulina do Nightscout Careportal para removê-los do histórico da bomba. + Comparar valores no histórico do AndroidAPS e a bomba (se a bomba possui esta opção). + Dê uma porção do bolus calculado não administrado por meio de seringa/caneta ou usando o menu ações -> purgar/preencher. + Não faça nada e permita que o AndroidAPS corrija qualquer nível de glicose elevado resultante. + Insulina ativa + Marque todas as respostas corretas. + O valor de IA é afetado por basais temporárias efetuadas. + Um basal alto temporário não será efetuado quando sua glicose estiver abaixo do alvo. + Insulina Ativa (IA) negativa por um período substancial na ausência de exercícios, sugere que seu perfil é muito agressivo e menos insulina deve ser considerada nas suas configurações. + Insulina Ativa (IA) positiva durante um período substancial sugere resistência à insulina ou refeições não anunciadas. + Tópico: Entrada de carboidratos e bólus + Apenas a unidade \"gramas\" deve ser utilizada para estimar e gravar os carboidratos consumidos. + Carboidratos consumidos podem ser gravados usando um sistema de conversão apropriada (por exemplo, câmbio de \"CHO\" DAFNE ou Unidades de Pão Europeas\"). + O AndroidAPS usa um modelo dinâmico para estimar a \"degradação\" de carboidratos e calcular o Carboidratos Ativos (CA). Se os níveis de glicose no sangue estiverem fora dos limites aceitáveis (muito baixo ou muito alto) a calculadora de bolus pode ser usada para fornecer sugestões para correções de carboidrato ou insulina. https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u Tópico: e-Carbs @@ -60,6 +171,7 @@ https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html Você pode definir mais do que um valor para o rácio I:C no seu perfil. Se você mudar o ISF no seu perfil, também deveria mudar o I:C. + Tópico: Relação Insulina:Carboidrato (Relação I:C) Rácios IC mais altos levam a menos insulina administrada por uma dada quantidade de carboidratos. Rácios IC mais baixos levam a menos insulina administrada por uma dada quantidade de carboidratos. Se tiver 0 COB, alterar a proporção IC irá levar a uma quantidade diferente de insulina para corrigir um determinado valor da glicemia. @@ -70,12 +182,34 @@ Ao especificar uma mudança de perfil de 90%, quais respostas são corretas? Taxas de basal serão 10% menores. O valor do ISF será 10% maior. + O valor da relação I:C será 10% menor. O ISF e a I:C não sofrem alterações. https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#profile-switch Tópico: Troca de Perfil + Ao especificar uma mudança de perfil de 120%, quais respostas são corretas? + O alvo de glicose será 20% maior. + Os basais serão 20% maiores. + O alvo de glicose não muda. + O valor do FS será 20% maior. + Tópico: Alternando Perfil + Se você levantar 2h mais cedo do que o normal, como deveria avisar o AAPS da mudança do seu horário? + Iniciar uma mudança de perfil com uma alteração de turno de 2 + Iniciar uma mudança de perfil com uma alteração de turno de -2 + Defina um alvo temporário \"comer em breve\". + Altere seu perfil para mais de 100% https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profile%20switch#timeshift + Tópico: Alterações nos perfis + Taxas de basal, FS, rácios de I:C, etc., devem ser definidos em perfis. + Ativar alterações no seu perfil do Nightscout requer que o telefone do AndroidAPS tenha uma conexão com a Internet. + Apenas editar os valores nos seus perfis é suficiente para implementar as alterações feitas. + Múltiplos perfis podem ser configurados e selecionados para acomodar mudanças de circunstâncias (por exemplo, alterações hormonais, mudança de trabalho, dias de semana/fim de semana). https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy + Tópico: Ajuda com taxas basais Onde procurar ajuda para taxas basais e etc. Sua equipe de diabetes Google + Facebook + Outros Medicamentos. Por favor, leia a declaração abaixo e depois marque a caixa para aceitar a declaração. + AAPS reduz ou suspende as taxas basais para aumentar a glicose. Remédios do grupo de inibidores de SGLT2 (gliflozins) podem evitar o aumento esperado da glicose e, assim, podem produzir uma deficiência de insulina perigosa (cetoacidose diabética). +\nOs nomes comuns de marca são: Invokana®, Forxiga®, Jardiance®, Steglatro®, Suglat®, Apleway®, Deberza®, Synjardy®, Vokanamet®, Xigduo®.\n\nEu Prometo por este meio que não vou tomar tais remédios enquanto estou usando o AAPS ou eu desativo o loop antes de usar esses remédios. diff --git a/app/src/main/res/values-pt-rBR/objectives.xml b/app/src/main/res/values-pt-rBR/objectives.xml index bca5eb5aee..6802cc13e5 100644 --- a/app/src/main/res/values-pt-rBR/objectives.xml +++ b/app/src/main/res/values-pt-rBR/objectives.xml @@ -1,7 +1,25 @@ + Iniciar + Verificar + %1$d. Objetivo + Objetivo %1$d não iniciado + Objetivo %1$d não concluido + Configurando a visualização e monitoramento, e analisando basais e relações + Verificar se a Glicemia está disponível no Nightscout, e se os dados de insulina da bomba estão sendo transferidos + Iniciando em um loop aberto + Utilize o modo Loop Aberto por alguns dias e execute manualmente várias basais temporárias. Configure e use alvos temporários e defina alvos temporários padrão (por exemplo, para exercício ou tratamento hipos com carboidratos) Entendendo o seu loop aberto, incluindo as suas recomendações de basais temporárias Com base nessa experiência, decidir qual deve ser a basal máximo e configurá-lo na bomba e nas preferências + Comece a fechar loop com Suspensão por Glicose Baixa + Utilizar em close loop com IOB máx = 0 por alguns dias sem muitas situações de Suspensão por Baixa Glicose + Ajustar o loop fechado, aumentar a IOB máximo acima de 0 e reduzir gradualmente os alvos de glicemia + Utilizar por alguns dias e pelo menos uma noite sem alarmes de glicose baixa, antes de baixar a glicemia + Ajuste as basais e os parâmetros, se necessário, e, em seguida, ative o auto-sens + 1 semana de looping durante o dia com sucesso com entrada regular de carboidratos + Ativando recursos adicionais para uso durante o dia, como SMB + Ativando a automação + Deverá ler a wiki e aumentar a I.A máx para que os SMBs funcionem corretamente! Inicialmente poderá considerar maxI.A=média dos bólus + 3 x a basal diária máxima Leia os documentos de como a automação funciona. Configure suas primeiras regras simples. Em vez de efetuar uma ação deixe AAPS apresentar apenas uma notificação. Quando você tiver certeza de que a automação é acionada no momento certo substitua a notificação por uma ação real. (https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html) Glicose disponível no NS Status da Bomba disponível no NS @@ -32,6 +50,6 @@ https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen Não está ligado à internet - Falha ao recuperar tempo + Falha no tempo de recuperação Requisitos de objetivo não cumpridos diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 89743a1cbb..5826fbdf32 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -6,6 +6,7 @@ Segurança do Tratamento Máximo bolus permitido [U] Máximo de carbs permitidos [g] + %1$s Preferências Preferências Atualizar tratamentos de NS Redefinir banco de dados @@ -18,11 +19,13 @@ Exibe as predefinições de comida definidas no Nightscout Predefinição de Insulina para Humalog e NovoRapid / NovoLog Pré-ajuste de Insulina para Fiasp + Configuração pre-definida para a Insulina Lyumyev Permite que você defina o pico da atividade de insulina, deve ser usado apenas por usuários avançados Ative ou desative a implementação ativando o loop. Sincroniza seus dados com o Nightscout Estado do algoritmo em 2017 Algoritmo mais recente para usuários avançados + Algoritmo mais recente para usuários avançados com FS dinâmico/automático Exibe o estado atual do seu loop e botões para ações mais comuns Mostra uma notificação em curso com um breve resumo do que o seu loop está a fazer Defina um perfil que está disponível offline. @@ -35,6 +38,7 @@ Receber valores BG do Glimp. Receber valores de Glucose do 600SeriesAndroidUploader. Downloads de dados de Glicose do Nightscout + Receber valores de glicose do xDrip+. Salva todos os tratamentos que foram feitos Monitore e controle AndroidAPS usando seu relógio WearOS. Mostrar informações sobre o loop no watchface do xDrip+. @@ -54,6 +58,7 @@ TT Carbos Corr + I.A de Bolus Executar agora BOMBA VIRTUAL Última execução @@ -89,9 +94,10 @@ Depois das restrições processadas Basal temporária definida pela bomba SEM APS SELECIONADO OU RESULTADO FORNECIDO - Segurança + Seguro Plugin está desativado Violação das restrições + O Bolus relatou um erro. Verifique a quantidade administrada manualmente Aceitar nova basal temporária: Tratamento Calculadora @@ -102,6 +108,7 @@ Altere sua entrada! Fonte de BG De onde o AndroidAPS deve obter os dados? + xDrip+ Modo APS Loop Fechado Loop Aberto @@ -116,12 +123,16 @@ Outro Medidor Sensor + Hora do carboidrato Duração + Perfil Tipo de glicose Basal Temporária Bólus estendido Versão do Nightscout: + Precisando de %1$d g Preferências exportadas + Entradas do usuário exportadas Exportar configurações para Importar configurações de Configurações importadas @@ -136,6 +147,11 @@ Será perguntado pela senha mestre, que será necessária para desencriptar preferências importadas. Exportação cancelada! Preferências NÃO foram exportadas! Importação cancelada! Preferências NÃO foram importadas! + Não foi possível importar as preferências! + Por favor, volte à tela principal e tente novamente. + Senha Mestra Antiga + Este arquivo foi exportado e criptografado com uma senha mestra diferente. Insira a senha anterior para descriptografar o arquivo. + Como resultado da importação bem sucedida a senha mestra atual SERÁ SUBSTITUÍDA pela senha mestra anterior! Por favor, verifique as preferências antes da importação: Preferências não podem ser importadas! As preferências não devem ser importadas! @@ -146,7 +162,6 @@ Condições de Utilização NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCETO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É COM VOCÊ. CASO O PROGRAMA SEJA DEFEITUOSO, VOCÊ ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS. EU ENTENDO E CONCORDO - Salvar Recarregar perfil Comunicador SMS Números de telefone permitidos @@ -162,6 +177,9 @@ Número mínimo de minutos que deve decorrer entre um bólus remoto e o próximo Quantos minutos deve decorrer, pelo menos, entre um bólus e o próximo Para sua segurança, para editar esta preferência você precisa adicionar pelo menos 2 números de telefone. + Iniciando aplicação de %1$.2f U + Bolus %1$.2f U aplicado com sucesso + Bolus da refeição %1$.2f U aplicado com sucesso Alvo %1$s para %2$d minutos Alvo %1$s para %2$d minutos definido com sucesso Alvo Temp cancelado com êxito @@ -169,16 +187,25 @@ Loop foi desativado Loop foi ativado Loop ativado + Para conectar à bomba responda com o código %1$s + Conexão com a bomba falhou + Para desconectar a bomba por %1$d minutos responda com código %2$s Bomba desconectada Bomba reconectada O comando remoto não é permitido O bolus remoto não está disponível. Tente novamente mais tarde. + Para começar o basal %1$.2fU/h durante%2$d min responda com o código %3$s Para mudar o perfil para %1$s %2$d%% responda com o código %3$s + Para começar o bólus estendido %1$.2fU/h para %2$d min responda com o código %3$s Para inserir %1$dg em %2$s responda com código %3$s Para começar a basal %1$d%% U/h durante %2$d min responda com o código %3$s Para suspender o loop por %1$d minutos resposta com código %2$s + Para retomar o loop responda com o código %1$s + Para ativar o loop responda com o código %1$s + Para desativar o loop responda com o código %1$s Basal temporária %1$.2fU/h para %2$d min iniciada com êxito Bólus estendido %1$.2fU/h para %2$d min iniciado com êxito + Carboidratos %1$d g inseridos com sucesso Introdução de %1$dg de hidratos falhou Basal temporária %1$d%% U/h durante%2$d min iniciada com êxito Falha ao iniciar basal temp @@ -200,6 +227,7 @@ Refeição Correção Ações + (PERIGOSO PARA DESATIVAR) somente upload para NS Bomba não inicializada! Purgar/Preencher Por favor certifique-se que o valor corresponde ao especificado para o seu conjunto de infusão! @@ -217,6 +245,7 @@ Wear Reenviar Todos os Dados Abrir Definições em Wear + Valor da Basal Valor da basal abaixo do mínimo. Perfil não definido! BG: Último BG: @@ -225,16 +254,19 @@ Notificação em curso DADOS ANTIGOS %1$dmin atrás + Perfil OpenAPS AMA Array de %1$d elementos.\nValor atual: Dados Autosens Script debug Usar função Autosens + Atualizar de NS Apagar tratamentos do futuro ACT CONF LOOP OAPS + DINFS PL Início BOMBAV @@ -244,6 +276,7 @@ SMS Abreviar títulos dos separadores Usar sempre delta médio curto em vez de delta simples + Útil quando há ruído nos dados das fontes sem filtro como o xDrip. Perfil Valor padrão: 3 Por segurança é o valor limite estabelecido por OpenAPS. O que faz é limitar a basal a x3 a basal mázima. Se necessário modificar este valor, por favor ter em conta que os dados apontam para que os limites de segurança sejam - 3 x max diario ou 4x valor atual (qual seja menor) como valores máximos. Valor padrão: 4 Esta é a outra parte dos valores limites de segurança - 3 x max diário ou 4x valor actual - do OpenAPS. Isto define que não importa o valor da basal máxima definido na bomba, o valor máximo da basal temporária não pode ser maior que 4 x o valor da basal definida na bomba. O objetivo é evitar que sejam determinadas basais temporárias muito elevadas antes que se perceba como o algoritmo funciona. 4x é um valor que a maior parte das pessoas nunca necessitará de alterar pois o mais provável é necessitar de alterar outras definições para não necessitar de \"ultrapassar\" este limite de segurança. @@ -257,6 +290,9 @@ SMS número de telefone inválido Calibração xDrip+ não está instalado + Calibração enviada para o xDrip+ + Calibração enviada. O recebimento deve estar ativado no xDrip+. + xDrip+ não está recebendo calibrações Bomba suspensa Executando Definições da bomba virtual @@ -284,10 +320,13 @@ Dividir IOB entre IOB de bolus e de basal na face do relógio não foi bem sucedido - por favor, verifique o telefone n/a + Tipo de paciente Criança Adolescente Adulto Adulto resistente insulina + Grávida + Selecione o tipo de paciente para configurar os limites de segurança Nome do Paciente Por favor, forneça nome do paciente ou apelido para diferenciar entre várias configurações Usuário @@ -299,16 +338,24 @@ Suspender loop por 2h Suspender loop por 3h Suspender loop por 10h + Bomba Desconectada Desligar bomba por 15 min Desligar bomba por 30 min Desligar bomba por 1 h Desligar bomba por 2 h Desligar bomba por 3 h + 15 min + 30 min + 1 hora + 2 horas + 3 horas + 10 horas Continuar Reconectar Bomba Duração errada Loop suspenso Loop retomado + Tendência 15 min COB Superbólus Registar inicio da app no NS @@ -363,8 +410,6 @@ Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador. Ao ativar a função Autosense lembre-se de introduzir todos os carboidratos (carbs) que comeu. Caso contra contrário os desvios de carbs serão erroneamente identificados como uma variação da sensibilidade!! Média ponderada da Sensibilidade - OK - Cancelar Nem todos perfis foram carregados! Valores não guardados! Ativar partilha local. @@ -629,8 +674,14 @@ Verificador de Versão versão antiga versão muito antiga + Aplicativo expirou Nova versão para pelo menos %1$d dias disponíveis! Retorno a LGS após %2$d dias, o loop será desativado após %3$d dias 2h + BYODA + BYODA + Receber valores de glicemia do \'Build Your Own Dexcom App\'. + CA vs IA + Restrição de bólus aplicada: %1$.2f U para %2$.2f U !!!!! Absorção lenta de hidratos detectada: %2$d%% do tempo. Verifique o seu cálculo. COB pode estar sobreestimado, assim mais insulina pode ser dada !!!]]> Entregue esta parte do resultado do assistente de bólus [%] Assistente de bólus executa o cálculo, mas apenas esta parte da insulina calculada é entregue. Útil com o algoritmo SMB. @@ -638,6 +689,9 @@ Aumentar o valor máximo de basal porque a configuração é inferior à sua basal máxima no perfil Corpo da mensagem inválido %1$s FSI: %2$.1f + %1$.0fg IC: %2$.1f + %1$d%% + min Nome do Perfil: Seleccionado: Unidades @@ -650,18 +704,25 @@ IC FSI ALV + Clonar Guardar ou repor as alterações atuais primeiro Eliminar perfil atual? + Criar novo perfil local a partir deste perfil? Nome do perfil contém pontos.\nIsso não é suportado pelo NS.\nPerfil não foi enviado para o NS. Valor mais baixo da área de intervalo (apenas exibição) Valor mais alto da área de intervalo (apenas exibição) + Idade + Peso + ID: Enviar Perfil mais comum: Nota: Apenas os dados visíveis neste ecrã serão enviados anonimamente. O ID é atribuído a esta instalação do AndroidAPS. Você pode enviar dados novamente se o perfil principal for alterado, mas deixá-lo rodar pelo menos uma semana para tornar o resultado visível no intervalo de tempo. Sua ajuda é apreciada. Entrada de idade inválida Entrada de peso inválida + Entrada % inválida %1$s: Hipo: %2$02d%% Dentro: %3$02d%% Hiper: %4$02d%%]]> Média + TIR Monitor de atividade Quer reiniciar as estatísticas de atividade? Estatísticas @@ -670,6 +731,7 @@ GLIC Ferramentas Mostrar Localização + Mostrar removido(a)s Limpar fila? Todos os dados na fila serão perdidos! O uso do Bólus Estendido irá parar o modo Closed Loop no tempo do bólus estendido. Quer realmente isso? Closed Loop desabilitado por causa da execução do Bólus Estendido @@ -680,12 +742,20 @@ Hora de solicitação Basal Temp Hora de execução Basal Temp + do aplicativo Autenticador para: %1$s seguido por PIN + PIN adicional obrigatório no fim do token Dígitos adicionais que devem ser memorizados e colados no final de cada Uma-Password-Única que seja gerada Configuração do Autenticador + Código para verificar: + CÓDIGO + PIN + O código de verificação consiste em 6 dígitos exibidos pelo app Autenticador (conhecido como OTP) seguido por 3 ou mais dígitos do PIN obrigatório. Repor Autenticadores Repor Chave Autenticador Tem certeza de redefinir chave Authenticador? Ele tornará todos os Authenticators configurados atualmente como inválidos, e precisará de os configurar novamente. Nova Chave do Autenticador foi gerada! Por favor, use o QRCode atualizado para os autenticadores. + Exportando senha OTP + Tem certeza de que deseja copiar a senha OTP para a área de transferência?\n\nGeralmente, isso somente é necessário se o aplicativo autenticador apresenta problemas para escanear o QRCode, se você quer inserir a senha manualmente ou se você deseja configurar um token físico (hardware) de OTP usando um aplicativo dedicado. + Senha OTP (no formato Base32) exportada e copiada para a área de transferência. Cole-a em um aplicativo autenticador ou gravador de dispositivo OTP físico! 1. Instalar Autenticador 2. Pesquise o código para configurar os códigos OTP do AndroidAPS 3. Teste Uma-Password-Única @@ -698,10 +768,92 @@ Insulina absoluta Password Mestre é usada para encriptação da cópia de segurança e substituir segurança na aplicação. Lembre-se dela ou guarde-a em um lugar seguro. Senha mestra atual + Luzes de estado Copiar definições do NS + Copiar configurações do NS (se existirem)? Tema original + Design de baixa resolução Botões são sempre exibidos na parte inferior da tela Mostrador Grande Tema + Comparar perfis + Assistente de perfil + Perfil padrão + Perfil atual + Perfis disponíveis + Tipo de perfil + Idade: %1$.0f TDD: %2$.0f U + Idade: %1$.0f TDD: %2$.0f U %3$d%% + Idade: %1$.0f Peso: %2$.0f kg + % da basal + Perfil padrão DPV + Estado do RileyLink: + Filtros + Não foi possível criar o perfil. Perfil inválido. + Não encerre meu aplicativo? + Enviar SMS se um evento de bomba inacessível for identificado + Reportar bomba inacessível + Disparar alarme quando for a hora de comer + Disparar alarme em %1$d min + Assistente de bolus + Sua glicemia está alta. Em vez de comer agora, é recomendado esperar por uma glicemia melhor. Quer fazer um bolus de correção agora e ser lembrado de quando for hora de comer? Neste caso, nenhum carboidrato será registrado e você deverá usar o assistente novamente quando lembrarmos você. + Ativar o assistente de bolus + Hora de comer!\nAbra o assistente de bolus e faça o cálculo novamente. + Hora de comer + Lembrete de bolus + Ativar lembrete de bolus + Usar lembrete para adiar o bolus com o assistente + (\"pós-bolus\") + Hora do bolus!\nAbra o assistente de bolus e faça o cálculo novamente. + Estado dos dados de glicemia + idade da cânula + Idade da bomba patch + Bomba patch + Dados recalculados foram utilizados + Glicemia muito próxima:\n%1$s\n%2$s + Identificação (e-mail, apelido FB ou Discord, etc) + Identificação não definida no modo de desenvolvimento + caixa de diálogo + glicemia atual + resultado correto em % + resultado correto em unidades + Indisponível + hiper + dentro da meta + hipo + caindo rapidamente + caindo + caindo lentamente + estável + subindo lentamente + subindo + subindo rapidamente + nenhum + desconhecido + gráfico + qualidade da glicemia + recalculada + entradas duplicadas + insulina + glicemia + desatualizado + definir lembrete + adicionar novo perfil + clonar perfil atual + excluir perfil atual + adicionar novo à lista + Alvo temporário pré-definido desconhecido: %1$s + Cancelando Alvos temporários em execução? + Unidades diferentes usadas no relógio e telefone! + Desligar alvo temporário - cancelando Alvos temporários atuais? + Glicemia mínima fora do alvo! + Glicemia maxima fora da meta! + Alvo temporário:\nMin: %1$s\nMax: %2$s\nDuração: %3$s + Alvo temporário:\nTarget: %1$s\nDuration: %2$s + Alvo temporário:\Reason: %1$s\nTarget: %2$s\nDuration: %3$s + Assistente rápido: %1$s\nInsulin: %2$.2fU\nCarbs: %3$dg + Calculadora:\nInsulin: %1$.2fU\nCarbs: %2$dg + Mostrar entrada no dispositivo: + O assistente rápido selecionado não está mais disponível, atualize seu atalho diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 6f39d90a8a..b7eb291b82 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -161,7 +161,6 @@ Condições de Utilização NÃO DEVE SER USADO PARA FAZER DECISÕES MÉDICAS. NÃO HÁ NENHUMA GARANTIA PARA O PROGRAMA, NA EXTENSÃO PERMITIDA PELA LEGISLAÇÃO APLICÁVEL. EXCEPTO QUANDO DE OUTRA FORMA, POR ESCRITO, OS TITULARES DOS DIREITOS DE AUTOR E / OU OUTRAS PARTES FORNECEM O PROGRAMA “TAL COMO ESTÁ”, SEM GARANTIA DE QUALQUER TIPO, EXPRESSA OU IMPLÍCITA, INCLUINDO, MAS NÃO SE LIMITANDO, ÀS GARANTIAS IMPLÍCITAS DE COMERCIALIZAÇÃO E ADEQUAÇÃO A UMA FINALIDADE ESPECÍFICA. TODO O RISCO QUANTO À QUALIDADE E DESEMPENHO DO PROGRAMA É CONSIGO. CASO O PROGRAMA SEJA DEFEITUOSO, ASSUME O CUSTO DE TODOS OS SERVIÇOS, REPAROS OU CORREÇÕES NECESSÁRIOS. EU ENTENDO E CONCORDO - Guardar Recarregar perfil Comunicador SMS Número de telefones permitidos @@ -426,8 +425,6 @@ Impedir Android de desligar o ecrã. Isto irá consumir muita bateria quando não ligado ao carregador. Ao activar a função Autosense lembre-se de introduzir todos os hidratos de carbono (HC) que comeu. Caso contrário os desvios de hidratos serão erroneamente identificados como uma variação da sensibilidade !! Média ponderada da Sensibilidade - OK - Cancelar Nem todos perfis foram carregados! Valores não guardados! Activar transmissões para outras aplicações (como xDrip+). Não habilite se tiver mais de uma instância de AAPS ou ClienteNS instalado! diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 385e6ab60b..9a940d2d3d 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -161,7 +161,6 @@ Licență utilizator final NU FOLOSIȚI PENTRU LUAREA DE DECIZII MEDICALE. NU EXISTĂ RĂSPUNDERE LEGALĂ SAU GARANȚIE PENTRU ACEST PROGRAM, ÎN LIMITA APLICABILĂ A LEGII. CU EXCEPTIA CAZURILOR SPECIAL MENȚIONATE, AUTORUL ȘI/SAU ALTE PERSOANE IMPLICATE PUN LA DISPOZIȚIE ACEST PROGRAM FĂRĂ NICIO GARANȚIE, IMPLICITĂ SAU EXPLICITĂ, INCLUZÂND, DAR FĂRĂ A SE LIMITA LA, GARANȚIILE LEGATE DE VĂNZAREA SAU POTRIVIREA PENTRU UN ANUME SCOP. ÎNTREGUL RISC LEGAT DE CALITATEA ȘI PERFORMANȚA ACESTUI PROGRAM CAD ÎN RESPONSABILITATEA DUMNEAVOASTRĂ. DACĂ PROGRAMUL SE DOVEDEȘTE A FI DEFECT, DUMNEAVOASTRĂ VĂ ASUMAȚI ÎNTREAGA RĂSPUNDERE, PRECUM ȘI TOATE COSTURILE LEGATE DE SERVICE, REPARAȚII SAU CORECȚII. ÎNȚELEG ȘI SUNT DE ACORD - Salvează Reîncarcă profilul Comunicator SMS Numere de telefon permise @@ -426,8 +425,6 @@ Nu permite telefonului să stingă ecranul. Când este activă, această opțiune consumă foarte multă baterie atunci când telefonul nu este la încărcat. Trebuie introduși toți carbo la pornirea Autosens. În caz contrar, acțiunea carbo va fi percepută ca schimbare a sensibilității! Sensibilitate estimată prin mediere - OK - Renunță Nu s-au încărcat toate profilurile! Nu s-au salvat valorile! Activați transmisiunile către alte aplicații (cum ar fi xDrip+). Nu activați dacă aveți mai mult de o instanță de AAPS sau NSClient instalat! diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 7bb151d4fd..f0a5cc2a2e 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -25,6 +25,7 @@ Синхронизирует данные с Nightscout Состояние алгоритма в 2017 году Самый новый алгоритм для опытных пользователей + Последний алгоритм для опытных пользователей с динамическим/автоматическим ISF Отображает текущее состояние цикла и часто используемые кнопки Показывает текущие уведомления и краткий обзор событий цикла Определите профиль, доступный в автономном режиме. @@ -161,7 +162,6 @@ лицензионное соглашение с пользователем НЕ ДОЛЖНО ИСПОЛЬЗОВАТЬСЯ ДЛЯ ПРИНЯТИЯ МЕДИЦИНСКИХ РЕШЕНИЙ. ПРОГРАММА НЕ ДАЕТ ГАРАНТИЙ В РАМКАХ СУЩЕСТВУЮЩЕГО ЗАКОНОДАТЕЛЬСТВА. ПРЕДОСТАВЛЯЕТСЯ \"КАК ЕСТЬ\" БЕЗ ЯВНЫХ ИЛИ СКРЫТЫХ ГАРАНТИЙ ВКЛЮЧАЯ НО НЕ ОГРАНИЧИВАЯСЬ ВОЗМОЖНОСТЬЮ КОММЕРЧЕСКОГО ИСПОЛЬЗОВАНИ ИЛИ СООТВЕТСТВИЯ КАКИМ-ЛИБО ЦЕЛЯМ. ВСЕ РИСКИ ЛОЖАТСЯ НА ВАС. В СЛУЧАЕ НЕРАБОТОСПОСОБНОСТИ ПРОГРАММЫ ВЫ НЕСЕТЕ ВСЕ РАСХОДЫ СВЯЗАННЫЕ С ОБСЛУЖИВАНИЕМ РЕМОНТОМ ИЛИ КОРРЕКТИРОВКОЙ. я понимаю и принимаю - сохранить обновить профиль SMS коммуникатор разрешенные телефонные номера @@ -266,6 +266,7 @@ КОНФ ЗЦ OAPS + ДинISF ЛП НАЧАЛО ВиртПомпа @@ -426,13 +427,12 @@ Не давать системе Android отключать экран. Это увеличит потребление энергии при отключенной сети питания. Активируя Autosense не забывайте вводить все съеденные углеводы. Иначе отклонения в углеводах будут неверно определены как изменение чувствительности !! Средневзвешенная чувствительность - OK - отмена не все профили загружены! Данные не сохранены! Включить трансляцию для других приложений (например, xDrip). Не включайте, если установлено несколько экземпляров приложений AAPS или NSClient! Активировать локальную передачу Супер микро болюс OpenAPS + Динамический ISF Включить непредвиденный прием пищи UAM Включить супер микро болюс SMB Для ускорения действия используйте супер микро болюсы SMB вместо временного базала @@ -501,6 +501,7 @@ Только отрицательные Вычисление активных углеводов COB Вычисление временного целевого значения + Расчет процентов Цикл активирован Выбран APS NSClient имеет разрешение на запись @@ -661,6 +662,9 @@ Чувствительность поднимает цель При обнаружении чувствительности целевой уровень глюкозы повышается AndroidAPS перезапущен + Показать недействительные + Скрыть недействительные + Удалить элементы Найдены сохраненные параметры Внимание: Если вы активируете подключение к невиртуальной помпе, AndroidAPS скопирует настройки базала в профиль помпы, перезаписывая существующие настройки, хранящиеся в ней. Убедитесь, что настройки базала в AndroidAPS корректны. Если вы не уверены или не хотите перезаписать настройки базала на помпу, нажмите отменить и повторите подключение в другое время. Данные терапии неполные @@ -756,6 +760,8 @@ Имя профиля содержит точки.\nЭто не поддерживается NS.\nПрофиль не выгружен в NS. Меньшее значение диапазона целевых значений (только для дисплея) Большее значение диапазона целевых значений (только для дисплея) + Возраст + Вес Идентификатор: Отправить Наиболее часто применяемый профиль: @@ -928,4 +934,23 @@ уровень глюкозы в крови (ГК) устаревшие данные + Неизвестная конфигурация врем цели: %1$s + Отменить врем цели? + На часах и телефоне различные единицы измерения! + Нулевая врем цель - отмена? + Мин ГК вне диапазона! + Макс ГК вне диапазона! + ВремЦель:\nМин: %1$s\nМакс.: %2$s\nДлительность: %3$s + ВремЦель:\nЦель: %1$s\nДлительность: %2$s + Выберите профиль для изменения + Обновить из Nightscout + Удалить выбранные элементы + Выберите для удаления + Изменение профиля + Временные цели + Углеводы и болюс + Вы уверены, что хотите удалить %1$d элементов + Скрыть цикл + Показать цикл + %1$d выбрано diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 9dbf3f2944..13ce767148 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -162,7 +162,6 @@ Licenčná zmluva s koncovým používateľom Tento program nemôže byť použitý na medicínske rozhodnutia. Na program neexistuje žiadna záruka, alebo garantovaná podpora v akejkoľvek podobe. Keď už sa rozhodneš pre používanie, tak jeho kvalita a celkové schopnosti tohto projektu závisia len na Tebe samotnom. Ak by sa ukázalo, že je program chybný, preberáš všetky potrebné náklady na liečbu, prípadne náklady na iné servisné služby, opravy, alebo korekcie. ROZUMIEM A POTVRDZUJEM - Uložiť Obnoviť profil SMS komunikátor Povolené telefónne čísla @@ -428,14 +427,11 @@ Zabrániť Androidu, aby zhasínal obrazovku. Bez pripojenia nabíjačky vybije veľmi rýchlo batériu! Pri zapnutej automatickej detekcii citlivosti, nezabudnite vkladať všetky prijaté sacharidy. V opačnom prípade, budú odchýlky mylne vyhodnocované, ako zmena citlivosti !! Citlivosť vážený priemer - OK - Zrušiť Nenačítané všetky profily! Hodnoty nie sú uložené! Povoliť vysielanie do iných aplikácií (napr. xDrip+). Nepovoľujte, pokiaľ máte nainštalovanú viac ako jednu AAPS, alebo NSClient inštanciu! Povoliť lokálne vysielanie. OpenAPS SMB - OpenAPS SMB s dynamickým ISF Povoliť UAM Povoliť SMB Použiť Super Mikro Bolusy namiesto dočasných bazálov, pre zrýchleniu účinku diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index f657128eee..d4320379fa 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -163,7 +163,6 @@ Eversense-appen. Licensavtal för slutanvändare FÅR INTE ANVÄNDAS FÖR ATT FATTA MEDICINSKA BESLUT. DET FINNS INGEN GARANTI FÖR PROGRAMMET I DEN UTSTRÄCKNING SOM TILLÅTS AV GÄLLANDE LAG. FÖRUTOM NÄR ANNAT ANGES SKRIFTLIGEN LEVERERAS APPLIKATIONEN SOM DEN ÄR HELT UTAN GARANTIER I NÅGON SOM HELST FORM, VARKEN UTTRYCKTA ELLER UNDERFÖRSTÅDDA, INKLUSIVE MEN INTE BEGRÄNSAT TILL SÄLJBARHET OCH LÄMPLIGHET FÖR ETT VISST ÄNDAMÅL. HELA RISKEN VAD GÄLLER KVALITET OCH PRESTANDA AV PROGRAMMET ÅLIGGER ANVÄNDAREN. OM PROGRAMMET VISAR SIG VARA DEFEKT ANTAR ANVÄNDAREN DEN FULLA FÖR KOSTNADEN FÖR ALL NÖDVÄNDIG SERVICE, REPARATION ELLER KORRIGERING. JAG FÖRSTÅR OCH GODKÄNNER - Spara Ladda om profil SMS-tjänst Godkända telefonnummer @@ -430,14 +429,11 @@ Eversense-appen. Förhindrar att skärmen stängs av. Förbrukar mer batteri. Genom att slå på Autosens funktionen, kom ihåg att skriva in alla KH. Annars kommer programmet göra fel i beräkningar av känslighet (ISF)!! WeightedAverage - OK - Avbryt Alla profiler laddades inte! Alla värden sparades inte! Aktivera sändning till andra appar (som xDrip+) på denna telefon. Aktivera inte detta om du har fler än en förekomst av AAPS eller NSClient installerad! Aktivera lokala broadcasts OpenAPS SMB - OpenAPS SMB Dynamisk ISF Aktivera UAM Aktivera SMB Använd Super Micro Bolusar istället för temp basal för snabbare resultat diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 1b1bba77e5..128bbc7f26 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -162,7 +162,6 @@ Son Kullanıcı Lisans Sözleşmesi TIBBİ KARAR VERMEK İÇİN KULLANILMAMALIDIR. UYGULANABİLİR YASANIN İZİN VERDİĞİ ÖLÇÜDE, PROGRAM İÇİN GARANTİ YOKTUR. TELİF HAKKI SAHİPLERİNİN VE / VEYA DİĞER TARAFLARIN YAZILI OLMASINA YÖNELİK BAŞKA HİÇBİR ŞEKİLDE BELİRTİLEN VEYA BELİRLİ BİR AMACA UYGUNLUK İLE İLGİLİ ZIMNİ GARANTİLER DE DAHİL OLMAK ÜZERE ANCAK BUNLARLA SINIRLI OLMAMAK ÜZERE AÇIK VEYA ZIMNİ HİÇBİR GARANTİ OLMAKSIZIN “OLDUĞU GİBİ” SAĞLAMAKTADIR. PROGRAMIN KALİTESİ VE PERFORMANSI İLE İLGİLİ TÜM RİSK SİZE AİTTİR. PROGRAMIN HASARLI OLMASI DURUMUNDA, TÜM GEREKLİ SERVİS, ONARIM VEYA DÜZELTME MALİYETİNİ KABUL ETMİŞ OLURSUNUZ. ANLADIM VE KABUL EDİYORUM - Kaydet Profili yeniden yükle SMS Kominikatör İzinli telefon numaraları @@ -430,14 +429,12 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d Android\'in ekranı kapatmasını önleyin. Prize takılı değilken çok fazla enerji tüketir. Otoduyarlılık özelliğini açarsanız tüm yenen karbonhidratları girmeyi unutmayın. Aksi halde, karbonhidrat sapmaları duyarlılık değiştikçe yanlış tanımlanacaktır!! Ağırlıklı ortalama duyarlılık - Tamam - Vazgeç Tüm profiller yüklenmedi! Değerler kaydedilmedi! Diğer uygulamalara (xDrip+ gibi) yayınları etkinleştirin. Yüklü birden fazla APPS veya NSClient örneğiniz varsa etkinleştirmeyin! Yerel yayınları etkinleştirin. OpenAPS SMB - OpenAPS SMB Dinamik İDF + Dinamik İDF UAM etkinleştir SMB (Super Micro Bolus) etkinleştir Daha hızlı bir etki için geçici bazal yerine Super Micro Bolus kullanın @@ -667,6 +664,9 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d Duyarlılık hedefi yükseltir Hassasiyet tespit edildiğinde, KŞ hedefini yükseltin Temiz AndroidAPS başladı + Geçersiz olanları göster + Geçersiz olanları gizle + Öğeleri kaldır Saklanan ayarlar bulundu Dikkat: Eğer bir donanım pompasını etkinleştirir ve bağlarsanız, AndroidAPS, bazal ayarları profilden pompaya aktaracaktır ve pompada kayıtlı mevcut bazal oranlarının üzerine yazacaktır. AndroidAPS\'de doğru ayarların olduğundan emin olun. Emin değilseniz veya pompanızdaki bazal ayarların üzerine yazmak istemiyorsanız, iptal tuşuna basın ve daha sonra tekrar deneyin. Tedavi verileri eksik @@ -975,4 +975,15 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d Bilinmeyen eylem komutu: Yüzde Uygulama varsayılanı + Düzenlenecek profili seç + Nightscout\'tan Yenile + Seçili nesneleri kaldır + Silmek için seçin + Profil değişiklikleri + Geçici Hedefler + Karbonhidrat ve bolus + %1$d öğeyi kaldırmak istediğinizden emin misiniz + Döngüyü gizle + Döngüyü göster + %1$d seçildi diff --git a/app/src/main/res/values-zh-rCN/exam.xml b/app/src/main/res/values-zh-rCN/exam.xml index 5bfa347443..87ec82780f 100644 --- a/app/src/main/res/values-zh-rCN/exam.xml +++ b/app/src/main/res/values-zh-rCN/exam.xml @@ -1,4 +1,214 @@ + 关于DIA(胰岛素作用持续时间)哪些是对的? + 胰岛素作用持续时间 ( DIA) + 您应该在个人配置文件中设置胰岛素敏感系数DIA的值。 + 允许的最小值为 5 小时。 + https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html?#insulin + 如果您确信在 AndroidAPS 之前的泵中使用的 DIA 值工作良好，那么在开始循环时不需要更改此值。 + 您应该为自己确定 DIA 的适当值。 + 低血糖临时目标 + 设定低血糖临时目标的主要原因是什么？ + 纠正由于基础率设置不准确而引起的低血糖事件。 + 治疗低血糖时，防止AndroidAPS过度纠正因补充碳水引起的血糖速升事件。 + 纠正由于运动引起的低血糖事件。 + 在已设定0%临时基础率的基础上，进一步防止血糖降低。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html + 哪些配置文件可以离线使用和配置？ + 主题: 离线配置文件 + NS 文件可以使用，但不能配置 。 + https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#profile + 在 AndroidAPS中应用\"断开泵\"的原因 泵断开连接时我们应做些什么? + 这是没有必要的，如果胰岛素泵物理断开，胰岛素会无法输注。 + 在胰岛素泵物理断开时，它可以防止AndroidAPS将未输注的胰岛素剂量进行统计。 + 如果胰岛素泵保持连接，就不会停止胰岛素输注。 + 它将让AndroidAPS进入开环模式。 + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#other-settings + 安卓APS设置 + 安卓APS设置 + 备份设置的最佳办法是什么? + 你不需要导出你的设置，只要你对它们做了记录。 + 在实现一个目标后导出您的设置。 + 在更改您的任何设置后导出您的设置。 + 在您完成初始化并设置了您的偏好选项后导出您的设置。 + 使用维护菜单导出您的本地设置。 + 您的设置文件可以在手机上的文件夹内部存储/AAPS/preferences中找到。 + 将您的首选项文件复制到手机以外的安全位置(如使用云盘，用数据线传到计算机，电子邮箱等等) + 如果您的手机损坏或丢失，在没有备份的情况下可以轻松的远程恢复您的设置。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/ExportImportSettings.html + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-emergency-equipment-is-recommended-to-take-with-me + CGM数据噪音 + 如果 CGM 数据有噪声，我们应该怎么办? + 什么都不需要做，AAPS会处理的。 + 禁用闭环功能以避免胰岛素过量或不足。 + 更换持续产生噪音或不准确数据的传感器。 + 验证您的CGM应用程序是否提供了平滑数据。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/Smoothing-Blood-Glucose-Data-in-xDrip.html#smoothing-blood-glucose-data + 运动和配置 + 你如何使用配置文件来最好地帮助APS系统处理有氧运动？ + 请执行低于100%的配置文件切换。 + 请执行高于100%的配置文件切换。 + 将配置文件设置为100%。 + 暂停闭环。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target + 运动和临时目标 + 你如何使用临时目标功能来最好地帮助APS系统处理有氧运动？ + 在开始运动之前，选一个合适的时间设置活动血糖目标。 + 在运动结束之后，设置活动血糖目标。 + 让你的血糖目标保持不变。 + 等血糖值低于你的低血糖警戒线之后，吃15克速升的活性碳水合物。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/temptarget.html#activity-temp-target + 禁用/暂停闭环 + 在禁用/暂停闭环时，是否可以输注胰岛素? + 是的，胰岛素基础率可以正常输注的。 + 不，胰岛素停止输注。 + Basal(基础率)，ISF(胰岛素敏感系数)和I:C(胰岛素:碳水)测试 + 什么时候需要修订这些值？ + 在开始闭环之前。 + 当经常出现高血糖或低血糖时。 + 每周至少一次。 + 一旦设置和验证，这些值不应随着时间而变化。 + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#androidaps-settings + 先决条件 + 什么是建立和使用 AndroidAPS的基本条件？ + 已验证配置文件的信息 (Basal， IC， ISF， DIA)。 + 一台安装和配置了Android Studio软件的计算机。 + 一部支持此应用的手机。 + 一个兼容的胰岛素泵，如果您计划运行闭合模式。 + Nightscout, 以保存所有数据的日志和检查设置。 + Tidelpool账户。 + Google 账户 + GitHub 账户 + 编程或编辑代码方面的经验。 + 一台 MiniMed 670G 泵。 + https://androidaps.readthedocs.io/en/latest/EN/Module/module.html + 一个智能手表. + 一个可正常使用的 CGM。 + 先决条件 + 什么是建立和使用 AndroidAPS的基本条件？ + 验证参数信息用于个人配置文件（如ISF胰岛素敏感度系数、I:C胰岛素碳水比率、基础率、DIA胰岛素作用持续时间等等）。 + 兼容的Android 设备 (例如：手机、安卓原生系统手表，或平板电脑)。 + AndroidAPS需要互联网连接才能启用闭环功能。 + 一台安装了动态血糖监测应用或兼容软件的手机/设备，用于接收血糖数据。 + https://androidaps.readthedocs.io/en/latest/EN/Module/module.html + 更新 AndroidAPS + 检查所有正确的答案. + 您需要在您的计算机上安装和配置Git。 + 当更新的 AndroidAPS 版本发布时，先前的版本可能会在指定时间之后受到远程限制。 + 您应该保存并记住密钥的存储位置，并使用相同地签名密钥进行更新，与您以前的安装一样。 + 如果该系统运作良好，就不要去更新系统。 + 如果您在构建应用时遇到困难，您可以安装一个由朋友构建的应用程序。 + https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#update-to-a-new-version-or-branch + 疑难解答 + 您在哪里可以寻找到AndroidAPS的帮助信息？ + 您可以在 AndroidAPS 用户 Facebook 群组中询问建议。 + 您应该阅读(并多次阅读) AndroidAPS 文档。 + 您可以在AndroidAPS的Gitter房间询问建议，记录或讨论技术问题。 + 您应该问您的糖尿病诊所/内分泌专家。 + https://androidaps.readthedocs.io/en/latest/EN/Installing-AndroidAPS/Update-to-new-version.html#troubleshooting + https://www.facebook.com/groups/AndroidAPSUsers/ + https://gitter.im/MilosKozak/AndroidAPS + 胰岛素插件 + 在超速效Oref插件中你应该使用哪种胰岛素？ + Fiasp®速效门冬胰岛素(超速效) + 诺和锐®/门冬胰岛素® + 优泌乐®赖脯胰岛素 + 诺和灵®/优泌林 R®/\"常规\"人胰岛素 + https://androidaps.readthedocs.io/en/latest/EN/Configuration/Config-Builder.html#insulin + 敏感度插件 + 选择所有正确的答案。 + 灵敏度插件允许AndroidAPS临时调整胰岛素敏感度的短暂变化(例如激素变化或与输液部位吸收相关的问题)。 + 灵敏度插件为用户提供基础率、 I:C比率和 ISF 的更改建议，可用来编辑配置文件。 + 记录输注导管更换会将Autosens比率重置回100%。 + 一些插件选项具有可配置的时间范围，可由用户设置。 + https://androidaps.readthedocs.io/en/latest/EN/Configuration/Sensitivity-detection-and-COB.html + 碳水化合物输入错误 + 如果您输入了不正确的碳水化合物，该怎么办? + 删除治疗数据中的错误条目，并重新输入正确的碳水值。 + 使用主菜单地输注功能输注大剂量胰岛素。 + 什么都不做-AndroidAPS将进行适当的调整。 + 使用首页概览中的胰岛素(输注) 按钮输注大剂量胰岛素。 + 胰岛素输注/记录错误 + 如果你实际吸收的胰岛素少于泵的历史记录你应该做些什么？例如：由于堵塞、插管失败或淋浴后忘记重新连接泵？ + 从Nightscout护理门户删除胰岛素数据，将其从泵的历史记录中删除。 + 比较AndroidAPS和泵历史记录中的值(如果泵支持此功能)。 + 通过注射器或胰岛素笔输注你计算出的“遗漏”胰岛素的一部分。 + 不做任何事情，允许AndroidAPS纠正高血糖导致的任何结果。 + 活性胰岛素(IOB) + 选择所有正确的答案。 + 活性胰岛素IOB数值受发布的临时基础率影响。 + 当您的血糖低于目标值时，不会被给予高临时基础率。 + 在没有运动的情况下，活性胰岛素IOB长时间负数表明你的个人配置太强，你需要在配置中减少的胰岛素用量。 + 长时间活性胰岛素IOB数值过高，表示可能存在胰岛素抵扣，或者没有记录的饮食。 + 碳水记录和胰岛素输注 + 只能使用克来估算和记录消耗的碳水化合物。 + 消耗的碳水化合物可以使用适当地交换份系统 (例如：正常饮食剂量调整DAFNE的“碳水化合物量CHO” 或者 欧洲“面包单位Bread Units”)进行记录。 + AndroidAPS使用一个动态模型来估计碳水化合物的“衰减”并计算活性碳水化合物COB + 如果血糖水平超出可接受值(过低或过高)，则可以使用大剂量向导计算器提供碳水化合物或胰岛素的校正建议。 + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u + 扩展碳水化合物 + 你能使用碳水时间偏移功能 (扩展碳水化合物) 做什么？ + 计划今后的碳水化合物，可以在未来一段时间内分布碳水值(类似于在一段时间内分配胰岛素的扩展大剂量功能)。 + 通过记录“自由”运动的碳水化合物，你可以躲避AndroidAPS的统计。 + 通过扩展碳水化合物(将来分发统计) 可以帮助AndroidAPS 处理高脂肪/蛋白质的饮食。 + 用于记录治疗低血糖的碳水化合物。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/Extended-Carbs.html + 远程监控 + 你如何远程监控AndroidAPS(比如你的孩子)？ + NS客户端应用、Nightscout应用和Nightscout网页都允许您远程关注AndroidPS。 + 其他应用(如Dexcom follow、以follow模式运行的xDrip)允许您远程关注某些参数 (如血糖/传感器值)，但由于使用不同的算法，可能会有不准确的IOB或COB值。 + 要远程关注AndroidAPS ，两台设备都必须能够访问互联网 (例如通过Wi-Fi或移动数据网络)。 + NS客户端作为远程关注者使用时，将监控和提供对AndroidAPS的完全控制。 + https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html + 胰岛素敏感系数(ISF) + 提高ISF值将导致更多的胰岛素输注，以消化特定数量的碳水化合物。 + 降低ISF值会导致更多的胰岛素输注，用于纠正高于目标的血糖值。 + 当血糖水平低于目标值时，提高或降低ISF对胰岛素输送没有影响。 + 胰岛素敏感系数ISF应该在AndroidAPS 首选项配置中输入。 + 更改配置文件中的胰岛素敏感系数值要在可以实现的范围内。 + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-sensitivity-factor-isf-mmol-l-u-or-mg-dl-u + https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html + 在个人配置文件中可以使用一个以上的I:C比率。 + 如果你在个人配置文件中修改了你的胰岛素敏感系数ISF，你也应该经常改变你的I:C比率。 + 胰岛素与碳水化合物的比率(I:C比率) + 对于定量的碳水化合物，更高的I:C比率会导致胰岛素输注减少。 + 对于定量的碳水化合物，更低的I:C比率会导致胰岛素输注减少。 + 如果你的活性碳水化合物数值为0，改变IC比率将导致使用不同的胰岛素剂量来校正给定的血糖值。 + 如果你将面包单位(交换份) 计算为10克或12克，那么碳水系数IC比率将不同。 + IC 的含义是：1单位胰岛素可以覆盖多少面包单位 (交换份) 。 + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u + 配置文件切换 + 当指定一个90%的配置文件切换时，哪些答案是正确的？ + 基础率会降低10%。 + 胰岛素敏感系数ISF值将提高10%。 + 胰岛素与碳水化合物的比率I:C比率的值将降低10%。 + 胰岛素敏感系数ISF和胰岛素碳水比率I:C将保持不变。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profilewitch#profile-switch + 配置文件切换 + 当指定一个120%的配置文件切换时，哪些答案是正确的？ + 血糖的目标值将提高20%。 + 胰岛素基础率会提高20%。 + 血糖的目标值将保持不变。 + 胰岛素敏感系数ISF值将提高20%。 + 配置文件切换 + 如果您比平常早起 2 个小时，您应该如何通知AndroidAPS应对个人日程表中的更改? + 以增加2小时的方式，启动个人配置文件切换 + 以减少2小时的方式，启动个人配置文件切换 + 设置一个马上吃饭的临时的目标血糖值。 + 将配置文件切换到100%以上。 + https://androidaps.readthedocs.io/en/latest/EN/Usage/Profiles.html?highlight=profilewitch#timeshift + 修改配置文件 + 基础率、胰岛素敏感系数ISF、胰岛素和碳水比率I:C等，应在配置文件中设定。 + 激活对Nightscout配置文件的更改，需要您的AndroidAPS 手机启用互联网连接。 + 编辑配置文件并修改参数，足以进行任何更改。 + 可以设置和选择多个配置文件，以适应不断变化的环境(例如激素变化、轮班工作、工作日/周末生活方式)。 + https://androidaps.readthedocs.io/en/latest/EN/Module/module.html#good-individual-dosage-algorithm-for-your-diabetes-therapy + 帮助调整基础率 + 去哪里寻求胰岛素基础率等方面的帮助。 + 你的糖尿病团队 + 谷歌 + Facebook + 其他药物。请阅读下面的声明，然后勾选接受声明。 + AndroidAPS通过降低基础率或暂停胰岛素泵来提高血糖值。而SGLT2抑制剂类药物(格列氟嗪) 可防止血糖升高，因此可能会导致危险的胰岛素缺乏DKA症状。\n常见的品牌包括: Invokana卡格列净®, Forxiga达格列净®, Jardiance恩格列净®, Steglatro埃格列净®, Suglat伊格列净L-脯氨酸®, Apleway®, Deberza托格列净®, Synjardy恩格列净/二甲双胍®, Vokanamet卡格列净/速释二甲双胍®, Xigduo达格列净/缓释型盐酸二甲双胍®.\n\n我在此承诺，不会在使用AndroidAPS 时服用此类药物，保证在使用此类药物前停用闭环。 diff --git a/app/src/main/res/values-zh-rCN/objectives.xml b/app/src/main/res/values-zh-rCN/objectives.xml index 3ea04e700d..88614427d7 100644 --- a/app/src/main/res/values-zh-rCN/objectives.xml +++ b/app/src/main/res/values-zh-rCN/objectives.xml @@ -1,2 +1,55 @@ - + + 开始 + 验证 + %1$d．目标 + 目标 %1$d 未开始 + 目标 %1$d 未完成 + 设置可视化的连续血糖监测系统，并且分析胰岛素基础率和比率。 + 验证Nightscout中血糖(BG) 数据可用，并且泵的胰岛素数据正在上传。 + 开始开环 + 在开环模式下运行几天，手动设定多次临时基础率。设置临时目标默认值并使用临时目标功能（例如，在运动或低血糖补充碳水化合物时） + 了解你的开环，包括它的临时基础率建议 + 基于使用开环的经验，决定基础率的最大值，在胰岛素泵和AAPS的参数选项上设置它 + 从低血糖维持模式(用于测算基础率) 开始闭环功能 + 设置最大活性胰岛素IOB=0，在闭环的低血糖维持模式下运行几天，确保没有太多的低血糖事件 + 优化闭环，逐渐增加活性胰岛素IOB的最大值，并逐渐降低血糖的目标值 + 运行几天，至少一个晚上没有低血糖报警，然后才可以继续调低血糖的目标值 + 必要时调整胰岛素基础率和比率，然后再启用auto-sens胰岛素敏感系数自动调整功能 + 规律的进行碳水记录，成功在一个星期的白天开启闭环 + 在白天启用额外的功能，例如微型大剂量 SMB + 启用自动操作功能插件 + 你应该阅读wiki指南，以调整 maxIOB(活性胰岛素的最大值) 设置，让SMB(微型大剂量) 更好的工作。建议是 maxIOB值=餐时剂量的平均值+基础率的最大值的3倍。 + 阅读有关自动操作插件的说明文档，设定你的第一个简单规则。让AAPS只显示通知，而不是操作。当您确定自动操作在正确的时间触发时，用真实操作代替通知。(https://androidaps.readthedocs.io/en/latest/EN/Usage/Automation.html) + 血糖在NS中可用 + 泵状态在 NS 中可用 + 手动执行 + 已完成: %1$s + 学习如何控制 AndroidAPS + 在 AndroidAPS 中执行不同的操作 + 将个人配置文件设置为90%持续10分钟 (长按首页概览左上角的配置文件名称) + 模拟淋浴。 将泵断开连接1个小时(长按开环图标) + ... 然后以同样的方式重新连接 + 创建具有 10 分钟持续时间的定制临时目标 (当前目标上长按 ) + 在配置生成器中启用Actions(常用操作) 插件，使其可视并在顶部菜单显示其内容 + 显示闭环插件的内容 + 长按血糖图来使用缩放功能 + 输入 + 如果您有至少3个月的其他系统闭环经验，您可能有资格获得跳过学习目标的代码。参见 https://androidaps.readthedocs.io/en/latest/EN/Usage/Objectives.html#skip-objectives for details。 + 已接受代码 + 代码无效 + 证明你的知识 + 研究这些问题。每个问题都有四个可能的答案。答案可能不止一个。请选择所有正确的选项，然后点击验证。 + 禁止答题，直到： %1$s + 错误答案！ + 下一个未完成的 + 请求码： %1$s + (选择所有正确的答案) + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#what-to-do-when-taking-a-shower-or-bath + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#config-builder + https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/Screenshots.html#the-homescreen + 未连接到网络 + 时间同步失败 + 未满足目标要求。 + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e3f52dcdd0..22cd34bb28 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -6,32 +6,39 @@ 治疗安全 允许的最大大剂量值[U] 最大允许碳水化合物 [g] + %1$s 首选项 参数选项 从Nightscout刷新治疗数据 重置数据库 你真的想重置数据库吗? 退出 + 此设备似乎不支持电池优化白名单 - 您可能会遇到性能问题。 一些快速访问常用功能的按钮 用于配置活动插件 学习计划 显示 Nightscout 中定义的食物预设 胰岛素预设为 Humalog(优泌乐) 和 NovoRapid(门冬)/NovoLog(诺和锐) Fiasp 胰岛素预设 + 预设为Lyumjev速效赖脯胰岛素 允许您定义胰岛素作用的峰值, 并且只应由高级用户使用 激活或停用这个工具触发闭环。 将数据与 Nightscout 同步 算法的状态在2017年 最新的适合高级用户的算法 + 面向高级用户的最新算法，可以动态/自动调整ISF胰岛素敏感系数 显示闭环的当前状态和大多数常用操作的按钮 显示持续的通知, 其中简要概述了您的闭环正在做什么 + 定义一个离线可使用的配置文件。 与用于糖尿病治疗的多次每日注射的泵集成 与我们还没有其驱动的泵集成（开环） 灵敏度的计算方式与 Oref0 相同, 但可以指定过去的时间范围。碳水化合物吸收最小值是根据参数选项里的碳水化合物吸收时间最大值计算得来的 + 根据过去的8小时或24小时数据计算胰岛素灵敏度（使用更敏感的数据）。碳水化合物（如果没有被吸收）则在首选项中指定的时间后被核减。插件还计算UAM。 灵敏度计算根据偏差的加权平均值。新的偏差有更高的权重。碳水化合物吸收最小值是根据参数选项里的碳水化合物吸收时间最大值计算得来的好。此算法在敏感度变化后最快。 从 Eversense 补丁app接收血糖值。 从 Glimp 接收血糖值。 从美敦力600Series 的AndroidUploader 接收血糖值。 从 Nightscout 下载 血糖数据 + 从 xDrip+ 接收血糖值。 保存所做的所有治疗 使用您的 WearOS 手表监视和控制 AndroidAPS。 在 xDrip + 表盘上显示有关闭环的信息。 @@ -51,6 +58,7 @@ 临时目标 碳水化合物 矫正值 + 大剂量活性胰岛素IOB 现在运行 虚拟泵 上一次运行 @@ -61,6 +69,7 @@ 配置文件 膳食数据 结果 + 结果: %1$s %2$s 没有可用的血糖数据 请求 增量 @@ -88,6 +97,7 @@ 安全性 插件已禁用 违反约束条件 + 大剂量输注报告了一个错误。请手动检查真实输注量 接受新的临时基础率 治疗 计算器 @@ -98,11 +108,14 @@ 更改您的输入! 血糖来源 AndroidAPS 从何处获取数据？ + xDrip+ APS模式 闭环 开环 + 低血糖维持模式 闭环禁用 新的建议可用 + 碳水建议 不支持的 Nightscout 版本 基础 IOB 大剂量约束条件应用了 @@ -110,43 +123,90 @@ 其他 血糖仪 传感器 + 碳水时间 持续时间 + 配置文件 血糖类型 临时基础 扩展大剂量 Nightscout 版本: + 缺少 %1$d 克 参数选项导出了 + 用户条目已导出 导出配置 导入配置 配置导入了 找不到文件 导出配置 导入配置 + 临时基础率可以设置的最大值(U/小时) 这个值在 OpenAPS被称为最大基础率 OpenAPS通过基础率可以输注的IOB活性胰岛素的最大值[U] 这个值在OpenAPS中被成为最大IOB\n这是APS单次可以输注的胰岛素的最大值[U] + 请您输入主密码，该密码将用于加密导出的首选项配置。 + 请您输入主密码，该密码将用于解密导入的首选项配置。 + 导出已取消！首选项未导出！ + 导入已取消! 未导入首选项 ! + 无法导入首选项 ! + 请返回主屏幕，然后重试。 + 旧的主密码 + 此文件已导出并使用不同的主密码进行加密。 提供旧的主密码以解密文件。 + 成功导入后，当前主密码将替换为旧主密码！ + 请在导入之前检查首选项： + 无法导入首选项！ + 不应导入首选项 ! + 说明导入问题… + 导入问题详细信息 + 导入 + 继续导入（危险！） 最终用户许可协议 不得用于制定医疗决定。在适用法律允许的范围内，对该程序不作任何保证。除非另有书面授权的版权所有者和/或其他方均按原样提供程序，不附带明示或暗示的任何形式的担保，包括但不限于对适销性和适用于特定用途的默示担保。对您的程序的质量和性能的完整风险。如果程序存在缺陷，您应承担所有必要维修，修理或更正的代价. 我理解并同意 - 保存 重新加载配置文件 SMS短信通讯器 允许的手机号码 +XXXXXXXXXX;+YYYYYYYYYY 要输注大剂量胰岛素%1$.2fU 回复如下代码 %2$s + 要输注餐前大剂量 %1$.2fU ，请回复验证码 %2$s + 要设置临时目标 %1$s，请回复验证码 %2$s + 要取消临时目标，请回复验证码 %1$s + 要禁用短信遥控服务，请回复验证码%1$s.\n\n请记住，你只能在AAPS闭环手机上重新激活此功能。 + 短信遥控服务已禁用。要重新激活它，请使用AAPS闭环手机。 要发送校准值 %1$.2f 回复如下代码 %2$s 大剂量输注失败 + 一次远程遥控输注命令与下一次命令之间必须经过的最小分钟数 + 两次短信遥控胰岛素输注的时间间隔 + 为了您的安全，您需要添加至少两个电话号码。 + 将要输注 %1$.2f U + 成功输注大剂量%1$.2fU + 成功输注餐时大剂量%1$.2fU + 目标 %1$s 执行 %2$d 分钟 + 目标 %1$s 执行 %2$d 分钟设置成功 + 临时目标已成功取消 通过SMS短信允许远程命令 闭环已经被禁用 闭环已经被启用 闭环被启用 + 连接泵，请回复验证码：%1$s + 连接泵失败 + 断开泵%1$d分钟，请回复验证码：%2$s + 泵已断开 + 泵已重新连接 远程命令没有被允许 远程大剂量不可用。请稍后再试。 + 执行基础率%1$.2fU/h持续时间%2$d分钟，请回复验证码：%3$s 要切换配置文件到 %1$s %2$d%% 请回复代码 %3$s + 要开始扩展大剂量 %1$.2fU/h 持续时间%2$d 分钟，请回复验证码：%3$s + 要在 %2$s 输入 %1$d 克，请回复验证码 %3$s 要开始基础率 %1$d%% 持续时间%2$d 分钟，请回复如下代码 %3$s 要暂停闭环 %1$d 分钟请回复如下代码 %2$s + 恢复闭环，请回复验证码：%1$s + 启用闭环，请回复验证码：%1$s + 禁用闭环，请回复验证码：%1$s 临时基础率 %1$.2fU/h 持续 %2$d 分钟启用成功了 扩展大剂量 %1$.2fU/h 持续时间 %2$d 分钟已经启用成功了 + 碳水%1$d克输入成功 + 输入 %1$d 克碳水化合物失败 临时基础率 %1$d%% 持续时间 %2$d 分钟 启用成功了 开始临时基础率失败了 开始扩展大剂量失败了 @@ -167,12 +227,18 @@ 饮食 矫正 手动操作 + (禁用很危险) NS仅上传 + NS只上传数据(禁用同步)。除非选择本地血糖数据如xDrip+否则此功能无效。使用NS网站配置文件时此功能无效。\n！！！警告！！！如果您的任何组件(AAPS，NS，xDrip+) 配置错误，禁用此选项可能导致故障和胰岛素过量。请仔细观察AAPS显示的数据是否与泵状态匹配！ 泵未初始化! 充盈 请确保数量和输液器里的药量匹配 + 输注/充盈标准胰岛素剂量 按钮1 按钮2 按钮3 + 单位: + 单位 + DIA 可视化范围 在智能手表上的图表上的高值和低值标记 低值标记 @@ -180,6 +246,7 @@ 手表 重新发送所有数据 在手表上打开设置 + 基础率 基础率值低于泵支持的最小值。配置文件没有设定 血糖: 上次血糖： @@ -188,16 +255,19 @@ 持续的的通知 旧数据 %1$d分钟前 + 配置文件 OpenAPS AMA %1$d 元素的数组. \n 实际值: Autosens 数据 脚本调试 使用Autosens功能 + 从NS刷新 删除未来的治疗项 操作 配置 闭环 OpenAPS + 动态ISF 本地配置文件 主页 虚拟泵 @@ -207,11 +277,13 @@ 手机SMS 标题名称缩写 总是使用短时间的平均增量代替简单增量 + 当血糖数据未经过滤时，如xDrip+数据嘈杂，此功能非常有用。 配置文件 默认值: 3 这是一个关键的 OpenAPS 安全阀值。这是限制你的闭环可以最大扩张3倍的日最大基础率。你可能不需要改变这个值 但你应该这个值的含义。日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值 默认值: 4 这是另一个的关键 OpenAPS 安全阀值, 日最大基础率的3倍，当前基础率的4倍，这是建议的安全阀值。这意味着你的基础率, 无论你的泵上的最大基础率设置的多少，也 不能超过你的当前基础率的4倍。这是为了防止人们在了解该算法的工作原理之前进入危险的领域 。同样, 默认值为 4倍; 大多数人将永远不需要调整, 而是更有可能需要调整其他设置, 默认值: 1.2 \n 这是 autosens 的安全阀值 对 autosens ( 很快autotune) 比率的高值设置最大增加20%% 最大限制, 这反过来决定了 autosens 可以调整的基础率的上限值, 可以调整的胰岛素敏感系数的下限值, 以及它可以设置血糖目标的下限值。 默认值: 0.7 \n 　这是autosens 的另一个安全阈值, 。这个值决定了 autosens 可以调整的基础率的下限值, 可以调整的胰岛素敏感系数的上限值, 以及它可以设置血糖目标的上限值。 + Autosens自动调整胰岛素敏感系数时，也调整血糖目标值 缺省值：是\n　这是用来允许 autosens调整血糖目标，还有 ISF胰岛素敏感系数和基础率这些参数。 默认值: 2 \n大剂量snooze是在输注餐时大剂量后开始生效的, 所以在你刚吃完饭的时候, 闭环不会因为你输注了大剂量而减少或停基础。这里的例子和缺省是 2; 因此, 3 小时的DIA(胰岛素持续作用时间) 意味着大剂量snooze将逐步在１. ５小时 (3 DIA/2) 后失效。 默认值: 3.0 (AMA) 或者 8.0 (SMB)。这是默认的每5分钟碳水化合物吸收量。默认值为3毫克/dl/5 分钟。 当血糖的下降超过预期时, 或者不像预期的上升的那么多时，这个值就影响了活性碳水化合物的衰减速度, 以及在计算预测未来血糖时假设的碳水化合物吸收量, @@ -219,6 +291,9 @@ 无效的SMS手机号码 校准 没有安装xDrip+ + 校准发送到 xDrip+ + 校准已发送。必须在 xDrip+ 中启用接收功能。 + xDrip+未接收校准 泵暂停了 正在执行 虚拟泵设置 @@ -245,10 +320,17 @@ 显示详细 IOB 在手表的表盘上分别显示大剂量IOB和基础IOB 未成功-请检查手机 + 无可用 + 患者类型 儿童 青少年 成人 胰岛素抵抗成人 + 孕妇 + 请选择患者类型，以设置安全限制 + 患者名称 + 请提供患者姓名或昵称来区分多个设置 + 用户 Glimp %1$s 需要加入电池优化白名单才能正常运行 闭环暂停了 @@ -257,16 +339,24 @@ 暂停闭环2个小时 暂停闭环3个小时 暂停闭环10个小时 + 断开泵连接 与泵断开连接15分钟 与泵断开连接30分钟 与泵断开连接1个小时 与泵断开连接2个小时 与泵断开连接3个小时 + 15 分钟 + 30 分钟 + 1 小时 + 2 小时 + 3 小时 + 10 小时 恢复 重新连接泵 错误的持续时间 闭环暂停了 闭环恢复了 + 15分钟 趋势 碳水 超级大剂量Superbolus 记录app启动事件到NS服务器 @@ -278,16 +368,45 @@ 在向导中启用超级大剂量 在向导中启用 superbolus超级大剂量 功能。不要启用, 直到你了解它真正的用法。如果盲目使用, 可能会导致胰岛素过量! 在主屏幕上显示状态指示灯 + 输注导管状态灯警示阈值[小时] + 输注导管状态灯临界阈值[小时] + 胰岛素状态灯警示阀值[小时] + 胰岛素状态灯临界阀值[小时] + 传感器状态灯警示阀值[小时] + 传感器状态灯临界阀值[小时] + 传感器剩余电量状态灯警示阀值[百分比] + 传感器剩余电量状态灯临界阀值[百分比] + 胰岛素泵电池使用时长状态灯警示阀值[小时] + 胰岛素泵电池使用时长状态灯临界阀值[小时] 储药器药量低于阈值[U] 警告 储药器药量低于阈值[U] 严重警告 + 胰岛素泵剩余电量状态灯警示阀值[百分比] + 胰岛素泵剩余电量状态灯临界阀值[百分比] + 预测 + 基础率 + 偏差 + 操作 + -BGI + ABS + DEVSLOPE 关于 缺少 SMS 短信权限 缺少手机状态权限 + xDrip+状态 (手表) + xDrip+状态线 (手表) xdrip 显示血糖线 添加血糖线到状态线 取消扩展大剂量 + 配置文件切换 + 传感器 + 胰岛素 + 泵电池 + 年龄： + 剩余: 报警选项 + 创建来自NS报警的通知 + 创建来自NS公告的通知 陈旧数据阈值 [min] 紧急陈旧数据阈值 [min] Autosens间隔的 [h] @@ -309,12 +428,12 @@ 阻止 Android 系统关闭手机屏幕。这将非常耗电 如果要打开 Autosense功能, 记住输入所有吃的碳水化合物。否则碳水化合物的偏差将被识别为错误的灵敏度变化!! 灵敏度 WeightedAverage - 确定 - 取消 配置文件加载不完整 值没有被存储 + 广播信息到其他应用(如xDrip+)。如果你安装了不止一个AAPS或NS客户端，请不要启用此功能！ 启用本地广播。 OpenAPS SMB + 动态ISF(胰岛素敏感系数) 启用 UAM 启用微型大剂量 使用微型大剂量代替使用临时基础率，更快的干预 @@ -324,6 +443,7 @@ Free-Peak Oref 速效 Oref 超速效 Oref + Lyumjev(超速效赖脯胰岛素) DIA of %1$f 太短了，请使用 %2$f 代替 激活配置文件 无效 @@ -336,6 +456,7 @@ 运动临时目标 持续时间短 低目标 + 重新使用%1$d%% %2$d小时 从手表上控制 设置临时目标并从手表中进行治疗操作。 食物 @@ -349,10 +470,12 @@ 现在命令被执行了 血糖读数丢失 对警报和通知使用系统通知音 + 逐渐增加警报和通知的音量 本地警报 如果未收到血糖数据, 则发出警报 如果无法连接泵, 则发出警报 泵无法连接的时间阈值[min] + 当需要碳水化合物时发出提醒 紧急报警 信息 Everyang App (补丁) @@ -360,10 +483,16 @@ 血糖上传设置 显示详细的增量 增量再多显示一个小数位 + 以分钟为单位设置SMB(微型大剂量) 的频率 基础率的最大分钟数限制SMB微型大剂量到 + UAM(未通知膳食) SMB(微型大剂量) 最大分钟数 + 监测到UAM(未通知膳食) 后启用SMB(微型大剂量) 替代基础率的最大分钟数 + 碳水化合物需求建议的最小值 + 显示碳水化合物需求警告的最小克数。低于此数值的碳水化合物需求不会触发通知。 将血糖数据发送到 xDrip + 在 xDrip + 选择640ｇ/Eversense 数据源 NSClient 血糖 + NS血糖 血糖计算 大剂量IOB (活性胰岛素) 计算 基础率IOB (活性胰岛素) 计算 @@ -373,6 +502,7 @@ 仅负数 COB计算 临时目标血糖计算 + 百分比计算 闭环启用了 APS已选择 NSClient 具有写入权限 @@ -389,17 +519,26 @@ 启用带有临时目标的SMB 当临时目标处于活动状态时启用 SMB (很快吃饭, 运动) 启用具有高临时目标的 SMB + 当激活较高的临时目标时，启用SMB微型大剂量(目标血糖大于100 mg/dl或5.5 mmol/l) 胰岛素 按钮 + 将校准发送到xDrip+或打开BYODA校准对话框 + 打开xDrip+或BYODA应用时，返回键将返回到AAPS应用 按下按钮时添加的碳水化合物数量 按下按钮时添加的胰岛素量 无法启动 CGM 应用程序。 请确保已安装。 CGM + 忽略5分钟 + 忽略 15分钟 + 忽略30分钟 + 要 历史浏览 在 SMB 上通知 在手表上像显示常规大剂量一样显示SMB微型大剂量 创建错误公告 + 从碳水需求警报创建NS公告 为错误对话框和本地警报创建Nightscout公告(在治疗标签下的护理记录里也可查看) + 为碳水化合物需求警报创建Nightscout网站的公告 在手表的表盘上显示预测 预测 数据选择 @@ -413,8 +552,10 @@ 不打大剂量，只记录 类别 子类别 + 仅记录大剂量数值(泵不会输注) 通过泵设置SMB微型大剂量 活动 + 血糖影响 灵敏度 偏差 活性碳水化合物 @@ -488,11 +629,19 @@ 跳过设置向导 按下下面的按钮, 以使 AndroidAPS 建议或者更改基础率 灵敏度插件用于灵敏度检测和碳水化合物计算。有关详细信息, 请访问: + https://androidaps.readthedocs.io/en/latest/Configuration/Sensitivity-detection-and-COB.html + NS客户端可以处理与Nightscout的连接。您可以先跳过这一部分，但在设置NS参数前，你无法通过学习计划的目标。 请记住：新的胰岛素分布需要DIA至少5小时。 对于新的配置文件，DIA 5-6小时相当于旧胰岛素配置文件中的DIA 3小时 从可用算法中选择一个。 他们从最旧到最新排序。 较新的算法通常更强大，更冒险。 因此，如果你是新的闭环使用者，你可能会从AMA算法开始，而不是最新的。 不要忘记在使用之前阅读OpenAPS文档并对其进行配置。 + 在下面配置你的RileyLink 。选择RileLink后，一旦RileLink状态为“已连接”，就可以继续安装。这可能需要一分钟。\n + 注意：胰岛素泵设置完成后，您可以继续安装。\n 开始你的第一个目标 权限 请求权限 + 应用程序需要悬浮窗权限用于发送通知。 + 应用程序需要定位权限，才能进行蓝牙扫描及WIFI识别。 + 应用程序需要文件存储权限，才能存储日志文件及导出设置。 + 应用程序需要蓝牙权限。 请求 打开导航栏 关闭导航栏 @@ -502,16 +651,26 @@ 已用时间 Poctech 从 Poctech app 接收血糖值。 + Glunovo + 从Glunovo应用接收血糖数据。 从番茄app(喵喵设备) 接收血糖值 高临时目标增加灵敏度 =100 mg/dl (5.5 mmol/l) 时提高灵敏度]]> 低临时目标降低灵敏度 + 抗药时降低目标 + 当检测到胰岛素抵抗时，降低血糖的目标值。 + 敏感时提高目标 + 当检测到胰岛素敏感时，提高血糖的目标值。 Clean AndroidAPS 启动了 + 显示无效项 + 隐藏失效项 + 删除项目 发现曾经保存过的设置 注意：如果你激活并且连接到了一个硬件泵，AndroidAPS将会从配置文件复制基础率到泵上。覆盖泵上已有的基础率。请确定你已经在AndroidAPS上设置了正确的基础率。如果你不确定或者不想覆盖泵上的基础率设置，按取消键，以后再切换激活配置文件。 治疗数据不完整 维护设置 + 电子邮箱收件人 没有要发送的日志 维护 维护 @@ -525,11 +684,13 @@ 重置为默认值 NSClient故障。 考虑Nightscout和NSClient重启。 时区偏移 + 稍后提醒输注大剂量 首选的APS模式 总计 计算 发送包括当前时间的今日的日志文件给开发者。描述一下意外情况 最小请求更改[%] + 开环状态下，算法建议的基础率调整百分比大于此数值时，才会弹出更改建议。默认值为20% == ∑ %1$s U 记录传感器更换至NS服务器 在传感器启动时在 NS服务器 自动创建事件 \"传感器更改\" @@ -550,16 +711,280 @@ 上传临时基础率 上传配置文件切换，临时目标 上传血糖值 + 在24小时或更少时间内变更\"夏令时\" + 夏令时变更在三小时内-已禁用闭环 内部储存空间不足 至少 剩余%1$d MB 内部存储！闭环已禁用！ 格式错误 + TBR(临时基础率) 的持续时间必须是 %1$d 分钟的倍数，且大于0。 错误的代码。命令取消 未配置 配置文件切换已创建 版本检查器 旧版本 非常旧版本 + 应用版本已过期。 + 新版本已发布至少%1$d天！将在%2$d天后回退到LGS (低血糖维持模式)，闭环功能将在%3$d天后禁用。 2小时 + BYODA德康补丁版(构建你自己的德康应用Build Your Own Dexcom App) + BYODA + 从德康补丁版接收血糖数据(Build Your Own Dexcom App)。 + 活性碳水vs活性胰岛素 + 大剂量约束应用为： %1$.2f U 到 %2$.2f U + !!!!! 检测到碳水化合物吸收缓慢：%2$d%%的时间。再次检查你的计算。COB可能被高估，因此可以给予更多胰岛素!!!!!]]> + 输注大剂量向导结果的一部分[%] + 大剂量向导执行计算，但只有这部分计算结果的胰岛素被输注。适用于SMB算法。 + 稍后再响 + 增加最大基础率，因为设置参数低于你配置文件中的最大基础率 + 无效消息 + %1$s ISF: %2$.1f + %1$.0fg IC: %2$.1f + %1$.1fg IC: %2$.1f + %1$d%% + 分钟 + 个人配置名称： + 已选择: + 单位 + 是否要切换配置文件并放弃对当前配置文件所作的更改? + 清除已完成 + 清除已启动 + 你想要重置已启动的目标? 你会失去已有的进度。 + 选择你想要的血糖显示单位。 + DIA + IC + ISF + TARG + 克隆 + 首先保存或重置当前更改 + 删除当前配置文件 + 是否复制这个配置文件的参数来创新一个新的配置文件？ + 配置文件名称包含点。\n这不受 NS 支持。\n配置未上载到 NS。 + 血糖范围区域的下限值(仅显示，不影响算法) + 血糖范围区域的上限值(仅显示，不影响算法) + 年龄 + 重量 + ID： + 提交 + 最常见的配置文件: + 注意: 只有在此屏幕上可视的数据将被匿名上载。个人身份识别已分配给此 AndroidAPS 的安装。 如果您的主配置文件发生更改，请让它在可视的时间范围内至少运行一周，那么您可以再次提交数据。 非常感谢您的帮助！ + 输入的年龄无效 + 输入的权重无效 + 输入的百分比无效 + %1$s: 低: %2$02d%% 中: %3$02d%% 高: %4$02d%%]]> + 平均 + TIR + 活动监视器 + 您想要重置所有的统计信息吗？ + 统计 + 随机血糖 + 生成随机血糖数据（仅限demo演示模式） + 血糖 + 工具 + 显示计时器 + 显示已删除 + 清除队列? 队列中的所有数据都将丢失! + 在使用扩展大剂量(方波) 功能期间将停止闭环功能。你真的想要启用吗？ + 由于运行扩展大剂量而禁用了闭环 + 手机号验证器 + 图表菜单 + SMB 请求时间 + SMB持续时长 + 临时基础率请求时间 + 临时基础率持续时长 + 从验证码生成器应用获取%1$s的随机码，并附加PIN码 + 验证码末尾强制附加的PIN码 + 在每次生成的一次性随机密码末尾，需要记住并强制附加的数字。 + 验证码生成器设置 + 验证码检查： + OTP随机 + PIN固定 + 验证码包含6位数字，由验证器应用程序生成（称为OTP），然后再包含3位或3位以上的必填数字PIN码。 + 重置身份验证器 + 重置身份验证器的密钥 + 你确定要重置验证器密钥吗？它将导致以前配置的OTP随机验证码无效，您需要重新设置它们(在遥控手机的OTP应用上)。 + 生成了新的身份验证器密钥！请使用更新的二维码设置验证器。 + 导出OTP密钥 + 你确定要将OTP密钥复制到剪贴板？\n\n只有在验证器应用扫描二维码出现问题时，你才需要这么做。可能你想手动输入二维码，或者使用专用的应用程序配置硬件OTP令牌。 + 将OTP密钥 (Base32 格式) 导出并复制到剪贴板。粘贴它到身份验证器或硬件OTP中！ + 1. 安装身份验证器app + 2. 扫描二维码以安装AndroidAPS随机验证码密钥 + 3. 测试一次性验证码 + 重置身份验证器 + 在其他遥控手机上安装支持RFC 6238 TOTP令牌协议的应用程序。常用的免费应用有:\n • Authy\n • Google Authenticator\n • LastPass Authenticator\n • FreeOTP Authenticator + 通过重置验证码核心密钥，可以使所有已设置的OTP随机验证码生成配置无效，您需要在遥控手机上重新设置! + 预测 + 斜度偏差 + 授权失败 + 胰岛素绝对值 + 主密码用于备份和安全性加密，它优先于其他功能模块的密码，请牢记它或储存在安全的地方。 + 当前主密码 + 状态指示灯 + 从NS复制设置 + 复制 NS 设置(如果存在的话)？ + 原始皮肤 + 低分辨率皮肤 + 按钮总是显示在屏幕底部 + 大显示屏 + 皮肤 + 比较个人配置文件 + 配置文件助手 + 默认个人配置文件 + 当前配置文件 + 可用配置文件 + 配置文件类型 + 年龄: %1$.0f TDD: %2$.0f U + 年龄: %1$.0f TDD: %2$.0f U %3$d%% + 年龄: %1$.0f 体重: %2$.0f 千克 + 基础率% + DPV默认个人配置 + RileyLink 状态: + 筛选 + 无法创建配置文件。配置文件无效。 + 不要杀死我的应用程序？ + 如果触发泵连接丢失事件，则发送短信通知。 + 泵连接丢失报告 + 在应当吃饭时提醒 + 在 %1$d 分钟内运行提醒 + 大剂量向导 + 你现在血糖值高，请等待血糖值改善后再吃饭。你是否需要输注胰岛素进行纠正并提醒你吃饭？在这种情况下，不会记录碳水，当我们提醒你吃饭时，您必须再次使用大剂量向导。 + 启用大剂量向导 + 在高血糖期间(\"预测大剂量\")，使用延迟吃饭的提醒功能，来替代大剂量向导结果 + 吃饭时间到了！\n请运行大剂量向导，然后进行计算。 + 吃饭时间 + 大剂量提醒 + 启用大剂量提醒 + 使用大剂量向导稍后推注的提醒功能 + (“稍后注射大剂量”) + 输注胰岛素时间到了！\n请运行大剂量向导，然后再次进行计算。 + 已禁用崩溃日志上传！ + 绘图 + 图表菜单 + 清除筛选 + 趋势箭头 + 输注导管 + 用户条目 + \n选择您三餐的最大碳水值和最大胰岛素剂量\n + 此项为选填信息，会附在反馈的崩溃报告中，以便我们在紧急情况下与您联系。 + 电子邮件地址 + 隐私设置 + 如果你想得到应用程序重大缺陷的通知，你可以选择提供电子邮件地址、Facebook或Discord等信息。这不是一项自动化的服务。在可能存在危险时，开发人员才会联系您。 + 完全同步 + 完全同步数据? 这可能需要很长时间，在完成以前你将无法在NS中看到新数据。 + 充盈 + 同步 + 将用户配置，大剂量，碳水化合物，临时基础率的数据上传到NS网站 + 上传数据到NS网站 + 接收存储用户配置 + 同步NS配置文件编辑器的用户配置到本地。 + 接收临时目标 + 允许通过NS或NS客户端接收血糖的临时目标值。 + 接收用户配置文件切换 + 允许通过NS或NS客户端接收用户配置文件切换。 + 接收 APS 离线事件 + 允许通过NS或NS客户端接收APS 离线事件。 + 接收TBR 和 EB + 接受通过另一个实例输入 TBR 和 EB + 接收胰岛素输注 + 允许通过NS或 NS客户端接收胰岛素输注 (它并不会输注胰岛素，只计算为活性胰岛素IOB) + 接收碳水化合物 + 允许通过NS或NS客户端接收碳水化合物输入。 + 接收治疗事件 + 允许通过NS或NS客户端接收(导管更换、胰岛素更换、电池更换等) 护理事件 + 接收/回填CGM数据 + 接受来自NS 的 CGM 数据 + 等待上一次胰岛素泵通信完成时超时 + 队列中在执行另一个大剂量命令，请稍后再试。 + 正在进行计算 + 缺少配置文件名称 + IC数值错误 + 基础率数值错误 + 目标数值错误 + ISF数值错误 + 运行 %s？ + 不接受来自NS的无效配置文件%1$s + 查看 + 错误 + 放慢上传速度 + 血糖数据状态 + 导管年龄 + patch 泵年龄 + Patch 泵 + 重新计算的数据 + 血糖间隔太近:\n%1$s\n%2$s + 身份识别 (email邮件地址, FaceBook账号 或 Discord账号等等) + 开发模式下未设置身份识别联系方式 + 会话 + 当前血糖 + 校正结果使用% + 校正结果使用单位 + 不可用 + 高 + 在范围内 + 低 + 迅速下降 + 下降 + 缓慢减少 + 稳定 + 缓慢增长 + 上升 + 快速上升 + 无 + 未知 + 绘图 + 血糖质量 + 重新计算 + 双重条目 + 胰岛素 + 血糖 + 已过期 + 设置提醒 + 添加新配置文件 + 克隆当前配置文件 + 删除当前配置文件 + 新增条目到列表 + 未预设的临时目标： %1$s + 取消正在运行的临时目标？ + 手表和手机上使用了不同的单位！ + 无临时目标-取消正在运行的临时目标？ + 目标血糖最小值超出范围！ + 目标血糖最大值超出范围！ + 临时目标:\n最小: %1$s\n最大: %2$s\n持续时间: %3$s + 临时目标:\n目标: %1$s\n持续时间: %2$s + 临时目标:\原因: %1$s\n目标: %2$s\n持续时间: %3$s + 快速向导: %1$s\n胰岛素: %2$.2fU\n碳水: %3$d克 + 计算. 向导:\n胰岛素: %1$.2fU\n碳水: %2$d克 + 在设备上显示条目： + 选定的快速向导不再可用，请刷新 + 最近没有血糖数据可供计算！ + 没有激活的个人配置文件！ + 未知的活性碳水！血糖读取缺失或最近重新启动了应用程序？ + 碳水违反约束条件! + 计算(IC: %2$.1f, ISF: %2$.1f) 从:\" + 碳水: %1$.2fU + 活性碳水: %1$.0f克 %2$.2fU + 血糖: %1$.2fU + 基础率活性胰岛素: %1$.2fU + 大剂量活性胰岛素: %1$.2fU + 超级大剂量：%1$.2fU + 15分钟趋势：%1$.2fU + 百分比：%1$.2fU x %2$d%% ≈ %3$.2fU + 胰岛素剂量违法约束！\n无法输注 %1$.2fU + 临时目标：%1$s + %1$s 至 %2$s + 没有可用的泵！ + 未知操作命令： + 百分比 + 应用程序预设 + 选择要编辑的配置文件 + 从 Nightscout 刷新 + 删除选中项？ + 选择要删除的 + 配置文件更改 + 临时目标 + 碳水与大剂量 + 你确定要删除 %1$d 吗？ + 隐藏闭环 + 显示闭环 + 已选中 %1$d diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9ec8c6ec2a..07bf55f635 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1110,6 +1110,8 @@ Accept profile switches entered through NS or NSClient Receive APS offline events Accept APS Offline events entered through NS or NSClient + Receive TBR and EB + Accept TBR and EB entered through another instance ns_receive_insulin Receive insulin Accept insulin entered through NS or NSClient (it\'s not delivered, only calculated towards IOB) @@ -1117,6 +1119,7 @@ Receive carbs Accept carbs entered through NS or NSClient ns_receive_therapy_events + ns_receive_tbr_eb Receive therapy events Accept therapy events (cannula, insulin, battery change etc) entered through NS or NSClient ns_receive_cgm diff --git a/app/src/main/res/xml/pref_nsclientinternal.xml b/app/src/main/res/xml/pref_nsclientinternal.xml index 208bb66168..9d9aca0133 100644 --- a/app/src/main/res/xml/pref_nsclientinternal.xml +++ b/app/src/main/res/xml/pref_nsclientinternal.xml @@ -84,6 +84,12 @@ android:summary="@string/ns_receive_offline_event_summary" android:title="@string/ns_receive_offline_event" /> + + > - e?.let { - aapsLogger.debug(LTag.AUTOMATION, "Grabbed location: $it.location.latitude $it.location.longitude Provider: $it.location.provider") - processActions() - } + .subscribe({ + aapsLogger.debug(LTag.AUTOMATION, "Grabbed location: ${it.location.latitude} ${it.location.longitude} Provider: ${it.location.provider}") + processActions() }, fabricPrivacy::logException) disposable += rxBus .toObservable(EventChargingState::class.java) diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt index 915d37a684..ba7385cc9b 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEvent.kt @@ -24,8 +24,8 @@ import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.JsonHelper import info.nightscout.androidaps.utils.T import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONObject import javax.inject.Inject diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt index 96fa1d72e0..131e4fd707 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResume.kt @@ -16,8 +16,8 @@ import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.DateUtil -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class ActionLoopResume(injector: HasAndroidInjector) : Action(injector) { diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt index 488b21608e..aaa7ef263d 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotification.kt @@ -16,8 +16,8 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotifi import info.nightscout.androidaps.plugins.general.overview.notifications.NotificationUserMessage import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.JsonHelper -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONObject import javax.inject.Inject diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt index 596093ca69..7647ecd11b 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTarget.kt @@ -29,8 +29,8 @@ import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.JsonHelper import info.nightscout.androidaps.utils.JsonHelper.safeGetDouble -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONObject import java.util.concurrent.TimeUnit import javax.inject.Inject diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt index 7d01a8b199..1f8c77c95b 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTarget.kt @@ -11,8 +11,8 @@ import info.nightscout.shared.logging.LTag import info.nightscout.androidaps.logging.UserEntryLogger import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.DateUtil -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class ActionStopTempTarget(injector: HasAndroidInjector) : Action(injector) { diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt index c27d6937a0..94c87f75bd 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditEventDialog.kt @@ -26,8 +26,8 @@ import info.nightscout.androidaps.plugins.general.automation.events.EventAutomat import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.ToastUtils import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class EditEventDialog : DialogFragmentWithDate() { diff --git a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt index 82cc8ef0a2..d6cdb53a74 100644 --- a/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt +++ b/automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/dialogs/EditTriggerDialog.kt @@ -17,8 +17,8 @@ import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerCon import info.nightscout.androidaps.plugins.general.automation.triggers.TriggerDummy import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import org.json.JSONObject import javax.inject.Inject diff --git a/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt b/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt index 5764ee08da..4183c24932 100644 --- a/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt +++ b/automation/src/main/java/info/nightscout/androidaps/services/LocationService.kt @@ -27,7 +27,7 @@ import info.nightscout.androidaps.utils.FabricPrivacy import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.rx.AapsSchedulers import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable +import io.reactivex.rxjava3.disposables.CompositeDisposable import javax.inject.Inject class LocationService : DaggerService() { diff --git a/automation/src/main/res/values-zh-rCN/strings.xml b/automation/src/main/res/values-zh-rCN/strings.xml index 8795fc867d..635bce9e5d 100644 --- a/automation/src/main/res/values-zh-rCN/strings.xml +++ b/automation/src/main/res/values-zh-rCN/strings.xml @@ -6,6 +6,8 @@ 请输入任务的名称 请选择至少一个过滤条件 请指定至少一个操作。 + 警告: %1$s + 报警: 消息: 已启用 已禁用 @@ -36,6 +38,9 @@ 血糖值不可用 血糖值 %1$s %2$.0f %3$s 血糖值%1$s %2$.1f %3$s + 临时目标不存在 + 临时目标 %1$s %2$.0f %3$s + 临时目标 %1$s %2$.1f %3$s 配置文件pct %1$s %2$d IOB %1$s %2$.1f 而且 @@ -46,6 +51,8 @@ 使用 GPS 定位 使用设备位置 定位服务 + 连接时 + 断开时 短平均增量 长平均增量 增量 @@ -69,9 +76,12 @@ 添加 复制 临时目标 %1$s + 蓝牙连接设备 %1$s %2$s + 连接到蓝牙设备 WiFi SSID %1$s %2$s 自动传感器 %1$s %2$s %% 自动传感器 % + 自动敏感度 %3$s %1$s (%2$s BG 差异 BG 差异 [%1$s] @@ -80,8 +90,10 @@ 纬度： 经度： 血糖值 %1$s]: + 目标 [%1$s]: 上次大剂量 上次大剂量时间 %1$s %2$s 分钟前 + 碳水 COB %1$s %2$.0f IOB [U]: 区 [m]: @@ -94,9 +106,11 @@ 编辑 选择操作类型 选择触发点类型 + 选择操作类型 触发器： 移除 前置条件： 自动化事件 重新排序 + 用户操作 diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt index 8badae72d2..6d7ed68b7d 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionCarePortalEventTest.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.plugins.general.automation.elements.InputCareP import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration import info.nightscout.androidaps.plugins.general.automation.elements.InputString import info.nightscout.androidaps.queue.Callback -import io.reactivex.Single +import io.reactivex.rxjava3.core.Single import org.junit.Assert import org.junit.Before import org.junit.Test diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt index 72401cc0a7..00957cab4a 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionLoopResumeTest.kt @@ -5,7 +5,7 @@ import info.nightscout.androidaps.database.entities.TemporaryTarget import info.nightscout.androidaps.database.transactions.CancelCurrentOfflineEventIfAnyTransaction import info.nightscout.androidaps.database.transactions.Transaction import info.nightscout.androidaps.queue.Callback -import io.reactivex.Single +import io.reactivex.rxjava3.core.Single import org.junit.Assert import org.junit.Before import org.junit.Test diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt index 21c0812627..a43794571e 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionNotificationTest.kt @@ -12,7 +12,7 @@ import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.plugins.general.automation.elements.InputString import info.nightscout.androidaps.queue.Callback import info.nightscout.androidaps.utils.resources.ResourceHelper -import io.reactivex.Completable +import io.reactivex.rxjava3.core.Completable import org.junit.Assert import org.junit.Before import org.junit.Test diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt index c01b372c09..0777e6a687 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStartTempTargetTest.kt @@ -8,7 +8,7 @@ import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.plugins.general.automation.elements.InputDuration import info.nightscout.androidaps.plugins.general.automation.elements.InputTempTarget import info.nightscout.androidaps.queue.Callback -import io.reactivex.Single +import io.reactivex.rxjava3.core.Single import org.junit.Assert import org.junit.Before import org.junit.Test diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt index 08e1effa01..0f0e80eb8f 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionStopTempTargetTest.kt @@ -5,7 +5,7 @@ import info.nightscout.androidaps.database.entities.TemporaryTarget import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction import info.nightscout.androidaps.database.transactions.Transaction import info.nightscout.androidaps.queue.Callback -import io.reactivex.Single +import io.reactivex.rxjava3.core.Single import org.junit.Assert import org.junit.Before import org.junit.Test diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt index d9a6ad0509..53f9e0e9c0 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerBolusAgoTest.kt @@ -5,7 +5,7 @@ import info.nightscout.androidaps.automation.R import info.nightscout.androidaps.database.ValueWrapper import info.nightscout.androidaps.database.entities.Bolus import info.nightscout.androidaps.plugins.general.automation.elements.Comparator -import io.reactivex.Single +import io.reactivex.rxjava3.core.Single import org.json.JSONException import org.json.JSONObject import org.junit.Assert diff --git a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValueTest.kt b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValueTest.kt index 9e500fbbee..6c4a09f505 100644 --- a/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValueTest.kt +++ b/automation/src/test/java/info/nightscout/androidaps/plugins/general/automation/triggers/TriggerTempTargetValueTest.kt @@ -6,7 +6,7 @@ import info.nightscout.androidaps.database.ValueWrapper import info.nightscout.androidaps.database.entities.TemporaryTarget import info.nightscout.androidaps.interfaces.GlucoseUnit import info.nightscout.androidaps.plugins.general.automation.elements.Comparator -import io.reactivex.Single +import io.reactivex.rxjava3.core.Single import org.json.JSONObject import org.junit.Assert import org.junit.Before diff --git a/build.gradle b/build.gradle index 6c2a214ee0..a848fa690b 100644 --- a/build.gradle +++ b/build.gradle @@ -3,11 +3,11 @@ buildscript { ext { kotlin_version = '1.6.10' - core_version = '1.6.0' - rxjava_version = '2.2.21' - rxandroid_version = '2.1.1' - rxkotlin_version = '2.4.0' - room_version = '2.3.0' + core_version = '1.7.0' + rxjava_version = '3.1.3' + rxandroid_version = '3.0.0' + rxkotlin_version = '3.0.1' + room_version = '2.4.2' lifecycle_version = '2.3.1' dagger_version = '2.41' coroutines_version = '1.4.1' @@ -15,10 +15,10 @@ buildscript { fragmentktx_version = '1.3.6' ormLite_version = '4.46' nav_version = '2.3.5' - appcompat_version = '1.3.1' + appcompat_version = '1.4.1' material_version = '1.4.0' constraintlayout_version = '2.1.0' - preferencektx_version = '1.1.1' + preferencektx_version = '1.2.0' commonslang3_version = '3.11' commonscodec_version = '1.15' jodatime_version = '2.10.13' @@ -30,7 +30,7 @@ buildscript { dexmaker_version = "1.2" retrofit2_version = '2.9.0' okhttp3_version = '4.9.0' - byteBuddy_version = '1.12.3' + byteBuddy_version = '1.12.8' androidx_junit_version = '1.1.2' androidx_rules_version = '1.4.0' diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java index 28cd911379..abc3f676f5 100644 --- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java +++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboFragment.java @@ -30,7 +30,7 @@ import info.nightscout.androidaps.utils.DateUtil; import info.nightscout.androidaps.utils.FabricPrivacy; import info.nightscout.androidaps.utils.resources.ResourceHelper; import info.nightscout.androidaps.utils.rx.AapsSchedulers; -import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.rxjava3.disposables.CompositeDisposable; public class ComboFragment extends DaggerFragment { @Inject ComboPlugin comboPlugin; diff --git a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java index 197a4f70b6..d5ac43d7f8 100644 --- a/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java +++ b/combo/src/main/java/info/nightscout/androidaps/plugins/pump/combo/ComboPlugin.java @@ -1309,6 +1309,7 @@ public class ComboPlugin extends PumpPluginBase implements Pump, Constraints { if (ps.activeAlert != null && ps.activeAlert.errorCode != null) { extendedJson.put("ErrorCode", ps.activeAlert.errorCode); } + extendedJson.put("BaseBasalRate", getBaseBasalRate()); pumpJson.put("extended", extendedJson); JSONObject batteryJson = new JSONObject(); diff --git a/combo/src/main/res/layout/combopump_fragment.xml b/combo/src/main/res/layout/combopump_fragment.xml index 5ca2fe8be9..fe8ffa905e 100644 --- a/combo/src/main/res/layout/combopump_fragment.xml +++ b/combo/src/main/res/layout/combopump_fragment.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="5dp" - tools:context=".plugins.pump.combo.ComboFragment"> + tools:context="info.nightscout.androidaps.plugins.pump.combo.ComboFragment"> Nombre de TBR Bolus arrêté Arrêter bolus + Nombre d\'erreurs de Comm. + Afficher le nombre d\'erreurs de comm. + Affiche le nombre d\'erreurs de communication avec Ruffy. Dans la plupart des cas, un nombre supérieur à 0 indique des problèmes de communication Ruffy (le redémarrage peut être nécessaire). + Jamais + En cas d\'erreur + Toujours diff --git a/combo/src/main/res/values-nl-rNL/strings.xml b/combo/src/main/res/values-nl-rNL/strings.xml index d373ebb673..79afef3fd7 100644 --- a/combo/src/main/res/values-nl-rNL/strings.xml +++ b/combo/src/main/res/values-nl-rNL/strings.xml @@ -51,4 +51,10 @@ Aantal TBR Bolus gestopt Stoppen van bolus + Aantal communicatie fouten + Toon aantal communicatie fouten + Toont het aantal fouten tijdens de communicatie met Ruffy. In de meeste gevallen betekent een getal groter dan 0 - Ruffy communicatieproblemen (een herstart kan nodig zijn). + Nooit + Bij een fout + Altijd diff --git a/combo/src/main/res/values-pt-rBR/strings.xml b/combo/src/main/res/values-pt-rBR/strings.xml index 20c39d1c92..a4a15441d4 100644 --- a/combo/src/main/res/values-pt-rBR/strings.xml +++ b/combo/src/main/res/values-pt-rBR/strings.xml @@ -2,7 +2,10 @@ Integração para bombas Accu-Chek Combo, requer ter o Ruffy instalado Programando a bomba para aplicar o bolus - Atividade + Estado + Atividades + Sem conexão há %1$d min + %1$d%% (%2$d min restantes) Inicializando Suspensa devido a um erro Suspensa pelo usuário @@ -11,23 +14,47 @@ Ajustando a TBR (%1$d%% / %2$d min) Aplicando bolus (%1$.1f U) Atualizando + Ação solicitada não compatível com a bomba Utilização insegura: bolus estendidos ou multionda estão ativos. O modo do loop foi alterado para apenas suspender hipoglicemias por 6h. São suportados apenas bolus normais no modo loop Utilização insegura: a bomba está utilizando um perfil de dose basal diferente do primeiro. O loop foi desligado. Selecione o primeiro perfil basal na bomba e atualize. Um bolus com este mesmo valor já foi administrado nos dois últimos minutos. Para evitar bolus acidentais e para garantir a segurança contra bugs, o bolus foi cancelado. + Agora + Lendo histórico da bomba + Configurando perfil basal O nível do cartucho da bomba está baixo A bateria da bomba está fraca A bomba está dando o erro E%1$d: %2$s + Baixo + Vazio + Normal É necessário atualizar o relógio da bomba O aviso DBT CANCELADA foi confirmado Não foi possivel establecer comunicação com a bomba. Nenhum bolus foi aplicado. A administração do bolus falhou. Nenhum bolus parece ter sido administrado. Para evitar uma dupla administração do bolus, por favor verifique a informação de bolus na bomba e se preciso administre o bolus novamente. Como segurança contra bugs, os bolus não são reprogramados de forma automática. + Apenas %1$.2f U do bolus de %2$.2f U foi aplicado devido a um erro. Por favor verifique a bomba e tome as medidas necessárias. + A aplicação do bolus e a verificação do histórico da bomba falharam, por favor verifique a bomba. Se o bolus foi injetado será adicionado ao histórico de tratamentos durante a próxima conexão com a bomba. + Não há insulina suficiente no reservatório para bolus + Configuração da bomba inválida, verifique a documentação e se o menu de informações rápidas está nomeado de QUICK INFO utilizando o programa de configuração 360. + Lendo perfil basal O histórico da bomba foi alterado após o cálculo do bolo ter sido realizado. O bolus não foi aplicado. Por favor, verifique se bolus ainda é necessário. + O bolus foi aplicado, mas não foi possível adicionar ao histórico. Isto é possível se dois bolus do mesmo valor baixo foram aplicados nos últimos dois minutos. Por favor verifique o histórico da bomba e use o Careportal para adicionar os dados em falta caso necessário. Cuidado para não adicionar dados com o mesmo valor no mesmo minuto. Rejeitando basal temporária porque o cálculo não considerou o histórico da bomba alterado recentemente + Atualizando estado da bomba + A taxa basal na bomba mudou e será atualizada em breve Taxa de basal alterada na bomba, mas a leitura falhou Verificando mudanças do histórico Bólus múltiplos, com a mesma quantidade dentro do mesmo minuto acabaram de ser importados. Apenas um registro pode ser adicionado aos tratamentos. Por favor, verifique a bomba e adicione manualmente um bólus record utilizando a aba Careportal. Certifique-se de criar um bolus com o tempo em que nenhum outro bolus usa. \n\ndocumentation:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers O último bólus tem mais de 24 horas ou está no futuro. Por favor, verifique se a data está definida corretamente. + Hora/data da entrega do bólus na bomba parece errado, insulina ativa parece estar provavelmente incorreto. Verifique hora/data na bomba. + Contagem Bólus + Contagem Basal Teporária Bolus interrompido Interrompendo bolus + Contagem de erro comunicada + Mostrar contagem de erros comunicada + Mostra a contagem de erros, ao se comunicar com o Ruffy. Na maioria dos casos, número maior que 0 significa que há problemas de comunicação com o Ruffy (pode ser necessário reiniciar). + Nunca + Quando erro + Sempre diff --git a/combo/src/main/res/values-zh-rCN/strings.xml b/combo/src/main/res/values-zh-rCN/strings.xml index afe4b30161..4fae07af7f 100644 --- a/combo/src/main/res/values-zh-rCN/strings.xml +++ b/combo/src/main/res/values-zh-rCN/strings.xml @@ -44,10 +44,17 @@ 泵上的基础率改变了，但是读取失败 检查历史记录变化 在同一分钟内使用相同数量的多个大剂量记录被导入的。治疗中只能增加一项记录。请手动检查泵并使用记录标签手动添加一个大剂量记录。确保创建一个和其他大剂量记录时间不重复的大剂量记录. + \n\n文档:\nhttps://androidaps.readthedocs.io\n\nfacebook:\nhttps://www.facebook.com/groups/AndroidAPSUsers 最后一次大剂量的输注时间是在24个小时以前或者在未来的时间，请检查泵上的日期设置的的是否正确 输注过的大剂量的时间／日期看着好像错了，活性胰岛素可能不准确。请检查泵的时间／日期 大剂量 计数 临时基础率 计数 大剂量停止了 正在停止大剂量 + 通信. 错误计数 + 显示通信. 错误数 + 显示与Ruffy通信时的错误计数。在大多数情况下，大于0的数字表示存在通信问题(可能需要重新启动)。 + 从不 + 当出错时 + 总是 diff --git a/combo/src/main/res/xml/pref_combo.xml b/combo/src/main/res/xml/pref_combo.xml index 601bc4f62f..bdac3f4099 100755 --- a/combo/src/main/res/xml/pref_combo.xml +++ b/combo/src/main/res/xml/pref_combo.xml @@ -9,7 +9,7 @@ app:initialExpandedChildrenCount="0"> = listOf()) { - val filteredValues = listvalues.toList().filter { it != null} + val filteredValues = listvalues.toList().filterNotNull() compositeDisposable += repository.runTransaction(UserEntryTransaction( action = action, source = source, diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt index 6698250f9e..d1c5cb573d 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/bus/RxBus.kt @@ -5,8 +5,8 @@ import info.nightscout.androidaps.events.Event import info.nightscout.shared.logging.AAPSLogger import info.nightscout.shared.logging.LTag import info.nightscout.androidaps.utils.rx.AapsSchedulers -import io.reactivex.Observable -import io.reactivex.subjects.PublishSubject +import io.reactivex.rxjava3.core.Observable +import io.reactivex.rxjava3.subjects.PublishSubject import javax.inject.Inject import javax.inject.Singleton @@ -26,7 +26,7 @@ class RxBus @Inject constructor( // Listen should return an Observable and not the publisher // Using ofType we filter only events that match that class type - fun toObservable(eventType: Class): Observable = + fun toObservable(eventType: Class): Observable = publisher .subscribeOn(aapsSchedulers.io) .ofType(eventType) diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt index 4994f81c03..ddf0aeb680 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/PumpSyncImplementation.kt @@ -20,8 +20,8 @@ import info.nightscout.androidaps.utils.DateUtil import info.nightscout.androidaps.utils.T import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject class PumpSyncImplementation @Inject constructor( diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt index eb20995fd6..6e836a077b 100644 --- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt +++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/ble/BlePreCheck.kt @@ -42,7 +42,7 @@ class BlePreCheck @Inject constructor( ActivityCompat.requestPermissions(activity, arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION), PERMISSION_REQUEST_COARSE_LOCATION) } // change after SDK = 31+ - if (Build.VERSION.SDK_INT >= /*Build.VERSION_CODES.S*/31) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (ContextCompat.checkSelfPermission(context, "android.permission.BLUETOOTH_CONNECT") != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(context, "android.permission.BLUETOOTH_SCAN") != PackageManager.PERMISSION_GRANTED ) { diff --git a/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt b/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt index 01409e23b2..abd2c3be03 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/HardLimits.kt @@ -9,8 +9,8 @@ import info.nightscout.shared.logging.AAPSLogger import info.nightscout.androidaps.plugins.bus.RxBus import info.nightscout.androidaps.utils.resources.ResourceHelper import info.nightscout.shared.sharedPreferences.SP -import io.reactivex.disposables.CompositeDisposable -import io.reactivex.rxkotlin.plusAssign +import io.reactivex.rxjava3.disposables.CompositeDisposable +import io.reactivex.rxjava3.kotlin.plusAssign import javax.inject.Inject import javax.inject.Singleton import kotlin.math.max diff --git a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt index 495b71eeac..c9f22c0718 100644 --- a/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt +++ b/core/src/main/java/info/nightscout/androidaps/utils/textValidator/ValidatingEditTextPreference.kt @@ -27,10 +27,10 @@ class ValidatingEditTextPreference(ctx: Context, attrs: AttributeSet, defStyleAt constructor(ctx: Context, attrs: AttributeSet) : this(ctx, attrs, R.attr.editTextPreferenceStyle) - override fun onBindViewHolder(holder: PreferenceViewHolder?) { + override fun onBindViewHolder(holder: PreferenceViewHolder) { super.onBindViewHolder(holder) - holder?.isDividerAllowedAbove = false - holder?.isDividerAllowedBelow = false + holder.isDividerAllowedAbove = false + holder.isDividerAllowedBelow = false } private fun obtainValidatorParameters(attrs: AttributeSet): DefaultEditTextValidator.Parameters { diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml index 25c899fe6c..9347b36e33 100644 --- a/core/src/main/res/values-cs-rCZ/strings.xml +++ b/core/src/main/res/values-cs-rCZ/strings.xml @@ -4,6 +4,7 @@ Obnovit Chyba + Uložit Nenastaveno Chyba při nastavení bazálního profilu Bazální profil aktualizován @@ -376,6 +377,7 @@ RESET STATISTIK VYMAZAT LOGY VYMAZAT BUDOUCÍ OŠETŘENÍ + Odstranit ošetření v budoucnu EXPORTOVAT NASTAVENÍ IMPORTOVAT NASTAVENÍ RESETOVAT DATABÁZE diff --git a/core/src/main/res/values-es-rES/strings.xml b/core/src/main/res/values-es-rES/strings.xml index 103685ff60..31b039d14c 100644 --- a/core/src/main/res/values-es-rES/strings.xml +++ b/core/src/main/res/values-es-rES/strings.xml @@ -4,6 +4,7 @@ Actualizar Error + Guardar No configurado Error al actualizar el perfil basal Perfil basal actualizado en la bomba @@ -376,6 +377,7 @@ RESTABLECER ESTADÍSTICAS ELIMINAR REGISTROS ELIMINAR TRATAMIENTOS FUTUROS + Eliminar tratamientos futuros EXPORTAR AJUSTES IMPORTAR AJUSTES RESTABLECER BASES DE DATOS diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml index ed61273bf4..74326661d7 100644 --- a/core/src/main/res/values-fr-rFR/strings.xml +++ b/core/src/main/res/values-fr-rFR/strings.xml @@ -4,6 +4,7 @@ Actualiser Erreur + Enregistrer Non configuré La mise à jour du profil basal a échouée Profil Basal mise à jour dans la pompe @@ -376,6 +377,7 @@ RÉINITIALISATION DES STATS LOGS SUPPRIMÉS TRAITEMENTS FUTURS SUPPRIMÉS + Supprimer traitements futurs PARAMÈTRES EXPORTÉS PARAMÈTRES IMPORTÉS BASE DE DONNÉES RÉINITIALISÉE diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml index faaafd6ae2..31d803c614 100644 --- a/core/src/main/res/values-it-rIT/strings.xml +++ b/core/src/main/res/values-it-rIT/strings.xml @@ -4,6 +4,7 @@ Aggiorna Errore + Salva Non impostato Impossibile aggiornare il profilo basale Profilo basale aggiornato nel micro @@ -48,6 +49,7 @@ ISF Basale Target + Velocità basale Inizializzazione... Numero seriale Batteria diff --git a/core/src/main/res/values-nl-rNL/strings.xml b/core/src/main/res/values-nl-rNL/strings.xml index 230a54471a..2388bc6e66 100644 --- a/core/src/main/res/values-nl-rNL/strings.xml +++ b/core/src/main/res/values-nl-rNL/strings.xml @@ -4,6 +4,7 @@ Vernieuwen Fout + Opslaan Niet ingesteld Update basaal profiel mislukt Basaal profiel in pomp bijgewerkt @@ -376,6 +377,7 @@ STATISTIEKEN RESET VERWIJDER LOGS VERWIJDER TOEKOMSTIGE BEHANDELINGEN + Verwijder behandelingen in de toekomst EXPORTEER INSTELLINGEN IMPORT INSTELLINGEN RESET DATABASES diff --git a/core/src/main/res/values-ru-rRU/strings.xml b/core/src/main/res/values-ru-rRU/strings.xml index 0d36727b0e..a002262313 100644 --- a/core/src/main/res/values-ru-rRU/strings.xml +++ b/core/src/main/res/values-ru-rRU/strings.xml @@ -376,6 +376,7 @@ СБРОС СТАТИСТИКИ УДАЛИТЬ ЖУРНАЛ УДАЛИТЬ НАЗНАЧЕНИЯ ИЗ БУДУЩЕГО + Удалить назначения из будущего ЭКСПОРТИРОВАТЬ НАСТРОЙКИ ИМПОРТИРОВАТЬ НАСТРОЙКИ СБРОСИТЬ БАЗЫ ДАННЫХ diff --git a/core/src/main/res/values-tr-rTR/strings.xml b/core/src/main/res/values-tr-rTR/strings.xml index 90e1823414..0e3634e741 100644 --- a/core/src/main/res/values-tr-rTR/strings.xml +++ b/core/src/main/res/values-tr-rTR/strings.xml @@ -4,6 +4,7 @@ Yenile Hata + Kaydet Ayarlanmadı Bazal profiliniz güncellenemedi Pompadaki Bazal profil güncellendi @@ -376,6 +377,7 @@ İSTATİSK SIFIRLAMA GÜNLÜKLERİ SİL GELECEK TEDAVİLERİ SİL + İleri tarihli tedavileri sil AYARLARI DIŞA AKTAR AYARLARI İÇE AKTAR VERİTABANLARINI SIFIRLA diff --git a/core/src/main/res/values-zh-rCN/strings.xml b/core/src/main/res/values-zh-rCN/strings.xml index 31785a9224..0efe890f87 100644 --- a/core/src/main/res/values-zh-rCN/strings.xml +++ b/core/src/main/res/values-zh-rCN/strings.xml @@ -2,57 +2,266 @@ + 刷新 + 错误 + 保存 + 未设置 + 更新基础率配置文件失败 + 泵基础率配置文件更新了 + 无效的输入数据 + 临时基础输注错误 + 将要输注 %1$.2f U + 正在等待泵 + 正在连接 %1$d 秒 + 正在输注 %1$.2f U + 握手 + 正在连接 + 已连接 + 已断开连接 + 正在断开连接 + 正在等待连接 + AndroidAPS 启动了 + %1$.1f U + %1$.2f U + %1$+.2f U + %1$d 克 + %1$.0f / %2$d U %1$.2f U/h + %1$.2f 小时 + %1$d 分钟 + 胰岛素泵忙碌中 + 泵连接错误 + 你达到了允许的极限 + 目标 + 关闭 + 请稍等... + 静音 + 重新加载 + 停止键按下了 + 停止 + 碳水化合物 + 无效的配置文件!!! + 没有设置配置文件 + 日期 + 单位 + DIA + IC碳水系数 + ISF胰岛素敏感系数 + 基础率 + 血糖控制目标值 + 胰岛素作用持续时间DIA + 碳水化合物系数（ICR） + 胰岛素敏感系数ISF + 基础率 + 血糖目标 + 正在初始化 + 序列号 + 电池 + 上次连接 + 上次大剂量 + 每日单位数 + 基础率 + 临时基础率 + 扩展大剂量(方波) + 储药器 + 泵历史记录 + 查看配置文件 + 事件类型 + mg/dl + mmol/l + 克 + % + 高级设置 + 蓝牙 + 蓝牙看门狗 + 如果没有连接到泵，关闭手机的蓝牙一秒钟再自动打开。这在一些蓝牙堆栈僵死的手机上是有帮助的, + 配对中 是 否 按约束条件禁用循环 + 成功输注大剂量 %1$.2f U + 确定 从泵中无法读取有效的基础率 - 由于 %2$s, 将最大 IOB(活性胰岛素) 限制为 %1$.1f U + 由于 %2$s 将最大 IOB活性胰岛素限制为 %1$.1f U 不安全的用法 泵无法连接 + 扩展大剂量(方波) 泵时间已经更新 + 退出 删除记录 + 闭环被禁用 + 报警 禁用闭环 启用闭环 恢复闭环 暂停闭环 + 持续时间 [min] 通知 尚未从 NS 加载配置文件 存在 不存在 血糖 + IOB活性胰岛素 COB活性碳水 名称: 时间 WiFi SSID + 正在加载… + 事件时间 + 备注 + 删除 添加新条目 + 在顶部新增 + 数据来自不同的胰岛素泵，修改泵的驱动配置用来重置泵的状态。 + 最大基础率被限定为 %1$.2f U/h 由于 %2$s + 泵限制 + 由于 %2$s, 将最大百分比限制为 %1$d%% + 它必须是正数 + 由于 %2$s, 将大剂量限制为 %1$.1f U + 泵未初始化, 配置文件未设置! + 确认 + 消息 + 确定 + 取消 + 忽略 + 不支持蓝牙低能量。 + 蓝牙低电量或设备未配对。 + 蓝牙未启用 + 未启用位置 + 为了蓝牙能发现新的设备，手机定位功能必须启用， AAPS 不会追踪你的位置，你可以在配对成功后禁用定位。 + %1$d 分钟前 + %1$d 分钟前 + %1$.1f 小时前 + h + 天 + 小时 + 秒 + 分钟 + 小时 + 天 + 周 + 秒 + 分钟 + 小时 + 天 + 周 + m + d + 密码错误 + 密码不匹配 + 基础率值与小时数不一致:%1$s + 基础率值被泵支持的最小值: %1$s 替换了 + 基础率值被泵支持的最大值:%1$s 替换了 + /U + U/h + 克/U 启动配置文件 %1$d%%在 %2$d 分钟 + *在虚拟泵中，基础率/大剂量仅支持离散值，不支持范围值。 + 取消临时基础率 + 让临时基础率运行 + 比率 + 持续时间 + 原因 + 不需要改变 + 无效的配置文件：%1$s + %1$d 分钟 + %1$s: ∑: %2$.2f U 大剂量: %3$.2f U 基础率: %4$.2f U(%5$.0f%%)]]> + %1$s: ∑: %2$.2f U 大剂量: %3$.2f U 基础率: %4$.2f U(%5$.0f%%) 碳水s: %6$.0f g]]> + %1$s: %2$s 在 %3$d 天内
]]> + 护理记录 + 指血检查 + 指血BG 或 校准 + 通告 + 备注 + 问题 + 运动 + 公告: %1$s + 备注： %1$s + 问题 : %1$s + 运动 : %1$s + 泵更换管路 + CGM 传感器插入 + CGM 传感器启动 + CGM 传感器停止 + D.A.D. 警告 + 更换储药器 + 配置文件切换 + 零食大剂量 + 餐时大剂量 + 矫正大剂量 + Combo组合大剂量 + 临时基础率开始 + 临时基础率结束 + 碳水化合物校正 + OpenAPS 离线 + 更换泵电池 + 临时目标 + 临时目标值 + 临时目标取消 大剂量向导 + 手指 + 传感器 + 手动 + 未知的 很快吃饭 低 活动 手表 自动操作 自定义 + 胰岛素泵 + 闭环 + NS + 记录 + 读取泵历史记录 + 泵图标 + 连接超时 + 设定 + 评论 + 成功 + 百分比 + 绝对值 + 胰岛素 + U + 正在等待结果 + SMB + 在 %2$d 分钟内需要 %1$d 克碳水化合物 + 统计信息 + 累积的每日胰岛素输注的总量 + 日输注总量指数加权 + 基础率 + 大剂量 + 日胰岛素总量 + 比值 + # 天 + 权重 + 如果使用大剂量来充盈排气的话，活性胰岛素的量显示的可能不准确 + 旧数据请按 \"重新加载\" + 基础率总量 + TBB * 2 + 时间检测 + %1$dh %2$dm + 静音 5 分钟 + 文件格式 创建于 AAPS 版本 构建变体 @@ -63,7 +272,9 @@ 新调试格式 (未加密) 未知的导出格式 已导出 %1$s + 导出 %1$s 不到 1 小时前更新过 + 目录: %1$s 选择要导入的文件 使用 AAPS 的不同版本创建首选项 (%1$s) 而你有 %2$s\n\n某些设置可能缺失或无效 - 导入后，请检查并更新首选项。 首选项是在不同的设备上创建的。 如果要从较旧/不同的电话导入，但确保导入的首选项正确 ! @@ -77,6 +288,7 @@ 使用不安全且未加密的设置格式 JSON 格式错误，缺少必填字段 (格式，内容，元数据或安全性) 解密错误，该密码无法解密文件 + 缺少文件校验码（哈希值），无法验证设置的真实性！ 导出后文件已修改 ! 解密错误，解析首选项失败! 解密错误，提供的密码无效或设置文件已修改! 导入的文件可能是使用其他主密码导出的。 @@ -86,10 +298,166 @@ 验证签名 我们检测到您运行的版本无效。 已禁用循环! 版本 %1$s 可用 + 版本 %1$s 将在 %2$s 过期 + 请重启你的手机或者从系统设置里重启AndroidAPS软件 \n 否则 Android APS将不会记录日志 (这对于跟踪和检查算法是否正确很重要)! + 周一 + 周二 + 周三 + 周四 + 周五 + 周六 + 周日 + 大剂量 + 大剂量向导 + 大剂量顾问 + 扩展大剂量 + 超级大剂量TBR + 碳水 + 扩展碳水 + 临时基础率 + 临时目标 + 新配置文件 + 克隆配置文件 + 存储配置文件 + 配置文件切换 + 配置文件克隆 + 闭环模式 + 低血糖模式 + 开环模式 + 闭环禁用 + 闭环启用 + 重新连接 + 断开连接 + 恢复 + 暂停 + 泵允许使用 + 清除配对密钥 + 接受临时基础率 + 取消临时基础率 + 取消大剂量 + 取消扩展剂量 + 取消临时目标 + 护理功能 + 位置变更 + 储药器更换 + 校准 + 注射胰岛素 + 治疗 + 从NS刷新护理数据 + 从NS刷新配置文件切换 + 从NS刷新治疗数据 + 从NS刷新临时目标 + 删除自动操作 + 删除血糖数据 + 删除护理数据 + 删除大剂量 + 删除碳水 + 删除临时基础率 + 删除扩展大剂量 + 食物 + 删除食物 + 删除配置文件 + 删除配置文件切换 + 删除重启事件 + 删除治疗事件 + 删除临时目标 + NS暂停 + NS恢复 + 清除NS队列 + 复制NS设置 + 确认 + 静音 + 静音5分钟 + 目标已开始 + 目标未开始 + 目标已跳过 + 统计重置 + 删除日志 + 删除未来的治疗 + 删除未来的治疗 + 导出设置 + 导入设置 + 重置数据库 + 导出数据库 + 导入数据库 + OTP 导出 + OTP 重置 + 停用短信 + 导出用户数据 + 启动 AAPS + 退出 AAPS + 插件已启用 + 插件已禁用 + 未知 + 字符串 + 来源 + 时区偏移 + 操作 + 时间戳 + 无单位 + 导出用户条目到 Excel (csv) + 闭环更改 + 闭环删除 + 其他 + 个人配置低目标 + 个人配置高目标 + 临时目标值下限值 + 临时目标值上限值 + 临时目标值 + 配置文件DIA值 + 配置文件敏感系数值 + 配置文件最大基础率值 + 当前基础率值 + 配置文件碳水系数值 %1$.2f 超过 %2$.2f的限制 + »%1$s« 超出了硬限制 + »%1$s« %2$.2f 超出了硬限制 + 基础率值 + NS客户端版本与AndroidAPS不匹配，请更新。 + 大剂量 %1$.2f U + 碳水 %1$d 克 + 扩展大剂量 %1$.2f U 持续 %2$d分 + 加载事件 + 加载历史记录 %1$d + 加载日胰岛素总量 + 设置配置文件 + 用户设置参数 + SMB剂量 %1$.2f U + 启动泵 + 停止泵 + 临时基础率 %1$.2f U/h %2$d 分 + 临时基础率 %1$d%% %2$d 分 + 设置临时基础率超过时通知 + 读取状态 %1$s + 状态保持超时 + 状态保持. 基础率超时 + 手机SMS + 单击连接到泵 + 泵驱动程序已变更 + 泵驱动程序变更 + 设备已更改 + 点击刷新 + 计划状态刷新 + 未确认命令 + 用户请求 + 用户请求 + 大剂量完成 + 泵已配对 + Insight刷新按钮 + 将%1$s 减少 %2$s + 将%1$s 增加 %2$s + + %1$d　天 + + + %1$d 小时 + + + %1$d 分钟 + diff --git a/core/src/main/res/values-zh-rCN/validator.xml b/core/src/main/res/values-zh-rCN/validator.xml index 87a88ef29a..4e5168783d 100644 --- a/core/src/main/res/values-zh-rCN/validator.xml +++ b/core/src/main/res/values-zh-rCN/validator.xml @@ -2,6 +2,23 @@ 只允许数字。 仅允许在范围 %1$s - %2$s 内的数字。 + 此字段不能包含任何特殊字符 + 只允许使用标准字母 此字段不能为空 + 电子邮件地址无效 + 信用卡号码无效 电话号码无效 + 域名无效 + IP地址无效 + 网址无效 + 不是有效的名字或姓氏。 + 不是有效的全名。 + 格式无效 + 必须是4位数字 + 必须是6位数字 + 必须是12位字符，在ABCDEF0123456789中选用 + 必须是8位字符，在ABCDEF0123456789中选用 + 必须是4位字符，在ABCDEF0123456789中选用 + 不是最小长度 + Pin 应该是 3 到 6 位数字，不是相同或连续的数字 diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index b7a81bc5b4..31076be1d6 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -69,8 +69,12 @@