Skip to content

Commit ddfe360

Browse files
committed
update
1 parent 1e429a4 commit ddfe360

File tree

10 files changed

+132
-91
lines changed

10 files changed

+132
-91
lines changed

app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ android {
77
applicationId "com.espressif.espblufi"
88
minSdkVersion 21
99
targetSdkVersion 29
10-
versionCode 22
11-
versionName "1.5.1"
10+
versionCode 23
11+
versionName "1.5.2"
1212
}
13+
1314
buildTypes {
1415
release {
1516
minifyEnabled false

app/src/main/java/com/espressif/espblufi/ui/BlufiActivity.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,14 +382,16 @@ public void onGattPrepared(BlufiClient client, BluetoothGatt gatt, BluetoothGatt
382382

383383
updateMessage("Discover service and characteristics success", false);
384384

385-
int mtu = (int) BlufiApp.getInstance().settingsGet(
386-
SettingsConstants.PREF_SETTINGS_KEY_MTU_LENGTH, BlufiConstants.DEFAULT_MTU_LENGTH);
387-
boolean requestMtu = gatt.requestMtu(mtu);
388-
if (!requestMtu) {
389-
mLog.w("Request mtu failed");
390-
updateMessage(String.format(Locale.ENGLISH, "Request mtu %d failed", mtu), false);
391-
onGattServiceCharacteristicDiscovered();
392-
}
385+
// int mtu = (int) BlufiApp.getInstance().settingsGet(
386+
// SettingsConstants.PREF_SETTINGS_KEY_MTU_LENGTH, BlufiConstants.DEFAULT_MTU_LENGTH);
387+
// boolean requestMtu = gatt.requestMtu(mtu);
388+
// if (!requestMtu) {
389+
// mLog.w("Request mtu failed");
390+
// updateMessage(String.format(Locale.ENGLISH, "Request mtu %d failed", mtu), false);
391+
// onGattServiceCharacteristicDiscovered();
392+
// }
393+
client.setPostPackageLengthLimit(20);
394+
onGattServiceCharacteristicDiscovered();
393395
}
394396

395397
@Override

app/src/main/java/com/espressif/espblufi/ui/SettingsActivity.java

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
import android.text.TextUtils;
99

1010
import androidx.annotation.Nullable;
11+
import androidx.annotation.StringRes;
1112
import androidx.appcompat.app.AlertDialog;
1213
import androidx.appcompat.widget.Toolbar;
1314
import androidx.preference.EditTextPreference;
1415
import androidx.preference.Preference;
16+
import androidx.preference.PreferenceCategory;
1517
import androidx.preference.PreferenceFragmentCompat;
1618

1719
import com.espressif.espblufi.R;
@@ -68,22 +70,28 @@ public void onCreate(Bundle savedInstanceState) {
6870
mApp = BlufiApp.getInstance();
6971

7072
getVersionInfo();
71-
findPreference(getString(R.string.settings_version_key)).setSummary(mAppVersionName);
72-
findPreference(getString(R.string.settings_blufi_version_key)).setSummary(BlufiClient.VERSION);
73+
findPreference(R.string.settings_version_key).setSummary(mAppVersionName);
74+
findPreference(R.string.settings_blufi_version_key).setSummary(BlufiClient.VERSION);
7375

74-
mMtuPref = findPreference(getString(R.string.settings_mtu_length_key));
76+
mMtuPref = findPreference(R.string.settings_mtu_length_key);
7577
int mtuLen = (int) mApp.settingsGet(KEY_MTU_LENGTH, BlufiConstants.DEFAULT_MTU_LENGTH);
7678
mMtuPref.setOnPreferenceChangeListener(this);
7779
if (mtuLen >= BlufiConstants.MIN_MTU_LENGTH && mtuLen <= BlufiConstants.MAX_MTU_LENGTH) {
7880
mMtuPref.setSummary(String.valueOf(mtuLen));
7981
}
82+
PreferenceCategory blufiCategory = findPreference(R.string.settings_category_blufi_key);
83+
blufiCategory.removePreference(mMtuPref);
8084

81-
mBlePrefixPref = findPreference(getString(R.string.settings_ble_prefix_key));
85+
mBlePrefixPref = findPreference(R.string.settings_ble_prefix_key);
8286
mBlePrefixPref.setOnPreferenceChangeListener(this);
8387
String blePrefix = (String) mApp.settingsGet(KEY_BLE_PREFIX, BlufiConstants.BLUFI_PREFIX);
8488
mBlePrefixPref.setSummary(blePrefix);
8589

86-
mVersionCheckPref = findPreference(getString(R.string.settings_upgrade_check_key));
90+
mVersionCheckPref = findPreference(R.string.settings_upgrade_check_key);
91+
}
92+
93+
public <T extends Preference> T findPreference(@StringRes int res) {
94+
return findPreference(getString(res));
8795
}
8896

8997
private void getVersionInfo() {

blufilibrary/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
defaultConfig {
77
minSdkVersion 18
88
targetSdkVersion 29
9-
versionCode 9
10-
versionName "2.3.1"
9+
versionCode 10
10+
versionName "2.3.2"
1111
}
1212
buildTypes {
1313
release {

0 commit comments

Comments
 (0)