1.初始化项目

2.在AppListActivity页面中增加返回按钮

Author: lodgkk

build.gradle

@@ -11,7 +11,6 @@ buildscript {
         jcenter()
         google()
         mavenCentral()
-
         maven { url "https://plugins.gradle.org/m2/" }
         maven { url "https://maven.google.com" }
     }

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
+

qpysdk/src/main/jni

@@ -68,7 +68,12 @@ android {
         }
 
         debug {
-            signingConfig signingConfigs.release
+//            signingConfig signingConfigs.release
+            debuggable true
+            minifyEnabled false
+            jniDebuggable true
+            signingConfig signingConfigs.debug
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
 
     }

qpython/build.gradle

@@ -12,6 +12,9 @@
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.Toolbar;
+import android.view.Gravity;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.quseit.util.FileHelper;
@@ -116,6 +119,8 @@ public void exit() {
         appsView.setAdapter(adapter);
 
         ((TextView) findViewById(R.id.tv_folder_name)).setText(R.string.qpy_app);
+        findViewById(R.id.iv_back).setOnClickListener(view -> AppListActivity.this.finish());
+
         getScriptList();
     }
 

qpython/src/main/java/org/qpython/qpy/main/activity/AppListActivity.java

@@ -88,6 +88,8 @@ private void initIcon() {
             case "2.x":
                 binding.icon.setImageResource(R.drawable.img_home_logo);
                 break;
+            default:
+                break;
         }
     }
 
@@ -146,6 +148,8 @@ private void initListener() {
                     .setTitle(R.string.choose_action)
                     .setItems(chars, (dialog, which) -> {
                         switch (which) {
+                            default:
+                                break;
                             case 0: // Create Shortcut
                                 TermActivity.startActivity(HomeMainActivity.this);
                                 break;
@@ -227,7 +231,7 @@ private void handlePython3(Intent intent) {
     }
 
     private void handleNotification(Bundle bundle) {
-        if (bundle == null) return;
+        if (bundle == null) {return;}
         if (!bundle.getBoolean("force") && !PreferenceManager.getDefaultSharedPreferences(this).getBoolean(getString(R.string.key_hide_push), true)) {
             return;
         }

qpython/src/main/java/org/qpython/qpy/main/activity/HomeMainActivity.java

@@ -436,6 +436,7 @@ public boolean OnClickListener(String name) {
         }
     }
 
+    @Override
     public void toast(String msg) {
         Toast.makeText(this, msg, Toast.LENGTH_SHORT).show();
     }

qpython/src/main/java/org/qpython/qpy/main/activity/NotebookActivity.java

@@ -1,29 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
 
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/rootView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@drawable/mohu"
         android:orientation="vertical"
         android:padding="@dimen/default_margin">
 
-        <TextView
-            android:id="@+id/tv_folder_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/qpy_app"
-            android:textColor="#FFF"
-            android:textSize="28sp"/>
+        <FrameLayout
+            android:id="@+id/app_bar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/iv_back"
+                android:src="@drawable/ic_back"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="25dp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
+
+            <TextView
+                android:id="@+id/tv_folder_name"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/qpy_app"
+                android:textColor="#FFF"
+                android:textSize="28sp" />
+
+        </FrameLayout>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/rv_app"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="40dp"
-            android:background="@null"/>
+            android:background="@null" />
     </LinearLayout>
 </layout>