回退整理

WeiChat/src/main/java/com/sk/weichat/ui/nearby/UserSearchActivity.java

@@ -42,7 +42,6 @@ public class UserSearchActivity extends ActionBackActivity implements View.OnCli
         setContentView(R.layout.activity_user_search);
         initView();
     }
-
     private void initView() {
         mKeyWordEdit = (EditText) findViewById(R.id.keyword_edit);
         mSexTv = (TextView) findViewById(R.id.sex_tv);

WeiChat/src/main/res/values-v14/styles.xml

@@ -21,22 +21,22 @@
 
     <style name="IMActionBar" parent="@style/Widget.AppCompat.ActionBar">
         <item name="android:icon">@drawable/action_bar_divider</item>
-        <item name="android:background">>@style/MyActionBar</item>
+        <item name="android:background">@drawable/BackBar</item>
         <item name="android:titleTextStyle">@style/IMActionBar.TitleTextStyle</item>
         <item name="android:subtitleTextStyle">@style/IMActionBar.SubTitleTextStyle</item>
         <item name="android:indeterminateProgressStyle">@style/ActionBarCustomProgressBar</item>
-        <item name="android:backgroundStacked">@color/antionbarcolor</item>
+        <item name="android:backgroundStacked">@color/antionbaritemcolor</item>
         <item name="android:backgroundSplit">@color/red</item>
         <item name="titleTextStyle">@style/IMActionBar.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/IMActionBar.SubTitleTextStyle</item>
         <item name="icon">@drawable/action_bar_divider</item>
-        <item name="background">@style/MyActionBar</item>
-        <item name="backgroundStacked">@color/antionbarcolor</item>
+        <item name="background">@drawable/BackBar</item>
+        <item name="backgroundStacked">@color/antionbaritemcolor</item>
         <item name="backgroundSplit">@color/red</item>
         <item name="indeterminateProgressStyle">@style/ActionBarCustomProgressBar</item>
     </style>
 
     <style name="MyActionBar" parent="Widget.AppCompat.ActionBar.TabView">
-        <item name="android:background">@color/antionbarcolor</item>
+        <item name="android:background">@color/antionbaritemcolor</item>
     </style>
 </resources>

WeiChat/src/main/res/values/colors.xml

@@ -6,6 +6,7 @@
     <color name="item_text">#cca0a0a0</color>
     <color name="item_line">#BCBBC0</color>
     <color name="antionbarcolor">#646464</color>
+    <color name="antionbaritemcolor">#a3b2cf</color>
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>
     <color name="text_hine">#575757</color>

WeiChat/src/main/res/values/styles.xml

@@ -203,7 +203,6 @@
         <item name="android:layout_height">@dimen/next_height</item>
         <item name="android:layout_alignParentRight">true</item>
         <item name="android:layout_centerVertical">true</item>
-        <item name="android:alpha">0.26</item>
         <item name="android:background">@drawable/set_list_next</item>
     </style>
 
@@ -253,8 +252,8 @@
 
     <!--erp 字体-->
     <style name="text_black_16">
-        <item name="android:textSize">@dimen/text_main</item>
-        <item name="android:textColor">@color/text_main</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@android:color/black</item>
     </style>
 
     <!-- erp 自定义对话框 -->
@@ -267,13 +266,14 @@
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:background">@android:color/transparent</item>
     </style>
-    <!--<item name="android:layout_marginLeft">5dp</item>-->
-    <!--<item name="android:layout_marginRight">5dp</item>-->
-    <!--<item name="android:layout_marginTop">20dp</item>-->
-    <!--<item name="android:layout_marginBottom">15dp</item>-->
+
     <style name="form_linear_customer">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_marginLeft">5dp</item>
+        <item name="android:layout_marginRight">5dp</item>
+        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:layout_marginBottom">15dp</item>
         <item name="android:background">@drawable/ry_setting_selector</item>
         <item name="android:orientation">vertical</item>
     </style>
@@ -347,7 +347,7 @@
     <!-- form表单  请假单，特殊考勤等单据 -->
     <style name="form_relative_customer">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/item_height</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:background">@drawable/ry_setting_selector</item>
         <item name="android:clickable">true</item>
     </style>