推送 QPython 3C 3.5.4

Author: buddygr

QPython修改版说明.doc

@@ -17,7 +17,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.2.0'
 
         // A gradle plugin for getting java lambda support in java 6, 7 and android
         // https://github.com/evant/gradle-retrolambda
@@ -91,9 +91,9 @@ ext {
     libSupportDesign = "com.android.support:design:${supportVersion}"
     libOkHttp3Log = "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
 
-    minSdkVersion = 14
+    minSdkVersion = 21
     targetSdkVersion = 28
-    compileSdkVersion = 28
+    compileSdkVersion = 31
     buildToolsVersion = '28.0.3'
 
     // firebase related https://firebase.google.com/docs/android/setup

build.gradle

@@ -4,6 +4,5 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Thu Aug 02 10:23:49 CST 2018
-ndk.dir=/Users/yanhecun/Library/Android/sdk/ndk-bundle
-sdk.dir=/Users/yanhecun/Library/Android/sdk
+#Sat Apr 03 16:46:13 CST 2021
+sdk.dir=C\:\\Users\\Administrator\\AppData\\Local\\Android\\Sdk

local.properties

@@ -18,6 +18,10 @@ android {
     lintOptions {
         abortOnError false
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

qpypluginman/build.gradle

@@ -3,7 +3,7 @@ function gotoApp() {
 	total = total+1
 	if (total>=10) {
 		//setTimeout('milib.closeWait()',100);
-	    $('#mainEle').html('<div id="loading">Fail to start QPyWebapp, please check manually.</div>');
+	    $('#mainEle').html('<div id="loading">Fail to start QPython WebApp, please click LOG button in the upper right to check .<br>启动QPython网页应用失败，请点击右上角LOG查看原因。</div>');
 	    milib.onNext("timeout");
 
 	} else {

qpysdk/src/main/assets/android.js

@@ -1,43 +1,48 @@
 package org.qpython.qpysdk;
 
+import android.content.Context;
 import android.os.Environment;
 
 import com.quseit.config.BASE_CONF;
+import com.quseit.util.FileHelper;
 
 public interface QPyConstants extends BASE_CONF {
 
-    final String WEB_PROJECT     = "web";
-    final String CONSOLE_PROJECT = "console";
-    final String KIVY_PROJECT    = "kivy";
-    final String PYGAME_PROJECT    = "pygame";
-    final String QUIET_PROJECT    = "quiet";
-    final String QSL4A_PROJECT    = "qsl4a";
+    String WEB_PROJECT     = "web";
+    String CONSOLE_PROJECT = "console";
+    //final String KIVY_PROJECT    = "kivy";
+    //String PYGAME_PROJECT    = "pygame";
+    String QUIET_PROJECT    = "quiet";
+    String QSL4A_PROJECT    = "qsl4a";
 
     String BASE_PATH         = "qpython";
     String AD_URL            = "https://apu2.quseit.com/ad/";
 
     String UPDATE_URL  = "https://apu2.quseit.com/conf/update/";
     String LOG_URL     = "https://apu2.quseit.com/conf/log/";
-    String IAP_LOG_URL = "https://apu2.quseit.com/conf/iaplog/";
+    //String IAP_LOG_URL = "https://apu2.quseit.com/conf/iaplog/";
 
     String DFROM_RUN   = ".runtime";
     String PY_CACHE    = ".qpyc";
 
-    String DFROM_QPY2 = "scripts";
+   // String DFROM_QPY2 = "scripts";
     String DFROM_QPY3 = "scripts3";
-    String DFROM_PRJ2 = "projects";
+   // String DFROM_PRJ2 = "projects";
     String DFROM_PRJ3 = "projects3";
 
-    final String KEY_PY3_RES = "setting.py3resource.path";
-    final String KEY_NOTEBOOK_RES = "setting.notebook3sresource.path";
-    final String KEY_NOTEBOOK2_RES = "setting.notebook2resource.path";
+    String KEY_PY3_RES = "setting.py3resource.path";
+    //String KEY_NOTEBOOK_RES = "setting.notebook3sresource.path";
+    //String KEY_NOTEBOOK2_RES = "setting.notebook2resource.path";
 
+    //String py3Ver = "3.9";
 
     String ABSOLUTE_PATH = Environment.getExternalStorageDirectory().getPath() + "/" + BASE_PATH;
     String PY_CACHE_PATH = ABSOLUTE_PATH+"/"+PY_CACHE;
     String ABSOLUTE_LOG = ABSOLUTE_PATH + "/log/last.log";
+    String WEB_LOG = ABSOLUTE_PATH + "/log/web.log";
+    String QUIET_LOG = ABSOLUTE_PATH + "/log/quiet.log";
 
-    String PYTHON_2 = "2.x";
+    //String PYTHON_2 = "2.x";
 
     String QPYC3 = "https://dl.qpy.io/py3.json";
     String QPYC2COMPATIBLE = "https://dl.qpy.io/py2compatible.json";