gongpm 9 years ago
parent
commit
b5861b710c

+ 22 - 21
WeiChat/src/main/java/com/sk/weichat/adapter/FriendSortAdapter.java

@@ -68,27 +68,27 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer {
         if (position == getPositionForSection(section)) {
             isFrist = true;
         }
-        if (isLog.get(position) == null || isLog.get(position).isEmpty()) {
-            Log.i("gongpengming", "position" + position + "@@为空");
-            if (isFrist) {
-                isLog.put(position, "true");
-                RelativeLayout relativeLayout= (RelativeLayout) convertView.findViewById(R.id.rela);
-                relativeLayout.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
-                if (relativeLayout!=null)
-                ViewAlphaUtil.setViewAlpha(relativeLayout);
-            } else {
-                isLog.put(position, "false");
-                convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
-            }
-
-        } else {
-            if (isLog.get(position).equals("true")) {
-                convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
-                ViewAlphaUtil.setViewAlpha(convertView);
-            } else {
-                convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
-            }
-        }
+//        if (isLog.get(position) == null || isLog.get(position).isEmpty()) {
+
+//            if (isFrist) {
+//                isLog.put(position, "true");
+//                RelativeLayout relativeLayout= (RelativeLayout) convertView.findViewById(R.id.rela);
+//                relativeLayout.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
+//                if (relativeLayout!=null)
+//                ViewAlphaUtil.setViewAlpha(relativeLayout);
+//            } else {
+//                isLog.put(position, "false");
+//                convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
+//            }
+//
+//        } else {
+//            if (isLog.get(position).equals("true")) {
+//                convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
+//                ViewAlphaUtil.setViewAlpha(convertView);
+//            } else {
+//                convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
+//            }
+//        }
 
 //        if (isFrist) {
 //            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
@@ -106,6 +106,7 @@ public class FriendSortAdapter extends BaseAdapter implements SectionIndexer {
         if (position == getPositionForSection(section)) {
             catagoryTitleTv.setVisibility(View.VISIBLE);
             catagoryTitleTv.setText(mSortFriends.get(position).getFirstLetter());
+//            ViewAlphaUtil.setViewAlpha(catagoryTitleTv,127);
         } else {
             catagoryTitleTv.setVisibility(View.GONE);
         }

+ 2 - 2
WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/LinksManFragment.java

@@ -261,8 +261,8 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         my_friends_rl = (RelativeLayout) headview.findViewById(R.id.my_friends_rl);
         local_video_rl = (RelativeLayout) headview.findViewById(R.id.local_video_rl);
 
-        ViewAlphaUtil.setViewAlpha(my_data_rl);
-        ViewAlphaUtil.setViewAlpha(my_friend_rl);
+//        ViewAlphaUtil.setViewAlpha(my_data_rl);
+//        ViewAlphaUtil.setViewAlpha(my_friend_rl);
 
         local_video_rl.setOnClickListener(this);
         my_data_rl.setOnClickListener(this);

+ 3 - 3
WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/WorksFragment.java

@@ -70,9 +70,9 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         setting_rl.setOnClickListener(this);
         my_friend_rl.setOnClickListener(this);
 
-        ViewAlphaUtil.setViewAlpha(my_data_rl);
-        ViewAlphaUtil.setViewAlpha(rl_uas_sys);
-        ViewAlphaUtil.setViewAlpha(goods_find);
+//        ViewAlphaUtil.setViewAlpha(my_data_rl);
+//        ViewAlphaUtil.setViewAlpha(rl_uas_sys);
+//        ViewAlphaUtil.setViewAlpha(goods_find);
         if (MainActivity.isUnReadWork)
             iv_remain.setVisibility(View.VISIBLE);
         else

+ 24 - 16
WeiChat/src/main/java/com/sk/weichat/ui/me/MeFragment.java

@@ -32,7 +32,6 @@ import com.sk.weichat.ui.erp.util.StringUtils;
 import com.sk.weichat.ui.erp.util.ViewUtil;
 import com.sk.weichat.ui.erp.view.MasterDialog;
 import com.sk.weichat.ui.tool.SingleImagePreviewActivity;
-import com.sk.weichat.util.ViewAlphaUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -191,26 +190,35 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         }
         getChinaMaster();
         updateStatus();
-        setApl();
 
 
-    }
-
-    private void setApl() {
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.info_rl));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_data_rl));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_friend_rl));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_space_rl));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.local_video_rl));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.rl_company_change));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.rl_master_change));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_erp_rl));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_b2b_rl));
-        ViewAlphaUtil.setViewAlpha(findViewById(R.id.setting_rl));
-
 
     }
 
