修改页面布局

陈硕
2 parents dee81be7 83292208
Showing 180 changed files with 122 additions and 315 deletions
.idea/encodings.xml
.idea/inspectionProfiles/Project_Default.xml
.idea/markdown-navigator.xml
.idea/markdown-navigator/profiles_settings.xml
.idea/vcs.xml
app/src/main/AndroidManifest.xml
app/src/main/res/drawable-hdpi/ic_bubble.png
app/src/main/res/drawable-hdpi/ic_bubble_sel.png
app/src/main/res/drawable-hdpi/ic_camera.png → app/src/main/res/drawable-hdpi/main_camera.png
app/src/main/res/drawable-hdpi/ic_camera_sel.png → app/src/main/res/drawable-hdpi/main_camera_sel.png
app/src/main/res/drawable-hdpi/ic_home.png → app/src/main/res/drawable-hdpi/main_home.png
app/src/main/res/drawable-hdpi/ic_home_sel.png → app/src/main/res/drawable-hdpi/main_home_sel.png
app/src/main/res/drawable-hdpi/ic_live_tv.png → app/src/main/res/drawable-hdpi/main_live_tv.png
app/src/main/res/drawable-hdpi/ic_live_tv_sel.png → app/src/main/res/drawable-hdpi/main_live_tv_sel.png
app/src/main/res/drawable-hdpi/ic_person.png → app/src/main/res/drawable-hdpi/main_person.png
app/src/main/res/drawable-hdpi/ic_person_sel.png → app/src/main/res/drawable-hdpi/main_person_sel.png
app/src/main/res/drawable-hdpi/ic_videocam.png → app/src/main/res/drawable-hdpi/main_videocam.png
app/src/main/res/drawable-hdpi/ic_videocam_sel.png → app/src/main/res/drawable-hdpi/main_videocam_sel.png
app/src/main/res/drawable-hdpi/player_back.png
app/src/main/res/drawable-hdpi/player_brightness.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
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="AndroidLintNewApi" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="AndroidLintSetTextI18n" enabled="false" level="WARNING" enabled_by_default="false" />
     <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
       <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
       <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownProjectSettings">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="true" showSelectionInPreview="true">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="COMMONMARK_LISTS" value="false" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="true" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_EMOJI_URL" value="false" />
-        <option name="GITHUB_LISTS" value="true" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-</project>
 \ No newline at end of file
-<component name="MarkdownNavigator.ProfileManager">
-  <settings default="" pdf-export="" />
-</component>
 \ No newline at end of file
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+    <mapping directory="" vcs="Git" />
   </component>
 </project>
 \ No newline at end of file
@@ -53,6 +53,7 @@
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize" />
+
         <activity android:name=".user.activity.LoginActivity"/>
  
         <receiver
 <?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
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_camera_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_camera" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_camera_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_camera" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_camera" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_camera" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_camera" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_camera" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_camera" android:state_pressed="true" />
  
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_home" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_home_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_home" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_home_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_home_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_home_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_home_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_home_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_home_sel" android:state_pressed="true" />
  
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_live_tv" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_live_tv" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_live_tv_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_live_tv_sel" android:state_pressed="true" />
  
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_person" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_person_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_person" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_person_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_person_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_person_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_person_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_person_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_person_sel" android:state_pressed="true" />
  
 </selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Non focused states -->
-    <item android:drawable="@drawable/ic_videocam" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_videocam" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
     <!-- Focused states -->
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
     <!-- Pressed -->
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_pressed="true" android:state_selected="true" />
-    <item android:drawable="@drawable/ic_videocam_sel" android:state_pressed="true" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_pressed="true" android:state_selected="true" />
+    <item android:drawable="@drawable/main_videocam_sel" android:state_pressed="true" />
  
 </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"
@@ -5,15 +5,14 @@
     >
  
     <LinearLayout
-
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
  
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="150dp"
-            >
+            android:layout_height="48dp">
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -21,100 +20,99 @@
                 android:singleLine="true"
                 android:text="我的"
                 android:textColor="@color/config_black_color"
-                android:textSize="22sp"
-                />
+                android:textSize="22sp" />
  
  
         </RelativeLayout>
+
         <View
             android:layout_width="match_parent"
-            android:layout_marginBottom="@dimen/_20px"
             android:layout_height="1px"
+            android:layout_marginBottom="@dimen/_20px"
             android:background="@color/gray_line_color" />
  
  
-            <RelativeLayout
-                android:id="@+id/config_header"
-                android:layout_width="fill_parent"
-                android:layout_height="85dp"
-                android:gravity="center_vertical"
-                style="@style/list_item_style">
-
-                <com.cnlive.gundam.user.view.CircleImageView
-                    android:id="@+id/head_img"
-                    android:layout_width="55dip"
-                    android:layout_height="55dip"
-                    android:layout_centerVertical="true"
-                    android:src="@drawable/cnlive_user_header"
-                    cn:border_color="@android:color/transparent"
-                    android:layout_marginLeft="11dp"
-                    android:layout_marginRight="16dp" />
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toRightOf="@+id/head_img"
-                    android:orientation="vertical"
-                    android:layout_toLeftOf="@+id/next">
-
-                    <TextView
-                        android:id="@+id/tv_nickname"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="3dp"
-                        android:gravity="center_vertical"
-                        android:singleLine="true"
-                        android:text="@string/click_login"
-                        android:textColor="@color/config_black_color"
-                        android:textSize="17sp" />
-
-                </LinearLayout>
+        <RelativeLayout
+            android:id="@+id/config_header"
+            style="@style/list_item_style"
+            android:layout_width="fill_parent"
+            android:layout_height="85dp"
+            android:gravity="center_vertical">
+
+            <com.cnlive.gundam.user.view.CircleImageView
+                android:id="@+id/head_img"
+                android:layout_width="55dip"
+                android:layout_height="55dip"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="11dp"
+                android:layout_marginRight="16dp"
+                cn:border_color="@android:color/transparent"
+                android:src="@drawable/cnlive_user_header" />
  
