diff --git a/README.md b/README.md index ae99304..001996b 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ +# 公告 +我们没有预料到大家对我们Teamtalk反响如此热烈,还没正式对外开放就有这么多人关注,目前github上的代码是早期版本,还存在一些问题,最新的代码还没来得及提交,开发人员正在努力中,非常感谢大家对Teamtalk开源的关注和支持~ + + # mogujie Open Source IM App ![Logo](https://avatars2.githubusercontent.com/u/8542441?v=2&s=200) [mogujie](http://www.mogujie.com) Open Source IM is aiming to provide another IM solution in your company for colleagues to communicate with each other. we've released Win/Mac/Android/iOS client repositories in github as well as IM server repository. -see all projects in our [mogutt](https://github.com/mogutt) github account page or visit our [ website](http://tt.mogu.io/)(Chinease) for more information +see all projects in our [mogutt](https://github.com/mogutt) github account page or visit our [ website](http://tt.mogu.io/)(In Chinese) for more information ## Android Client Features * list all colleagues in your company as well as detail profiles like (email addr, title, phone No. etc.) @@ -36,17 +40,17 @@ Build steps: ## Manual use below identities to login: * **id:** eric -* **password:** 12345 +* **password:** 123456 * **id:** tom -* **password:** 12345 +* **password:** 123456 ![loginpage] (http://s6.sinaimg.cn/mw690/003j8GoBgy6MMp9gLNra5&690) ![contactpage](http://s9.sinaimg.cn/mw690/003j8GoBgy6MMp9dHmM38&690) -or you can go to our oficial [website](http://tt.mogu.io/home/sign)(Chinease) to register an account +or you can go to our official [website](http://tt.mogu.io/home/sign)(In Chinese) to register an account ## Acknowledgements diff --git a/mgandroid-teamtalk/project.properties b/mgandroid-teamtalk/project.properties index 80bfdd8..79a3e21 100644 --- a/mgandroid-teamtalk/project.properties +++ b/mgandroid-teamtalk/project.properties @@ -11,6 +11,6 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-16 +target=android-19 android.library.reference.1=../mgimlibs android.library=false diff --git a/mgandroid-teamtalk/res/values/tt_strings_activity_login.xml b/mgandroid-teamtalk/res/values/tt_strings_activity_login.xml index 76f29d7..1242128 100755 --- a/mgandroid-teamtalk/res/values/tt_strings_activity_login.xml +++ b/mgandroid-teamtalk/res/values/tt_strings_activity_login.xml @@ -13,6 +13,7 @@ 亲,密码太短了 请检查用户名密码是否正确 请输入用户名 + 请输入密码 登录失败,请重试 请检查网络是否正常! 登陆超时,请重试 diff --git a/mgandroid-teamtalk/src/com/mogujie/tt/ui/activity/LoginActivity.java b/mgandroid-teamtalk/src/com/mogujie/tt/ui/activity/LoginActivity.java index 0e94c95..5cf306f 100755 --- a/mgandroid-teamtalk/src/com/mogujie/tt/ui/activity/LoginActivity.java +++ b/mgandroid-teamtalk/src/com/mogujie/tt/ui/activity/LoginActivity.java @@ -322,7 +322,7 @@ public void attemptLogin() { if (TextUtils.isEmpty(mPassword)) { // mPasswordView.setError(getString(R.string.error_field_required)); - Toast.makeText(this, getString(R.string.error_field_required), + Toast.makeText(this, getString(R.string.error_password_required), Toast.LENGTH_SHORT).show(); focusView = mPasswordView; diff --git a/mgimlibs/project.properties b/mgimlibs/project.properties index dfa4dd0..91d2b02 100644 --- a/mgimlibs/project.properties +++ b/mgimlibs/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-16 +target=android-19 android.library=true