qpython-android · riverfor · Apr 15, 2020 · Apr 15, 2020 · Apr 15, 2020 · Apr 15, 2020
diff --git a/build.gradle b/build.gradle
@@ -8,16 +8,19 @@ def butterknifeVersion = '9.0.0' //eqals to line 26
 
 buildscript {
     repositories {
-        jcenter()
-        google()
-        mavenCentral()
-
+        // 配置HMS Core SDK的Maven仓地址。
+        maven {url 'https://developer.huawei.com/repo/'}
+        maven {url 'https://maven.aliyun.com/repository/jcenter'}
+        maven {url 'https://maven.aliyun.com/repository/google'}
+        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://maven.google.com" }
+        google()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.5.4'
 
         // A gradle plugin for getting java lambda support in java 6, 7 and android
         // https://github.com/evant/gradle-retrolambda
@@ -35,18 +38,25 @@ buildscript {
         classpath "io.realm:realm-gradle-plugin:3.5.0"
 
         classpath 'com.google.gms:google-services:4.0.2'
+
+        // 添加agcp插件配置。
+        classpath 'com.huawei.agconnect:agcp:1.6.0.300'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        // 配置HMS Core SDK的Maven仓地址。
+        maven {url 'https://developer.huawei.com/repo/'}
+        maven {url 'https://maven.aliyun.com/repository/jcenter'}
+        maven {url 'https://maven.aliyun.com/repository/google'}
+        maven { url 'https://maven.aliyun.com/nexus/content/groups/public/' }
+        maven { url "https://jitpack.io" }
+//        maven { url 'https://dl.bintray.com/azeesoft/maven' }
+        //maven { url "http://mvn.leancloud.cn/nexus/content/repositories/public" }
         google()
 
         mavenCentral()
-        maven { url "https://jitpack.io" }
-        maven { url 'https://dl.bintray.com/azeesoft/maven' }
-        //maven { url "http://mvn.leancloud.cn/nexus/content/repositories/public" }
     }
 }
 
@@ -74,11 +84,16 @@ subprojects {
 }
 
 ext {
+    minSdkVersion = 18
+    targetSdkVersion = 28
+    compileSdkVersion = 28
+    buildToolsVersion = '28.0.2'//30.0.2正常
+
     libOkHttp3 = "com.squareup.okhttp3:okhttp:${okhttpVersion}"
 
     libRxJava = "io.reactivex:rxandroid:${rxVersion}"
     libRxAndroid = "io.reactivex:rxjava:${rxVersion}"
-    libFileDownloaderLib = 'com.liulishuo.filedownloader:library:0.3.5'
+    libFileDownloaderLib = 'com.liulishuo.filedownloader:library:1.7.4'
 
     libSupportV4 = "com.android.support:support-v4:${supportVersion}"
     libSupportV4Design = 'com.android.support:design:${supportVersion}'
@@ -91,16 +106,12 @@ ext {
     libSupportDesign = "com.android.support:design:${supportVersion}"
     libOkHttp3Log = "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}"
 
-    minSdkVersion = 14
-    targetSdkVersion = 28
-    compileSdkVersion = 28
-    buildToolsVersion = '28.0.3'
-
     // firebase related https://firebase.google.com/docs/android/setup
-    firebaseCore = "com.google.firebase:firebase-core:16.0.6"
-    firebaseMsg = "com.google.firebase:firebase-messaging:17.3.4"
+    firebaseCore = "com.google.firebase:firebase-core:16.0.7"
+    firebaseMsg = "com.google.firebase:firebase-messaging:18.0.0"
+    firebaseIid = "com.google.firebase:firebase-iid:17.0.4"
     firebaseAuth = "com.google.firebase:firebase-auth:16.1.0"
-    firebaseDatabase = "com.google.firebase:firebase-database:16.0.5"
+    firebaseDatabase = "com.google.firebase:firebase-database:16.0.6"
 
     // https://developers.google.com/android/guides/setup
     googlePlayServiceAuth = "com.google.android.gms:play-services-auth:16.0.1"
@@ -115,4 +126,8 @@ ext {
 
     libButterknife = "com.jakewharton:butterknife:${butterknifeVersion}"
     libButterknifeCompiler ="com.jakewharton:butterknife-compiler:${butterknifeVersion}"
+
+    //https://developer.huawei.com/consumer/cn/doc/development/HMSCore-Guides/android-app-quickstart-0000001071490422
+    huaweiPush = "com.huawei.hms:push:6.1.0.300"
+    huaweiAnlytics = "com.huawei.hms:hianalytics:6.3.2.300"
 }
diff --git a/local.properties b/local.properties
@@ -4,6 +4,8 @@
 # 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
+#Mon Apr 13 14:53:44 CST 2020
+#ndk.dir=/Users/yanhecun/Library/Android/sdk/ndk-bundle
+ndk.dir=D\:\\android-sdk-windows\\ndk\\20.1.5948944
+sdk.dir=D\:\\android-sdk-windows
+
diff --git a/qbaselib b/qbaselib
diff --git a/qpysdk/build.gradle b/qpysdk/build.gradle
@@ -20,11 +20,18 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    externalNativeBuild {
-        ndkBuild {
-            path 'src/main/jni/Android.mk'
+    sourceSets {
+        main {
+            jniLibs.srcDirs = ['src/main/libs']
+
         }
     }
+
+//    externalNativeBuild {
+//        ndkBuild {
+//            path 'src/main/jni/Android.mk'
+//        }
+//    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java b/qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.java
@@ -3,6 +3,7 @@
 import android.os.Environment;
 
 import com.quseit.config.BASE_CONF;
+import com.quseit.util.FileUtils;
 
 public interface QPyConstants extends BASE_CONF {
 
@@ -34,8 +35,9 @@ public interface QPyConstants extends BASE_CONF {
 
 
     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 ABSOLUTE_PATH = FileUtils.getPath().getPath() + "/" + BASE_PATH;
+//    String PY_CACHE_PATH = ABSOLUTE_PATH+"/"+PY_CACHE;
+//    String ABSOLUTE_LOG = ABSOLUTE_PATH + "/log/last.log";
 
     String PYTHON_2 = "2.x";
 

diff --git a/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java b/qpysdk/src/main/java/org/qpython/qpysdk/QPySDK.java
@@ -94,10 +94,10 @@ public void playQScript(final String script) {
         mArguments.add(script);
         String[] argumentsArray = mArguments.toArray(new String[mArguments.size()]);
 
-        final File mLog = new File(String.format("%s", QPyConstants.ABSOLUTE_LOG));
+        final File mLog = new File(String.format("%s", com.quseit.util.FileUtils.getAbsoluteLogPath(context.getApplicationContext())));
         File logDir = mLog.getParentFile();
 
-        mFd = Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(f.getParentFile() + ""), Environment.getExternalStorageDirectory() + "/", pid);
+        mFd = Exec.createSubprocess(binaryPath, argumentsArray, getEnvironmentArray(f.getParentFile() + ""), com.quseit.util.FileUtils.getPath(context.getApplicationContext()) + "/", pid);
         final AtomicInteger mPid = new AtomicInteger(PID_INIT_VALUE);
 
         mPid.set(pid[0]);
@@ -106,34 +106,32 @@ public void playQScript(final String script) {
         long mStartTime = System.currentTimeMillis();
 
 
-        new Thread(new Runnable() {
-            public void run() {
-                int returnValue = Exec.waitFor(mPid.get());
-                //long mEndTime = System.currentTimeMillis();
-                int pid = mPid.getAndSet(PID_INIT_VALUE);
-                Log.d("", "out:" + mFd.out.toString());
+        new Thread(() -> {
+            int returnValue = Exec.waitFor(mPid.get());
+            //long mEndTime = System.currentTimeMillis();
+            int pid1 = mPid.getAndSet(PID_INIT_VALUE);
+            Log.d("", "out:" + mFd.out.toString());
 
-                Message msg = new Message();
-                msg.what = returnValue;
-                msg.obj = mArguments.get(0);
+            Message msg = new Message();
+            msg.what = returnValue;
+            msg.obj = mArguments.get(0);
 
-                Log.d(TAG, "Process " + pid + " exited with result code " + returnValue + ".");
+            Log.d(TAG, "Process " + pid1 + " exited with result code " + returnValue + ".");
 
-                try {
-                    mIn.close();
-                } catch (IOException e) {
-                    Log.e(TAG, e.getMessage());
-                }
+            try {
+                mIn.close();
+            } catch (IOException e) {
+                Log.e(TAG, e.getMessage());
+            }
 
-                try {
-                    mOut.close();
-                } catch (IOException e) {
-                    Log.e(TAG, e.getMessage());
-                }
+            try {
+                mOut.close();
+            } catch (IOException e) {
+                Log.e(TAG, e.getMessage());
+            }
 
-                //context.updateNotify(msg);
+            //context.updateNotify(msg);
 
-            }
         }).start();
     }
 
@@ -149,7 +147,7 @@ private String[] getEnvironmentArray(String pyPath) {
         environmentVariables.add("PYTHONHOME=" + filesDir);
         environmentVariables.add("ANDROID_PRIVATE=" + filesDir);
 
-        File externalStorage = new File(Environment.getExternalStorageDirectory(), "org.qpython.qpy");
+        File externalStorage = new File(com.quseit.util.FileUtils.getPath(context.getApplicationContext()), "org.qpython.qpy");
 
         environmentVariables.add("PYTHONPATH=" + externalStorage + "/lib/python2.7/site-packages/:"
                 + filesDir + "/lib/python2.7/site-packages/:"
+27 −19		src/main/java/com/quseit/base/QBaseApp.java
+240 −237		src/main/java/com/quseit/base/QBaseUpdateService.java
+5 −2		src/main/java/com/quseit/common/CrashHandler.java
+7 −6		src/main/java/com/quseit/service/DownloaderBase.java
+15 −10		src/main/java/com/quseit/util/FileHelper.java
+66 −23		src/main/java/com/quseit/util/FileUtils.java
+7 −4		src/main/java/com/quseit/util/Utils.java