Skip to content

Commit ab42f2e

Browse files
riverforriverfor
committed
Bump v3.0.0 - 304
1 parent 2215f1b commit ab42f2e

File tree

10 files changed

+178
-211
lines changed

10 files changed

+178
-211
lines changed

‎qpysl4a

‎qpython/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
defaultConfig {
1515
minSdkVersion rootProject.ext.minSdkVersion
1616
targetSdkVersion rootProject.ext.targetSdkVersion
17-
versionCode 302
18-
versionName "3.0.0-beta2"
17+
versionCode 304
18+
versionName "3.0.0"
1919
multiDexEnabled true
2020
vectorDrawables.useSupportLibrary = true
2121

‎qpython/src/main/AndroidManifest.xml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
android:resource="@xml/shortcuts"/>
111111
</activity>
112112

113-
114113
<activity
115114
android:name="org.qpython.qpy.main.activity.QWebViewActivity"
116115
android:label="@string/browser">
@@ -132,7 +131,6 @@
132131
<intent-filter>
133132
<action android:name="android.intent.action.SEND"/>
134133
<category android:name="android.intent.category.DEFAULT"/>
135-
136134
<data android:mimeType="text/plain"/>
137135
<data android:mimeType="image/*"/>
138136
</intent-filter>
@@ -290,8 +288,6 @@
290288
android:name="org.qpython.qpy.console.WindowList"
291289
android:label="@string/window_list"
292290
android:theme="@style/ConsoleTheme"/>
293-
294-
295291
<activity
296292
android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
297293
android:configChanges="orientation|keyboard|keyboardHidden"
@@ -330,11 +326,9 @@
330326
</intent-filter>
331327
</activity>
332328

333-
334329
<activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
335330
<activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
336331

337-
338332
<!--zxing-->
339333
<activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
340334
<activity
@@ -372,30 +366,7 @@
372366
android:name=".main.activity.NotebookListActivity"
373367
android:configChanges="keyboardHidden|orientation|screenSize"/>
374368

375-
<service
376-
android:name=".main.service.MyFirebaseMessagingService"
377-
tools:ignore="ExportedService">
378-
<intent-filter>
379-
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
380-
</intent-filter>
381-
</service>
382-
<service
383-
android:name=".main.service.MyFirebaseInstanceIDService"
384-
tools:ignore="ExportedService">
385-
<intent-filter>
386-
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
387-
</intent-filter>
388-
</service>
389-
390-
<receiver android:name="org.qpython.qpy.main.receiver.BootBroadcastReceiver">
391-
<intent-filter>
392-
<!--注册开机广播地址-->
393-
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
394-
<action android:name="android.intent.action.USER_PRESENT"/>
395-
<action android:name="org.qpython.qpysl4a.KeepAlive"/>
396-
<category android:name="android.intent.category.DEFAULT" />
397-
</intent-filter>
398-
</receiver>
369+
<receiver android:name="org.qpython.qpy.main.receiver.BootBroadcastReceiver" />
399370
</application>
400371

401372
<meta-data

‎qpython/src/main/java/org/qpython/qpy/main/receiver/BootBroadcastReceiver.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Context;
55
import android.content.Intent;
66
import android.util.Log;
7+
import android.os.Build;
78

89
import org.qpython.qsl4a.QPyScriptService;
910

@@ -18,6 +19,15 @@ public void onReceive(Context context, Intent intent) {
1819
Log.d(TAG, "BootReceiver.onReceive: " + intent.getAction());
1920
System.out.println("QPYSL4A程序即将执行");
2021

21-
context.startService(new Intent(context, QPyScriptService.class));
22+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
23+
24+
} else {
25+
26+
try {
27+
context.startService(new Intent(context, QPyScriptService.class));
28+
} catch (RuntimeException e) {
29+
30+
}
31+
}
2232
}
2333
}

‎qpython/src/ol/AndroidManifest.xml

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<uses-feature android:glEsVersion="0x00020000" android:required="false"/>
6464

6565
<application
66+
android:networkSecurityConfig="@xml/network_security_config"
6667
android:name="org.qpython.qpy.main.app.App"
6768
android:allowBackup="true"
6869
android:hardwareAccelerated="true"
@@ -71,6 +72,7 @@
7172
android:largeHeap="true"
7273
android:supportsRtl="true"
7374
android:theme="@style/AppTheme">
75+
<uses-library android:name="org.apache.http.legacy" android:required="false"/>
7476

