diff --git a/qpython/build.gradle b/qpython/build.gradle index 2842fc58129137d6ea069b673c886ef5e4c5bb20..089b4f2d0277fcdf4233bdbe964aeae3ad2f1e82 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -15,8 +15,8 @@ android { defaultConfig { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 315 - versionName "3.2.0" + versionCode 316 + versionName "3.2.1" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/qpython/src/main/AndroidManifest.xml b/qpython/src/main/AndroidManifest.xml index 42d046e832328301cbe95ab607cb7096319a333b..9c022266b90693e50771b7a3c419ab15e214bf1a 100644 --- a/qpython/src/main/AndroidManifest.xml +++ b/qpython/src/main/AndroidManifest.xml @@ -293,8 +293,9 @@ + android:label="@string/qsl4a_future" + android:theme="@style/AppTheme" + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"> diff --git a/qpython/src/main/assets/private1.mp3 b/qpython/src/main/assets/private1.mp3 deleted file mode 100644 index 7bf49d5577018080b74a46b9398b57390b92e92d..0000000000000000000000000000000000000000 Binary files a/qpython/src/main/assets/private1.mp3 and /dev/null differ diff --git a/qpython/src/main/assets/private2.mp3 b/qpython/src/main/assets/private2.mp3 deleted file mode 100644 index 194477802af7d1b975efd11945cba1135b2adac3..0000000000000000000000000000000000000000 Binary files a/qpython/src/main/assets/private2.mp3 and /dev/null differ diff --git a/qpython/src/main/assets/private3.mp3 b/qpython/src/main/assets/private3.mp3 deleted file mode 100644 index ea8d4793c491370f5151b34a9aef8094b724d623..0000000000000000000000000000000000000000 Binary files a/qpython/src/main/assets/private3.mp3 and /dev/null differ diff --git a/qpython/src/main/assets/public.mp3 b/qpython/src/main/assets/public.mp3 deleted file mode 100644 index 392ee2661546da18e7bd134e4517bc238be6e884..0000000000000000000000000000000000000000 Binary files a/qpython/src/main/assets/public.mp3 and /dev/null differ diff --git a/qpython/src/main/assets/resource3.mp3 b/qpython/src/main/assets/resource3.mp3 index 20ef5ac652fe6eecdc272d5c56669652d53862af..c62f18e91f3d371399ae85994e469600d3d85392 100644 Binary files a/qpython/src/main/assets/resource3.mp3 and b/qpython/src/main/assets/resource3.mp3 differ diff --git a/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java b/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java index b6f150210db16a92d61c170fc033febf280913a5..861f45426e54b0e86a4646c36132fc3fe22e3d63 100644 --- a/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java +++ b/qpython/src/main/java/org/qpython/qpy/console/ScriptExec.java @@ -189,7 +189,7 @@ public class ScriptExec { +filesDir+"/lib/python"+pyVer+"/:" +filesDir+"/lib/python"+pyVer.replace(".","")+".zip:" //+filesDir+"/lib/notebook.zip:" - +filesDir+"/lib/python"+pyVer+"/qpyutil.zip:" + //+filesDir+"/lib/python"+pyVer+"/qpyutil.zip:" +filesDir+"/lib/python"+pyVer+"/lib-dynload/:" +externalStorage+"/lib/python"+pyVer+"/site-packages/:" +pyPath; diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java index 2288873e47d237da3692ee3f8fde65b39be6c44d..5bff25057232911af98461ef04f3a45ed3078bfb 100644 --- a/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java +++ b/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java @@ -86,8 +86,18 @@ public class AboutActivity extends BaseActivity { viewWebSite(R.string.thanks_link) ); - String[] words = new String[]{"github", "gitee", "gitee (3c)"}; - int[] sites = new int[]{R.string.qpython_github, R.string.qpython_gitee, R.string.qpython_3c_gitee}; + String[] words = new String[]{ + "qpython-github", + "qpython-gitee", + "qpython-3c-gitee", + "qpython-sl4a-gui-gitee" + }; + int[] sites = new int[]{ + R.string.qpython_github, + R.string.qpython_gitee, + R.string.qpython_3c_gitee, + R.string.qpython_sl4a_gui_gitee + }; binding.qpythonGit.setOnClickListener(v -> new AlertDialog.Builder(this) diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java index 68cf19967c800ed6d9df3533d847044eb46edf63..55ff6320e6fefa670faef443d411b64995a2501a 100644 --- a/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java +++ b/qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java @@ -397,7 +397,7 @@ public class HomeMainActivity extends BaseActivity { public void onGrant() { //这里只执行一次做为初始化 if (!NAction.isQPyInterpreterSet(HomeMainActivity.this)) { - new AlertDialog.Builder(HomeMainActivity.this, R.style.MyDialog) + /*new AlertDialog.Builder(HomeMainActivity.this, R.style.MyDialog) .setTitle(R.string.notice) .setMessage(R.string.py2_or_3) .setPositiveButton(R.string.use_py3, (dialog1, which) @@ -409,7 +409,8 @@ public class HomeMainActivity extends BaseActivity { initQpySDK(clickListener); }) .create() - .show(); + .show();*/ + initQpySDK3(clickListener); } else { clickListener.onClick(null); } diff --git a/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java b/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java index 9d113cd3ba20ebd61ac0ff36574e499295419fc9..120e2992d15d9f804ef4e63c67364a3523cbd412 100644 --- a/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java +++ b/qpython/src/main/java/org/qpython/qpy/main/fragment/SettingFragment.java @@ -77,7 +77,7 @@ public class SettingFragment extends PreferenceFragment { private CheckBoxPreference sl4a, running_state, root, display_pwd, notebook_run, keepAliveBox; private PreferenceScreen py_inter, notebook_page; - private Preference py3, py2; //notebook_res, py2compatible + //private Preference py3, py2; notebook_res, py2compatible //private Preference update_qpy3,update_qpy2compatible; private SwitchPreference log, app; @@ -161,7 +161,7 @@ public class SettingFragment extends PreferenceFragment { showIpAddress(); lastlog = (Preference) findPreference("lastlog"); - py_inter = (PreferenceScreen) findPreference(getString(R.string.key_py_inter)); + //py_inter = (PreferenceScreen) findPreference(getString(R.string.key_py_inter)); notebook_page = (PreferenceScreen) findPreference(getString(R.string.key_notebook_page)); notebook_page.setTitle(MessageFormat.format(getString(R.string.notebook_for_py), NAction.getPyVer(getActivity()))); if (NAction.isQPy3(getActivity())) { @@ -178,9 +178,9 @@ public class SettingFragment extends PreferenceFragment { //update_qpy3 = (Preference)findPreference(getString(R.string.key_update_qpy3)); //update_qpy2compatible = (Preference)findPreference(getString(R.string.key_update_qpy2compatible)); - py2 = (Preference) findPreference(getString(R.string.key_py2)); + //py2 = (Preference) findPreference(getString(R.string.key_py2)); //py2compatible = (Preference) findPreference(getString(R.string.key_py2compatible)); - py3 = (Preference) findPreference(getString(R.string.key_py3)); + //py3 = (Preference) findPreference(getString(R.string.key_py3)); root = (CheckBoxPreference) findPreference(resources.getString(R.string.key_root)); @@ -196,7 +196,7 @@ public class SettingFragment extends PreferenceFragment { portnum_pref = findPreference(resources.getString(R.string.key_port_num)); chroot_pref = findPreference(resources.getString(R.string.key_root_dir)); - boolean isRoot, isRunning, isSaverOn; + boolean isRoot, isRunning; isRoot = settings.getBoolean(getString(R.string.key_root), false); root.setChecked(isRoot); root.setSummary(isRoot ? R.string.enable_root : R.string.disable_root); @@ -227,7 +227,7 @@ public class SettingFragment extends PreferenceFragment { chroot_pref.setSummary(settings.getString(resources.getString(R.string.key_root_dir), FileUtils.getPath(App.getContext()).getPath())); - py_inter.setSummary(NAction.isQPy3(getActivity()) ? R.string.py3_now : R.string.py2_now); + //py_inter.setSummary(NAction.isQPy3(getActivity()) ? R.string.py3_now : R.string.py2_now); //setNotebookCheckbox(); SharedPreferences.Editor editor = settings.edit(); @@ -299,7 +299,7 @@ public class SettingFragment extends PreferenceFragment { }); } - py2.setOnPreferenceClickListener(preference -> { + /*py2.setOnPreferenceClickListener(preference -> { Log.d(TAG, "py2.setOnPreferenceClickListener"); NotebookUtil.killNBSrv(getActivity()); @@ -312,7 +312,7 @@ public class SettingFragment extends PreferenceFragment { releasePython3(preference); return false; - }); + });*/ root.setOnPreferenceChangeListener((preference, newValue) -> { diff --git a/qpython/src/main/res/values-ja/strings.xml b/qpython/src/main/res/values-ja/strings.xml index 06df6638f89cff4d1e3a26cc1269f0fdf6103f4d..a00741f45c99b4fc8a88335e3c3c8a27743739df 100644 --- a/qpython/src/main/res/values-ja/strings.xml +++ b/qpython/src/main/res/values-ja/strings.xml @@ -199,7 +199,6 @@ SL4Aは動作中です SL4Aは動作していません。 Server taggle - QPythonはAndroidデバイス上で動作するスクリプトエンジンです。QPythonはAndoidのタブレットやスマートホン上で動作します。 警告 この操作を続行すると、設定やダウンロードしたライブラリがすべて失われます。続行しますか? ライブラリ diff --git a/qpython/src/main/res/values-ru/strings.xml b/qpython/src/main/res/values-ru/strings.xml index 9162ff56636ad8dcbd046b0ca8eb6ad803fb0579..fef6b8bddfb9be656d3f36dc048d19baa3a0ba3b 100644 --- a/qpython/src/main/res/values-ru/strings.xml +++ b/qpython/src/main/res/values-ru/strings.xml @@ -245,7 +245,6 @@ SL4A сервер запущен SL4A сеовер не активен Переключить сервер - QPython это движок для скриптов, запускаемый на устройствах Android, таких, как телефоны и планшеты. Предупреждение Сброс удалит все данные и загруженные библиотеки. Вы уверены, что хотите продолжить? Библиотека diff --git a/qpython/src/main/res/values-zh-rCN/strings.xml b/qpython/src/main/res/values-zh-rCN/strings.xml index b8f6fb95311413c6b5c9f73ab2d73e2e2a726be7..37f78e56f8dc6a1615c79c8990985413531bb580 100644 --- a/qpython/src/main/res/values-zh-rCN/strings.xml +++ b/qpython/src/main/res/values-zh-rCN/strings.xml @@ -137,7 +137,7 @@ 添加 SL4A服务运行中 服务开关 - QPython is a script engine running on android devices like phone or tablet.QPython is a script engine running on android devices like phone or tablet. + QPython是安卓设备Python小程序引擎,支持Python 3.10。 警告 将重置所有设置并删除已下载的库,确定重置吗? 库文件 @@ -496,5 +496,6 @@ QPython Git 链接 检查上次运行时日志 运行日志 + QSL4A未来小程序 diff --git a/qpython/src/main/res/values-zh-rTW/strings.xml b/qpython/src/main/res/values-zh-rTW/strings.xml index ce5c4fa4717dece581a3013a6862f3faa502120c..de86f36496f2fd4a0e4c44804fe2d8019fb6c901 100644 --- a/qpython/src/main/res/values-zh-rTW/strings.xml +++ b/qpython/src/main/res/values-zh-rTW/strings.xml @@ -131,7 +131,6 @@ 添加 SL4A服務運行中 服務開關 - QPython is a script engine running on android devices like phone or tablet.QPython is a script engine running on android devices like phone or tablet. 警告 重置空間將刪除所有在/qpython下的文件,包括您新建的文件,確定重置嗎? 庫文件 diff --git a/qpython/src/main/res/values/strings.xml b/qpython/src/main/res/values/strings.xml index e053376014e29c3d2832f076bda91c12c686df09..a0c344cbbcaed1e0209f48a74834aba8bb1bb904 100644 --- a/qpython/src/main/res/values/strings.xml +++ b/qpython/src/main/res/values/strings.xml @@ -253,7 +253,7 @@ SL4A server is running SL4A server is not running Server taggle - QPython is a script engine running on android devices like phone or tablet. + QPython is the Python applet engine for Android devices. It supports Python3.10 . Warning Reset storage will lost all setting and downloaded libs, are you sure you want to reset? Library @@ -765,5 +765,7 @@ https://github.com/qpython-android https://gitee.com/qpython-android https://gitee.com/buddygr/qpython-3c + " QSL4A FutureActivity" + https://gitee.com/buddygr/qpython-sl4a-gui diff --git a/qpython/src/main/res/xml/qpython_setting.xml b/qpython/src/main/res/xml/qpython_setting.xml index e9f765f2c0f669975a1b00036ea3c3b58adc5034..bbaba0697c4389e63a94472e66226a9173495ebf 100644 --- a/qpython/src/main/res/xml/qpython_setting.xml +++ b/qpython/src/main/res/xml/qpython_setting.xml @@ -40,11 +40,11 @@ android:title="@string/last_log" android:summary="@string/get_last_log"/> - - + - + android:title="@string/switch_py2compatible"/> - diff --git a/qpython/src/ol/AndroidManifest.xml b/qpython/src/ol/AndroidManifest.xml index 43d432fe3804fcd24714e55af8b9518668b438ba..fb4e17252e4eaaa86e6799c180b332af1dc4cdb7 100644 --- a/qpython/src/ol/AndroidManifest.xml +++ b/qpython/src/ol/AndroidManifest.xml @@ -265,8 +265,9 @@ + android:label="@string/qsl4a_future" + android:theme="@style/AppTheme" + android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">