Commit 544537772bd660927de2f3d861b4bbc4effc8e78

Authored by 陈硕
2 parents dee81be7 83292208

修改页面布局

Showing 100 changed files with 4 additions and 76 deletions

Too many changes to show.

To preserve performance only 100 of 180 files are displayed.

.idea/encodings.xml
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3   - <component name="Encoding">
  3 + <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
4 4 <file url="PROJECT" charset="UTF-8" />
5 5 </component>
6 6 </project>
7 7 \ No newline at end of file
... ...
.idea/inspectionProfiles/Project_Default.xml
... ... @@ -2,6 +2,7 @@
2 2 <profile version="1.0">
3 3 <option name="myName" value="Project Default" />
4 4 <inspection_tool class="AndroidLintNewApi" enabled="false" level="ERROR" enabled_by_default="false" />
  5 + <inspection_tool class="AndroidLintSetTextI18n" enabled="false" level="WARNING" enabled_by_default="false" />
5 6 <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
6 7 <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
7 8 <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
... ...
.idea/markdown-navigator.xml deleted 100644 → 0
1   -<?xml version="1.0" encoding="UTF-8"?>
2   -<project version="4">
3   - <component name="MarkdownProjectSettings">
4   - <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">
5   - <PanelProvider>
6   - <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
7   - </PanelProvider>
8   - </PreviewSettings>
9   - <ParserSettings gitHubSyntaxChange="false">
10   - <PegdownExtensions>
11   - <option name="ABBREVIATIONS" value="false" />
12   - <option name="ANCHORLINKS" value="true" />
13   - <option name="ASIDE" value="false" />
14   - <option name="ATXHEADERSPACE" value="true" />
15   - <option name="AUTOLINKS" value="true" />
16   - <option name="DEFINITIONS" value="false" />
17   - <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
18   - <option name="FENCED_CODE_BLOCKS" value="true" />
19   - <option name="FOOTNOTES" value="false" />
20   - <option name="HARDWRAPS" value="false" />
21   - <option name="INSERTED" value="false" />
22   - <option name="QUOTES" value="false" />
23   - <option name="RELAXEDHRULES" value="true" />
24   - <option name="SMARTS" value="false" />
25   - <option name="STRIKETHROUGH" value="true" />
26   - <option name="SUBSCRIPT" value="false" />
27   - <option name="SUPERSCRIPT" value="false" />
28   - <option name="SUPPRESS_HTML_BLOCKS" value="false" />
29   - <option name="SUPPRESS_INLINE_HTML" value="false" />
30   - <option name="TABLES" value="true" />
31   - <option name="TASKLISTITEMS" value="true" />
32   - <option name="TOC" value="false" />
33   - <option name="WIKILINKS" value="true" />
34   - </PegdownExtensions>
35   - <ParserOptions>
36   - <option name="COMMONMARK_LISTS" value="false" />
37   - <option name="DUMMY" value="false" />
38   - <option name="EMOJI_SHORTCUTS" value="true" />
39   - <option name="FLEXMARK_FRONT_MATTER" value="false" />
40   - <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="true" />
41   - <option name="GFM_TABLE_RENDERING" value="true" />
42   - <option name="GITBOOK_URL_ENCODING" value="false" />
43   - <option name="GITHUB_EMOJI_URL" value="false" />
44   - <option name="GITHUB_LISTS" value="true" />
45   - <option name="GITHUB_WIKI_LINKS" value="true" />
46   - <option name="JEKYLL_FRONT_MATTER" value="false" />
47   - <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
48   - </ParserOptions>
49   - </ParserSettings>
50   - <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
51   - <GeneratorProvider>
52   - <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
53   - </GeneratorProvider>
54   - <headerTop />
55   - <headerBottom />
56   - <bodyTop />
57   - <bodyBottom />
58   - </HtmlSettings>
59   - <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
60   - <StylesheetProvider>
61   - <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
62   - </StylesheetProvider>
63   - <ScriptProviders />
64   - <cssText />
65   - </CssSettings>
66   - <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" />
67   - <LinkMapSettings>
68   - <textMaps />
69   - </LinkMapSettings>
70   - </component>
71   -</project>
72 0 \ No newline at end of file
.idea/markdown-navigator/profiles_settings.xml deleted 100644 → 0
1   -<component name="MarkdownNavigator.ProfileManager">
2   - <settings default="" pdf-export="" />
3   -</component>
4 0 \ No newline at end of file
.idea/vcs.xml
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="VcsDirectoryMappings">
4   - <mapping directory="$PROJECT_DIR$" vcs="Git" />
  4 + <mapping directory="" vcs="Git" />
5 5 </component>
6 6 </project>
7 7 \ No newline at end of file
... ...
app/src/main/AndroidManifest.xml
... ... @@ -53,6 +53,7 @@
53 53 android:launchMode="singleTop"
54 54 android:screenOrientation="portrait"
55 55 android:windowSoftInputMode="adjustResize" />
  56 +
