资源文件整理

朱显松
1 parent dfae0dfa
Showing 91 changed files with 72 additions and 188 deletions
.idea/encodings.xml
.idea/modules.xml
app/src/main/res/drawable-hdpi/ic_close.png → app/src/main/res/drawable-hdpi/stream_close.png
app/src/main/res/drawable-hdpi/ic_close_on.png → app/src/main/res/drawable-hdpi/stream_close_on.png
app/src/main/res/drawable-hdpi/ic_flash_on.png → app/src/main/res/drawable-hdpi/stream_flash_on.png
app/src/main/res/drawable-hdpi/ic_flash_on_sel.png → app/src/main/res/drawable-hdpi/stream_flash_on_sel.png
app/src/main/res/drawable-hdpi/ic_meiyan.png → app/src/main/res/drawable-hdpi/stream_meiyan.png
app/src/main/res/drawable-hdpi/ic_meiyan_on.png → app/src/main/res/drawable-hdpi/stream_meiyan_on.png
app/src/main/res/drawable-hdpi/ic_meiyan_on_sel.png → app/src/main/res/drawable-hdpi/stream_meiyan_on_sel.png
app/src/main/res/drawable-hdpi/ic_meiyan_sel.png → app/src/main/res/drawable-hdpi/stream_meiyan_sel.png
app/src/main/res/drawable-hdpi/ic_switch_camera.png → app/src/main/res/drawable-hdpi/stream_switch_camera.png
app/src/main/res/drawable-hdpi/ic_switch_camera_sel.png → app/src/main/res/drawable-hdpi/stream_switch_camera_sel.png
app/src/main/res/drawable-mdpi/ic_close.png → app/src/main/res/drawable-mdpi/stream_close.png
app/src/main/res/drawable-mdpi/ic_close_on.png → app/src/main/res/drawable-mdpi/stream_close_on.png
app/src/main/res/drawable-mdpi/ic_flash_on.png → app/src/main/res/drawable-mdpi/stream_flash_on.png
app/src/main/res/drawable-mdpi/ic_flash_on_sel.png → app/src/main/res/drawable-mdpi/stream_flash_on_sel.png
app/src/main/res/drawable-mdpi/ic_meiyan.png → app/src/main/res/drawable-mdpi/stream_meiyan.png
app/src/main/res/drawable-mdpi/ic_meiyan_on.png → app/src/main/res/drawable-mdpi/stream_meiyan_on.png
app/src/main/res/drawable-mdpi/ic_meiyan_on_sel.png → app/src/main/res/drawable-mdpi/stream_meiyan_on_sel.png
app/src/main/res/drawable-mdpi/ic_meiyan_sel.png → app/src/main/res/drawable-mdpi/stream_meiyan_sel.png
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
     <file url="PROJECT" charset="UTF-8" />
   </component>
 </project>
 \ No newline at end of file
@@ -3,7 +3,6 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/CNLiveApp.iml" filepath="$PROJECT_DIR$/CNLiveApp.iml" />
-      <module fileurl="file://$PROJECT_DIR$/CNLiveApp5.iml" filepath="$PROJECT_DIR$/CNLiveApp5.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
       <module fileurl="file://$PROJECT_DIR$/user/user.iml" filepath="$PROJECT_DIR$/user/user.iml" />
     </modules>
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_flash_on_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_flash_on" android:state_pressed="false" />
+
+    <item android:drawable="@drawable/stream_close_on" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_close" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_meiyan_on_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_meiyan_on" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_flash_on_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_flash_on" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_close_on" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_close" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_switch_camera_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_switch_camera" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_meiyan_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_meiyan" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_meiyan_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_meiyan" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/ic_switch_camera_sel" android:state_pressed="true" />
-    <item android:drawable="@drawable/ic_switch_camera" android:state_pressed="false" />
+    <item android:drawable="@drawable/stream_meiyan_on_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/stream_meiyan_on" android:state_pressed="false" />
 </selector>
 \ No newline at end of file
@@ -125,7 +125,7 @@
                     android:layout_below="@+id/end_view"
                     android:layout_centerHorizontal="true"
                     android:layout_marginTop="48dp"
-                    android:background="@drawable/btn_record_end"
+                    android:background="@drawable/record_end"
                     android:onClick="onClick"
                     android:text="知道了"
                     android:textColor="@android:color/white"
