修改ui

WeiChat/src/main/AndroidManifest.xml

@@ -194,7 +194,8 @@
         </activity>
         <activity android:name=".video.VideoRecordActivity" >
         </activity>
-        <activity android:name=".ui.cardcast.CardcastActivity" >
+        <activity android:name=".ui.cardcast.CardcastActivity" android:theme="@style/Theme.AppCompat.Light.NoActionBar" >
+
         </activity>
         <activity
             android:name=".ui.me.BasicInfoEditActivity"

WeiChat/src/main/java/com/sk/weichat/adapter/PublicMessageAdapter.java

@@ -240,7 +240,6 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
         if (convertView == null || ((Integer) convertView.getTag(R.id.tag_key_list_item_type)) != viewType) {
             convertView = mInflater.inflate(R.layout.p_msg_item_main_body, null);
             View innerView = null;
-
             if (viewType == VIEW_TYPE_NORMAL_TEXT) {
                 viewHolder = new NormalTextHolder();
             } else if (viewType == VIEW_TYPE_FW_TEXT) {
@@ -308,7 +307,7 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
             viewHolder.operation_more_img = (ImageView) convertView.findViewById(R.id.operation_more_img);
             viewHolder.multi_praise_tv = (TextView) convertView.findViewById(R.id.multi_praise_tv);
             viewHolder.command_listView = (ListView) convertView.findViewById(R.id.command_listView);
-            viewHolder.viewLine=convertView.findViewById(R.id.line);
+            viewHolder.viewLine = convertView.findViewById(R.id.line);
             if (innerView != null) {
                 viewHolder.content_fl.addView(innerView);
             }
@@ -318,11 +317,11 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
             viewHolder = (ViewHolder) convertView.getTag(R.id.tag_key_list_item_view);
         }
 
-        if (position % 2 == 0) {
-            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
-        } else {
-            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
-        }
+//        if (position % 2 == 0) {
+//            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color1));
+//        } else {
+//            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.item_color2));
+//        }
 
 
         final ViewHolder finalHolder = viewHolder;// 和ViewHolder一样的，只不过用作匿名内部类里面调用需要final
@@ -420,16 +419,24 @@ public class PublicMessageAdapter extends BaseAdapter implements ListenerAudio,
                 builder.append("...");
             }
             viewHolder.multi_praise_tv.setText(builder);
+            if (viewHolder.multi_praise_tv.getLineCount() > 0) {
+                ViewGroup.LayoutParams p = viewHolder.multi_praise_tv.getLayoutParams();
+                p.height = viewHolder.multi_praise_tv.getHeight() * viewHolder.multi_praise_tv.getLineCount();
+                viewHolder.multi_praise_tv.setLayoutParams(p);
+
+            }
+            Log.i("gongpengming", viewHolder.multi_praise_tv.getLineCount() + "行数");
+//            if (viewHolder.multi_praise_tv.getLineCount()>1)
         } else {
             viewHolder.multi_praise_tv.setVisibility(View.GONE);
             viewHolder.multi_praise_tv.setText("");
         }
         viewHolder.multi_praise_tv.setLinksClickable(true);
         viewHolder.multi_praise_tv.setMovementMethod(LinkMovementClickMethod.getInstance());
-			/* 设置回复 */
+            /* 设置回复 */
         final List<Comment> comments = message.getComments();
         if ((praises != null && praises.size() > 0) || (comments != null && comments.size() > 0)) {
-            viewHolder.viewLine.setVisibility(View.VISIBLE);
+            viewHolder.viewLine.setVisibility(View.GONE);
         } else {
             viewHolder.viewLine.setVisibility(View.GONE);
         }

WeiChat/src/main/java/com/sk/weichat/ui/MainActivity.java

@@ -154,6 +154,12 @@ public class MainActivity extends BaseActivity implements NetWorkObserver, AuthS
             mImStatus = mCoreService.isAuthenticated() ? AuthStateListener.AUTH_STATE_SUCCESS : AuthStateListener.AUTH_STATE_NOT;
         }
     };