56 57 <activity android:name=".user.activity.LoginActivity"/>
57 58  
58 59 <receiver
... ...
app/src/main/res/drawable-hdpi/ic_bubble.png deleted 100644 → 0

4.46 KB

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

4.12 KB

app/src/main/res/drawable-hdpi/ic_camera.png renamed to app/src/main/res/drawable-hdpi/main_camera.png

1.52 KB

app/src/main/res/drawable-hdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-hdpi/main_camera_sel.png

2.3 KB

app/src/main/res/drawable-hdpi/ic_home.png renamed to app/src/main/res/drawable-hdpi/main_home.png

650 Bytes

app/src/main/res/drawable-hdpi/ic_home_sel.png renamed to app/src/main/res/drawable-hdpi/main_home_sel.png

883 Bytes

app/src/main/res/drawable-hdpi/ic_live_tv.png renamed to app/src/main/res/drawable-hdpi/main_live_tv.png

732 Bytes

app/src/main/res/drawable-hdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-hdpi/main_live_tv_sel.png

999 Bytes

app/src/main/res/drawable-hdpi/ic_person.png renamed to app/src/main/res/drawable-hdpi/main_person.png

681 Bytes

app/src/main/res/drawable-hdpi/ic_person_sel.png renamed to app/src/main/res/drawable-hdpi/main_person_sel.png

931 Bytes

app/src/main/res/drawable-hdpi/ic_videocam.png renamed to app/src/main/res/drawable-hdpi/main_videocam.png

518 Bytes

app/src/main/res/drawable-hdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-hdpi/main_videocam_sel.png

692 Bytes

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/ic_close.png renamed to app/src/main/res/drawable-hdpi/stream_close.png

4.45 KB

app/src/main/res/drawable-hdpi/ic_close_on.png renamed to app/src/main/res/drawable-hdpi/stream_close_on.png

4.12 KB

app/src/main/res/drawable-hdpi/ic_flash_on.png renamed to app/src/main/res/drawable-hdpi/stream_flash_on.png

4.11 KB

app/src/main/res/drawable-hdpi/ic_flash_on_sel.png renamed to app/src/main/res/drawable-hdpi/stream_flash_on_sel.png

3.91 KB

app/src/main/res/drawable-hdpi/ic_meiyan.png renamed to app/src/main/res/drawable-hdpi/stream_meiyan.png

4.49 KB

app/src/main/res/drawable-hdpi/ic_meiyan_on.png renamed to app/src/main/res/drawable-hdpi/stream_meiyan_on.png

5.06 KB

app/src/main/res/drawable-hdpi/ic_meiyan_on_sel.png renamed to app/src/main/res/drawable-hdpi/stream_meiyan_on_sel.png

4.42 KB

app/src/main/res/drawable-hdpi/ic_meiyan_sel.png renamed to app/src/main/res/drawable-hdpi/stream_meiyan_sel.png

4.09 KB

app/src/main/res/drawable-hdpi/ic_switch_camera.png renamed to app/src/main/res/drawable-hdpi/stream_switch_camera.png

4.15 KB

app/src/main/res/drawable-hdpi/ic_switch_camera_sel.png renamed to app/src/main/res/drawable-hdpi/stream_switch_camera_sel.png

4.05 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/ic_bubble.png deleted 100644 → 0

2.49 KB

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

2.29 KB

app/src/main/res/drawable-mdpi/ic_camera.png renamed to app/src/main/res/drawable-mdpi/main_camera.png

822 Bytes

app/src/main/res/drawable-mdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-mdpi/main_camera_sel.png

1.18 KB

app/src/main/res/drawable-mdpi/ic_home.png renamed to app/src/main/res/drawable-mdpi/main_home.png

411 Bytes

app/src/main/res/drawable-mdpi/ic_home_sel.png renamed to app/src/main/res/drawable-mdpi/main_home_sel.png

564 Bytes

app/src/main/res/drawable-mdpi/ic_live_tv.png renamed to app/src/main/res/drawable-mdpi/main_live_tv.png

464 Bytes

app/src/main/res/drawable-mdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-mdpi/main_live_tv_sel.png

632 Bytes

app/src/main/res/drawable-mdpi/ic_person.png renamed to app/src/main/res/drawable-mdpi/main_person.png

516 Bytes

app/src/main/res/drawable-mdpi/ic_person_sel.png renamed to app/src/main/res/drawable-mdpi/main_person_sel.png

717 Bytes

app/src/main/res/drawable-mdpi/ic_videocam.png renamed to app/src/main/res/drawable-mdpi/main_videocam.png

315 Bytes

app/src/main/res/drawable-mdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-mdpi/main_videocam_sel.png

425 Bytes

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/ic_close.png renamed to app/src/main/res/drawable-mdpi/stream_close.png

2.43 KB

app/src/main/res/drawable-mdpi/ic_close_on.png renamed to app/src/main/res/drawable-mdpi/stream_close_on.png

2.25 KB

app/src/main/res/drawable-mdpi/ic_flash_on.png renamed to app/src/main/res/drawable-mdpi/stream_flash_on.png