+//    private void setApl() {
+//
+//        View view1=findViewById(R.id.info_rl);
+//        View view2=findViewById(R.id.my_data_rl);
+//        View view3=findViewById(R.id.my_friend_rl);
+//        View view4=findViewById(R.id.my_space_rl);
+//        View view5=findViewById(R.id.local_video_rl);
+//        View view6=findViewById(R.id.rl_company_change);
+//        View view7=findViewById(R.id.rl_master_change);
+//
+//        ViewAlphaUtil.setViewAlpha(view1);
+//        ViewAlphaUtil.setViewAlpha(view2);
+//        ViewAlphaUtil.setViewAlpha(view3);
+//        ViewAlphaUtil.setViewAlpha(view4);
+//        ViewAlphaUtil.setViewAlpha(view5);
+//        ViewAlphaUtil.setViewAlpha(view6);
+//        ViewAlphaUtil.setViewAlpha(view7);
+//        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_erp_rl));
+//        ViewAlphaUtil.setViewAlpha(findViewById(R.id.my_b2b_rl));
+//        ViewAlphaUtil.setViewAlpha(findViewById(R.id.setting_rl));
+//
+//
+//    }
+
     /**
      * @desc:账户设置菜单界面
      * @author:Administrator on 2016/1/27 16:05

+ 1 - 1
WeiChat/src/main/java/com/sk/weichat/ui/message/MessageFragment.java

@@ -472,7 +472,7 @@ public class MessageFragment extends EasyFragment {
             }
             if (position % 2 == 0) {
                 convertView.setBackgroundColor(getActivity().getResources().getColor(R.color.item_color1));
-                ViewAlphaUtil.setViewAlpha(convertView);
+//                ViewAlphaUtil.setViewAlpha(convertView);
             } else {
                 convertView.setBackgroundColor(getActivity().getResources().getColor(R.color.item_color2));
             }

+ 6 - 6
WeiChat/src/main/java/com/sk/weichat/util/ViewAlphaUtil.java

@@ -7,13 +7,13 @@ import android.view.View;
  */
 public class ViewAlphaUtil {
 
-    public static void setViewAlpha(View view) {
-        view.getBackground().setAlpha(26);
-    }
+//    public static void setViewAlpha(View view) {
+//        view.getBackground().setAlpha(30);
+//    }
 
-    public static void setViewAlpha(View view, int alpha) {
-
-    }
+//    public static void setViewAlpha(View view, int alpha) {
+//        view.getBackground().setAlpha(alpha);
+//    }
 
 
 }

BIN
WeiChat/src/main/res/drawable-xxhdpi/bg_main.png


+ 8 - 8
WeiChat/src/main/res/layout/fragment_works.xml

@@ -60,8 +60,8 @@
                 android:visibility="gone" />
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
@@ -86,8 +86,8 @@
                 android:textSize="14sp" />
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
@@ -112,8 +112,8 @@
                 android:textSize="14sp" />
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"
@@ -138,8 +138,8 @@
                 android:textSize="14sp" />
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:alpha="0.26"

+ 12 - 6
WeiChat/src/main/res/layout/headview_cantacts_menus.xml

@@ -8,7 +8,7 @@
 
     <RelativeLayout
         android:id="@+id/my_data_rl"
-        style="@style/IMTbleLine">
+        style="@style/IMTbleLine_UP">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -32,7 +32,8 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="2dp" />
+        android:layout_height="1dp"
+        android:background="@color/item_line"/>
     <RelativeLayout
         android:id="@+id/my_friends_rl"
         style="@style/IMTbleLine_UP">
@@ -57,14 +58,14 @@
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
     </RelativeLayout>
-
     <View
         android:layout_width="match_parent"
-        android:layout_height="2dp" />
+        android:layout_height="1dp"
+        android:background="@color/item_line"/>
 
     <RelativeLayout
         android:id="@+id/my_friend_rl"
-        style="@style/IMTbleLine">
+        style="@style/IMTbleLine_UP">
 
         <TextView
             android:layout_width="wrap_content"
@@ -89,7 +90,8 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="2dp" />
+        android:layout_height="1dp"
+        android:background="@color/item_line"/>
 
     <RelativeLayout
         android:id="@+id/local_video_rl"
@@ -142,5 +144,9 @@
             android:contentDescription="@string/app_name"
             android:visibility="gone" />
     </RelativeLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/item_line"/>
 </LinearLayout>
 

+ 6 - 7
WeiChat/src/main/res/layout/row_nearly_message.xml

@@ -2,22 +2,21 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-
     android:descendantFocusability="blocksDescendants"
