推送 QPython 3C 3.5.6

buddygr · buddygr · commit 8af6862a64b7 · 2022-03-09T10:41:39.000+08:00
diff --git a/QPython修改版说明.doc b/QPython修改版说明.doc
diff --git a/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PreferencesFacade.java b/qpysl4a/src/main/java/org/qpython/qsl4a/qsl4a/facade/PreferencesFacade.java
@@ -1,6 +1,7 @@
 package org.qpython.qsl4a.qsl4a.facade;
 
 import android.app.Service;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.preference.PreferenceManager;
@@ -34,10 +35,15 @@
 public class PreferencesFacade extends RpcReceiver {
 
   private Service mService;
+  private final AndroidFacade mAndroidFacade;
+  private final Context context;
 
   public PreferencesFacade(FacadeManager manager) {
     super(manager);
+    mAndroidFacade = manager.getReceiver(AndroidFacade.class);
+    context = mAndroidFacade.context;
     mService = manager.getService();
+
   }
 
   @Rpc(description = "Read a value from shared preferences")
@@ -52,12 +58,12 @@ public Object prefGetValue(
   public void prefPutValue(
       @RpcParameter(name = "key") String key,
       @RpcParameter(name = "value") Object value,
-      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename)
-      throws IOException {
+      @RpcParameter(name = "filename", description = "Desired preferences file. If not defined, uses the default Shared Preferences.") @RpcOptional String filename) {
+    SharedPreferences p;
     if (filename == null || filename.equals("")) {
-      throw new IOException("Can't write to default preferences.");
-    }
-    SharedPreferences p = getPref(filename);
+      //throw new IOException("Can't write to default preferences.");
+      p = PreferenceManager.getDefaultSharedPreferences(context);
+    } else p = getPref(filename);
     Editor e = p.edit();
     if (value instanceof Boolean) {
       e.putBoolean(key, (Boolean) value);
@@ -72,7 +78,7 @@ public void prefPutValue(
     } else {
       e.putString(key, value.toString());
     }
-    e.commit();
+    e.apply();
   }
 
   @Rpc(description = "Get list of Shared Preference Values", returns = "Map of key,value")
diff --git a/qpython/build.gradle b/qpython/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.jakewharton.butterknife'
 apply plugin: 'realm-android'
 
 //获取系统时间
-def releaseTime() {
+static def releaseTime() {
     return new Date().format("yyyyMMdd-HHmmss")
 }
 
@@ -14,8 +14,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 355
-        versionName "3.5.5"
+        versionCode 356
+        versionName "3.5.6"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary = true
 
diff --git a/qpython/src/main/assets/resource.mp3 b/qpython/src/main/assets/resource.mp3
diff --git a/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java b/qpython/src/main/java/org/qpython/qpy/console/TermActivity.java
@@ -1163,14 +1163,16 @@ private TermSession createPyTermSession(String[] mArgs) throws IOException {
         String shell_type = intent.getStringExtra(TYPE);
         if (shell_type==null) {
             if (mArgs!=null) shell_type = "";
-            else shell_type = "1";
+            else shell_type = "color";
         }
-        if (shell_type.equals("1"))
+        if (shell_type.equals("color"))
             mArgs = new String[]{CONF.qpyccs, CONF.qpyccs};
         else if (shell_type.endsWith(".py")) {
             shell_type = CONF.binDir + shell_type;
             mArgs = new String[]{shell_type, shell_type};
-        } else
+        } else if (shell_type.equals("shell"))
+            session = createTermSession(this, settings, "cd && cat text/" + getString(R.string.lang_flag) + "/shell", CONF.filesDir);
+        else
             session = createTermSession(this, settings, CONF.binDir + shell_type + " && exit", CONF.filesDir);
         if (mArgs != null) {
             //String content = FileHelper.getFileContents(mArgs[0]);
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
@@ -185,7 +185,7 @@ private void initListener() {
                     .setItems(chars, (dialog, which) -> {
                         switch (which) {
                             case 0:
-                                startShell("1");
+                                startShell("color");
                                 break;
                             case 1:
                                 startShell("ipython.py");
@@ -197,10 +197,10 @@ private void initListener() {
                                 playPy("browserConsole");
                                 break;
                             case 4:
-                                startShell("shell.sh");
+                                startShell("shell");
                                 break;
                             case 5:
-                                startShell("blackConsole.py");
+                                startShell("qpython.sh");
                                 break;
                             case 6:
                                 startShell("shell.py");
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
@@ -59,7 +59,7 @@ public class SettingFragment extends PreferenceFragment {
 
     private SharedPreferences settings;
     private Resources         resources;
-    private Preference        mPassWordPref, username_pref, portnum_pref, chroot_pref, lastlog;
+    private Preference        mPassWordPref, username_pref, portnum_pref, chroot_pref, lastlog, ipaddress;
     private CheckBoxPreference sl4a, running_state, root, display_pwd, qpy_protect;//, notebook_run;
 
     //private PreferenceScreen py_inter,notebook_page;
@@ -75,17 +75,21 @@ private void viewWebSite(int resId) {
         @Override
         public void onReceive(Context context, Intent intent) {
             Log.v(TAG, "FTPServerService action received: " + intent.getAction());
-            if (intent.getAction().equals(FTPServerService.ACTION_STARTED)) {
-                running_state.setChecked(true);
-                // Fill in the FTP server address
-                setFtpAddress();
-            } else if (intent.getAction().equals(FTPServerService.ACTION_STOPPED)) {
-                running_state.setChecked(false);
-                running_state.setSummary(org.swiftp.R.string.running_summary_stopped);
-            } else if (intent.getAction().equals(FTPServerService.ACTION_FAILEDTOSTART)) {
-                running_state.setChecked(false);
-                running_state.setSummary(org.swiftp.R.string.running_summary_failed);
-                Toast.makeText(getActivity(),R.string.ip_address_need_wifi_or_ap,Toast.LENGTH_LONG).show();
+            switch (intent.getAction()) {
+                case FTPServerService.ACTION_STARTED:
+                    running_state.setChecked(true);
+                    // Fill in the FTP server address
+                    setFtpAddress();
+                    break;
+                case FTPServerService.ACTION_STOPPED:
+                    running_state.setChecked(false);
+                    running_state.setSummary(org.swiftp.R.string.running_summary_stopped);
+                    break;
+                case FTPServerService.ACTION_FAILEDTOSTART:
+                    running_state.setChecked(false);
+                    running_state.setSummary(org.swiftp.R.string.running_summary_failed);
+                    Toast.makeText(getActivity(), R.string.ip_address_need_wifi_or_ap, Toast.LENGTH_LONG).show();
+                    break;
             }
         }
     };
@@ -128,8 +132,7 @@ public void onResume() {
         super.onResume();
     }
 
-    private void initSettings() {
-        Preference ipaddress = findPreference("ipaddress");
+    private boolean showIpAddress(){
         InetAddress ip;
         try {
             ip = FTPServerService.getWifiAndApIp();
@@ -139,10 +142,18 @@ private void initSettings() {
         }
         if (ip!=null) {
             ipaddress.setSummary(ip.getHostAddress());
+            return true;
         } else {
             ipaddress.setSummary(R.string.ip_address_need_wifi_or_ap);
+            return false;
         }
-        lastlog = (Preference) findPreference("lastlog");
+    }
+
+    private void initSettings() {
+        ipaddress = findPreference("ipaddress");
+        showIpAddress();
+
+        lastlog = findPreference("lastlog");
         //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())));
@@ -225,7 +236,7 @@ private void setFtpAddress() {
         if (address == null) {
             Log.v(TAG, "Unable to retreive wifi ip address");
             running_state.setSummary(org.swiftp.R.string.cant_get_url);
-            Toast.makeText(getActivity(),R.string.ip_address_need_wifi_or_ap,Toast.LENGTH_LONG).show();
+            Toast.makeText(getActivity(),"FTP: "+getString(R.string.ip_address_need_wifi_or_ap),Toast.LENGTH_LONG).show();
         } else {
             String iptext = "ftp://" + address.getHostAddress() + ":"
                     + FTPServerService.getPort() + "/";
@@ -264,6 +275,8 @@ private void initListener() {
             return false;
         });
 
+        ipaddress.setOnPreferenceClickListener(preference -> showIpAddress());
+
         /*if (!NAction.isQPy3(getActivity())) {
             notebook_run.setSummary(getString(R.string.notebook_py3_support));
             notebook_run.setEnabled(false);
diff --git a/qpython/src/main/res/values-zh-rCN/strings.xml b/qpython/src/main/res/values-zh-rCN/strings.xml
@@ -135,7 +135,7 @@
     <string name="add">添加</string>
     <string name="sl4a_running">SL4A服务运行中</string>
     <string name="service_toggle">服务开关</string>
-    <string name="qpy_description">QPython 3C是安卓设备Python小程序引擎，支持PyVer、新版SL4A、FileProvider、 DocumentFile、加解密、GUI、音视频播放。</string>
+    <string name="qpy_description">QPython 3C是安卓设备Python小程序引擎，支持PyVer、新版SL4A、打开文件、写外置卡、加解密、图形界面、音视频播放。</string>
     <string name="warning">警告</string>
     <string name="reset_warning">将重置所有设置并删除已下载的库,确定重置吗?</string>
     <string name="downloading">库文件</string>
@@ -448,7 +448,7 @@
     <string name="use_py3">使用 Python 3</string>
     <string name="welcome">欢迎使用QPython 3C，享受您的手机编程之旅吧。</string>
     <string name="notice">提示</string>
-    <string name="python_interpreter">黑白Python解释器</string>
+    <string name="python_interpreter">传统Python解释器</string>
     <string name="shell_terminal">传统 Shell 终端</string>
     <string name="package_name_title">软件包名</string>
     <string name="bili_web_tip">教程/下载/检查更新：</string>
diff --git a/qpython/src/main/res/values/strings.xml b/qpython/src/main/res/values/strings.xml
@@ -231,7 +231,7 @@
     <string name="sl4a_running">SL4A server is running</string>
     <string name="sl4a_un_running">SL4A server is not running</string>
     <string name="service_toggle">Server taggle</string>
-    <string name="qpy_description">QPython 3C is the Python applet engine for Android devices. It supports PyVer, new SL4A, FileProvider, DocumentFile, encryption and decryption, GUI, audio and video play.</string>
+    <string name="qpy_description">QPython 3C is the Python applet engine for Android devices. It supports PyVer, new SL4A, Open File, Write External Sdcard, Encryption and Decryption, GUI, Audio and Video Play.</string>
     <string name="warning">Warning</string>
     <string name="reset_warning">Reset storage will lost all setting and downloaded libs, are you sure you want to reset?</string>
     <string name="downloading">Library</string>
@@ -656,7 +656,7 @@
     <string name="key_update_qpy3" translatable="false">update_py3</string>
     <string name="key_update_qpy2compatible" translatable="false">update_py2compatible</string>
 
-    <string name="python_interpreter">BlackWhite Python Interpreter</string>
+    <string name="python_interpreter">Traditional Python Interpreter</string>
     <string name="action_notebook">Notebook</string>
 
     <string name="shell_terminal">Traditional Shell Terminal</string>
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/EmulatorView.java
@@ -16,17 +16,6 @@
 
 package jackpal.androidterm.emulatorview;
 
-import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompat;
-import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompatFactory;
-import jackpal.androidterm.emulatorview.compat.KeycodeConstants;
-import jackpal.androidterm.emulatorview.compat.Patterns;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.LinkedList;
-import java.util.List;
-
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
@@ -55,11 +44,17 @@
 import android.view.inputmethod.InputConnection;
 import android.widget.Scroller;
 
-import static android.view.inputmethod.EditorInfo.IME_ACTION_DONE;
-import static android.view.inputmethod.EditorInfo.IME_ACTION_NEXT;
-import static android.view.inputmethod.EditorInfo.IME_ACTION_NONE;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Hashtable;
+import java.util.LinkedList;
+
+import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompat;
+import jackpal.androidterm.emulatorview.compat.ClipboardManagerCompatFactory;
+import jackpal.androidterm.emulatorview.compat.KeycodeConstants;
+import jackpal.androidterm.emulatorview.compat.Patterns;
+
 import static android.view.inputmethod.EditorInfo.IME_ACTION_UNSPECIFIED;
-import static android.view.inputmethod.EditorInfo.IME_MASK_ACTION;
 
 /**
  * A view on a {@link TermSession}.  Displays the terminal emulator's screen,
@@ -308,7 +303,7 @@ private int createLinks(int row) {
             for (lineLen = 0; line[lineLen] != 0; ++lineLen) ;
         }
 
-        SpannableStringBuilder textToLinkify = new SpannableStringBuilder(new String(line, 0, lineLen));
+        SpannableStringBuilder textToLinkify = new SpannableStringBuilder(new String(line, 0, lineLen - 1));//去空格
 
         boolean lineWrap = transcriptScreen.getScriptLineWrap(row);
 
@@ -333,7 +328,7 @@ private int createLinks(int row) {
                 for (lineLen = 0; line[lineLen] != 0; ++lineLen) ;
             }
 
-            textToLinkify.append(new String(line, 0, lineLen));
+            textToLinkify.append(new String(line, 0, lineLen-1));//去空格
 
             //Check if line after next is wrapped
             lineWrap = transcriptScreen.getScriptLineWrap(nextRow);
@@ -657,7 +652,7 @@ public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
             private int mSelectedTextEnd;
 
             private void sendText(CharSequence text) {
-                Log.d(TAG, "sendText:"+text);
+                //writeToFile("sendText",text.toString());
                 int n = text.length();
                 char c;
                 try {
@@ -1347,7 +1342,7 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
         } else if (handleFnKey(keyCode, true)) {
             return true;
         } else if (isSystemKey(keyCode, event)) {
-            if (!isInterceptedSystemKey(keyCode)) {
+            if (allowSystemKey(keyCode)) {
                 // Don't intercept the system keys
                 return super.onKeyDown(keyCode, event);
             }
@@ -1377,8 +1372,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
     /**
      * Do we want to intercept this system key?
      */
-    private boolean isInterceptedSystemKey(int keyCode) {
-        return keyCode == KeyEvent.KEYCODE_BACK && mBackKeySendsCharacter;
+    private boolean allowSystemKey(int keyCode) {
+        return keyCode != KeyEvent.KEYCODE_BACK || !mBackKeySendsCharacter;
     }
 
     /**
@@ -1399,7 +1394,7 @@ public boolean onKeyUp(int keyCode, KeyEvent event) {
             return true;
         } else if (isSystemKey(keyCode, event)) {
             // Don't intercept the system keys
-            if (!isInterceptedSystemKey(keyCode)) {
+            if (allowSystemKey(keyCode)) {
                 return super.onKeyUp(keyCode, event);
             }
         }
diff --git a/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java b/termemulator/src/main/java/jackpal/androidterm/emulatorview/TerminalEmulator.java
@@ -674,6 +674,7 @@ public void append(byte[] buffer, int base, int length) {
 
         //Log.d(EmulatorDebug.LOG_TAG, "In: '" + EmulatorDebug.bytesToString(buffer, base, length) + "'");
 
+        //乘着船 修改：不同终端不同退格模式
         String s = EmulatorDebug.bytesToString(buffer, base, length);
         if (s.contains("\\x08\\x08  \\x08\\x08"))
             backSpaceType = 1;//传统退格模式