2.28 KB

app/src/main/res/drawable-mdpi/ic_flash_on_sel.png renamed to app/src/main/res/drawable-mdpi/stream_flash_on_sel.png

2.21 KB

app/src/main/res/drawable-mdpi/ic_meiyan.png renamed to app/src/main/res/drawable-mdpi/stream_meiyan.png

2.45 KB

app/src/main/res/drawable-mdpi/ic_meiyan_on.png renamed to app/src/main/res/drawable-mdpi/stream_meiyan_on.png

2.8 KB

app/src/main/res/drawable-mdpi/ic_meiyan_on_sel.png renamed to app/src/main/res/drawable-mdpi/stream_meiyan_on_sel.png

2.45 KB

app/src/main/res/drawable-mdpi/ic_meiyan_sel.png renamed to app/src/main/res/drawable-mdpi/stream_meiyan_sel.png

2.26 KB

app/src/main/res/drawable-mdpi/ic_switch_camera.png renamed to app/src/main/res/drawable-mdpi/stream_switch_camera.png

2.36 KB

app/src/main/res/drawable-mdpi/ic_switch_camera_sel.png renamed to app/src/main/res/drawable-mdpi/stream_switch_camera_sel.png

2.26 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/ic_bubble.png deleted 100644 → 0

5.84 KB

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

5.52 KB

app/src/main/res/drawable-xhdpi/ic_camera.png renamed to app/src/main/res/drawable-xhdpi/main_camera.png

1.82 KB

app/src/main/res/drawable-xhdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-xhdpi/main_camera_sel.png

2.63 KB

app/src/main/res/drawable-xhdpi/ic_home.png renamed to app/src/main/res/drawable-xhdpi/main_home.png

702 Bytes

app/src/main/res/drawable-xhdpi/ic_home_sel.png renamed to app/src/main/res/drawable-xhdpi/main_home_sel.png

910 Bytes

app/src/main/res/drawable-xhdpi/ic_live_tv.png renamed to app/src/main/res/drawable-xhdpi/main_live_tv.png

874 Bytes

app/src/main/res/drawable-xhdpi/ic_live_tv_sel.png renamed to app/src/main/res/drawable-xhdpi/main_live_tv_sel.png

1.16 KB

app/src/main/res/drawable-xhdpi/ic_person.png renamed to app/src/main/res/drawable-xhdpi/main_person.png

994 Bytes

app/src/main/res/drawable-xhdpi/ic_person_sel.png renamed to app/src/main/res/drawable-xhdpi/main_person_sel.png

1.3 KB

app/src/main/res/drawable-xhdpi/ic_videocam.png renamed to app/src/main/res/drawable-xhdpi/main_videocam.png

561 Bytes

app/src/main/res/drawable-xhdpi/ic_videocam_sel.png renamed to app/src/main/res/drawable-xhdpi/main_videocam_sel.png

729 Bytes

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/ic_close.png renamed to app/src/main/res/drawable-xhdpi/stream_close.png

5.83 KB

app/src/main/res/drawable-xhdpi/ic_close_on.png renamed to app/src/main/res/drawable-xhdpi/stream_close_on.png

5.44 KB

app/src/main/res/drawable-xhdpi/ic_flash_on.png renamed to app/src/main/res/drawable-xhdpi/stream_flash_on.png

5.4 KB

app/src/main/res/drawable-xhdpi/ic_flash_on_sel.png renamed to app/src/main/res/drawable-xhdpi/stream_flash_on_sel.png

5.26 KB

app/src/main/res/drawable-xhdpi/ic_meiyan.png renamed to app/src/main/res/drawable-xhdpi/stream_meiyan.png

6.04 KB

app/src/main/res/drawable-xhdpi/ic_meiyan_on.png renamed to app/src/main/res/drawable-xhdpi/stream_meiyan_on.png

6.82 KB

app/src/main/res/drawable-xhdpi/ic_meiyan_on_sel.png renamed to app/src/main/res/drawable-xhdpi/stream_meiyan_on_sel.png

6.03 KB

app/src/main/res/drawable-xhdpi/ic_meiyan_sel.png renamed to app/src/main/res/drawable-xhdpi/stream_meiyan_sel.png

5.55 KB

app/src/main/res/drawable-xhdpi/ic_switch_camera.png renamed to app/src/main/res/drawable-xhdpi/stream_switch_camera.png

5.35 KB

app/src/main/res/drawable-xhdpi/ic_switch_camera_sel.png renamed to app/src/main/res/drawable-xhdpi/stream_switch_camera_sel.png

5.36 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/ic_bubble.png deleted 100644 → 0

10.5 KB

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

9.94 KB

app/src/main/res/drawable-xxhdpi/ic_camera.png renamed to app/src/main/res/drawable-xxhdpi/main_camera.png

3.39 KB

app/src/main/res/drawable-xxhdpi/ic_camera_sel.png renamed to app/src/main/res/drawable-xxhdpi/main_camera_sel.png

4.77 KB