diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java b/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java index cd9aae04d688775bcbc5722f76126488bfddddc2..fa8e8d374fec25e84a21fa17e8bf38d53c8da8ca 100644 --- a/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java +++ b/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java @@ -40,7 +40,7 @@ public interface QPyConstants extends BASE_CONF { // String ABSOLUTE_LOG = ABSOLUTE_PATH + "/log/last.log"; String PYTHON_2 = "2.x"; - String PyVer = "3.6"; + String PyVer = "3.10"; String QPYC3 = "https://dl.qpy.io/py3.json"; String QPYC2COMPATIBLE = "https://dl.qpy.io/py2compatible.json"; diff --git a/qpython/build.gradle b/qpython/build.gradle index ed8488a0952c9d265a96c3b5869a6f3a5211ee39..2842fc58129137d6ea069b673c886ef5e4c5bb20 100644 --- a/qpython/build.gradle +++ b/qpython/build.gradle @@ -16,7 +16,7 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 315 - versionName "3.1.10" + versionName "3.2.0" multiDexEnabled true vectorDrawables.useSupportLibrary = true diff --git a/qpython/src/main/assets/resource3.mp3 b/qpython/src/main/assets/resource3.mp3 index 3c4a24c817c5df6421e07ce094ca9228c1c20cdb..20ef5ac652fe6eecdc272d5c56669652d53862af 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/main/activity/AboutActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/AboutActivity.java index 0dd7d95a2b40c481e73b8668cd16ad9d37755d87..2288873e47d237da3692ee3f8fde65b39be6c44d 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 @@ -60,6 +60,10 @@ public class AboutActivity extends BaseActivity { checkUpdate(true); } + private void viewWebSite(int resId) { + startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(getString(resId)))); + } + private void initListener() { binding.tvStar.setOnClickListener(v -> { Intent viewIntent = new Intent("android.intent.action.VIEW", @@ -68,8 +72,7 @@ public class AboutActivity extends BaseActivity { }); binding.tvPrivacy.setOnClickListener(v -> { - Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_user_private))); - startActivity(browserIntent); + viewWebSite(R.string.url_user_private); }); binding.tvFeedback.setOnClickListener(v -> onFeedback("")); @@ -80,7 +83,21 @@ public class AboutActivity extends BaseActivity { }); binding.tvThanks.setOnClickListener(v -> - startActivity(new Intent(Intent.ACTION_VIEW,Uri.parse(getString(R.string.thanks_link)))) + 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}; + + binding.qpythonGit.setOnClickListener(v -> + new AlertDialog.Builder(this) + .setTitle(R.string.qpython_git_links) + .setItems(words, (dialogInterface, i) -> { + viewWebSite(sites[i]); + dialogInterface.dismiss(); + }) + .create() + .show() ); } diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java index 88f6b2b0b644d4e997b5def325a1f35f5530016a..cbfaa6a3fb05bf16c8dd5b43fc35f2f614c8af48 100644 --- a/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java +++ b/qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java @@ -56,7 +56,7 @@ public class NotebookActivity extends BaseActivity implements View.OnClickListen private ActivityNotebookBinding mBinding; private String lastNotebook; - private static final String TOKEN = "?token=qpythonotebook"; + private static final String TOKEN = "?token=123456"; private SharedPreferences mSharedPreferences; private static final String FILE_PATH = "FILEPATH"; public static final int REQUEST_SETTTING_CODE = 0X998; diff --git a/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java b/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java index 649b53203016a5eb53f14d0be17f102bd7b3be09..a20ab41c708becdb7b7f95dde05d6e58a0457bae 100644 --- a/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java +++ b/qpython/src/main/java/org/qpython/qpy/main/activity/QWebViewActivity.java @@ -1,5 +1,6 @@ package org.qpython.qpy.main.activity; +import android.annotation.SuppressLint; import android.app.Activity; import android.app.AlertDialog; import android.app.DownloadManager; @@ -191,6 +192,9 @@ public class QWebViewActivity extends BaseActivity { setTitle(R.string.app_name); } + binding.wv.getSettings().setSupportZoom(true); + binding.wv.getSettings().setBuiltInZoomControls(true); + switch (type == null ? "" : type) { case HTML: binding.wv.loadData(i.getStringExtra(HTML), "text/html", null); @@ -223,6 +227,7 @@ public class QWebViewActivity extends BaseActivity { return true; } + @SuppressLint("NonConstantResourceId") @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { @@ -372,8 +377,7 @@ public class QWebViewActivity extends BaseActivity { @Override public void onProgressChanged(WebView view, int progress) {// 载入进度改变而触发 - if (binding.WebViewProgress != null) - binding.WebViewProgress.setProgress(binding.wv.getProgress()); + binding.WebViewProgress.setProgress(binding.wv.getProgress()); super.onProgressChanged(view, progress); } diff --git a/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java index c8e027b2208d2d8f032e2b0633476712c2ca5bb2..9f8b6062256c7d3dcf01911464ca81dd3e06d6eb 100644 --- a/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java +++ b/qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java @@ -2,6 +2,7 @@ package org.qpython.qpy.utils; import android.app.Activity; import android.content.Context; +import android.os.Environment; import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -47,7 +48,7 @@ public class NotebookUtil { public static final String KILL_SERVER = NB_SERVER + "/__exit"; public static final String NOTEBOOK_SERVER = NB_SERVER + "/notebooks/"; - public static final String NOTEBOOK_DIR = FileUtils.getAbsolutePath(App.getContext())+"/"; + public static final String NOTEBOOK_DIR = Environment.getExternalStorageDirectory() +"/"; public static final String ext = ".ipynb"; public static final String Untitled = "Untitled"; @@ -259,7 +260,7 @@ public class NotebookUtil { notebookPid = ScriptExec.getInstance().playQScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb_man.py", null,false); } else { - notebookPid = ScriptExec.getInstance().playQScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb2_man.py", null,false); + notebookPid = ScriptExec.getInstance().playQScript(context, context.getFilesDir().getAbsolutePath() + "/bin/nb_man.py", null,false); } Log.d("NotebookUtil", "startNotebookService2:"+notebookPid); NStorage.setSP(context, "notebook.pid", ""+notebookPid); diff --git a/qpython/src/main/res/layout/activity_about.xml b/qpython/src/main/res/layout/activity_about.xml index ebd0c23339d19e95f8a54eb4239ce6c8ee6001e9..e76c104eddb67a24534331af36dc20279010dfa1 100644 --- a/qpython/src/main/res/layout/activity_about.xml +++ b/qpython/src/main/res/layout/activity_about.xml @@ -102,10 +102,65 @@ android:layout_height="1dp" android:background="@color/toolbar"/> - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/qpython/src/main/res/values-zh-rCN/strings.xml b/qpython/src/main/res/values-zh-rCN/strings.xml index 5cd733d25b0c48dec9fb987924aead4b59369085..b8f6fb95311413c6b5c9f73ab2d73e2e2a726be7 100644 --- a/qpython/src/main/res/values-zh-rCN/strings.xml +++ b/qpython/src/main/res/values-zh-rCN/strings.xml @@ -491,5 +491,10 @@ 这需要些时间,请检查通知栏进度条 关闭进度条后,方可按返回键退出 请连接你的WiFi或开启WiFi热点 + " QPython 开发者" + 我的IP地址 + QPython Git 链接 + 检查上次运行时日志 + 运行日志 diff --git a/qpython/src/main/res/values/strings.xml b/qpython/src/main/res/values/strings.xml index 2521cf6c95e8a5fc6ac2427c49bd1bea236c67d2..e053376014e29c3d2832f076bda91c12c686df09 100644 --- a/qpython/src/main/res/values/strings.xml +++ b/qpython/src/main/res/values/strings.xml @@ -758,5 +758,12 @@ Service Agreement Press the back key to exit after close the progress bar Please connect your WiFi or turn on WiFi hotspot + QPython Author + + QPython Git Links + qpython-android + https://github.com/qpython-android + https://gitee.com/qpython-android + https://gitee.com/buddygr/qpython-3c