Skip to content

Commit 4952c71

Browse files
riverforriverfor
committed
Added: OS, OL branches
1 parent 8165270 commit 4952c71

File tree

64 files changed

+3916
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+3916
-52
lines changed

‎qpython/build.gradle

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,16 @@ android {
9696
//设置渠道
9797
productFlavors {
9898

99-
google {
99+
ol {
100+
// resValue "string", "app_name", "Qpython"
101+
applicationId "org.qpython.qpy"
102+
}
103+
os {
100104
// resValue "string", "app_name", "Qpython"
101105
applicationId "org.qpython.qpy"
102106
}
103107

104-
cn {
108+
op {
105109
// resValue "string", "app_name", "QpythonL"
106110
applicationId "com.hipipal.qpyplus"
107111
}
@@ -165,11 +169,17 @@ dependencies {
165169
api rootProject.ext.libSupportCardView
166170
api rootProject.ext.libSupportPreference
167171

168-
googleApi rootProject.ext.firebaseCore
169-
googleApi rootProject.ext.firebaseMsg
170-
googleApi rootProject.ext.firebaseAuth
171-
googleApi rootProject.ext.firebaseDatabase
172-
googleApi rootProject.ext.googlePlayServiceAuth
172+
osApi rootProject.ext.firebaseCore
173+
osApi rootProject.ext.firebaseMsg
174+
osApi rootProject.ext.firebaseAuth
175+
osApi rootProject.ext.firebaseDatabase
176+
osApi rootProject.ext.googlePlayServiceAuth
177+
178+
olApi rootProject.ext.firebaseCore
179+
olApi rootProject.ext.firebaseMsg
180+
olApi rootProject.ext.firebaseAuth
181+
olApi rootProject.ext.firebaseDatabase
182+
olApi rootProject.ext.googlePlayServiceAuth
173183

174184
api rootProject.ext.retrofit
175185
api rootProject.ext.retrofitCoverterGson
@@ -178,11 +188,11 @@ dependencies {
178188
api 'com.android.support.constraint:constraint-layout:1.0.2'
179189

180190
// 微信
181-
// cnApi('com.tencent.mm.opensdk:wechat-sdk-android-with-mta:1.4.0') {
182-
// exclude group: 'com.android.support:support-v4'
183-
// }
191+
opApi('com.tencent.mm.opensdk:wechat-sdk-android-with-mta:1.4.0') {
192+
exclude group: 'com.android.support:support-v4'
193+
}
184194
// 友盟统计
185-
cnApi('com.umeng.analytics:analytics:6.1.2') {
195+
opApi('com.umeng.analytics:analytics:6.1.2') {
186196
exclude group: 'com.android.support:support-v4'
187197
}
188198

‎qpython/src/main/AndroidManifest.xml

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,48 @@
77
android:name="android.hardware.touchscreen"
88
android:required="false"/>
99

10-
<uses-permission android:name="android.permission.INTERNET"/>
11-
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
12-
<uses-permission android:name="android.permission.WAKE_LOCK"/>
13-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
14-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
15-
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
16-
<uses-permission android:name="android.permission.CAMERA"/>
1710

11+
<uses-permission android:name="android.permission.INTERNET" />
12+
<uses-permission android:name="android.permission.WAKE_LOCK" />
13+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
14+
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
15+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
16+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
17+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
18+
<uses-permission android:name="android.permission.CAMERA"/>
1819
<uses-permission android:name="android.permission.FLASHLIGHT"/>
19-
<uses-permission android:name="android.permission.VIBRATE"/>
20-
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
20+
<uses-permission android:name="android.permission.VIBRATE" />
21+
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
2122
<uses-permission android:name="com.android.vending.BILLING"/>
22-
23-
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
24-
<uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
25-
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
26-
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
27-
28-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
29-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
30-
23+
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
24+
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
25+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
26+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
27+
<uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
3128
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
3229
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
33-
3430
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
3531
<uses-permission android:name="android.permission.BLUETOOTH" />
3632
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
3733
<uses-permission android:name="android.permission.NFC" />
38-
3934
<uses-permission android:name="android.permission.RECORD_AUDIO" />
35+
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
36+
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
37+
<uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
38+
39+
<uses-feature android:name="android.hardware.microphone" android:required="false"/>
40+
<uses-feature android:name="android.hardware.telephony" android:required="false"/>
41+
<uses-feature android:name="android.hardware.camera" android:required="false"/>
42+
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
43+
<uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
44+
<uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
45+
<uses-feature android:name="android.hardware.wifi" android:required="false"/>
46+
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
47+
<uses-feature android:name="android.hardware.location.gps" android:required="false"/>
48+
<uses-feature android:name="android.hardware.location.network" android:required="false"/>
49+
<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
50+
51+
<uses-feature android:glEsVersion="0x00020000" android:required="false"/>
4052

4153
<application
4254
android:networkSecurityConfig="@xml/network_security_config"

‎qpython/src/main/res/values-ja/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
22

3-
<string name="app_name">QPython 3P</string>
3+
<string name="app_name">QPython OS</string>
44
<string name="terminal">コンソール</string>
55
<string name="recent">最近</string>
66
<string name="snippet">スニペット</string>

‎qpython/src/google/AndroidManifest.xml renamed to ‎qpython/src/ol/AndroidManifest.xml

Lines changed: 49 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,60 @@
77
android:name="android.hardware.touchscreen"
88
android:required="false"/>
99

10-
<uses-permission android:name="android.permission.INTERNET"/>
11-
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
12-
<uses-permission android:name="android.permission.WAKE_LOCK"/>
13-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
14-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
15-
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
10+
<uses-permission android:name="android.permission.INTERNET" />
11+
<uses-permission android:name="android.permission.WAKE_LOCK" />
12+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
13+
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
14+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
15+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
16+
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
1617
<uses-permission android:name="android.permission.CAMERA"/>
17-
1818
<uses-permission android:name="android.permission.FLASHLIGHT"/>
19-
<uses-permission android:name="android.permission.VIBRATE"/>
20-
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT"/>
19+
<uses-permission android:name="android.permission.VIBRATE" />
20+
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
2121
<uses-permission android:name="com.android.vending.BILLING"/>
22-
23-
<uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>
24-
<uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS"/>
25-
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
26-
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
27-
28-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
29-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
30-
22+
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
23+
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
24+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
25+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
26+
<uses-permission android:name="android.permission.READ_MEDIA_STORAGE" />
3127
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
3228
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
29+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
30+
<uses-permission android:name="android.permission.BLUETOOTH" />
31+
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
32+
<uses-permission android:name="android.permission.NFC" />
33+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
34+
<uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
35+
<uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"/>
36+
<uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
37+
<!-- privacy sensitive permissions -->
38+
<uses-permission android:name="android.permission.ACCESS_SUPERUSER" />
39+
<uses-permission android:name="android.permission.READ_SMS"/>
40+
<uses-permission android:name="android.permission.SEND_SMS" />
41+
<uses-permission android:name="android.permission.RECEIVE_SMS"/>
42+
<uses-permission android:name="android.permission.WRITE_SMS"/>
43+
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
44+
<uses-permission android:name="android.permission.CALL_PHONE"/>
45+
<uses-permission android:name="android.permission.READ_CALL_LOG"/>
46+
<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS"/>
47+
<uses-permission android:name="android.permission.READ_CONTACTS"/>
48+
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
49+
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
50+
51+
<uses-feature android:name="android.hardware.microphone" android:required="false"/>
52+
<uses-feature android:name="android.hardware.telephony" android:required="false"/>
53+
<uses-feature android:name="android.hardware.camera" android:required="false"/>
54+
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
55+
<uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
56+
<uses-feature android:name="android.hardware.screen.landscape" android:required="false"/>
57+
<uses-feature android:name="android.hardware.wifi" android:required="false"/>
58+
<uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
59+
<uses-feature android:name="android.hardware.location.gps" android:required="false"/>
60+
<uses-feature android:name="android.hardware.location.network" android:required="false"/>
61+
<uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
62+
63+
<uses-feature android:glEsVersion="0x00020000" android:required="false"/>
3364

3465
<application
3566
android:name="org.qpython.qpy.main.app.App"

‎qpython/src/google/java/org/qpython/qpy/codeshare/ShareCodeUtil.java renamed to ‎qpython/src/ol/java/org/qpython/qpy/codeshare/ShareCodeUtil.java

File renamed without changes.

‎qpython/src/google/java/org/qpython/qpy/codeshare/pojo/CloudFile.java renamed to ‎qpython/src/ol/java/org/qpython/qpy/codeshare/pojo/CloudFile.java

File renamed without changes.

‎qpython/src/google/java/org/qpython/qpy/main/PayActivity.java renamed to ‎qpython/src/ol/java/org/qpython/qpy/main/PayActivity.java

File renamed without changes.

‎qpython/src/google/java/org/qpython/qpy/main/activity/BaseActivity.java renamed to ‎qpython/src/ol/java/org/qpython/qpy/main/activity/BaseActivity.java

File renamed without changes.

‎qpython/src/google/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java renamed to ‎qpython/src/ol/java/org/qpython/qpy/main/activity/FundingPurchaseActivity.java

File renamed without changes.

‎qpython/src/google/java/org/qpython/qpy/main/activity/PayActivity.java renamed to ‎qpython/src/ol/java/org/qpython/qpy/main/activity/PayActivity.java

File renamed without changes.

0 commit comments

Comments
 (0)