-    android:minHeight="64dp"
+    android:minHeight="@dimen/item_height"
     android:paddingLeft="15dp"
-    android:paddingRight="15dp" >
+    android:paddingRight="15dp">
     <!--android:background="@color/item_color1"-->
     <FrameLayout
         android:id="@+id/head_area"
         android:layout_width="57dp"
         android:layout_height="64dp"
-        android:layout_centerVertical="true" >
+        android:layout_centerVertical="true">
 
         <ImageView
             android:id="@+id/avatar_img"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
+            android:layout_width="@dimen/item_img_height"
+            android:layout_height="@dimen/item_img_width"
             android:layout_gravity="center_vertical"
             android:contentDescription="@string/app_name"
             android:src="@drawable/avatar_normal" />
@@ -41,7 +40,7 @@
         android:layout_centerVertical="true"
         android:layout_marginLeft="3dp"
         android:layout_toRightOf="@id/head_area"
-        android:gravity="center_vertical" >
+        android:gravity="center_vertical">
 
         <TextView
             android:id="@+id/nick_name_tv"

+ 11 - 7
WeiChat/src/main/res/layout/row_sort_friend.xml

@@ -2,25 +2,25 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/catagory_title"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@color/text_hine"
+        android:background="@color/item_line"
         android:gravity="center_vertical"
         android:paddingLeft="15dip"
-        android:textSize="10sp"
-        android:textColor="@color/white" />
+        android:textColor="@color/white"
+        android:textSize="10sp" />
 
     <RelativeLayout
         android:id="@+id/rela"
         android:layout_width="fill_parent"
-        android:layout_height="64dp"
+        android:layout_height="@dimen/item_height"
         android:minHeight="64dp"
         android:paddingLeft="15dp"
-        android:paddingRight="15dp" >
+        android:paddingRight="15dp">
 
         <ImageView
             android:id="@+id/avatar_img"
@@ -38,7 +38,7 @@
             android:layout_marginLeft="12dp"
             android:layout_toRightOf="@id/avatar_img"
             android:gravity="center_vertical"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <TextView
                 android:id="@+id/nick_name_tv"
@@ -61,4 +61,8 @@
         </LinearLayout>
     </RelativeLayout>
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/item_line" />
 </LinearLayout>

+ 3 - 3
WeiChat/src/main/res/values/colors.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--by gongpengming-->
-    <color name="item_color1">#a0a0a0</color>
+    <color name="item_color1">#30a0a0a0</color>
     <color name="item_color2">@color/white</color>
-    <!--<color name="message_item1">#6c7eb7</color>-->
-    <!--<color name="message_item2">#778fc6</color>-->
+    <color name="item_text">#cca0a0a0</color>
+    <color name="item_line">#a0a0a0</color>
     <color name="antionbarcolor">#646464</color>
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>

+ 6 - 3
WeiChat/src/main/res/values/dimens.xml

@@ -1,7 +1,10 @@
 <resources>
-    <dimen name="next_width">15.0dip</dimen>
-    <dimen name="next_height">25.0dip</dimen>
-
+    <dimen name="next_width">10.0dip</dimen>
+    <dimen name="next_height">20.0dip</dimen>
+    <dimen name="item_height">65.0dip</dimen>
+    <dimen name="bar_height">80.0dip</dimen>
+    <dimen name="item_img_height">45.0dip</dimen>
+    <dimen name="item_img_width">45.0dip</dimen>
     <dimen name="LargestTextSize">30.0dip</dimen>
     <dimen name="BigerTextSize">24.0dip</dimen>
     <dimen name="BigTextSize">17.0dip</dimen>

+ 4 - 3
WeiChat/src/main/res/values/styles.xml

@@ -141,10 +141,11 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
+
     <style name="IMTbleLine">
         <item name="android:background">@color/item_color1</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">@dimen/item_height</item>
         <item name="android:minHeight">55dp</item>
         <item name="android:paddingLeft">9dp</item>
         <item name="android:paddingRight">5dp</item>
@@ -153,7 +154,7 @@
     <style name="IMTbleLine_UP_Me">
         <item name="android:background">@color/item_color1</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">@dimen/item_height</item>
         <item name="android:minHeight">60dp</item>
         <item name="android:paddingLeft">9dp</item>
         <item name="android:paddingRight">5dp</item>
@@ -161,7 +162,7 @@
     <style name="IMTbleLine_UP">
         <item name="android:background">@color/item_color2</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_height">@dimen/item_height</item>
         <item name="android:minHeight">55dp</item>
         <item name="android:paddingLeft">9dp</item>
         <item name="android:paddingRight">5dp</item>