Skip to content

Commit 528576d

Browse files
riverforriverfor
committed
Bump v3.0.0-beta1
1 parent 4ef90b9 commit 528576d

9 files changed

Lines changed: 35 additions & 57 deletions

File tree

‎qpysdk/src/main/assets/html/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ function gotoApp() {
33
total = total+1
44
if (total>=10) {
55
//setTimeout('milib.closeWait()',100);
6-
$('#mainEle').html('<div id="loading">Fail to start, please retry.</div>');
6+
$('#mainEle').html('<div id="loading">Fail to start QPyWebapp, please check manually.</div>');
77
milib.onNext("timeout");
88

99
} else {

‎qpython/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
minSdkVersion rootProject.ext.minSdkVersion
1616
targetSdkVersion rootProject.ext.targetSdkVersion
1717
versionCode 300
18-
versionName "3.0.0"
18+
versionName "3.0.0-beta1"
1919
multiDexEnabled true
2020
vectorDrawables.useSupportLibrary = true
2121

@@ -60,7 +60,7 @@ android {
6060
variant.outputs.each { output ->
6161
def outputFile = output.outputFile
6262
if (outputFile != null && outputFile.name.endsWith('.apk')) {
63-
def fileName = "Qpython_${releaseTime()}_${variant.productFlavors[0].name}.apk"
63+
def fileName = "qpython_os_${releaseTime()}_${variant.productFlavors[0].name}.apk"
6464
output.outputFileName = fileName
6565
}
6666
}

‎qpython/src/main/assets/ipynb.mp3‎

1.59 KB
Binary file not shown.

‎qpython/src/main/java/org/qpython/qpy/console/TermActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
275275
mSettings.readPrefs(sharedPreferences);
276276
}
277277

278-
@SuppressLint("WrongConstant")
278+
@SuppressLint({"WrongConstant", "InvalidWakeLockTag"})
279279
@Override
280280
public void onCreate(Bundle icicle) {
281281
super.onCreate(icicle);

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,12 @@ private void initQPy(boolean py3) {
371371
File externalStorage = new File(Environment.getExternalStorageDirectory(), "qpython");
372372
FileHelper.createDirIfNExists(externalStorage + "/cache");
373373
FileHelper.createDirIfNExists(externalStorage + "/log");
374+
FileHelper.createDirIfNExists(externalStorage + "/notebooks");
375+
374376
qpysdk.extractRes(py3?"public3":"public", new File(externalStorage + "/lib"));
377+
378+
qpysdk.extractRes("ipynb", new File(externalStorage + "/notebooks"));
379+
375380
extractRes();
376381
}).start();
377382
}
@@ -409,7 +414,12 @@ public void extractRes() {
409414
Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/projects3/", false);
410415

411416
} else if (sFileName.equals("scripts3.zip")) {
417+
Utils.createDirectoryOnExternalStorage("qpython/scripts3/");
412418
Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/scripts3/", false);
419+
420+
} if (sFileName.equals("ipynb.zip")) {
421+
Utils.createDirectoryOnExternalStorage("qpython/notebooks/");
422+
Utils.unzip(content, Environment.getExternalStorageDirectory().getAbsolutePath() + "/qpython/notebooks/", false);
413423
}
414424

415425
} catch (Exception e) {

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
106106
initNotebookRes();
107107
initWebView();
108108
initListener();
109-
} else if (NotebookUtil.isNotebookInstall(this)) {
110-
NotebookUtil.extraData(this);
111-
initNotebookRes();
112-
initWebView();
113-
initListener();
114-
115109
} else {
116110
enableNotebookFromSetting();
117111
}
@@ -216,25 +210,27 @@ private void initNotebookRes() {
216210
lastNotebook = mSharedPreferences.getString("last_notebook", null);
217211
if (lastNotebook == null) {
218212
String fileName = "Welcome.ipynb";
219-
// if (Locale.getDefault().getLanguage().equals("zh")) {
220-
// fileName = "Welcome(cn).ipynb";
221-
// }
222213
File file = new File(NotebookUtil.NOTEBOOK_DIR + "notebooks", fileName);
223214
if (file.exists()) {
224215
lastNotebook = file.getAbsolutePath();
225216
} else {
226217
lastNotebook = NotebookUtil.createNotebook(this, NotebookUtil.Untitled);
227218
}
219+
} else {
220+
Log.d(TAG, "lastNotebook:"+lastNotebook);
228221
}
229222
} else {
230223
if (filePath.contains(NotebookUtil.NOTEBOOK_DIR)) {
231224
lastNotebook = filePath;
232225
} else {
226+
233227
Toast.makeText(this, "inalid file", Toast.LENGTH_SHORT).show();
234228
return;
235229
}
236230
}
237-
mBinding.toolbar.setTitle(getFileName(lastNotebook));
231+
if (lastNotebook!=null) {
232+
mBinding.toolbar.setTitle(getFileName(lastNotebook));
233+
}
238234
// if (checkNotebook()) {
239235
// createServer();
240236
// }
@@ -258,6 +254,7 @@ private void createServer() {
258254
protected static final String TAG = "NotebookActivity";
259255

260256
protected final BroadcastReceiver webviewActivityReceiver = new BroadcastReceiver() {
257+
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN_MR1)
261258
@Override
262259
public void onReceive(Context context, Intent intent) {
263260
String act = intent.getExtras().getString(ACT);

‎qpython/src/main/java/org/qpython/qpy/utils/NotebookUtil.java‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,12 @@ public class NotebookUtil {
5151
public static final String Untitled = "Untitled";
5252

5353
public static boolean isNotebookEnable(Context context) {
54-
boolean isNI = isNotebookInstall(context);
5554
boolean isNLI = isNotebookLibInstall(context);
56-
Log.d("NotebookUtil", "isNotebookEnable:" + isNI + "-" + isNLI);
57-
return isNI && isNLI;
55+
Log.d("NotebookUtil", "isNotebookEnable:" + "-" + isNLI);
56+
return isNLI;
5857
}
5958

6059

61-
/**
62-
* 检查notebook app是否安装
63-
*/
64-
public static boolean isNotebookInstall(Context context) {
65-
if (NAction.isQPy3(context)) {
66-
return true;
67-
//return new File(RELEASE_PATH, context.getString(R.string.notebook3libs_file_name)).exists();
68-
69-
} else {
70-
return new File(RELEASE_PATH, context.getString(R.string.notebook2libs_file_name)).exists();
71-
72-
}
73-
}
7460

7561
/**
7662
* 检查notebook库是否安装
@@ -88,16 +74,6 @@ public static boolean isNotebookLibInstall(Context context) {
8874
* 释放相关资源
8975
*/
9076
public static boolean extraData(Context context) {
91-
QPySDK qPySDK = new QPySDK(context, (Activity) context);
92-
93-
//将文件解压到本地files目录
94-
if (NAction.isQPy3(context)) {
95-
qPySDK.extractRes(new File(RELEASE_PATH, context.getString(R.string.notebook3libs_file_name)), context.getFilesDir(), false);
96-
} else {
97-
98-
qPySDK.extractRes(new File(RELEASE_PATH, context.getString(R.string.notebook2libs_file_name)), context.getFilesDir(), false);
99-
}
100-
10177
//如果解压成功则lib目录下回出现libzmq.so文件
10278
if (new File(context.getFilesDir().getAbsolutePath() + "/lib", "notebook.zip").exists()) {
10379
//对bin目录下的文件修改执行权限

‎qpython/src/main/res/values-zh-rCN/strings.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,7 @@
402402
<string name="support_explanation">您的赞赏是我们持续写出好教材的驱动力</string>
403403
<string name="rmb">¥ %s </string>
404404
<string name="thank">致谢</string>
405-
<string name="notebook_installed">现在可以打开后缀为.ipynb的文件了</string>
406-
<string name="notebook_not_install">qpynotebook未安装</string>
405+
<string name="notebook_installed">启动QPyNotebook服务后，你可以从文件中打开后缀为.ipynb的文件了</string>
407406
<string name="jupyter_not_release">请先安装并运行Jupyter</string>
408407
<string name="jupyter_not_support">Jupyter暂时未支持Python 3</string>
409408
<string name="aipy_install">安装AIPY</string>

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

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="ExtraTranslation">
2-
<string name="notebook3_version" translatable="false">20200206.1205</string>
3-
<string name="notebook2_version" translatable="false">20180805.1205</string>
4-
<string name="notebook3libs_file_name" translatable="false">notebook3.mp3</string>
5-
<string name="notebook2libs_file_name" translatable="false">notebook2.mp3</string>
6-
72
<string name="private1_version" translatable="false">1347438995.05</string>
83
<string name="private2_version" translatable="false">1347438995.05</string>
94
<string name="private3_version" translatable="false">1347438995.05</string>
10-
115
<string name="private31_version" translatable="false">1347438791.05</string>
126
<string name="private32_version" translatable="false">1347438791.05</string>
137
<string name="private33_version" translatable="false">1347438791.05</string>
14-
15-
<string name="public_version" translatable="false">12000</string>
8+
<string name="public_version" translatable="false">12500</string>
169
<string name="public3_version" translatable="false">1347438610.05</string>
10+
<string name="notebook3_version" translatable="false">20200206.1205</string>
11+
<string name="ipynb_version" translatable="false">20200207.1205</string>
1712

18-
<string name="privacy_html" translatable="false">https://www.qpython.com/privacy.html</string>
13+
<string name="privacy_html" translatable="false">https://www.qpython.org/privacy.html</string>
1914
<string name="thanks_link" translatable="false">https://www.qpython.org/contributors.html</string>
2015
<string name="lower_project" translatable="false">projects</string>
2116
<string name="lib_manager" translatable="false">QPYPI</string>
@@ -549,9 +544,9 @@
549544

550545
<string name="choose_py3_inter"><![CDATA[You have downloaded it, you can switch to Python 3 to use it\'s interpreter]]></string>
551546
<string name="choose_py2compatible_inter"><![CDATA[You have downloaded it, you can switch to Python 2 Compatible to use it\'s interpreter]]></string>
552-
<string name="install_notebook_first">To Start Notebook Service, please install first</string>
547+
<string name="install_notebook_first">To Start QPyNotebook Service, please install first</string>
553548

554-
<string name="choose_notebook_inter"><![CDATA[You can Start Notebook Service now]]></string>
549+
<string name="choose_notebook_inter"><![CDATA[You can Start QPyNotebook Service now]]></string>
555550

556551
<string name="notebook_first">First run, it will extract the notebook resource</string>
557552

@@ -576,15 +571,15 @@
576571
<string name="notebook_for_py">QPyNotebook for Python {0}</string>
577572

578573
<string name="install_notebook">Install QPyNotebook</string>
579-
<string name="notebook_service">Notebook Service</string>
580-
<string name="notebook_service_not_ready">Notebook Service is not ready, please retry</string>
574+
<string name="notebook_service">QPyNotebook Service</string>
575+
<string name="notebook_service_not_ready">QPyNotebook Service is not ready, please retry</string>
581576
<string name="notebook_service_restart">Do you want to reload this notebook or restart the service?</string>
582577
<string name="notebook_restart">Restart</string>
583578
<string name="notebook_reload">Reload</string>
584579

585580
<string name="notebook_open">Do you want to open it with QPyNotebook?</string>
586581

587-
<string name="notebook_explorer">Start Notebook Service</string>
582+
<string name="notebook_explorer">Start QPyNotebook Service</string>
588583
<string name="notebook_explorer_bg_start">It will run when QPython starts</string>
589584

590585
<string name="enter_history">History</string>
@@ -665,7 +660,8 @@
665660
<string name="start">Start</string>
666661
<string name="buy_course">Buy Course</string>
667662
<string name="rmb">%s RMB</string>
668-
<string name="notebook_installed">You can browse the ipynb file from explorer</string> <string name="notebook_not_started">QPyNotebook is not started</string>
663+
<string name="notebook_installed">After starting QPyNotebook Service, you can browse the ipynb file from explorer</string>
664+
<string name="notebook_not_started">QPyNotebook is not started</string>
669665

670666
<string name="notebook_py3_support">QPyNotebook only supports Python 3</string>
671667
<string name="notebook_enable" translatable="false">notebook_enable</string>

0 commit comments

Comments
 (0)