Commit 2110f56f708a8355166f190a0f2a440c0b9e186a

Authored by 朱显松
1 parent 82a9022b

更新图片资源

Showing 46 changed files with 74 additions and 159 deletions
app/src/main/AndroidManifest.xml
@@ -53,6 +53,7 @@ @@ -53,6 +53,7 @@
53 android:launchMode="singleTop" 53 android:launchMode="singleTop"
54 android:screenOrientation="portrait" 54 android:screenOrientation="portrait"
55 android:windowSoftInputMode="adjustResize" /> 55 android:windowSoftInputMode="adjustResize" />
  56 +
56 <activity android:name=".user.activity.LoginActivity"/> 57 <activity android:name=".user.activity.LoginActivity"/>
57 58
58 <receiver 59 <receiver
app/src/main/res/drawable-hdpi/player_back.png 0 → 100644

723 Bytes

app/src/main/res/drawable-hdpi/player_brightness.png 0 → 100644

1.89 KB

app/src/main/res/drawable-hdpi/player_full_screen.png 0 → 100644

849 Bytes

app/src/main/res/drawable-hdpi/player_pause.png 0 → 100644

2.01 KB

app/src/main/res/drawable-hdpi/player_play.png 0 → 100644

1.71 KB

app/src/main/res/drawable-hdpi/player_volume.png 0 → 100644

2.02 KB

app/src/main/res/drawable-hdpi/switch_thumb_dan_off.png 0 → 100644

2.83 KB

app/src/main/res/drawable-hdpi/switch_thumb_dan_on.png 0 → 100644

2.5 KB

app/src/main/res/drawable-mdpi/player_back.png 0 → 100644

506 Bytes

app/src/main/res/drawable-mdpi/player_brightness.png 0 → 100644

1.3 KB

app/src/main/res/drawable-mdpi/player_full_screen.png 0 → 100644

588 Bytes

app/src/main/res/drawable-mdpi/player_pause.png 0 → 100644

1.16 KB

app/src/main/res/drawable-mdpi/player_play.png 0 → 100644

1.01 KB

app/src/main/res/drawable-mdpi/player_volume.png 0 → 100644

1.09 KB

app/src/main/res/drawable-mdpi/switch_thumb_dan_off.png 0 → 100644

1.54 KB

app/src/main/res/drawable-mdpi/switch_thumb_dan_on.png 0 → 100644

1.36 KB

app/src/main/res/drawable-xhdpi/player_back.png 0 → 100644

1.06 KB

app/src/main/res/drawable-xhdpi/player_brightness.png 0 → 100644

2.92 KB

app/src/main/res/drawable-xhdpi/player_full_screen.png 0 → 100644

1.47 KB

app/src/main/res/drawable-xhdpi/player_pause.png 0 → 100644

3.38 KB

app/src/main/res/drawable-xhdpi/player_play.png 0 → 100644

2.83 KB

app/src/main/res/drawable-xhdpi/player_volume.png 0 → 100644

2.58 KB

app/src/main/res/drawable-xhdpi/switch_thumb_dan_off.png

1.34 KB | W: | H:

4.11 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xhdpi/switch_thumb_dan_on.png

1.28 KB | W: | H:

3.65 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/player_back.png

1.19 KB | W: | H:

1.97 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/player_brightness.png

3.26 KB | W: | H:

5.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/player_full_screen.png

386 Bytes | W: | H:

2.38 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/player_pause.png

1.18 KB | W: | H:

6.13 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/player_play.png

945 Bytes | W: | H:

5.05 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/player_volume.png

3.58 KB | W: | H:

4.68 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
app/src/main/res/drawable-xxhdpi/switch_thumb_dan_off.png 0 → 100644

7.4 KB

app/src/main/res/drawable-xxhdpi/switch_thumb_dan_on.png 0 → 100644

6.79 KB

app/src/main/res/drawable-xxxhdpi/player_back.png 0 → 100644

3.22 KB

app/src/main/res/drawable-xxxhdpi/player_brightness.png 0 → 100644

8.37 KB

app/src/main/res/drawable-xxxhdpi/player_full_screen.png 0 → 100644

4.52 KB

app/src/main/res/drawable-xxxhdpi/player_pause.png 0 → 100644

9.8 KB

app/src/main/res/drawable-xxxhdpi/player_play.png 0 → 100644

8 KB

app/src/main/res/drawable-xxxhdpi/player_volume.png 0 → 100644

7.44 KB

