Skip to content

Commit

Permalink
修改版本号
Browse files Browse the repository at this point in the history
  • Loading branch information
csuyzb committed Sep 4, 2014
1 parent b99fe06 commit 42d818c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Linkup/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.znv.linkup"
android:versionCode="19"
android:versionName="1.4.5" >
android:versionCode="20"
android:versionName="1.4.6" >

<uses-sdk
android:minSdkVersion="14"
Expand Down
18 changes: 10 additions & 8 deletions Linkup/res/layout/level_top.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,32 @@

<TextView
android:id="@+id/level_tvWeibo"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:layout_gravity="center"
android:layout_margin="12dp"
android:layout_weight="1"
android:background="@drawable/weibo_login"
android:gravity="center"
android:singleLine="true"
android:text="@string/login_with_sina_weibo"
android:textColor="@color/white"
android:textSize="18sp" >
android:textSize="20sp" >
</TextView>

<TextView
android:id="@+id/level_tvQq"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_margin="8dp"
android:layout_gravity="center"
android:layout_margin="12dp"
android:layout_weight="1"
android:background="@drawable/qq_login"
android:gravity="center"
android:singleLine="true"
android:text="@string/login_with_qzone"
android:textColor="@color/white"
android:textSize="18sp" >
android:textSize="20sp" >
</TextView>
</LinearLayout>

Expand Down
6 changes: 3 additions & 3 deletions Linkup/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<string name="help">帮助</string>
<string name="help_info">将2个相同的图片连接起来,连线不多于3根,就可以成功将图片消除。\n微博或QQ登录后可以参与网络排行,还能将成就分享到QQ,微博和微信等平台。</string>
<string name="about">关于</string>
<string name="about_info">应用名称:休闲连连看 \n版本编号:1.4.5\n应用作者:白杨,青须\n官网:http://xxllk.aliapp.com</string>
<string name="about_info">应用名称:休闲连连看 \n版本编号:1.4.6\n应用作者:白杨,青须\n官网:http://xxllk.aliapp.com</string>
<string name="submit">确定</string>
<string name="cancel">取消</string>
<string name="back">返回</string>
Expand All @@ -29,8 +29,8 @@
<string name="game_task_taskscore">游戏任务:</string>
<string name="game_ready_go">GO!</string>
<string name="game_prompt_none">已经不能消除了,请重排或按返回退出.</string>
<string name="login_with_sina_weibo">新浪微博</string>
<string name="login_with_qzone">QQ空间</string>
<string name="login_with_sina_weibo">微博登录</string>
<string name="login_with_qzone">QQ登录</string>
<string name="network_exception">登录失败,请检查网络设置。</string>
<string name="logining">登录成功,欢迎回来!</string>
<string name="auth_cancel">授权操作已取消</string>
Expand Down

0 comments on commit 42d818c

Please sign in to comment.