+
+
+
+    private void hineColor(){
+
+    }
     /**
      * @desc:主页菜单入口
      * @author：Administrator on 2016/1/26 10:03

WeiChat/src/main/java/com/sk/weichat/ui/cardcast/CardcastActivity.java

@@ -1,5 +1,6 @@
 package com.sk.weichat.ui.cardcast;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -9,9 +10,12 @@ import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBar.Tab;
+import android.view.View;
+import android.widget.RadioButton;
 
 import com.sk.weichat.R;
 import com.sk.weichat.bean.message.NewFriendMessage;
@@ -22,8 +26,6 @@ import com.sk.weichat.xmpp.CoreService.CoreServiceBinder;
 
 /**
  * 我的名片盒
- *
- *
  */
 @SuppressWarnings("deprecation")
 public class CardcastActivity extends BaseActivity {
@@ -34,38 +36,91 @@ public class CardcastActivity extends BaseActivity {
 
     private boolean mBind;
     private CoreService mXmppService;
+    private RadioButton btnG;
+    private RadioButton btnAG;
+    private FriendFragment friendFragment;
+    private AttentionFragment attentionFragment;
+    private RoomFragment roomFragment;
+    private FragmentTransaction bt;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         // setup action bar for tabs
-        ActionBar actionBar = getSupportActionBar();
-
-        actionBar.setTitle(R.string.my_friend);
-
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-
-        mFriend = new TabListener<FriendFragment>(this, "friend", FriendFragment.class);
-        mAttention = new TabListener<AttentionFragment>(this, "attention", AttentionFragment.class);
-        mRoom = new TabListener<RoomFragment>(this, "room", RoomFragment.class);
-        int index = 0;
-        if (savedInstanceState != null) {
-            mFriend.setFragment(getSupportFragmentManager().findFragmentByTag("friend"));
-            mAttention.setFragment(getSupportFragmentManager().findFragmentByTag("attention"));
-            mRoom.setFragment(getSupportFragmentManager().findFragmentByTag("room"));
-            index = savedInstanceState.getInt("index", 0);
-        }
-        Tab tab = actionBar.newTab().setText(R.string.focus_on_each_other).setTabListener(mFriend);
-        actionBar.addTab(tab);
-
-        tab = actionBar.newTab().setText(R.string.unilateral_attention).setTabListener(mAttention);
-        actionBar.addTab(tab);
-        tab = actionBar.newTab().setText(R.string.focus_room).setTabListener(mRoom);
-        actionBar.addTab(tab);
-        actionBar.setSelectedNavigationItem(index);
+        setContentView(R.layout.activity_cardast);
+//        ActionBar actionBar = getSupportActionBar();
+
+//        actionBar.setTitle(R.string.my_friend);
+//        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
+
+//        mFriend = new TabListener<FriendFragment>(this, "friend", FriendFragment.class);
+//        mAttention = new TabListener<AttentionFragment>(this, "attention", AttentionFragment.class);
+//        mRoom = new TabListener<RoomFragment>(this, "room", RoomFragment.class);
+//        int index = 0;
+//        if (savedInstanceState != null) {
+//            mFriend.setFragment(getSupportFragmentManager().findFragmentByTag("friend"));
+//            mAttention.setFragment(getSupportFragmentManager().findFragmentByTag("attention"));
+//            mRoom.setFragment(getSupportFragmentManager().findFragmentByTag("room"));
+//            index = savedInstanceState.getInt("index", 0);
+//        }
+        roomFragment = new RoomFragment();
+        friendFragment = new FriendFragment();
+        attentionFragment = new AttentionFragment();
+        btnG = (RadioButton) findViewById(R.id.btn_guanzu);
+        btnAG = (RadioButton) findViewById(R.id.btn_aguanzu);
+        FragmentManager fm = getSupportFragmentManager();
+        bt = fm.beginTransaction();
+        bt.add(R.id.fl, friendFragment);
+        bt.add(R.id.fl, attentionFragment);
+        bt.hide(roomFragment);
+        bt.commit();
+        findViewById(R.id.tv_back).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                CardcastActivity.this.finish();
+            }
+        });
+        btnG.setOnClickListener(new View.OnClickListener() {
+            @SuppressLint("NewApi")
+            @Override
+            public void onClick(View view) {
+                btnG.setClickable(false);
+                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu_pass));
+                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu));
+                btnAG.setClickable(true);
+                bt = getSupportFragmentManager().beginTransaction();
+                bt.show(friendFragment);
+                bt.hide(attentionFragment);
+                bt.commit();
 