7577
<meta-data
7678
android:name="com.google.firebase.messaging.default_notification_icon"
@@ -79,24 +81,19 @@
7981
<service android:name=".main.service.QPyService"/>
8082
<service android:name="org.qpython.qsl4a.QPyScriptService"/>
8183
<service android:name=".main.service.FTPServerService"/>
82-
<service
83-
android:name=".main.service.MyFirebaseMessagingService"
84-
tools:ignore="ExportedService">
85-
<intent-filter>
86-
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
87-
</intent-filter>
88-
</service>
89-
<service
90-
android:name=".main.service.MyFirebaseInstanceIDService"
91-
tools:ignore="ExportedService">
92-
<intent-filter>
93-
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
94-
</intent-filter>
95-
</service>
96-
9784
<activity
9885
android:name=".main.activity.SignInActivity"
9986
android:launchMode="singleTask"/>
87+
<activity
88+
android:name="org.renpy.android.PythonSDLActivity"
89+
android:hardwareAccelerated="true"
90+
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|fontScale|uiMode|orientation"
91+
android:launchMode="singleTask"
92+
android:process=":python"
93+
android:screenOrientation="user"
94+
android:theme="@style/AppTheme"
95+
android:windowSoftInputMode="stateAlwaysHidden">
96+
</activity>
10097

10198
<activity
10299
android:name="org.qpython.qpylib.MPyApi"
@@ -126,7 +123,6 @@
126123
android:resource="@xml/shortcuts"/>
127124
</activity>
128125

129-
130126
<activity
131127
android:name="org.qpython.qpy.main.activity.QWebViewActivity"
132128
android:label="@string/browser">
@@ -148,7 +144,6 @@
148144
<intent-filter>
149145
<action android:name="android.intent.action.SEND"/>
150146
<category android:name="android.intent.category.DEFAULT"/>
151-
152147
<data android:mimeType="text/plain"/>
153148
<data android:mimeType="image/*"/>
154149
</intent-filter>
@@ -180,15 +175,15 @@
180175
<!--<action android:name="android.intent.action.SEND"/>-->
181176
<action android:name="android.intent.action.VIEW"/>
182177
<category android:name="android.intent.category.DEFAULT"/>
183-
178+
<category android:name="android.intent.category.BROWSABLE" />
184179
<data android:mimeType="text/*"/>
185180
<data android:scheme="file"/>
186181
</intent-filter>
187182

188183
<intent-filter>
189184
<action android:name="android.intent.action.VIEW"/>
190185
<category android:name="android.intent.category.DEFAULT"/>
191-
186+
<category android:name="android.intent.category.BROWSABLE" />
192187
<data android:scheme="content"/>
193188
<data android:host="*"/>
194189
<data android:mimeType="*/*"/>
@@ -306,8 +301,6 @@
306301
android:name="org.qpython.qpy.console.WindowList"
307302
android:label="@string/window_list"
308303
android:theme="@style/ConsoleTheme"/>
309-
310-
311304
<activity
312305
android:name="org.qpython.qpy.console.shortcuts.AddShortcut"
313306
android:configChanges="orientation|keyboard|keyboardHidden"
@@ -346,11 +339,9 @@
346339
</intent-filter>
347340
</activity>
348341

349-
350342
<activity android:name="org.qpython.qpy.plugin.activity.PluginManagerActivity"/>
351343
<activity android:name="org.qpython.qpy.plugin.activity.LocalPluginInstallActivity"/>
352344

353-
354345
<!--zxing-->
355346
<activity android:name="org.qpython.qpy.main.activity.QrCodeActivity"/>
356347
<activity
@@ -388,6 +379,20 @@
388379
android:name=".main.activity.NotebookListActivity"
389380
android:configChanges="keyboardHidden|orientation|screenSize"/>
390381

382+
<service
383+
android:name=".main.service.MyFirebaseMessagingService"
384+
tools:ignore="ExportedService">
385+
<intent-filter>
386+
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
387+
</intent-filter>
388+
</service>
389+
<service
390+
android:name=".main.service.MyFirebaseInstanceIDService"
391+
tools:ignore="ExportedService">
392+
<intent-filter>
393+
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
394+
</intent-filter>
395+
</service>
391396
</application>
392397

393398
<meta-data

‎qpython/src/ol/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
22
<string name="sign_in_with_google">Sign in with Google</string>
3-
<string name="app_name">QPython OL</string>
3+
<string name="app_name">QPython OC</string>
44
</resources>

0 commit comments

Comments
 (0)