更改ui 我的任务里面添加任务的时钟改为向下兼容，并将日历和时钟整合

WeiChat/src/main/java/com/sk/weichat/ui/calendar/views/DatePicker.java

@@ -27,18 +27,21 @@ import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 public class DatePicker extends LinearLayout {
     private DPTManager mTManager;// 主题管理器
     private DPLManager mLManager;// 语言管理器
-
+    private boolean isMonth = false, isTime = false;
     private MonthView monthView;// 月视图
     private TextView tvYear, tvMonth;// 年份 月份显示
     private TextView tvEnsure;// 确定按钮显示
 
 
     private OnDateSelectedListener onDateSelectedListener;// 日期多选后监听
+    private TimeView timeView;
+    private String time;
 
     /**
      * 日期单选监听器
      */
     public interface OnDatePickedListener {
+        //        if(timeView!=null)
         void onDatePicked(String date);
     }
 
@@ -136,7 +139,7 @@ public class DatePicker extends LinearLayout {
         addView(llWeek, llParams);
 
         // ------------------------------------------------------------------------------------月视图
-        monthView = new MonthView(context);
+        monthView = new MonthView(context,this);
         monthView.setOnDateChangeListener(new MonthView.OnDateChangeListener() {
             @Override
             public void onMonthChange(int month) {
@@ -153,6 +156,22 @@ public class DatePicker extends LinearLayout {
             }
         });
         addView(monthView, llParams);
+
+        TextView tv = new TextView(context);
+        tv.setHeight(100);
+        timeView = new TimeView(context, this);
+        addView(timeView, llParams);
+    }
+
+    /**
+     * 设置时间
+     */
+    public void setTimes(String time) {
+        isTime = true;
+        this.time = time;
+//        if (isMonth) {
+//                monthView.setOnDatePickedListener();
+//        }
     }
 
     /**
@@ -197,7 +216,25 @@ public class DatePicker extends LinearLayout {
             throw new RuntimeException(
                     "Current DPMode does not SINGLE! Please call setMode set DPMode to SINGLE!");
         }
+
         monthView.setOnDatePickedListener(onDatePickedListener);
+
+    }
+
+    public void setOnTimeListener(OnDatePickedListener onDatePickedListener) {
+        if (monthView.getDPMode() != DPMode.SINGLE) {
+            throw new RuntimeException(
+                    "Current DPMode does not SINGLE! Please call setMode set DPMode to SINGLE!");
+        }
+        timeView.setOnDatePickedListener(onDatePickedListener);
+    }
+
+    public void setTime(boolean is,String tim) {
+        monthView.setTime(is,tim);
+    }
+
+    public void setMonth(boolean is,String date) {
+        timeView.setMonth(is,date);
     }
 
     /**

WeiChat/src/main/java/com/sk/weichat/ui/calendar/views/MonthView.java

@@ -37,13 +37,13 @@ import java.util.Map;
 /**
  * MonthView
  *
- * @author AigeStudio 2015-06-29
+ * @author gongpengming 2015-06-29
  */
 public class MonthView extends View {
     private final Region[][] MONTH_REGIONS_4 = new Region[4][7];
     private final Region[][] MONTH_REGIONS_5 = new Region[5][7];
     private final Region[][] MONTH_REGIONS_6 = new Region[6][7];
-
+    private boolean isTime = false;
     private final DPInfo[][] INFO_4 = new DPInfo[4][7];
     private final DPInfo[][] INFO_5 = new DPInfo[5][7];
     private final DPInfo[][] INFO_6 = new DPInfo[6][7];
@@ -89,9 +89,12 @@ public class MonthView extends View {
     private Map<String, BGCircle> cirDpr = new HashMap<>();
 
     private List<String> dateSelected = new ArrayList<>();
+    private DatePicker datePicker;
+    private String tim;
 
-    public MonthView(Context context) {
+    public MonthView(Context context, DatePicker datePicker) {
         super(context);
+        this.datePicker = datePicker;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             scaleAnimationListener = new ScaleAnimationListener();
         }
@@ -99,6 +102,15 @@ public class MonthView extends View {
         mPaint.setTextAlign(Paint.Align.CENTER);
     }
 
+    public boolean isTime() {
+        return isTime;
+    }
+
+    public void setTime(boolean time, String tim) {
+        isTime = time;
+        this.tim = tim;
+    }
+
     @Override
     protected Parcelable onSaveInstanceState() {
         return super.onSaveInstanceState();
@@ -564,6 +576,8 @@ public class MonthView extends View {
                         regions.add(region);
                         final String date = centerYear + "-" + centerMonth + "-" +
                                 mCManager.obtainDPInfo(centerYear, centerMonth)[i][j].strG;
+                        final String data= centerYear + "年" + centerMonth + "月" +
+                                mCManager.obtainDPInfo(centerYear, centerMonth)[i][j].strG+"日";
                         BGCircle circle = createCircle(
                                 region.getBounds().centerX() + indexMonth * width,
                                 region.getBounds().centerY() + indexYear * height);
@@ -598,7 +612,9 @@ public class MonthView extends View {
                                 @Override
                                 public void onAnimationEnd(Animator animation) {
                                     if (null != onDatePickedListener) {
-                                        onDatePickedListener.onDatePicked(date);
+                                        datePicker.setMonth(true, data);
+                                        if (isTime)
+                                            onDatePickedListener.onDatePicked(data + "  " + tim);
                                     }
                                 }
                             });
@@ -608,11 +624,12 @@ public class MonthView extends View {
                         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
                             invalidate();
                             if (null != onDatePickedListener) {
-                                onDatePickedListener.onDatePicked(date);
+                                datePicker.setMonth(true, data);
+                                if (isTime)
+                                    onDatePickedListener.onDatePicked(data + "  " + tim);
                             }
                         }
-                    }
-                    else if (mDPMode == DPMode.MULTIPLE) {
+                    } else if (mDPMode == DPMode.MULTIPLE) {
                         if (regions.contains(region)) {
                             regions.remove(region);
                         } else {

WeiChat/src/main/java/com/sk/weichat/ui/calendar/views/TimeView.java

@@ -0,0 +1,120 @@
+package com.sk.weichat.ui.calendar.views;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.BaseAdapter;
+import android.widget.GridView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.sk.weichat.R;
+
+/**
+ * Created by 123 on 2016/4/11.
+ */
+public class TimeView extends LinearLayout implements View.OnClickListener {
+    private boolean isMonth = false;
+    private String month;
+    private int time = 0;
+    private Context mContext;
+    private GridView gv;
+    private TextView tvTime;
+    private DatePicker datePicker;
+    private DatePicker.OnDatePickedListener onDatePickedListener;
+
+    public TimeView(Context context, DatePicker datePicker) {
+        super(context);
+        this.datePicker = datePicker;
+        init(context);
+    }
+
+    public boolean isMonth() {
+        return isMonth;
+    }
+
+    public void setMonth(boolean month,String date) {
+        isMonth = month;
+        this.month=date;
+    }
+
+    public void setOnDatePickedListener(DatePicker.OnDatePickedListener onDatePickedListener) {
+        this.onDatePickedListener = onDatePickedListener;
+    }
+
+    private void init(Context context) {
+        mContext = context;
+        LayoutInflater.from(mContext).inflate(R.layout.item_date_time, this);
+        gv = (GridView) findViewById(R.id.gv_time);
+        gv.setAdapter(new mAdapter());
+        tvTime = (TextView) findViewById(R.id.tv_time);
+        findViewById(R.id.img_remove).setOnClickListener(this);
+        findViewById(R.id.img_add).setOnClickListener(this);
+        gv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
+                time = i + 1;
+                tvTime.setText("" + time);
+                datePicker.setTime(true,time+"时");
+//                setTime(time);
+                if (isMonth){
+                    onDatePickedListener.onDatePicked(month+" " + time+"时");
+                }
+
+            }
+        });
+    }
+
+
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.img_add:
+                if (time < 24)
+                    time++;
+                else
+                    time = 24;
+                tvTime.setText("" + time);
+                break;
+            case R.id.img_remove:
+                if (time > 0) {
+                    time--;
+
+                } else {
+                    time = 0;
+                }
+                tvTime.setText("" + time);
+                break;
+        }
+    }
+
+    class mAdapter extends BaseAdapter {
+
+        @Override
+        public int getCount() {
+            return 24;
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return i;
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return i;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup viewGroup) {
+            TextView text = new TextView(mContext);
+            text.setGravity(Gravity.CENTER);
+            text.setHeight(100);
+            text.setText("" + (i + 1));
+            return text;
+        }
+    }
+}

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

@@ -4,7 +4,6 @@
 package com.sk.weichat.ui.erp.activity;
 
 import android.app.AlertDialog;
-import android.app.DatePickerDialog;
 import android.app.TimePickerDialog;
 import android.content.Context;
 import android.content.Intent;
@@ -15,11 +14,14 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
+import android.text.format.Time;
 import android.util.Log;
+import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnTouchListener;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -42,6 +44,7 @@ import com.lidroid.xutils.http.client.HttpRequest.HttpMethod;
 import com.lidroid.xutils.view.annotation.ViewInject;
 import com.sk.weichat.R;
 import com.sk.weichat.ui.base.BaseActivity;
+import com.sk.weichat.ui.calendar.cons.DPMode;
 import com.sk.weichat.ui.calendar.views.DatePicker;
 import com.sk.weichat.ui.erp.net.ViewUtil;
 import com.sk.weichat.ui.erp.util.CommonUtil;
@@ -57,7 +60,6 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -213,23 +215,19 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
                     break;
             }
         }
