diff --git a/README.md b/README.md index f351835..3675db8 100644 --- a/README.md +++ b/README.md @@ -10,16 +10,40 @@ Web端使用的是朱大的[know_web](https://github.com/Jude95/know_web.git)的 ## 功能 + 登录、登出 + ![](readme.res/device-2016-02-15-162559.gif) + + 查看、提交问题 + ![](readme.res/device-2016-02-15-163152.gif) + + 查看、提交答案 + ![](readme.res/device-2016-02-15-163649.gif) + + 更换头像 + ![](readme.res/device-2016-02-15-164336.gif) + ## 下载 [下载APK](app/app-release.apk?raw=true) -## Developed by +## 开发者 Haruue Icymoon 本项目作为红岩移动开发部寒假作业 Level3 和 Level4 部分 ## 开源 -Apache 2.0 \ No newline at end of file +Apache License 2.0 +``` License +Copyright [2016] [Haruue Icymoon] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +``` \ No newline at end of file diff --git a/app/app-release.apk b/app/app-release.apk index 3a08791..6f23ac0 100644 Binary files a/app/app-release.apk and b/app/app-release.apk differ diff --git a/app/build.gradle b/app/build.gradle index 5903b03..401b3ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "cn.com.caoyue.bihu" minSdkVersion 15 targetSdkVersion 23 - versionCode 2 - versionName "1.0.1" + versionCode 3 + versionName "1.0.2" ndk { moduleName "JniApiKeys" ldLibs "log", "z", "m" diff --git a/app/src/main/java/cn/com/caoyue/bihu/ui/activity/LaunchPageActivity.java b/app/src/main/java/cn/com/caoyue/bihu/ui/activity/LaunchPageActivity.java index 748e0b6..2f40948 100644 --- a/app/src/main/java/cn/com/caoyue/bihu/ui/activity/LaunchPageActivity.java +++ b/app/src/main/java/cn/com/caoyue/bihu/ui/activity/LaunchPageActivity.java @@ -50,7 +50,12 @@ private void checkLogin() { .orderBy("RANDOM()") .executeSingle(); if (null == userTable) { - showLoginDialog(); + handler.postDelayed(new Runnable() { + @Override + public void run() { + showLoginDialog(); + } + }, 500); return; } Call loginWithOldTokenCall = RestApi.getHaruueKnowWebApiService().loginWithOldToken(ApiKeys.HARUUE_KNOW_WEB_APIKEY, userTable.token); @@ -108,7 +113,7 @@ public void onRegisterSuccess(String username, String password) { @Override public void onDialogCancel() { - AppControl.exitApp(); + } }; } diff --git a/app/src/main/java/cn/com/caoyue/bihu/ui/activity/ModifyFaceActivity.java b/app/src/main/java/cn/com/caoyue/bihu/ui/activity/ModifyFaceActivity.java index f03ed56..cd378e6 100644 --- a/app/src/main/java/cn/com/caoyue/bihu/ui/activity/ModifyFaceActivity.java +++ b/app/src/main/java/cn/com/caoyue/bihu/ui/activity/ModifyFaceActivity.java @@ -88,7 +88,7 @@ public void onClick(View v) { @Override public void onClick(View v) { selectImageBitmap = null; - new GetFace(imageView, CurrentUser.getInstance().face).load(); + onBackPressed(); } }); findViewById(R.id.btn_save).setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3ed788e..12eb481 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,7 +15,7 @@ 帐号或密码错误 注册成功,点击[登录]即可登录您的账户 用户名已被占用 - 服务器操作失败,请使用以下信息联系开发者: API Key 无效或服务器异常 + 您使用的版本太旧或者服务器发生异常 服务器提交了一个问题,我们正在紧张地撰写答案 世界上最遥远的距离就是没网,检查设置 身份失效,请重新登录 diff --git a/readme.res/device-2016-02-15-162559.gif b/readme.res/device-2016-02-15-162559.gif new file mode 100644 index 0000000..35e6513 Binary files /dev/null and b/readme.res/device-2016-02-15-162559.gif differ diff --git a/readme.res/device-2016-02-15-163152.gif b/readme.res/device-2016-02-15-163152.gif new file mode 100644 index 0000000..57a0ef5 Binary files /dev/null and b/readme.res/device-2016-02-15-163152.gif differ diff --git a/readme.res/device-2016-02-15-163649.gif b/readme.res/device-2016-02-15-163649.gif new file mode 100644 index 0000000..cb33059 Binary files /dev/null and b/readme.res/device-2016-02-15-163649.gif differ diff --git a/readme.res/device-2016-02-15-164336.gif b/readme.res/device-2016-02-15-164336.gif new file mode 100644 index 0000000..da04963 Binary files /dev/null and b/readme.res/device-2016-02-15-164336.gif differ