-                <ImageView
-                    android:id="@+id/next"
-                    android:layout_width="@dimen/next_image_width"
-                    android:layout_height="@dimen/next_image_height"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:layout_marginRight="@dimen/next_image_margin_right"
-                    android:contentDescription="@null"
-                    android:src="@drawable/btn_channel_more" />
-            </RelativeLayout>
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@+id/next"
+                android:layout_toRightOf="@+id/head_img"
+                android:orientation="vertical">
  
+                <TextView
+                    android:id="@+id/tv_nickname"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="3dp"
+                    android:gravity="center_vertical"
+                    android:singleLine="true"
+                    android:text="@string/click_login"
+                    android:textColor="@color/config_black_color"
+                    android:textSize="17sp" />
  
+            </LinearLayout>
  
+            <ImageView
+                android:id="@+id/next"
+                android:layout_width="@dimen/next_image_width"
+                android:layout_height="@dimen/next_image_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="@dimen/next_image_margin_right"
+                android:contentDescription="@null"
+                android:src="@drawable/btn_channel_more" />
+        </RelativeLayout>
  
  
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
             android:background="@color/gray_line_color" />
+
         <RelativeLayout
+            android:id="@+id/message"
+            style="@style/list_item_style"
             android:layout_width="match_parent"
             android:layout_height="50dp"
-            android:layout_marginTop="@dimen/_20px"
-            android:id="@+id/message"
-            style="@style/list_item_style">
+            android:layout_marginTop="@dimen/_20px">
  
             <ImageView
+                android:id="@+id/ic_setting_opinion"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:layout_marginLeft="@dimen/_20px"
                 android:layout_centerVertical="true"
-                android:id="@+id/ic_setting_opinion"
-                android:src="@drawable/ic_setting_opinion"/>
+                android:layout_marginLeft="@dimen/_20px"
+                android:src="@drawable/ic_setting_opinion" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
+                android:layout_marginLeft="30dp"
                 android:layout_toRightOf="@+id/ic_setting_opinion"
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:text="意见反馈"
                 android:textColor="@color/config_black_color"
-                android:layout_marginLeft="30dp"
-                android:textSize="17sp"/>
+                android:textSize="17sp" />
  
  
             <ImageView
@@ -37,70 +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="my_config_money_desc">中国币、兑换码、金额</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>
-    <string name="save_btn">保存</string>
-
-    //昵称修改页面
-    <string name="user_input_nickname">请输入昵称</string>
-
-    //手机号修改页面
-    <string name="register_mobile">手机号：</string>
-    <string name="user_personal_telephone_hint">手机号码</string>
-    <string name="register_mobile_keycode">验证码：</string>
-    <string name="hint_6_numbers_code">6位数字验证码</string>
-
-    //邮箱修改页面
-    <string name="email_notify">修改后，您输入的邮箱将会收到确认邮件，请按邮件中的说明去完成验证，谢谢！</string>
-
-    //关于我们页面
-    <string name="about_us_visit">访问视讯中国官网</string>
-    <string name="about_us_call_phone">拨打客服电话</string>
-    <string name="about_us_disclaimer">免责声明</string>
-    <string name="about_us_company_name">北京中投视讯文化传媒股份有限公司</string>
-
-    //分享
-    <string name="toast_msg_share_success">分享成功！</string>
-    <string name="toast_msg_share_fail">分享失败，请再试一次</string>
-    <string name="toast_msg_share_cancel">取消分享</string>
-    <string name="share_program_download_targetUrl"> http://www.cnlive.com/web/guide.jsp</string>
-
-    //AccountManager用户管理
-    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
-    <string name="ACCOUNT_LABEL">@string/app_name</string>
-
-    <string name="verified_url" formatted="false">https://mobile.cnlive.com/CnliveMobile/web/review/review.jsp?sid=%s&amp;plat=a&amp;appId=%s </string>
 </resources>
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen></PreferenceScreen>
+<?xml version="1.0" encoding="utf-8"?>
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="@string/ACCOUNT_TYPE"
+    android:icon="@mipmap/ic_launcher"
+    android:smallIcon="@mipmap/ic_launcher"
+    android:label="@string/ACCOUNT_LABEL"
+    android:accountPreferences="@xml/account_preferences" />
 \ No newline at end of file
@@ -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'
  
 }
-package cnlive.com.myuser;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("cnlive.com.myuser.test", appContext.getPackageName());
-    }
-}
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
  
     <color name="gray_line_color">#dcdcdc</color>
     <color name="config_black_color">#323333</color>
@@ -36,6 +36,8 @@
     <string name="find_password_hint">请确认密码：6&#8211;20位字母或数字</string>
     <string name="save_btn">保存</string>
  
+    <string name="ACCOUNT_TYPE">com.cnlive.libs.AccountType</string>
+    <string name="ACCOUNT_LABEL">@string/app_name</string>
  
  
  
 <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>
-package cnlive.com.myuser;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
 \ No newline at end of file