-
-        ;
     };
-    private DatePickerDialog dialogCalendar;
-    private AlertDialog dialog1;
-    private DatePicker picker;
     private int year;
     private int month;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Time time = new Time("GMT+8");
+        time.setToNow();
+        year = time.year;
+        month = time.month + 1;
         initView();
         initData();
-        Date date = new Date();
-        year = date.getYear();
-        month = date.getMonth();
     }
 
     /* (non-Javadoc)
@@ -249,7 +247,7 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 if (event.getAction() == event.ACTION_DOWN)
-                    showDialog(v);
+                    showDateDialog();
                 return false;
             }
         });
@@ -261,6 +259,51 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
         iv_delete_voice.setOnClickListener(this);
     }
 
+    private void showDateDialog() {
+        final AlertDialog dialog = new AlertDialog.Builder(this).create();
+        dialog.show();
+        DatePicker picker = new DatePicker(this);
+        picker.setDate(year, month);
+        picker.setMode(DPMode.SINGLE);
+
+        picker.setOnDatePickedListener(new DatePicker.OnDatePickedListener() {
+            @Override
+            public void onDatePicked(String date) {
+                Log.i("gongpengming","点击日期"+date);
+                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
+                et_task_startime.setText(date);
+                dialog.dismiss();
+            }
+        });
+        picker.setOnTimeListener(new DatePicker.OnDatePickedListener() {
+            @Override
+            public void onDatePicked(String date) {
+                Log.i("gongpengming","点击时间"+date);
+                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
+                et_task_startime.setText(date);
+                dialog.dismiss();
+            }
+        });
+        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        dialog.getWindow().setContentView(picker, params);
+        dialog.getWindow().setGravity(Gravity.CENTER);
+    }
+
+    //by gongpm 时间选择
+    private void showSelectTimeDialog(final String date) {
+        Calendar calendar = new GregorianCalendar();
+        final TimePickerDialog dialogTime = new TimePickerDialog(mContext, new TimePickerDialog.OnTimeSetListener() {
+            @Override
+            public void onTimeSet(TimePicker timePicker, int i, int i1) {
+                et_task_startime.setText(date + "  " + timePicker.getCurrentHour() + ":" + timePicker.getCurrentMinute());
+
+            }
+        }, calendar.get(Calendar.HOUR_OF_DAY),
+                calendar.get(Calendar.MINUTE), true);
+        dialogTime.show();
+    }
+
     /* (non-Javadoc)
      * @see com.erp.base.BaseAcivity#initData()
      */