app/src/main/res/drawable-xxxhdpi/switch_thumb_dan_off.png 0 → 100644

10.7 KB

app/src/main/res/drawable-xxxhdpi/switch_thumb_dan_on.png 0 → 100644

9.92 KB

app/src/main/res/layout/user_fragment.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 -<layout xmlns:android="http://schemas.android.com/apk/res/android"  
4 - > 3 +<layout xmlns:android="http://schemas.android.com/apk/res/android">
5 4
6 <LinearLayout 5 <LinearLayout
7 android:layout_width="match_parent" 6 android:layout_width="match_parent"
@@ -10,124 +9,127 @@ @@ -10,124 +9,127 @@
10 9
11 <RelativeLayout 10 <RelativeLayout
12 android:layout_width="match_parent" 11 android:layout_width="match_parent"
13 - android:layout_height="100dp"  
14 - > 12 + android:layout_height="100dp">
  13 +
15 <TextView 14 <TextView
16 android:layout_width="wrap_content" 15 android:layout_width="wrap_content"
17 android:layout_height="wrap_content" 16 android:layout_height="wrap_content"
18 android:layout_centerInParent="true" 17 android:layout_centerInParent="true"
19 android:text="我的" 18 android:text="我的"
20 - android:textSize="@dimen/_30px"  
21 - /> 19 + android:textSize="@dimen/_30px" />
22 20
23 21
24 </RelativeLayout> 22 </RelativeLayout>
  23 +
25 <View 24 <View
26 android:layout_width="match_parent" 25 android:layout_width="match_parent"
27 android:layout_height="1px" 26 android:layout_height="1px"
28 android:background="@color/gray_line_color" /> 27 android:background="@color/gray_line_color" />
29 28
30 29
31 - <RelativeLayout  
32 - android:id="@+id/config_header"  
33 - android:layout_width="fill_parent"  
34 - android:layout_height="85dp"  
35 - android:gravity="center_vertical"  
36 - style="@style/list_item_style"> 30 + <RelativeLayout
  31 + android:id="@+id/config_header"
  32 + style="@style/list_item_style"
  33 + android:layout_width="fill_parent"
  34 + android:layout_height="85dp"
  35 + android:gravity="center_vertical">
37 36
38 - <ImageView  
39 - android:id="@+id/head_img"  
40 - android:layout_width="55dip"  
41 - android:layout_height="55dip"  
42 - android:layout_centerVertical="true"  
43 - android:layout_marginLeft="11dp"  
44 - android:layout_marginRight="16dp" /> 37 + <ImageView
  38 + android:id="@+id/head_img"
  39 + android:layout_width="55dip"
  40 + android:layout_height="55dip"
  41 + android:layout_centerVertical="true"
  42 + android:layout_marginLeft="11dp"
  43 + android:layout_marginRight="16dp" />
  44 +
  45 + <LinearLayout
  46 + android:layout_width="wrap_content"
  47 + android:layout_height="wrap_content"
  48 + android:layout_centerVertical="true"
  49 + android:layout_toLeftOf="@+id/next"
  50 + android:layout_toRightOf="@+id/head_img"
  51 + android:orientation="vertical">
45 52
46 - <LinearLayout 53 + <TextView
  54 + android:id="@+id/tv_nickname"
47 android:layout_width="wrap_content" 55 android:layout_width="wrap_content"
48 android:layout_height="wrap_content" 56 android:layout_height="wrap_content"
49 - android:layout_centerVertical="true"  
50 - android:layout_toRightOf="@+id/head_img"  
51 - android:orientation="vertical"  
52 - android:layout_toLeftOf="@+id/next">  
53 -  
54 - <TextView  
55 - android:id="@+id/tv_nickname"  
56 - android:layout_width="wrap_content"  
57 - android:layout_height="wrap_content"  
58 - android:layout_margin="3dp"  
59 - android:gravity="center_vertical"  
60 - android:singleLine="true"  
61 - android:text="@string/click_login"  
62 - android:textColor="@color/config_black_color"  
63 - android:textSize="17sp" />  
64 - <TextView  
65 - android:id="@+id/point"  
66 - android:layout_width="wrap_content"  
67 - android:layout_height="wrap_content"  
68 - android:layout_margin="3dp"  
69 - android:text="@string/login_china_coin"  
70 - android:textColor="@color/config_gray_color"  
71 - android:textSize="12sp" />  
72 - </LinearLayout>  
73 -  
74 - <ImageView  
75 - android:id="@+id/next"  
76 - android:layout_width="@dimen/next_image_width"  
77 - android:layout_height="@dimen/next_image_height"  
78 - android:layout_alignParentRight="true"  
79 - android:layout_centerVertical="true"  
80 - android:layout_marginRight="@dimen/next_image_margin_right"  
81 - android:contentDescription="@null"  
82 - android:src="@drawable/btn_channel_more" />  
83 - </RelativeLayout>  
84 -  
85 - 57 + android:layout_margin="3dp"
  58 + android:gravity="center_vertical"
  59 + android:singleLine="true"
  60 + android:text="@string/click_login"
  61 + android:textColor="@color/config_black_color"
  62 + android:textSize="17sp" />
  63 +
  64 + <TextView
  65 + android:id="@+id/point"
  66 + android:layout_width="wrap_content"
  67 + android:layout_height="wrap_content"
  68 + android:layout_margin="3dp"
  69 + android:text="@string/login_china_coin"
  70 + android:textColor="@color/config_gray_color"
  71 + android:textSize="12sp" />
  72 + </LinearLayout>