@@ -162,7 +162,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@{isShow.beautifulBtn ? @drawable/icon_record_meiyan_on : @drawable/icon_record_meiyan}" />
+                android:src="@{isShow.beautifulBtn ? @drawable/record_meiyan_on : @drawable/record_meiyan}" />
             <ImageButton
                 android:id="@+id/btn_flip"
@@ -172,7 +172,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/icon_record_flip" />
+                android:src="@drawable/record_flip" />
             <ImageButton
                 android:id="@+id/btn_flash"
@@ -182,7 +182,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/icon_record_flash"
+                android:src="@drawable/record_flash"
                 android:visibility="@{isShow.flashBtn ? 0 : 8}" />
             <ImageButton
@@ -195,7 +195,7 @@
                 android:onClick="onClick"
                 android:padding="5dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/icon_record_close" />
+                android:src="@drawable/record_close" />
         </LinearLayout>
         <Button
@@ -203,7 +203,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:background="@drawable/anchor_retry_nor"
+            android:background="@drawable/record_retry_nor"
             android:onClick="onClick"
             android:padding="5dp"
             android:text="开始直播"
@@ -244,7 +244,7 @@
                 android:layout_below="@+id/auto_reconnect_msg"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/anchor_retry_nor"
+                android:background="@drawable/record_retry_nor"
                 android:onClick="onClick"
                 android:paddingBottom="8dp"
                 android:paddingLeft="15dp"
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    >
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
-<RelativeLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-<LinearLayout
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
-    <include layout="@layout/user_toolbar_title"
-        android:id="@+id/feedbackIncludeLayout"/>
+            <include
+                android:id="@+id/feedbackIncludeLayout"
+                layout="@layout/user_toolbar_title" />
-    <include layout="@layout/user_divider_head_line" />
+            <include layout="@layout/user_divider_head_line" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/_20px" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/_20px" />
-    <EditText
-        android:id="@+id/feedback_textView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="@dimen/_30px"
-        android:background="@null"
-        android:hint="有什么好的建议嘛"
-        android:textColor="#000000"
-        android:textColorHint="@color/color_list_bg"
-        android:textSize="@dimen/text_size_15"
-        android:imeOptions="flagNoExtractUi" />
+            <EditText
+                android:id="@+id/feedback_textView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="@dimen/_30px"
+                android:background="@null"
+                android:hint="有什么好的建议嘛"
+                android:imeOptions="flagNoExtractUi"
+                android:textColor="#000000"
+                android:textColorHint="@color/color_list_bg"
+                android:textSize="@dimen/text_size_15" />
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/_100px" />
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/_100px" />
-    <Button
-        android:id="@+id/feedback"
-        style="@style/LoginButtonStyle"
-        android:layout_width="match_parent"
-        android:layout_height="35dp"
-        android:layout_gravity="center"
-        android:layout_centerHorizontal="true"
-        android:layout_marginBottom="15dp"
-        android:layout_alignParentBottom="true"
-        android:background="@drawable/user_btn_login"
-        android:gravity="center"
-        android:onClick="onClick"
-        android:text="提交" />
+            <Button
+                android:id="@+id/feedback"
+                style="@style/LoginButtonStyle"
+                android:layout_width="match_parent"
+                android:layout_height="35dp"
+                android:layout_alignParentBottom="true"
+                android:layout_centerHorizontal="true"
+                android:layout_gravity="center"
+                android:layout_marginBottom="15dp"
+                android:background="@drawable/user_btn_login"
+                android:gravity="center"
+                android:onClick="onClick"
+                android:text="提交" />
-</LinearLayout>
+        </LinearLayout>
-    <ImageView
-        android:id="@+id/back_selector"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_marginLeft="@dimen/_10px"
-        android:layout_marginTop="@dimen/_20px"
-        android:onClick="onClick"
-        android:src="@drawable/btn_return" />
+        <ImageView
+            android:id="@+id/back_selector"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_marginLeft="@dimen/_10px"
+            android:layout_marginTop="@dimen/_20px"
+            android:onClick="onClick"
+            android:src="@drawable/btn_return" />
     </RelativeLayout>
-    </layout>
 \ No newline at end of file