@@ -314,9 +357,9 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
                     ViewUtil.ShowMessageTitle(ct, "请输入完整的信息！");
                 }
                 break;
-            case R.id.et_task_startime:
-                showDialog(v);
-                break;
+//            case R.id.et_task_startime:
+//                showDialog(v);
+//                break;
             case R.id.voice_display_voice_play:
                 // 播放录音
                 if (!mPlayState) {
@@ -733,83 +776,58 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
 
 //    private year
 
-    /**
-     * @author Administrator
-     * @功能:展示自定义对话框
-     * @update by gongpm 修改为日历形式
-     */
-    public void showDialog(final View view) {
-//        showSelectCalendarDialog(view);
-//        final AlertDialog dialog = new AlertDialog.Builder(AddTaskActivity.this).create();
-//        dialog.show();
-//        DatePicker picker = new DatePicker(AddTaskActivity.this);
-//        picker.setDate(year, month);
-//        picker.setMode(DPMode.SINGLE);
-//        picker.setOnDatePickedListener(new DatePicker.OnDatePickedListener() {
-//            @Override
-//            public void onDatePicked(String date) {
-//                showSelectTimeDialog(date);
-//                dialog.dismiss();
-//            }
-//        });
-//        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
-//                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
-//        dialog.getWindow().setContentView(picker, params);
-//        dialog.getWindow().setGravity(Gravity.CENTER);
-
-
-        //自带
-        Calendar calendar = new GregorianCalendar();
-        if (dialogCalendar == null) {
-            dialogCalendar = new DatePickerDialog(mContext, new DatePickerDialog.OnDateSetListener() {
-                @Override
-                public void onDateSet(android.widget.DatePicker datePicker, int year, int monthOfYear, int DayOfMonth) {
-                    showSelectTimeDialog(year + "-" + (monthOfYear + 1) + "-" + DayOfMonth);
-                }
-            }, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
-        }
-        dialogCalendar.show();
-        //最原始
-//	        if (dialog == null) {
-//	            dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
-//	        }
-//	        dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
-//	                public void OnDateTimeSet(AlertDialog dia, long date) {
-//	                	EditText vEditText= (EditText)view;
-//	                	vEditText.setText(CommonUtil.getStringDate(date));
-//	                    /** @注释：保证 初始化当前时间 */
-//	                    dialog = null;
-//	                }
-//	            });
-//	        if (!dialog.isShowing()) {
-//	            dialog.show();
-//	        }
-    }
-
-    private void dismissDialog(AlertDialog dialog) {
-        if (dialog.isShowing()) {
-            Log.i("gongpengming", "进来销毁");
-            dialog.dismiss();
-            dismissDialog(dialog);
-        }
-    }
-
-    //by gongpm 时间选择
-    private void showSelectTimeDialog(final String date) {
-        Calendar calendar = new GregorianCalendar();
-        final TimePickerDialog dialogTime = new TimePickerDialog(mContext, new TimePickerDialog.OnTimeSetListener() {
-            @Override
-            public void onTimeSet(TimePicker timePicker, int i, int i1) {
-                et_task_startime.setText(date + "  " + timePicker.getCurrentHour() + ":" + timePicker.getCurrentMinute());
-                if (dialogCalendar != null) {
-                    dismissDialog(dialogCalendar);
-//                    dialogCalendar.dismiss();
-                }
-            }
-        }, calendar.get(Calendar.HOUR_OF_DAY),
-                calendar.get(Calendar.MINUTE), true);
-        dialogTime.show();
-    }
+//    /**
+//     * @author Administrator
+//     * @功能:展示自定义对话框
+//     * @update by gongpm 修改为日历形式
+//     */
+//    public void showDialog(final View view) {
+////        showSelectCalendarDialog(view);
+////        final AlertDialog dialog = new AlertDialog.Builder(AddTaskActivity.this).create();
+////        dialog.show();
+////        DatePicker picker = new DatePicker(AddTaskActivity.this);
+////        picker.setDate(year, month);
+////        picker.setMode(DPMode.SINGLE);
+////        picker.setOnDatePickedListener(new DatePicker.OnDatePickedListener() {
+////            @Override
+////            public void onDatePicked(String date) {
+////                showSelectTimeDialog(date);
+////                dialog.dismiss();
+////            }
+////        });
+////        ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
+////                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+////        dialog.getWindow().setContentView(picker, params);
+////        dialog.getWindow().setGravity(Gravity.CENTER);
+//
+//
+//        //自带
+////        Calendar calendar = new GregorianCalendar();
+////        if (dialogCalendar == null) {
+////            dialogCalendar = new DatePickerDialog(mContext, new DatePickerDialog.OnDateSetListener() {
+////                @Override
+////                public void onDateSet(android.widget.DatePicker datePicker, int year, int monthOfYear, int DayOfMonth) {
+////                    showSelectTimeDialog(year + "-" + (monthOfYear + 1) + "-" + DayOfMonth);
+////                }
+////            }, calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), calendar.get(Calendar.DAY_OF_MONTH));
+////        }
+////        dialogCalendar.show();
+//        //最原始
+////	        if (dialog == null) {
+////	            dialog = new DateTimePickerDialog(this, System.currentTimeMillis());
+////	        }
+////	        dialog.setOnDateTimeSetListener(new DateTimePickerDialog.OnDateTimeSetListener() {
+////	                public void OnDateTimeSet(AlertDialog dia, long date) {
+////	                	EditText vEditText= (EditText)view;
+////	                	vEditText.setText(CommonUtil.getStringDate(date));
+////	                    /** @注释：保证 初始化当前时间 */
+////	                    dialog = null;
+////	                }
+////	            });
+////	        if (!dialog.isShowing()) {
+////	            dialog.show();
+////	        }
+//    }
 
 
     @Override

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

@@ -101,23 +101,24 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     private BaseComparator<Friend> mBaseComparator;
     private FriendSortAdapter mAdapter;
     private String mLoginUserId;
-    private Handler mHandler = new Handler() ;
+    private Handler mHandler = new Handler();
     private boolean mNeedUpdate = true;
     private Activity mActivity;
     private DBManager manager;
 
     //接收修改公司广播
     private IntentFilter inputFilter;
-    private BroadcastReceiver receiver=new BroadcastReceiver() {
+    private BroadcastReceiver receiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            if ("home".equals(intent.getStringExtra("falg"))){
+            if ("home".equals(intent.getStringExtra("falg"))) {
                 upDataFriend();
                 loadData();
 
             }
         }
     };
+
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
@@ -125,7 +126,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
                 ct.startActivity(new Intent(ct, CompanyContactsActivity.class));
                 break;
             case R.id.my_friends_rl:
-          ct.startActivity(new Intent(ct, MyFriendActivity.class));
+                ct.startActivity(new Intent(ct, MyFriendActivity.class));
                 break;
             case R.id.my_friend_rl:
                 ct.startActivity(new Intent(ct, CommonFragmentActivity.class));
@@ -153,8 +154,8 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        inputFilter=new IntentFilter("com.app.home.update");
-        getActivity().registerReceiver(receiver,inputFilter);
+        inputFilter = new IntentFilter("com.app.home.update");
+        getActivity().registerReceiver(receiver, inputFilter);
         setHasOptionsMenu(true);
     }
 
@@ -182,9 +183,9 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
         for (int i = 0; i < emList.size(); i++) {
             String fId = String.valueOf(emList.get(i).getEm_IMID());
             for (int j = 0; j < friend.size(); j++) {
-                if (fId.equals(friend.get(j).getUserId())){  //当有重复
+                if (fId.equals(friend.get(j).getUserId())) {  //当有重复
                     break;
-                } else if ((j == (friend.size() - 1))&&!(fId.equals(friend.get(j).getUserId()))) {
+                } else if ((j == (friend.size() - 1)) && !(fId.equals(friend.get(j).getUserId()))) {
                     friends.add(EnterChatAction(emList.get(i)));
                 }
             }
@@ -257,7 +258,7 @@ public class LinksManFragment extends XutilsFragment implements View.OnClickList
 
         my_friend_rl = (RelativeLayout) headview.findViewById(R.id.my_friend_rl);
         my_data_rl = (RelativeLayout) headview.findViewById(R.id.my_data_rl);
-        my_friends_rl= (RelativeLayout) headview.findViewById(R.id.my_friends_rl);
+        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);

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

@@ -32,13 +32,12 @@ 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.Md5Util;
+import com.sk.weichat.util.ViewAlphaUtil;
 
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 
 public class MeFragment extends EasyFragment implements View.OnClickListener {
     private ImageView mAvatarImg;
@@ -192,6 +191,24 @@ 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));
+
+
     }
 
     /**

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:state_checked="true" android:color="@color/white"/>
-    <item android:color="@color/main_tab_text_normal_grey"/>
+    <item android:color="@color/text_main" android:state_checked="true" />
+    <item android:color="@color/text_hine" />
 
 </selector>

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

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

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

@@ -7,8 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        >
+        android:orientation="vertical">
 
         <RelativeLayout
             android:id="@+id/info_rl"
@@ -66,176 +65,135 @@
                 android:visibility="invisible" />
         </RelativeLayout>
 
-        <!--公司-->
         <RelativeLayout
-            android:id="@+id/rl_company_change"
+            android:id="@+id/my_data_rl"
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="9dp">
 
             <TextView
-                android:id="@+id/company_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_company"
+                android:drawableLeft="@drawable/my_inf"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/change_company"
-                android:textColor="@color/white"
+                android:text="@string/my_data"
+                android:textColor="@color/text_main"
                 android:textSize="14sp" />
 
-            <TextView
-                android:id="@+id/company_tv"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/company_arrow_img"
-                android:layout_toRightOf="@+id/company_text"
-                android:textColor="@color/wirtehine" />
-
             <ImageView
-                android:id="@+id/company_arrow_img"
-                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:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
-        <!--账套-->
         <RelativeLayout
-            android:id="@+id/rl_master_change"
-            style="@style/IMTbleLine_UP">
+            android:id="@+id/my_friend_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:layout_marginTop="2dp">
 
             <TextView
-                android:id="@+id/master_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_inf"
+                android:drawableLeft="@drawable/my_friend"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/change_master"
-                android:textColor="@color/white"
+                android:text="@string/my_friend"
+                android:textColor="@color/text_main"
                 android:textSize="14sp" />
 
-            <TextView
-                android:id="@+id/master_tv"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/master_arrow_img"
-                android:layout_toRightOf="@+id/master_text"
-                android:textColor="@color/wirtehine" />
-
             <ImageView
-                android:id="@+id/master_arrow_img"
-                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:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
-
         <RelativeLayout
-            android:id="@+id/my_data_rl"
-            style="@style/IMTbleLine_UP_Me">
+            android:id="@+id/my_space_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:layout_marginTop="2dp">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_inf"
+                android:drawableLeft="@drawable/set_fans_u"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/my_data"
-                android:textColor="@color/white"
+                android:text="@string/my_space"
+                android:textColor="@color/text_main"
                 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:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-
         <RelativeLayout
-            android:id="@+id/my_erp_rl"
+            android:id="@+id/local_video_rl"
             style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="9dp">
+            android:layout_marginTop="2dp">
 
             <TextView
-                android:id="@+id/uas_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/set_resume"
+                android:drawableLeft="@drawable/my_video"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/my_uas"
-                android:textColor="@color/white"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/tv_uas_login"
-                style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/uas_arrow_img"
-                android:layout_toRightOf="@+id/uas_text"
-                android:text="未登录"
-                android:textColor="@color/wirtehine"
+                android:text="@string/local_video"
+                android:textColor="@color/text_main"
                 android:textSize="14sp" />
 
             <ImageView
-                android:id="@+id/uas_arrow_img"
-                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:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
-
+        <!--公司-->
         <RelativeLayout
-            android:id="@+id/my_b2b_rl"
-            style="@style/IMTbleLine_UP">
+            android:id="@+id/rl_company_change"
+            style="@style/IMTbleLine_UP_Me"
+            android:layout_marginTop="9dp">
 
             <TextView
-                android:id="@+id/b2b_text"
+                android:id="@+id/company_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/set_resume"
+                android:drawableLeft="@drawable/my_company"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/my_b2b"
-                android:textColor="@color/white"
+                android:text="@string/change_company"
+                android:textColor="@color/text_main"
                 android:textSize="14sp" />
 
             <TextView
-                android:id="@+id/tv_b2b_login"
+                android:id="@+id/company_tv"
                 style="@style/IMTbleLine_TextValue"
-                android:layout_toLeftOf="@+id/b2b_arrow_img"
-                android:layout_toRightOf="@+id/b2b_text"
-                android:text="未登录"
-                android:textColor="@color/wirtehine"
-                android:textSize="14sp" />
+                android:layout_toLeftOf="@+id/company_arrow_img"
+                android:layout_toRightOf="@+id/company_text"
+                android:textColor="@color/text_hine" />
 
             <ImageView
-                android:id="@+id/b2b_arrow_img"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:id="@+id/company_arrow_img"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/set_list_next"
@@ -243,87 +201,126 @@
         </RelativeLayout>
 
 
+        <!--账套-->
         <RelativeLayout
-            android:id="@+id/my_friend_rl"
+            android:id="@+id/rl_master_change"
             style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="9dp">
+            android:layout_marginTop="2dp">
 
             <TextView
+                android:id="@+id/master_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_friend"
+                android:drawableLeft="@drawable/zhang_dao"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/my_friend"
-                android:textColor="@color/white"
+                android:text="@string/change_master"
+                android:textColor="@color/text_main"
                 android:textSize="14sp" />
 
+            <TextView
+                android:id="@+id/master_tv"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/master_arrow_img"
+                android:layout_toRightOf="@+id/master_text"
+                android:textColor="@color/text_hine" />
+
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:id="@+id/master_arrow_img"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
 
         <RelativeLayout
-            android:id="@+id/my_space_rl"
-            style="@style/IMTbleLine_UP">
+            android:id="@+id/my_erp_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:layout_marginTop="2dp">
 
             <TextView
+                android:id="@+id/uas_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/set_fans_u"
+                android:drawableLeft="@drawable/usa_zhanghu"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/my_space"
-                android:textColor="@color/white"
+                android:text="@string/my_uas"
+                android:textColor="@color/text_main"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_uas_login"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/uas_arrow_img"
+                android:layout_toRightOf="@+id/uas_text"
+                android:text="未登录"
+                android:textColor="@color/text_hine"
                 android:textSize="14sp" />
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:id="@+id/uas_arrow_img"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp" />
 
         <RelativeLayout
-            android:id="@+id/local_video_rl"
-            style="@style/IMTbleLine_UP_Me">
+            android:id="@+id/my_b2b_rl"
+            style="@style/IMTbleLine_UP_Me"
+            android:layout_marginTop="9dp">
 
             <TextView
+                android:id="@+id/b2b_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/my_video"
+                android:drawableLeft="@drawable/btob"
                 android:drawablePadding="10dp"
                 android:gravity="center"
-                android:text="@string/local_video"
-                android:textColor="@color/white"
+                android:text="@string/my_b2b"
+                android:textColor="@color/text_main"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/tv_b2b_login"
+                style="@style/IMTbleLine_TextValue"
+                android:layout_toLeftOf="@+id/b2b_arrow_img"
+                android:layout_toRightOf="@+id/b2b_text"
+                android:text="未登录"
+                android:textColor="@color/text_hine"
                 android:textSize="14sp" />
 
             <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:id="@+id/b2b_arrow_img"
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
                 android:layout_alignParentRight="true"
                 android:layout_centerVertical="true"
                 android:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
+
         <RelativeLayout
             android:id="@+id/setting_rl"
             style="@style/IMTbleLine_UP_Me"
@@ -337,12 +334,12 @@
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="@string/setting"
-                android:textColor="@color/white"
+                android:textColor="@color/text_main"
                 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:background="@drawable/set_list_next"

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

@@ -13,7 +13,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_resume"
+            android:drawableLeft="@drawable/qiyetongxunlu"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="企业通讯录"
@@ -41,7 +41,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_resume"
+            android:drawableLeft="@drawable/friend"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="我的好友"
@@ -70,7 +70,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_fans"
+            android:drawableLeft="@drawable/qunliao"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="我的群组"
@@ -99,7 +99,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
-            android:drawableLeft="@drawable/set_video"
+            android:drawableLeft="@drawable/bess"
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="商务伙伴"

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

@@ -0,0 +1,45 @@
+<?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:layout_margin="10dp"
+    android:gravity="center">
+
+    <RelativeLayout
+        android:id="@+id/top"
+        android:layout_width="match_parent"
+        android:layout_height="40dp"
+        android:layout_centerHorizontal="true"
+        android:gravity="center">
+
+
+        <ImageView
+            android:id="@+id/img_remove"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/add_picture" />
+
+        <TextView
+            android:id="@+id/tv_time"
+            android:layout_width="80dp"
+            android:layout_height="match_parent"
+            android:layout_toRightOf="@+id/img_remove"
+            android:gravity="center"
+            android:hint="时钟" />
+
+        <ImageView
+            android:id="@+id/img_add"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/tv_time"
+            android:src="@drawable/add_picture" />
+    </RelativeLayout>
+
+    <GridView
+        android:id="@+id/gv_time"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/top"
+        android:numColumns="8" />
+
+</RelativeLayout>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</LinearLayout>

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

@@ -27,7 +27,7 @@
             android:layout_height="50dp"
             android:layout_centerVertical="true"
             android:contentDescription="@string/app_name"
-            android:src="@drawable/avatar_normal" />
+            android:src="@drawable/friend_u" />
 
         <LinearLayout
             android:id="@+id/info_layout"

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

@@ -1,4 +1,6 @@
 <resources>
+    <dimen name="next_width">15.0dip</dimen>
+    <dimen name="next_height">25.0dip</dimen>
 
     <dimen name="LargestTextSize">30.0dip</dimen>
     <dimen name="BigerTextSize">24.0dip</dimen>

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

@@ -248,7 +248,7 @@
     <string name="create_room_failed">创建房间失败</string>
 
     <!-- MeFragment -->
-    <string name="my_uas">UAS平台</string>\
+    <string name="my_uas">UAS账户</string>\
     <string name="my_b2b">B2B平台</string>
 
     <string name="my_data">我的资料</string>
@@ -278,8 +278,8 @@
     <string name="change_my_nickname">修改我的群昵称</string>
     <string name="add_notice">添加公告</string>
     <!-- SettingActivity -->
-    <string name="change_master">我的账套</string>
-    <string name="change_company">我的公司</string>
+    <string name="change_master">账套</string>
+    <string name="change_company">公司</string>
     <string name="uas_website_address">UAS地址</string>
     <string name="uas_callback">建议反馈</string>
 

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

@@ -151,7 +151,7 @@
     </style>
 
     <style name="IMTbleLine_UP_Me">
-        <item name="android:background">@color/white</item>
+        <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:minHeight">60dp</item>