86 73
  74 + <ImageView
  75 + android:id="@+id/next"
  76 + android:layout_width="@dimen/next_image_width"
  77 + android:layout_height="@dimen/next_image_height"
  78 + android:layout_alignParentRight="true"
  79 + android:layout_centerVertical="true"
  80 + android:layout_marginRight="@dimen/next_image_margin_right"
  81 + android:contentDescription="@null"
  82 + android:src="@drawable/btn_channel_more" />
  83 + </RelativeLayout>
87 84
88 85
89 <RelativeLayout 86 <RelativeLayout
90 - android:layout_width="match_parent"  
91 - android:layout_height="30dp"  
92 android:id="@+id/live" 87 android:id="@+id/live"
93 - style="@style/list_item_style"> 88 + style="@style/list_item_style"
  89 + android:layout_width="match_parent"
  90 + android:layout_height="30dp">
  91 +
94 <ImageView 92 <ImageView
  93 + android:id="@+id/ic_config_history"
95 android:layout_width="20dp" 94 android:layout_width="20dp"
96 android:layout_height="20dp" 95 android:layout_height="20dp"
97 - android:id="@+id/ic_config_history"  
98 android:layout_centerVertical="true" 96 android:layout_centerVertical="true"
99 - android:src="@drawable/ic_config_history"/> 97 + android:src="@drawable/ic_config_history" />
  98 +
100 <TextView 99 <TextView
101 android:layout_width="wrap_content" 100 android:layout_width="wrap_content"
102 android:layout_height="wrap_content" 101 android:layout_height="wrap_content"
103 android:layout_centerVertical="true" 102 android:layout_centerVertical="true"
104 - android:layout_toRightOf="@+id/ic_config_history"  
105 android:layout_marginLeft="20dp" 103 android:layout_marginLeft="20dp"
106 - android:text="我要直播"/> 104 + android:layout_toRightOf="@+id/ic_config_history"
  105 + android:text="我要直播" />
107 </RelativeLayout> 106 </RelativeLayout>
  107 +
108 <View 108 <View
109 android:layout_width="match_parent" 109 android:layout_width="match_parent"
110 android:layout_height="1px" 110 android:layout_height="1px"
111 android:background="@color/gray_line_color" /> 111 android:background="@color/gray_line_color" />
  112 +
112 <RelativeLayout 113 <RelativeLayout
113 - android:layout_width="match_parent"  
114 - android:layout_height="30dp"  
115 android:id="@+id/message" 114 android:id="@+id/message"
116 - style="@style/list_item_style"> 115 + style="@style/list_item_style"
  116 + android:layout_width="match_parent"
  117 + android:layout_height="30dp">
117 118
118 <ImageView 119 <ImageView
  120 + android:id="@+id/ic_setting_opinion"
119 android:layout_width="20dp" 121 android:layout_width="20dp"
120 android:layout_height="20dp" 122 android:layout_height="20dp"
121 android:layout_centerVertical="true" 123 android:layout_centerVertical="true"
122 - android:id="@+id/ic_setting_opinion"  
123 - android:src="@drawable/ic_setting_opinion"/> 124 + android:src="@drawable/ic_setting_opinion" />
  125 +