+</layout>
 \ No newline at end of file
@@ -37,43 +37,4 @@
     <string name="request_state_error">获取活动状态失败</string>
     <string name="request_state_play_error">此活动状态无法播放</string>
-
-    <string name="net_connect_toast">"你好像掉线了"</string>
-
-    //我的
-    <string name="main_tab_config">我的</string>
-    <string name="click_login">点击登录</string>
-    <string name="login_china_coin">登录就送中国币哟</string>
-    <string name="logout">注销</string>
-
-    //登录页面
-    <string name="user_login_account">账号：</string>
-    <string name="user_login_account_hint">Email/手机号码</string>
-    <string name="user_login_code">密码：</string>
-    <string name="user_login_code_hint">6&#8211;20位字母或数字</string>
-    <string name="user_login_recall_code">忘记密码？</string>
-    <string name="string_fast_access">短信验证登录</string>
-    <string name="user_login">登录</string>
-    <string name="user_login_third_part_login">第三方账号登录</string>
-    <string name="third_login_sina">微博</string>
-    <string name="third_login_qq">QQ</string>
-    <string name="third_login_weixin">微信</string>
-
-    //注册页面
-    <string name="register_mobile_hint">请输入您的手机号</string>
-    <string name="getmobile_identify_code">获取验证码</string>
-    <string name="register_mobile_keycode_hint">请输入您收到的验证码</string>
-    <string name="register_password_hint">请设置密码：6&#8211;20位字母或数字</string>
-    <string name="register_show_password">显示密码</string>
-    <string name="register_and_agree">我已阅读并同意</string>
-    <string name="register_btn">注册</string>
-
-    //找回密码页面
-    <string name="find_password_btn">找回密码</string>
-    <string name="find_password_hint">请确认密码：6&#8211;20位字母或数字</string>
-
-    //AccountManager用户管理
-    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
-    <string name="ACCOUNT_LABEL">@string/app_name</string>
-
 </resources>
@@ -23,10 +23,6 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     compile 'com.android.support:appcompat-v7:26.+'
-    testCompile 'junit:junit:4.12'
 }
-<?xml version="1.0" encoding="utf-8"?>
-
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:id="@android:id/background">
-        <shape>
-            <corners android:radius="5dip" />
-            <gradient
-                android:startColor="#D5D5D5"
-                android:centerColor="#D5D5D5"
-                android:endColor="#D5D5D5" />
-        </shape>
-    </item>
-
-    <item android:id="@android:id/progress">
-        <clip>
-            <shape>
-                <corners android:radius="5dip" />
-                <gradient
-                    android:startColor="@color/ff4e51"
-                    android:centerColor="@color/ff4e51"
-                    android:endColor="@color/ff4e51" />
-            </shape>
-        </clip>
-    </item>
-
-</layer-list>
-<?xml version="1.0" encoding="utf-8"?>
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/btn_share_tengxun_sel" />
-    <item android:state_pressed="false" android:drawable="@drawable/btn_share_tengxun_nor" />
-</selector>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_micro_blog" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_micro_blog" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_micro_blog" android:state_focused="true" />
-    <item android:drawable="@drawable/user_micro_blog_click" />
-
-</selector>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_qq" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_qq" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_qq" android:state_focused="true" />
-    <item android:drawable="@drawable/user_qq_click" />
-
-</selector>
 \ No newline at end of file
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@drawable/user_wechat" android:state_enabled="false" android:state_focused="true" />
-    <item android:drawable="@drawable/user_wechat" android:state_pressed="true" />
-    <item android:drawable="@drawable/user_wechat" android:state_focused="true" />
-    <item android:drawable="@drawable/user_wechat_click" />
-
-</selector>
 \ No newline at end of file
 <resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
     <style name="ActionbarTitleStyle">
         <item name="android:textSize">22sp</item>
@@ -81,11 +74,4 @@
         <item name="android:windowCloseOnTouchOutside">true</item>
     </style>
-    <style name="ActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
-    <!-- Customize your theme here. -->
-    <item name="colorPrimary">@color/colorPrimary</item>
-    <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-    <item name="colorAccent">@color/colorAccent</item>
-    <item name="android:windowContentOverlay">@null</item>
-    </style>
 </resources>