-        registerReceiver(mUpdateReceiver, CardcastUiUpdateUtil.getUpdateActionFilter());
-        mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
+            }
+        });
+        btnAG.setOnClickListener(new View.OnClickListener() {
+            @SuppressLint("NewApi")
+            @Override
+            public void onClick(View view) {
+                btnAG.setClickable(false);
+                btnG.setClickable(true);
+                btnG.setBackground(getResources().getDrawable(R.drawable.aguanzu));
+                btnAG.setBackground(getResources().getDrawable(R.drawable.guanzu_pass));
+                bt = getSupportFragmentManager().beginTransaction();
+                bt.show(attentionFragment);
+                bt.hide(friendFragment);
+                bt.commit();
+            }
+        });
+
+//        Tab tab = actionBar.newTab().setText(R.string.focus_on_each_other).setTabListener(mFriend);
+//        actionBar.addTab(tab);
+//
+//        tab = actionBar.newTab().setText(R.string.unilateral_attention).setTabListener(mAttention);
+//        actionBar.addTab(tab);
+//        tab = actionBar.newTab().setText(R.string.focus_room).setTabListener(mRoom);
+//        actionBar.addTab(tab);
+//        actionBar.setSelectedNavigationItem(index);
+
+//        registerReceiver(mUpdateReceiver, CardcastUiUpdateUtil.getUpdateActionFilter());
+//        mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
     }
 
     @Override
@@ -95,8 +150,9 @@ public class CardcastActivity extends BaseActivity {
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        unregisterReceiver(mUpdateReceiver);
+
         if (mBind) {
+            unregisterReceiver(mUpdateReceiver);
             unbindService(mServiceConnection);
         }
     }

WeiChat/src/main/java/com/sk/weichat/ui/erp/activity/ErpMenActivity.java

@@ -34,13 +34,13 @@ public class ErpMenActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.fragment_tool_layout);
         ViewUtils.inject(this);