124 <TextView 126 <TextView
125 android:layout_width="wrap_content" 127 android:layout_width="wrap_content"
126 android:layout_height="wrap_content" 128 android:layout_height="wrap_content"
127 android:layout_centerVertical="true" 129 android:layout_centerVertical="true"
128 - android:layout_toRightOf="@+id/ic_setting_opinion"  
129 android:layout_marginLeft="20dp" 130 android:layout_marginLeft="20dp"
130 - android:text="意见反馈"/> 131 + android:layout_toRightOf="@+id/ic_setting_opinion"
  132 + android:text="意见反馈" />
131 133
132 </RelativeLayout> 134 </RelativeLayout>
133 135
app/src/main/res/values/colors.xml
@@ -12,19 +12,13 @@ @@ -12,19 +12,13 @@
12 <color name="gray_line_color">#dcdcdc</color> 12 <color name="gray_line_color">#dcdcdc</color>
13 <color name="config_black_color">#323333</color> 13 <color name="config_black_color">#323333</color>
14 <color name="config_gray_color">#969797</color> 14 <color name="config_gray_color">#969797</color>
15 - <color name="color_list_bg">#88615F5D</color>  
16 <color name="text_input_color">#323333</color> 15 <color name="text_input_color">#323333</color>
17 <color name="text_hint_color">#969797</color> 16 <color name="text_hint_color">#969797</color>
18 17
19 //登录页面 18 //登录页面
20 <color name="ff4e51">#ff4e51</color> 19 <color name="ff4e51">#ff4e51</color>
21 - <color name="black">#000000</color>  
22 20
23 //注册页面 21 //注册页面
24 <color name="text_white_color">#FFFFFF</color> 22 <color name="text_white_color">#FFFFFF</color>
25 23
26 - //关于我们页面  
27 - <color name="star_name_color">#323333</color>  
28 - <color name="about_us_btn_text_color">#177bdf</color>  
29 - <color name="about_us_company_name_color">#969797</color>  
30 </resources> 24 </resources>
app/src/main/res/values/dimens.xml
@@ -16,16 +16,7 @@ @@ -16,16 +16,7 @@
16 <dimen name="_20px">10dp</dimen> 16 <dimen name="_20px">10dp</dimen>
17 <dimen name="_28px">14dp</dimen> 17 <dimen name="_28px">14dp</dimen>
18 18
19 - //个人中心  
20 - <dimen name="personal_item_height">44dp</dimen>  
21 - <dimen name="personal_text_size">17sp</dimen>  
22 - <dimen name="personal_text_size_14">14sp</dimen>  
23 - <dimen name="personal_text_size_18">18sp</dimen>  
24 19
25 - //关于我们  
26 - <dimen name="about_us_text_size">17sp</dimen>  
27 - <dimen name="about_us_btn_size">13sp</dimen>  
28 - <dimen name="about_us_company_name_size">12sp</dimen>  
29 20
30 //反馈意见 21 //反馈意见
31 <dimen name="text_size_15">15sp</dimen> 22 <dimen name="text_size_15">15sp</dimen>
app/src/main/res/values/strings.xml
@@ -39,7 +39,6 @@ @@ -39,7 +39,6 @@
39 <string name="main_tab_config">我的</string> 39 <string name="main_tab_config">我的</string>
40 <string name="click_login">点击登录</string> 40 <string name="click_login">点击登录</string>
41 <string name="login_china_coin">登录就送中国币哟</string> 41 <string name="login_china_coin">登录就送中国币哟</string>
42 - <string name="my_config_money_desc">中国币、兑换码、金额</string>  
43 <string name="logout">注销</string> 42 <string name="logout">注销</string>
44 43
45 //登录页面 44 //登录页面
@@ -67,35 +66,9 @@ @@ -67,35 +66,9 @@
67 //找回密码页面 66 //找回密码页面
68 <string name="find_password_btn">找回密码</string> 67 <string name="find_password_btn">找回密码</string>
69 <string name="find_password_hint">请确认密码:6&#8211;20位字母或数字</string> 68 <string name="find_password_hint">请确认密码:6&#8211;20位字母或数字</string>
70 - <string name="save_btn">保存</string>  
71 -  
72 - //昵称修改页面  
73 - <string name="user_input_nickname">请输入昵称</string>  
74 -  
75 - //手机号修改页面  
76 - <string name="register_mobile">手机号:</string>  
77 - <string name="user_personal_telephone_hint">手机号码</string>  
78 - <string name="register_mobile_keycode">验证码:</string>  
79 - <string name="hint_6_numbers_code">6位数字验证码</string>  
80 -  
81 - //邮箱修改页面  
82 - <string name="email_notify">修改后,您输入的邮箱将会收到确认邮件,请按邮件中的说明去完成验证,谢谢!</string>  
83 -  
84 - //关于我们页面  
85 - <string name="about_us_visit">访问视讯中国官网</string>  
86 - <string name="about_us_call_phone">拨打客服电话</string>  
87 - <string name="about_us_disclaimer">免责声明</string>  
88 - <string name="about_us_company_name">北京中投视讯文化传媒股份有限公司</string>  
89 -  
90 - //分享  
91 - <string name="toast_msg_share_success">分享成功!</string>  
92 - <string name="toast_msg_share_fail">分享失败,请再试一次</string>  
93 - <string name="toast_msg_share_cancel">取消分享</string>  
94 - <string name="share_program_download_targetUrl"> http://www.cnlive.com/web/guide.jsp</string>  
95 69
96 //AccountManager用户管理 70 //AccountManager用户管理
97 <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string> 71 <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
98 <string name="ACCOUNT_LABEL">@string/app_name</string> 72 <string name="ACCOUNT_LABEL">@string/app_name</string>
99 73
100 - <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>  
101 </resources> 74 </resources>
app/src/main/res/values/styles.xml
@@ -12,32 +12,10 @@ @@ -12,32 +12,10 @@
12 <attr name="dividerDrawable" format="reference" /> 12 <attr name="dividerDrawable" format="reference" />
13 </declare-styleable> 13 </declare-styleable>
14 14
15 - <style name="ActionbarTitleStyle">  
16 - <item name="android:textSize">22sp</item>  
17 - <item name="android:textColor">#000000</item>  
18 - </style>  
19 -  
20 <style name="list_item_style"> 15 <style name="list_item_style">
21 <item name="android:background">@drawable/list_item_selector</item> 16 <item name="android:background">@drawable/list_item_selector</item>
22 </style> 17 </style>
23 18
24 - <style name="ConfigItemImageStyle">  
25 - <item name="android:layout_marginLeft">18dp</item>  
26 - <item name="android:layout_marginRight">10dp</item>  
27 - </style>  
28 -  
29 - <style name="ConfigItemTitleStyle">  
30 - <item name="android:textColor">@color/config_black_color</item>  
31 - <item name="android:textSize">15sp</item>  
32 - <item name="android:layout_marginLeft">8dp</item>  
33 - </style>  
34 -  
35 - <style name="ConfigItemDescStyle">  
36 - <item name="android:textColor">@color/config_gray_color</item>  
37 - <item name="android:textSize">12sp</item>  
38 - <item name="android:layout_marginRight">5dp</item>  
39 - </style>  
40 -  
41 <style name="ToolbarTitleStyle"> 19 <style name="ToolbarTitleStyle">
42 <item name="android:textSize">20sp</item> 20 <item name="android:textSize">20sp</item>
43 <item name="android:textColor">#000000</item> 21 <item name="android:textColor">#000000</item>
@@ -68,28 +46,4 @@ @@ -68,28 +46,4 @@
68 <item name="android:background">@null</item> 46 <item name="android:background">@null</item>
69 </style> 47 </style>
70 48
71 - <style name="take_photo_anim" parent="android:Animation">  
72 - <item name="android:windowEnterAnimation">@anim/pop_enter_anim</item>  
73 - <item name="android:windowExitAnimation">@anim/pop_exit_anim</item>  
74 - </style>  
75 -  
76 - <style name="CustomDialogStyle" parent="@android:style/Theme.Dialog">  
77 - <item name="android:windowFrame">@null</item>  
78 - <item name="android:windowIsFloating">true</item>  
79 - <item name="android:windowIsTranslucent">true</item>  
80 - <item name="android:windowNoTitle">true</item>  
81 - <item name="android:background">@android:color/transparent</item>  
82 - <item name="android:windowBackground">@android:color/transparent</item>  
83 - <item name="android:backgroundDimEnabled">true</item>  
84 - <item name="android:backgroundDimAmount">0.6</item>  
85 - <item name="android:windowCloseOnTouchOutside">true</item>  
86 - </style>  
87 -  
88 - <style name="ActionBar" parent="Theme.AppCompat.Light.DarkActionBar">  
89 - <!-- Customize your theme here. -->  
90 - <item name="colorPrimary">@color/colorPrimary</item>  
91 - <item name="colorPrimaryDark">@color/colorPrimaryDark</item>  
92 - <item name="colorAccent">@color/colorAccent</item>  
93 - <item name="android:windowContentOverlay">@null</item>  
94 - </style>  
95 </resources> 49 </resources>