1.处理所有getExternalStorageDirectory

2.解决谷歌fire库build不起来的bug

Author: lodgkk

build.gradle

@@ -96,10 +96,11 @@ ext {
     buildToolsVersion = '29.0.2'
 
     // 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"

qbaselib

@@ -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 {
 
@@ -33,9 +34,10 @@ public interface QPyConstants extends BASE_CONF {
     final String KEY_NOTEBOOK2_RES = "setting.notebook2resource.path";
 
 
-    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 = Environment.getExternalStorageDirectory().getPath() + "/" + BASE_PATH;
+//    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";
 

qpysdk/src/main/java/org/qpython/qpysdk/QPyConstants.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/:"