完善代码

xiemeng99 · May 15, 2017 · 98955a4 · 98955a4
1 parent 4e8765b
commit 98955a4
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/dgwlibrary/build.gradle b/dgwlibrary/build.gradle
@@ -42,7 +42,7 @@ dependencies {
     compile 'com.umeng.analytics:analytics:latest.integration'
     compile 'com.android.support:recyclerview-v7:23.1.0'
     compile 'com.android.support:design:23.1.0'
-    compile 'com.alibaba:fastjson:1.2.23'
+    compile 'com.alibaba:fastjson:1.2.32'
     /*极光IM*/
     compile files('libs/jcore-android_v1.1.0.jar')
     compile files('libs/jmessage-android-2.0.0.jar')

diff --git a/dgwlibrary/dgwlibrary.iml b/dgwlibrary/dgwlibrary.iml
@@ -98,6 +98,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="commons-io-1.4" level="project" />
     <orderEntry type="library" exported="" name="okio-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="fastjson-1.2.32" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="runner-0.5" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="espresso-idling-resource-2.2.2" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
@@ -109,11 +110,10 @@
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="Msc" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="jsr305-2.0.1" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="PersistentCookieJar-v0.9.3" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="fastjson-1.2.23" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="espresso-core-2.2.2" level="project" />
     <orderEntry type="library" exported="" name="jcore-android_v1.1.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="exposed-instrumentation-api-publish-0.5" level="project" />
@@ -124,8 +124,8 @@
     <orderEntry type="library" exported="" name="gestureimageview" level="project" />
     <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="eventbus-3.0.0" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-3.3.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="javawriter-2.1.1" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-3.3.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
     <orderEntry type="library" exported="" name="Sunflower" level="project" />

diff --git a/dgwlibrary/src/main/res/values/colors.xml b/dgwlibrary/src/main/res/values/colors.xml
@@ -14,9 +14,10 @@
     <color name="BLACK">#000000</color>
     <color name="BtnBackground">#2b3133</color>
     <color name="BLUELINE">#00789f</color>
-    <color name="BUTTON_BACKGROUND">#2b887d</color>
+   <!-- <color name="BUTTON_BACKGROUND">#2b887d</color>-->
     <color name="BLUETOOTHGROUND">#00789f</color>
 
+    <color name="BUTTON_BACKGROUND">#e50150</color>
 
     <!-- 字体颜色 文本标题 -->
     <color name="DEEPBUlETEXTCOLOR">#232323</color>
@@ -198,7 +199,7 @@
     <color name="colorPrimary">#2b887d</color><!--导航栏颜色-->
     <color name="colorPrimaryDark">#2b887d</color><!--状态栏颜色-->
 
-    <color name="Base_color">#2b887d </color><!--主色调-->
+    <color name="Base_color">#e50150</color><!--主色调-->
     <color name="Assist_color">#ffc400 </color><!--辅助色调-->
     <color name="Text_color">#323232 </color><!--主字体颜色-->
     <color name="Login_line_color">#515252 </color><!--主字体颜色-->
@@ -219,7 +220,7 @@
 
     <color name="back47">#005047</color>
     <color name="green98">#00ac98</color>
-    <color name="green7d">#2b887b</color>
+    <color name="green7d">#e50150</color>
     <color name="colorAccent">#FF4081</color>
     <color name="graybb">#bbbbbb</color>
     <color name="tranblack">#b1000000</color>
@@ -232,4 +233,29 @@
 
     <color name="check_detail_form_text">#5d5d5d</color>
     <color name="deep_yellow">#ffcc00</color>
+
+    <!--AndColor 2017-5-9-->
+    <color name="colorPrimaryRed">#e50150</color>
+    <color name="toolBar_color">#e50150</color>
+    <color name="textfous_yellow">#ef8132</color>
+    <color name="orangeYellow">#ef8132</color>
+    <color name="red50">#e50150</color>
+    <color name="materialTop_color">#ffe4ed</color>
+    <color name="materialTitle_color">#5f0000</color>
+    <color name="materialText_color">#bd0000</color>
+    <color name="materialDivider_color">#ffdce8</color>
+    <color name="tab_title_selected_color">#e50150</color>
+    <color name="tab_title_unselected_color">#8c8c8c</color>
+    <color name="tab_bg_color">#ffffff</color>
+    <color name="tab_divider_color">#fff3f7</color>
+    <color name="text_hint_color">#c0c0c0</color>
+    <color name="green1b">#86b81b</color>
+    <color name="black32">#323232</color>
+    <color name="gray5a">#5a5a5a</color>
+    <color name="dark_gray53">#535353</color>
+    <color name="gray_eb">#ebebeb</color>
+    <color name="line_gray_f0">#f0f0f0</color>
+
+    <color name="login_color_t">#e50150</color>
+
 </resources>