diff --git "a/app/src/main/assets/config/\346\234\210\345\205\211\351\230\277\350\245\277\350\245\277\346\233\264\346\226\260\350\257\264\346\230\216.txt" "b/app/src/main/assets/config/\346\234\210\345\205\211\351\230\277\350\245\277\350\245\277\346\233\264\346\226\260\350\257\264\346\230\216.txt"
deleted file mode 100755
index 58ed02fb8..000000000
--- "a/app/src/main/assets/config/\346\234\210\345\205\211\351\230\277\350\245\277\350\245\277\346\233\264\346\226\260\350\257\264\346\230\216.txt"
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-2024.6.22
-1、新增几种自定义特殊指令（HDR\关机\睡眠\重启\注销）
-2、ds4触控板虚拟手柄按钮
-3、强制使用设备震动马达震动
-4、手柄振幅强度调节&持续震动
-5、鼠标模式新增左右键互换
-
-
-2024.5.11
-1、多点触控模式支持灵敏度调节；
-2、自定义特殊指令支持自定义(json文件导入)；
-3、支持多种鼠标模式切换（多点触控、触控板、普通鼠标、禁用触控/鼠标）；
-4、开关类型的鼠标右键-特殊自定义按键里面(可能对按住右键转视野有点作用，本人不玩这类型游戏，没测试)；
-5、精简性能模式下，支持点击弹出游戏快捷菜单；
-6、手柄调试页面（对测试手柄震动的小伙伴有帮助）；
-7、最大码率可以提高到300Mbps（性能足够的，可以试试。）
-
-
diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.java b/app/src/main/java/com/limelight/preferences/StreamSettings.java
index 8788c4133..5b87ad1f2 100755
--- a/app/src/main/java/com/limelight/preferences/StreamSettings.java
+++ b/app/src/main/java/com/limelight/preferences/StreamSettings.java
@@ -757,98 +757,75 @@ public boolean onPreferenceClick(Preference preference) {
editText.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL);
-// editText.setKeyListener(new NumberKeyListener() {
-// @Override
-// public int getInputType() {
-// return InputType.TYPE_MASK_VARIATION;
-// }
-// @Override
-// protected char[] getAcceptedChars() {/*这里实现字符串过滤，把你允许输入的字母添加到下面的数组即可！*/
-// return new char[]{'0', '1', '2', '3', '4', '5','6','7', '8', '9', '.'};
-// }
-// });
editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(5)/*这里限制输入的长度为5个字母*/});
bitrateEditPre.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- String value= (String) newValue;
- if(TextUtils.isEmpty(value)){
- Toast.makeText(getActivity(),"请输入0-9999的数值。",Toast.LENGTH_SHORT).show();
+ String value = (String) newValue;
+ if (TextUtils.isEmpty(value)) {
+ Toast.makeText(getActivity(), getString(R.string.pref_enter_value_0_9999), Toast.LENGTH_SHORT).show();
return false;
}
- float bitrateValue=Float.valueOf(value)*1000;
- LimeLog.info("axi-bitrateValue:"+bitrateValue);
- int bitrate= (int) bitrateValue;
- LimeLog.info("axi-bitrate:"+bitrate);
+ float bitrateValue = Float.valueOf(value) * 1000;
+ LimeLog.info("axi-bitrateValue:" + bitrateValue);
+ int bitrate = (int) bitrateValue;
+ LimeLog.info("axi-bitrate:" + bitrate);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
- prefs.edit().putInt(PreferenceConfiguration.BITRATE_PREF_STRING,bitrate).apply();
- Toast.makeText(getActivity(),"设置成功！",Toast.LENGTH_SHORT).show();
+ prefs.edit().putInt(PreferenceConfiguration.BITRATE_PREF_STRING, bitrate).apply();
+ Toast.makeText(getActivity(), getString(R.string.pref_set_success), Toast.LENGTH_SHORT).show();
return true;
}
});
-
-
-// findPreference("checkbox_multi_touch_screen").setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-// @Override
-// public boolean onPreferenceChange(Preference preference, Object newValue) {
-//
-// if(((Boolean) newValue)){
-// CheckBoxPreference checkBoxPreference= (CheckBoxPreference) findPreference(PreferenceConfiguration.TOUCHSCREEN_TRACKPAD_PREF_STRING);
-// checkBoxPreference.setChecked(false);
-// }
-//
-// return true;
-// }
-// });
}
- int READ_REQUEST_CODE=1001;
- int READ_REQUEST_SPECIAL_CODE=1002;
+ int READ_REQUEST_CODE = 1001;
+ int READ_REQUEST_SPECIAL_CODE = 1002;
+
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == READ_REQUEST_CODE && resultCode == Activity.RESULT_OK &&data.getData()!=null) {
+ if (requestCode == READ_REQUEST_CODE && resultCode == Activity.RESULT_OK && data.getData() != null) {
try {
Uri uri = data.getData();
- String json=FileUriUtils.openUriForRead(getActivity(),uri);
- if(TextUtils.isEmpty(json)){
- Toast.makeText(getActivity(),"空文件~",Toast.LENGTH_SHORT).show();
+ String json = FileUriUtils.openUriForRead(getActivity(), uri);
+ if (TextUtils.isEmpty(json)) {
+ Toast.makeText(getActivity(), getString(R.string.pref_empty_file), Toast.LENGTH_SHORT).show();
return;
}
String name = PreferenceManager.getDefaultSharedPreferences(getActivity()).getString(KeyBoardControllerConfigurationLoader.OSC_PREFERENCE, KeyBoardControllerConfigurationLoader.OSC_PREFERENCE_VALUE);
SharedPreferences.Editor prefEditor = getActivity().getSharedPreferences(name, Activity.MODE_PRIVATE).edit();
- JSONObject object=new JSONObject(json);
+ JSONObject object = new JSONObject(json);
Iterator it = object.keys();
prefEditor.clear();
- while(it.hasNext()) {
+ while (it.hasNext()) {
String key = (String) it.next();// 获得key
String value = object.getString(key);// 获得value
- prefEditor.putString(key,value);
+ prefEditor.putString(key, value);
}
prefEditor.apply();
- Toast.makeText(getActivity(),"导入成功！",Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), getString(R.string.pref_import_success), Toast.LENGTH_SHORT).show();
} catch (Exception e) {
e.printStackTrace();
- Toast.makeText(getActivity(),"出错啦~"+e.getMessage(),Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), getString(R.string.pref_error_occurred) + e.getMessage(), Toast.LENGTH_SHORT).show();
}
return;
}
- if (requestCode == READ_REQUEST_SPECIAL_CODE && resultCode == Activity.RESULT_OK &&data.getData()!=null) {
+ if (requestCode == READ_REQUEST_SPECIAL_CODE && resultCode == Activity.RESULT_OK && data.getData() != null) {
try {
Uri uri = data.getData();
- String json=FileUriUtils.openUriForRead(getActivity(),uri);
- if(TextUtils.isEmpty(json)){
- Toast.makeText(getActivity(),"空文件~",Toast.LENGTH_SHORT).show();
+ String json = FileUriUtils.openUriForRead(getActivity(), uri);
+ if (TextUtils.isEmpty(json)) {
+ Toast.makeText(getActivity(), getString(R.string.pref_empty_file), Toast.LENGTH_SHORT).show();
return;
}
SharedPreferences.Editor prefEditor = getActivity().getSharedPreferences(GameMenu.PREF_NAME, Activity.MODE_PRIVATE).edit();
- prefEditor.putString(GameMenu.KEY_NAME,json);
+ prefEditor.putString(GameMenu.KEY_NAME, json);
prefEditor.apply();
- Toast.makeText(getActivity(),"导入成功！",Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), getString(R.string.pref_import_success), Toast.LENGTH_SHORT).show();
} catch (Exception e) {
e.printStackTrace();
- Toast.makeText(getActivity(),"出错啦~"+e.getMessage(),Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(), getString(R.string.pref_error_occurred) + e.getMessage(), Toast.LENGTH_SHORT).show();
}
}
}
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 3df17b41c..266b18f2c 100755
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -431,7 +431,7 @@
请选择
目前没有检测到手柄，请连接手柄，点击刷新按钮，再尝试！
手柄没有识别到震动马达！
- 设置振幅0-255【HD震动生效】
+ 设置振幅0-255(只对HD震动生效)
名称：
传感器：
无（没有相关驱动或者手柄不支持）
@@ -448,4 +448,9 @@
点击刷新手柄信息
刷新手柄列表
测试手柄震动
+ 请输入0-9999的数值。
+ 设置成功！
+ 文件为空！
+ 导入成功！
+ 出错啦~
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6516044c4..960e822cd 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -455,25 +455,28 @@
Simple Vibration for 1 Second
Continuous HD Vibration
Please Choose
- No gamepad detected, please connect a gamepad, click the refresh button, and try again!
+ No gamepad detected, please connect a gamepad, tap refresh, and try again!
No vibrator detected on the gamepad!
- Set Amplitude 0-255 [Effective for HD Vibration]
- Name:
- Sensors:
+ Set Amplitude 0-255 (Effective only for HD Vibration)
+ Name:
+ Sensors:
None (no relevant driver or gamepad not supported)
No corresponding API below Android 12
- VID_PID:
- Vibration:
+ VID_PID:
+ Vibration:
Supported
Not Supported
- Details:
- Number of Gamepads:
+ Details:
+ Number of Gamepads:
+Accelerometer
+Gyroscope
Stop Vibration
Tap to refresh gamepad info
Refresh gamepad list
Test gamepad rumble
-
+ Please enter a value between 0 and 9999.
+ Settings saved successfully!
+ Empty file!
+ Import successful!
+ An error occurred:
-