-        ct=this;
+        ct = this;
         initData();
     }
 
     private void initData() {
         getSupportActionBar().setTitle("工作");
-        menus=new ArrayList<String>();
+        menus = new ArrayList<String>();
 //        menus.add("销售订单");
 //        menus.add("报价单");
         menus.add("请假单");
@@ -48,7 +48,7 @@ public class ErpMenActivity extends BaseActivity {
         menus.add("加班申请");
         menus.add("特殊考勤");
         menus.add("查询与统计");
-        adapter=new DetailItemAdapter(this, menus);
+        adapter = new DetailItemAdapter(this, menus);
         lv_tool.setAdapter(adapter);
 
 //        lv_tool.setOnItemLongClickListener(new OnItemLongClickListener() {
@@ -86,30 +86,30 @@ public class ErpMenActivity extends BaseActivity {
 
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                DetailItemAdapter.ListItem item=(DetailItemAdapter.ListItem) view.getTag();
-                String tag=item.menu_name.getText().toString();
+                DetailItemAdapter.ListItem item = (DetailItemAdapter.ListItem) view.getTag();
+                String tag = item.menu_name.getText().toString();
                 int falg = 0;
 
 
-                if("销售订单".equals(tag)){
+                if ("销售订单".equals(tag)) {
                     falg = 0;
                 }
-                if("报价单".equals(tag)){
+                if ("报价单".equals(tag)) {
                     falg = 1;
                 }
-                if("请假单".equals(tag)){
+                if ("请假单".equals(tag)) {
                     falg = 2;
                 }
-                if("出差单".equals(tag)){
+                if ("出差单".equals(tag)) {
                     falg = 3;
                 }
-                if("加班申请".equals(tag)){
+                if ("加班申请".equals(tag)) {
                     falg = 4;
                 }
-                if("特殊考勤".equals(tag)){
+                if ("特殊考勤".equals(tag)) {
                     falg = 5;
                 }
-                if("查询与统计".equals(tag)){
+                if ("查询与统计".equals(tag)) {
                     falg = 6;
                 }
 
@@ -179,38 +179,35 @@ public class ErpMenActivity extends BaseActivity {
                 }
 
 
-
             }
         });
     }
 
 
-
-    public class DetailItemAdapter extends BaseAdapter {;
+    public class DetailItemAdapter extends BaseAdapter {
+        ;
         private Context ct;
-        private List<String> menus=new ArrayList<>();
+        private List<String> menus = new ArrayList<>();
         private LayoutInflater inflater;
 
-        public DetailItemAdapter(Context ct,List<String> menus) {;
-            this.ct=ct;
-            this.menus=menus;
+        public DetailItemAdapter(Context ct, List<String> menus) {
+            ;
+            this.ct = ct;
+            this.menus = menus;
             this.inflater = LayoutInflater.from(ct);
         }
 
 
-
         public List<String> getMenus() {
             return menus;
         }
 
 
-
         public void setMenus(List<String> menus) {
             this.menus = menus;
         }
 
 
-
         @Override
         public int getCount() {
             return menus.size();
@@ -228,18 +225,22 @@ public class ErpMenActivity extends BaseActivity {
 
         @Override
         public View getView(int position, View convertView, ViewGroup parent) {
-            ListItem item=null;
-            if (convertView==null) {
-                convertView =inflater.inflate(R.layout.item_weixin_listview, parent,false);
-                item=new ListItem();
-                item.menu_name=(TextView) convertView.findViewById(R.id.tv_menu_name);
+            ListItem item = null;
+            if (convertView == null) {
+                convertView = inflater.inflate(R.layout.item_weixin_listview, parent, false);
+                item = new ListItem();
+                item.menu_name = (TextView) convertView.findViewById(R.id.tv_menu_name);
 //                item.badge=new BadgeView(ct, item.menu_name);
                 convertView.setTag(item);
-            }else{
+            } else {
 
-                item=(ListItem) convertView.getTag();
+                item = (ListItem) convertView.getTag();
+            }
+            if (position % 2 == 0) {
+                convertView.setBackgroundColor(getResources().getColor(R.color.item_color1));
+            } else {
+                convertView.setBackgroundColor(getResources().getColor(R.color.item_color2));
             }
-
             item.menu_name.setText(menus.get(position));
 //            item.badge.setText(String.valueOf(position));
 //            item.badge.setBadgeBackgroundColor(Color
@@ -250,7 +251,7 @@ public class ErpMenActivity extends BaseActivity {
             return convertView;
         }
 
-        class ListItem{
+        class ListItem {
             TextView menu_name;
 //            BadgeView badge;
         }

WeiChat/src/main/java/com/sk/weichat/ui/erp/fragment/ChartListFragment.java

@@ -1,12 +1,22 @@
 package com.sk.weichat.ui.erp.fragment;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.support.v4.app.Fragment;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.BaseExpandableListAdapter;
+import android.widget.ExpandableListView;
+import android.widget.ExpandableListView.OnChildClickListener;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.lidroid.xutils.ViewUtils;
 import com.lidroid.xutils.view.annotation.ViewInject;
@@ -23,23 +33,13 @@ import com.sk.weichat.ui.erp.util.StringUtils;
 import com.sk.weichat.ui.erp.view.CustomProgressDialog;
 import com.sk.weichat.ui.erp.view.EmptyLayout;
 
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.support.v4.app.Fragment;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.View.OnClickListener;
-import android.widget.BaseExpandableListAdapter;
-import android.widget.ExpandableListView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.ExpandableListView.OnChildClickListener;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author :LiuJie 2015年11月11日 上午10:31:45
@@ -227,9 +227,14 @@ public class ChartListFragment extends Fragment implements OnClickListener {
 
 		@Override
 		public View getGroupView(int groupPosition, boolean isExpanded, View convertView, ViewGroup parent) {
-			convertView = (RelativeLayout) RelativeLayout.inflate(ct, R.layout.act_menu_group, null);
+			convertView =   RelativeLayout.inflate(ct, R.layout.act_menu_group, null);
 			TextView grouptitle = (TextView) convertView.findViewById(R.id.tv_group_title);
 			grouptitle.setText(list.get(groupPosition).getTitle());
+			if (groupPosition%2==0){
+				convertView.setBackgroundColor(ct.getResources().getColor(R.color.item_color1));
+			}else{
+				convertView.setBackgroundColor(ct.getResources().getColor(R.color.item_color2));
+			}
 			return convertView;
 		}
 

WeiChat/src/main/java/com/sk/weichat/ui/me/BasicInfoEditActivity.java

@@ -15,6 +15,7 @@ import android.widget.Button;
 import android.widget.DatePicker;
 import android.widget.EditText;
 import android.widget.ImageView;
+import android.widget.RadioButton;
 import android.widget.TextView;
 
 import com.alibaba.fastjson.JSON;
@@ -61,10 +62,10 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     // widget
     private ImageView mAvatarImg;
     private EditText mNameEdit;
-    private TextView mSexTv;
     private TextView mBirthdayTv;
     private TextView mCityTv;
     private Button mNextStepBtn;
+    private RadioButton rbBoy,rbGrid;
     // Temp
     private User mTempData;
     // 选择头像的数据
@@ -90,7 +91,11 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
         getSupportActionBar().setTitle(R.string.basic_info);
         mAvatarImg = (ImageView) findViewById(R.id.avatar_img);
         mNameEdit = (EditText) findViewById(R.id.name_edit);
-        mSexTv = (TextView) findViewById(R.id.sex_tv);
+        rbBoy= (RadioButton) findViewById(R.id.rb_boy);
+        rbGrid= (RadioButton) findViewById(R.id.rb_grid);
+
+
+
         mBirthdayTv = (TextView) findViewById(R.id.birthday_tv);
         mCityTv = (TextView) findViewById(R.id.city_tv);
         mNextStepBtn = (Button) findViewById(R.id.next_step_btn);
@@ -112,9 +117,12 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
             e.printStackTrace();
         }
         if (mTempData.getSex() == 1) {
-            mSexTv.setText(R.string.sex_man);
+            rbBoy.setChecked(true);
+
+
         } else {
-            mSexTv.setText(R.string.sex_woman);
+
+            rbGrid.setChecked(true);
         }
         mBirthdayTv.setText(TimeUtils.sk_time_s_long_2_str(mTempData.getBirthday()));
         mNameEdit.setText(mTempData.getNickName());
@@ -129,7 +137,7 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
                 showSelectAvatarDialog();
                 break;
             case R.id.sex_select_rl:
-                showSelectSexDialog();
+//                showSelectSexDialog();
                 break;
             case R.id.birthday_select_rl:
                 showSelectBirthdayDialog();
@@ -244,10 +252,10 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == 0) {
                             mTempData.setSex(1);
-                            mSexTv.setText(R.string.sex_man);
+//                            mSexTv.setText(R.string.sex_man);
                         } else {
                             mTempData.setSex(0);
-                            mSexTv.setText(R.string.sex_woman);
+//                            mSexTv.setText(R.string.sex_woman);
                         }
                         dialog.dismiss();
                     }
@@ -277,6 +285,15 @@ public class BasicInfoEditActivity extends BaseActivity implements View.OnClickL
     }
 
     private void next() {
+
+        if (rbBoy.isChecked()){
+            mTempData.setSex(1);
+            Log.i("gongpengming","选择男的");
+        }else{
+            mTempData.setSex(0);
+            Log.i("gongpengming","选择女的");
+        }
+
         if (!MyApplication.getInstance().isNetworkActive()) {
             ToastUtil.showToast(this, R.string.net_exception);
             return;

WeiChat/src/main/java/com/sk/weichat/view/OperationMorePopWindow.java

@@ -89,6 +89,7 @@ public class OperationMorePopWindow {
 		}else{
 			mPraiseTv.setText(R.string.cancel_praise);
 		}
+
 		mPopupWindow.showAsDropDown(anchowView, -mOperationMorePopWidth - 10, -(mOperationMorePopHeight + anchowView.getHeight()) / 2);
 	}
 

WeiChat/src/main/res/color/main_tab_btn_text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:color="@color/text_main" android:state_checked="true" />
+    <item android:color="@color/bar_pass" android:state_checked="true" />
     <item android:color="@color/text_hine" />
 
 </selector>

WeiChat/src/main/res/drawable/bg_aguanzu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/aguanzu_pass" android:state_pressed="true" />
+    <item android:drawable="@drawable/aguanzu_pass" android:state_checkable="false" />
+    <item android:drawable="@drawable/aguanzu_pass" android:state_checked="true" />
+    <item android:drawable="@drawable/aguanzu" android:state_checked="false" />
+    <item android:drawable="@drawable/aguanzu" android:state_checkable="true" />
+    <item android:drawable="@drawable/aguanzu"   />
+</selector>

WeiChat/src/main/res/drawable/bg_bay.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/boy_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/boy"/>
+</selector>

WeiChat/src/main/res/drawable/bg_grid.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/grid_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@drawable/grid"/>
+</selector>

WeiChat/src/main/res/drawable/bg_guanzu.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/guanzu_pass" android:state_pressed="true" />
+    <item android:drawable="@drawable/guanzu_pass" android:state_selected="true"/>
+    <item android:drawable="@drawable/guanzu" android:state_selected="false"/>
+    <item android:drawable="@drawable/guanzu" />
+</selector>

WeiChat/src/main/res/drawable/tab_textcolor.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/bar_pass" android:state_checked="true" android:state_enabled="true"/>
+    <item android:drawable="@color/text_hine"/>
+</selector>

WeiChat/src/main/res/layout/act_home_statis_menu.xml

@@ -3,16 +3,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="@color/yellow_home" />
+
     <ExpandableListView
         android:id="@+id/m_list"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:background="#ffffff"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/bg_main"
         android:cacheColorHint="#00000000"
-        android:listSelector="#00000000" >
-    </ExpandableListView>
+        android:listSelector="#00000000" />
 </LinearLayout>

WeiChat/src/main/res/layout/act_menu_group.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="110dp"
-    android:background="@drawable/ry_setting_selector"
-    android:orientation="vertical" >
+    android:layout_height="@dimen/item_height"
+     >
     <TextView
         android:id="@+id/tv_group_title"
-        style="@style/text_black_18"
+        android:textColor="@color/text_main"
+        android:textSize="@dimen/text_main"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="@dimen/item_height"
         android:layout_centerVertical="true"
-        android:layout_marginBottom="20dp"
+        android:gravity="center_vertical"
         android:layout_marginLeft="30dp"
-        android:layout_marginTop="20dp"
         android:text="组名" />
 </RelativeLayout>

WeiChat/src/main/res/layout/activity_basic_info.xml

@@ -22,7 +22,7 @@
                     android:layout_width="160dp"
                     android:layout_height="160dp"
                     android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="10dp"
                     android:background="@drawable/account_avatar_bg"
                     android:contentDescription="@string/app_name"
                     android:paddingBottom="5.0dip"
@@ -33,7 +33,7 @@
 
                 <RelativeLayout
                     style="@style/IMTbleLine"
-                    android:layout_marginTop="20dp">
+                    android:layout_marginTop="10dp">
 
                     <TextView
                         android:id="@+id/name_text"
@@ -54,13 +54,10 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-<View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/sex_rl"
-                    style="@style/IMTbleLine">
+                    style="@style/IMTbleLine_UP">
 
                     <TextView
                         android:id="@+id/sex_text"
@@ -81,10 +78,7 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/birthday_rl"
                     style="@style/IMTbleLine">
@@ -108,13 +102,10 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/city_rl"
-                    style="@style/IMTbleLine">
+                    style="@style/IMTbleLine_UP">
 
                     <TextView
                         android:id="@+id/city_text"
@@ -135,10 +126,7 @@
                         android:contentDescription="@string/app_name"
                         android:visibility="invisible" />
                 </RelativeLayout>
-                <View
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:background="@color/item_line"/>
+
                 <RelativeLayout
                     android:id="@+id/tel_rl"
                     style="@style/IMTbleLine">
@@ -191,6 +179,7 @@
 
         <com.sk.weichat.view.DataLoadView
             android:id="@+id/data_load_view"
+            android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
     </RelativeLayout>

WeiChat/src/main/res/layout/activity_basic_info_edit.xml

@@ -2,23 +2,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_main"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="match_parent">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/avatar_img"
                 android:layout_width="90.0dip"
                 android:layout_height="90.0dip"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="10dp"
                 android:background="@drawable/account_avatar_bg"
                 android:contentDescription="@string/app_name"
                 android:paddingBottom="5.0dip"
@@ -29,7 +29,7 @@
 
             <RelativeLayout
                 style="@style/IMTbleLine"
-                android:layout_marginTop="20dp" >
+                android:layout_marginTop="10dp">
 
                 <TextView
                     android:id="@+id/name_text"
@@ -53,13 +53,11 @@
                     android:contentDescription="@string/app_name"
                     android:visibility="invisible" />
             </RelativeLayout>
-<View
-    android:layout_width="match_parent"
-    android:layout_height="1dp"
-    android:background="@color/item_line"/>
+
+
             <RelativeLayout
                 android:id="@+id/sex_select_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine_UP">
 
                 <TextView
                     android:id="@+id/sex_text"
@@ -68,24 +66,47 @@
                     android:drawablePadding="5dp"
                     android:text="@string/sex_align" />
 
-                <TextView
-                    android:id="@+id/sex_tv"
-                    style="@style/IMTbleLine_TextValue"
-                    android:layout_toLeftOf="@+id/sex_arrow_img"
-                    android:layout_toRightOf="@+id/sex_text" />
+                <RadioGroup
+                    android:layout_width="150dp"
+                    android:layout_height="30dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:layout_marginRight="10dp"
+                    android:orientation="horizontal">
+
+                    <RadioButton
+                        android:id="@+id/rb_grid"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:button="@null"
+                        android:checked="true"
+                        android:drawableRight="@drawable/bg_grid" />
+
+                    <RadioButton
+                        android:id="@+id/rb_boy"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent"
+                        android:layout_weight="1"
+                        android:drawableLeft="@drawable/bg_bay"
+                        android:button="@null" />
+
+                </RadioGroup>
+
+
+                <!--<TextView-->
+                <!--android:id="@+id/sex_tv"-->
+                <!--style="@style/IMTbleLine_TextValue"-->
+                <!--android:layout_toLeftOf="@+id/sex_arrow_img"-->
+                <!--android:layout_toRightOf="@+id/sex_text" />-->
+
 
-                <ImageView
-                    android:id="@+id/sex_arrow_img"
-                    style="@style/IMTbleLine_ArrowImg"
-                    android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/item_line"/>
+
+
             <RelativeLayout
                 android:id="@+id/birthday_select_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine">
 
                 <TextView
                     android:id="@+id/birthday_text"
@@ -97,21 +118,22 @@
                 <TextView
                     android:id="@+id/birthday_tv"
                     style="@style/IMTbleLine_TextValue"
+                    android:layout_marginRight="5dp"
                     android:layout_toLeftOf="@+id/birthday_arrow_img"
-                    android:layout_toRightOf="@+id/birthday_text" />
+                    android:layout_toRightOf="@+id/birthday_text"
+                    android:background="@null"
+                     />
 
                 <ImageView
-                    android:id="@+id/birthday_arrow_img"
-                    style="@style/IMTbleLine_ArrowImg"
-                    android:contentDescription="@string/app_name" />
+                android:id="@+id/birthday_arrow_img"
+                style="@style/IMTbleLine_ArrowImg"
+                android:contentDescription="@string/app_name" />
             </RelativeLayout>
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:background="@color/item_line"/>
+
+
             <RelativeLayout
                 android:id="@+id/city_select_rl"
-                style="@style/IMTbleLine" >
+                style="@style/IMTbleLine_UP">
 
                 <TextView
                     android:id="@+id/city_text"
@@ -134,18 +156,17 @@
 
             <Button
                 android:id="@+id/next_step_btn"
-              android:background="@drawable/bg_btn"
                 android:layout_width="fill_parent"
                 android:layout_height="50dp"
                 android:layout_marginBottom="9dp"
                 android:layout_marginLeft="40dp"
                 android:layout_marginRight="40dp"
                 android:layout_marginTop="9dp"
+                android:background="@drawable/bg_btn"
                 android:gravity="center"
-                android:textSize="@dimen/text_main"
-                android:text="确    定"
+                android:text="更    新"
                 android:textColor="@color/white"
-                />
+                android:textSize="@dimen/text_main" />
         </LinearLayout>
     </ScrollView>
 

WeiChat/src/main/res/layout/activity_cardast.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="@color/antionbarcolor">
+
+        <TextView
+            android:id="@+id/tv_back"
+            android:clickable="true"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="15dp"
+            android:drawableLeft="@drawable/btn_back"
+            android:gravity="center_vertical"
+            android:text="我的关注"
+            android:textColor="@color/white" />
+
+        <RadioGroup
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:orientation="horizontal">
+
+            <RadioButton
+                android:id="@+id/btn_guanzu"
+                android:layout_width="70dp"
+                android:layout_height="35dp"
+                android:background="@drawable/aguanzu_pass"
+                android:button="@null"
+                android:clickable="false" />
+
+            <RadioButton
+                android:id="@+id/btn_aguanzu"
+                android:layout_width="70dp"
+                android:layout_height="35dp"
+                android:layout_toRightOf="@+id/btn_guanzu"
+                android:background="@drawable/guanzu"
+                android:button="@null"
+                android:clickable="true" />
+        </RadioGroup>
+    </RelativeLayout>
+
+    <FrameLayout
+        android:id="@+id/fl"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/top" />
+</RelativeLayout>

WeiChat/src/main/res/layout/activity_login.xml

@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/bg_main"
+    android:background="@drawable/login_bg"
     android:orientation="vertical">
 
     <ImageView
@@ -16,31 +16,34 @@
         android:layout_marginLeft="9dp"
         android:layout_marginRight="9dp"
         android:layout_marginTop="9dp"
-        android:background="@color/item_color2"
+        android:background="@color/wirtehine"
         android:drawableLeft="@drawable/login_user_name"
         android:hint="@string/please_input_phone_number"
         android:inputType="phone" />
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp" />
+
     <com.sk.weichat.view.ClearEditText
         android:id="@+id/password_edit"
         style="@style/IMLineEditPass"
         android:layout_marginLeft="9dp"
         android:layout_marginRight="9dp"
-        android:background="@color/item_color2"
+        android:background="@color/wirtehine"
         android:drawableLeft="@drawable/loginpw"
         android:hint="@string/please_input_password" />
 
     <Button
         android:id="@+id/login_btn"
-        android:layout_height="50dp"
-    android:background="@drawable/bg_btn"
         android:layout_width="match_parent"
+        android:layout_height="50dp"
         android:layout_marginLeft="40dp"
         android:layout_marginRight="40dp"
         android:layout_marginTop="10dp"
-        android:textColor="@color/white"
+        android:background="@drawable/bg_btn"
         android:text="登  录"
-      />
+        android:textColor="@color/white" />
 
     <RelativeLayout
         android:layout_width="match_parent"

WeiChat/src/main/res/layout/activity_setting.xml

@@ -143,8 +143,10 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
+                android:layout_marginTop="@dimen/line_big"
                 android:background="@color/item_line"/>
             <RelativeLayout
+
                 android:id="@+id/about_us_rl"
                 style="@style/IMTbleLine">
 

WeiChat/src/main/res/layout/layout_main_tab_radio_group.xml

@@ -19,8 +19,10 @@
             style="@style/IMTabButton"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:checked="true"
             android:drawableTop="@drawable/tab_job_bg"
             android:text="@string/message" />
+        <!--<item name="android:textColor">@drawable/tab_textcolor</item>-->
 
         <TextView
             android:id="@+id/main_tab_one_tv"
@@ -39,7 +41,7 @@
         android:layout_width="0dip"
         android:layout_height="match_parent"
         android:layout_weight="1"
-        android:background="@null" >
+         >
 
         <RadioButton
             android:id="@+id/main_tab_two"

WeiChat/src/main/res/layout/p_msg_item_main_body.xml

@@ -53,7 +53,7 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="15dp"
             android:gravity="center_vertical"
             android:orientation="horizontal" >
 
@@ -100,17 +100,18 @@
         <TextView
             android:id="@+id/multi_praise_tv"
             android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:background="@drawable/user_nick_name_bg"
-            android:drawableLeft="@drawable/icon_nice_press"
+            android:layout_height="18dp"
+            android:layout_marginTop="8dp"
+            android:background="@drawable/praise_bg"
+            android:drawableLeft="@drawable/likes"
             android:textSize="@dimen/text_min" />
 
         <com.sk.weichat.view.MyListView
             android:id="@+id/command_listView"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp" />
+            android:background="@color/pop_bg"
+            android:layout_marginTop="5dp" />
     </LinearLayout>
 
 </LinearLayout>

WeiChat/src/main/res/layout/p_msg_operation_more_pop_view.xml

@@ -1,7 +1,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/bar_color"
+    android:background="@color/pop_bg"
     android:gravity="center"
     android:orientation="horizontal"
     android:padding="1dp">

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

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--by gongpengming-->
+    <!--by gongpengming-->pop_bg
     <color name="item_color1">#30a0a0a0</color>
+    <color name="pop_bg">#aeaeae</color>
     <color name="item_color2">@color/white</color>
     <color name="item_text">#cca0a0a0</color>
     <color name="item_line">#BCBBC0</color>
@@ -10,6 +11,7 @@
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>
     <color name="text_hine">#575757</color>
+    <color name="bar_pass">#7bb4dc</color>
     <color name="bar_color">#e6e6e6</color>
     <color name="bg_main">@color/white</color>
     <color name="refresh">@color/black</color>

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

@@ -3,9 +3,9 @@
     <dimen name="line_big">7.0dip</dimen>
     <dimen name="line_min">2.0dip</dimen>
     <dimen name="next_height">20.0dip</dimen>
-    <dimen name="text_main">17.0dip</dimen>
-    <dimen name="text_hine">14.0dip</dimen>
-    <dimen name="text_min">12.0dip</dimen>
+    <dimen name="text_main">17.0sp</dimen>
+    <dimen name="text_hine">14.0sp</dimen>
+    <dimen name="text_min">12.0sp</dimen>
     <dimen name="item_height">60.0dip</dimen>
     <dimen name="item_me_height">80.0dip</dimen>
     <dimen name="bar_height">80.0dip</dimen>