Merge branch 'developer_master' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_master

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

@@ -576,8 +576,7 @@ 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);
@@ -612,9 +611,9 @@ public class MonthView extends View {
                                 @Override
                                 public void onAnimationEnd(Animator animation) {
                                     if (null != onDatePickedListener) {
-                                        datePicker.setMonth(true, data);
+                                        datePicker.setMonth(true, date);
                                         if (isTime)
-                                            onDatePickedListener.onDatePicked(data + "  " + tim);
+                                            onDatePickedListener.onDatePicked(date + "  " + tim);
                                     }
                                 }
                             });
@@ -624,9 +623,9 @@ public class MonthView extends View {
                         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
                             invalidate();
                             if (null != onDatePickedListener) {
-                                datePicker.setMonth(true, data);
+                                datePicker.setMonth(true, date);
                                 if (isTime)
-                                    onDatePickedListener.onDatePicked(data + "  " + tim);
+                                    onDatePickedListener.onDatePicked(date + "  " + tim);
                             }
                         }
                     } else if (mDPMode == DPMode.MULTIPLE) {

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

@@ -20,6 +20,7 @@ public class TimeView extends LinearLayout implements View.OnClickListener {
     private boolean isMonth = false;
     private String month;
     private int time = 0;
+    private String strTime;
     private Context mContext;
     private GridView gv;
     private TextView tvTime;
@@ -51,17 +52,20 @@ public class TimeView extends LinearLayout implements View.OnClickListener {
         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+"时");
+                if (time<10){
+                    strTime="0"+time;
+                }else{
+                    strTime=time+"";
+                }
+                tvTime.setText(strTime);
+                datePicker.setTime(true,strTime);
 //                setTime(time);
                 if (isMonth){
-                    onDatePickedListener.onDatePicked(month+" " + time+"时");
+                    onDatePickedListener.onDatePicked(month+" " + strTime);
                 }
 
             }
@@ -71,24 +75,7 @@ public class TimeView extends LinearLayout implements View.OnClickListener {
 
     @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 {

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

@@ -270,8 +270,8 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
             @Override
             public void onDatePicked(String date) {
                 Log.i("gongpengming","点击日期"+date);
-                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
-                et_task_startime.setText(date);
+//                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
+                et_task_startime.setText(date+":00:00");
                 dialog.dismiss();
             }
         });
@@ -279,8 +279,8 @@ public class AddTaskActivity extends BaseActivity implements OnClickListener {
             @Override
             public void onDatePicked(String date) {
                 Log.i("gongpengming","点击时间"+date);
-                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
-                et_task_startime.setText(date);
+//                Toast.makeText(AddTaskActivity.this, date, Toast.LENGTH_LONG).show();
+                et_task_startime.setText(date+":00:00");
                 dialog.dismiss();
             }
         });

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

@@ -226,7 +226,7 @@ public class ChatBottomView extends LinearLayout implements View.OnClickListener
 		} else {
 			mChatEdit.setVisibility(View.VISIBLE);
 			mRecordBtn.setVisibility(View.GONE);
-			mVoiceImgBtn.setImageResource(R.drawable.im_voice_nor);
+			mVoiceImgBtn.setImageResource(R.drawable.im_send_button_inactive_u);
 		}
 	}
 

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

@@ -3,15 +3,15 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <RelativeLayout
-        android:background="@color/item_color1"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
+        android:background="@color/item_color1"
         android:orientation="horizontal"
-        android:padding="3dp" >
+        android:padding="3dp">
 
         <LinearLayout
             android:id="@+id/left_layout"
@@ -20,8 +20,10 @@
             android:layout_alignParentLeft="true"
             android:layout_centerVertical="true"
             android:gravity="center_vertical"
-            android:orientation="horizontal" >
-
+            android:orientation="horizontal">
+            <View
+                android:layout_width="5dp"
+                android:layout_height="1dp" />
             <ImageButton
                 android:id="@+id/emotion_btn"
                 android:layout_width="wrap_content"
@@ -29,6 +31,10 @@
                 android:background="@drawable/im_btn_emotion_bg"
                 android:contentDescription="@string/app_name" />
 
+            <View
+                android:layout_width="5dp"
+                android:layout_height="1dp" />
+
             <ImageButton
                 android:id="@+id/more_btn"
                 android:layout_width="wrap_content"
@@ -46,7 +52,7 @@
             android:layout_toLeftOf="@+id/right_layout"
             android:layout_toRightOf="@+id/left_layout"
             android:focusable="true"
-            android:focusableInTouchMode="true" >
+            android:focusableInTouchMode="true">
 
             <EditText
                 android:id="@+id/chat_edit"
@@ -78,7 +84,7 @@
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:gravity="center_vertical"
-            android:orientation="horizontal" >
+            android:orientation="horizontal">
 
             <Button
                 android:id="@+id/send_btn"
@@ -103,10 +109,9 @@
 
     <FrameLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="wrap_content">
 
-        <com.sk.weichat.view.ChatFaceView
-            xmlns:chatface="http://schemas.android.com/apk/res-auto"
+        <com.sk.weichat.view.ChatFaceView xmlns:chatface="http://schemas.android.com/apk/res-auto"
             android:id="@+id/chat_face_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

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

@@ -11,13 +11,12 @@
 
         <RelativeLayout
             android:id="@+id/info_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_height="65dp">
+            style="@style/IMTbleLine_UP_">
 
             <ImageView
                 android:id="@+id/avatar_img"
-                android:layout_width="50dp"
-                android:layout_height="50dp"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
                 android:layout_alignParentLeft="true"
                 android:layout_centerVertical="true"
                 android:contentDescription="@string/app_name"
@@ -41,7 +40,7 @@
                     android:layout_toLeftOf="@+id/phone_number_tv"
                     android:singleLine="true"
                     android:textColor="@color/text_main"
-                    android:textSize="@dimen/BigTextSize" />
+                    android:textSize="@dimen/text_main" />
 
                 <TextView
                     android:id="@+id/phone_number_tv"
@@ -51,7 +50,7 @@
                     android:layout_centerVertical="true"
                     android:singleLine="true"
                     android:textColor="@color/text_hine"
-                    android:textSize="@dimen/SmallerTextSize" />
+                    android:textSize="@dimen/text_hine" />
             </RelativeLayout>
 
             <ImageView
@@ -64,11 +63,14 @@
                 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/my_data_rl"
             style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="7dp">
+           >
 
             <TextView
                 android:layout_width="wrap_content"
@@ -79,7 +81,7 @@
                 android:gravity="center"
                 android:text="@string/my_data"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -91,10 +93,14 @@
                 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/my_friend_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -105,7 +111,7 @@
                 android:gravity="center"
                 android:text="@string/my_friend"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -117,10 +123,14 @@
                 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/my_space_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -131,7 +141,7 @@
                 android:gravity="center"
                 android:text="@string/my_space"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -143,10 +153,14 @@
                 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/local_video_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -157,7 +171,7 @@
                 android:gravity="center"
                 android:text="@string/local_video"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -169,6 +183,10 @@
                 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/rl_company_change"
@@ -185,14 +203,15 @@
                 android:gravity="center"
                 android:text="@string/change_company"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <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/text_hine" />
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
 
             <ImageView
                 android:id="@+id/company_arrow_img"
@@ -205,12 +224,15 @@
                 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/rl_master_change"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:id="@+id/master_text"
@@ -222,14 +244,15 @@
                 android:gravity="center"
                 android:text="@string/change_master"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <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" />
+                android:textColor="@color/text_hine"
+                android:textSize="@dimen/text_hine" />
 
             <ImageView
                 android:id="@+id/master_arrow_img"
@@ -242,11 +265,14 @@
                 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/my_erp_rl"
-            style="@style/IMTbleLine_UP_Me"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:id="@+id/uas_text"
@@ -258,7 +284,7 @@
                 android:gravity="center"
                 android:text="@string/my_uas"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <TextView
                 android:id="@+id/tv_uas_login"
@@ -267,7 +293,7 @@
                 android:layout_toRightOf="@+id/uas_text"
                 android:text="未登录"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_hine" />
 
             <ImageView
                 android:id="@+id/uas_arrow_img"
@@ -280,6 +306,10 @@
                 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/my_b2b_rl"
@@ -296,7 +326,7 @@
                 android:gravity="center"
                 android:text="@string/my_b2b"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <TextView
                 android:id="@+id/tv_b2b_login"
@@ -305,7 +335,7 @@
                 android:layout_toRightOf="@+id/b2b_text"
                 android:text="未登录"
                 android:textColor="@color/text_hine"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_hine" />
 
             <ImageView
                 android:id="@+id/b2b_arrow_img"
@@ -326,8 +356,8 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp" />
-
+            android:layout_height="1dp"
+            android:background="@color/item_line" />
 
         <RelativeLayout
             android:id="@+id/setting_rl"
@@ -343,7 +373,7 @@
                 android:gravity="center"
                 android:text="@string/setting"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_main" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -354,6 +384,11 @@
                 android:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/item_line" />
     </LinearLayout>
 
 </ScrollView>

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

@@ -7,6 +7,7 @@
     android:orientation="vertical" >
 
     <RelativeLayout
+        android:background="@drawable/bg_bar"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:orientation="horizontal"

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

@@ -33,10 +33,20 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/item_line" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/my_friend_rl"
-            style="@style/IMTbleLine_UP"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine">
 
             <TextView
                 android:id="@+id/tv_zone"
@@ -69,10 +79,20 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/item_line" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/rl_uas_sys"
-            style="@style/IMTbleLine"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -95,10 +115,20 @@
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/item_line" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/item_line" />
+
         <RelativeLayout
             android:id="@+id/setting_rl"
-            style="@style/IMTbleLine_UP"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -121,10 +151,14 @@
                 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/goods_find"
-            style="@style/IMTbleLine"
-            android:layout_marginTop="2dp">
+            style="@style/IMTbleLine">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -146,6 +180,11 @@
                 android:background="@drawable/set_list_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/item_line" />
     </LinearLayout>
 
 </ScrollView>

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

@@ -2,9 +2,14 @@
 <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:background="@color/bg_main"
     android:gravity="center">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/item_line" />
+
     <RelativeLayout
         android:id="@+id/top"
         android:layout_width="match_parent"
@@ -13,26 +18,22 @@
         android:gravity="center">
 
 
-        <ImageView
-            android:id="@+id/img_remove"
+        <TextView
+            android:id="@+id/tvt"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/add_picture" />
+            android:layout_height="match_parent"
+            android:gravity="center_vertical"
+            android:text="选择时间：" />
 
         <TextView
             android:id="@+id/tv_time"
             android:layout_width="80dp"
             android:layout_height="match_parent"
-            android:layout_toRightOf="@+id/img_remove"
+            android:layout_toRightOf="@+id/tvt"
             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

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

@@ -4,7 +4,7 @@
     <color name="item_color1">#30a0a0a0</color>
     <color name="item_color2">@color/white</color>
     <color name="item_text">#cca0a0a0</color>
-    <color name="item_line">#a0a0a0</color>
+    <color name="item_line">#BCBBC0</color>
     <color name="antionbarcolor">#646464</color>
     <color name="wirtehine">#a3b2cf</color>
     <color name="text_main">#3c3c3c</color>

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

@@ -1,7 +1,11 @@
 <resources>
     <dimen name="next_width">10.0dip</dimen>
     <dimen name="next_height">20.0dip</dimen>
-    <dimen name="item_height">65.0dip</dimen>
+    <dimen name="text_main">17.0dip</dimen>
+    <dimen name="text_hine">14.0dip</dimen>
+
+    <dimen name="item_height">60.0dip</dimen>
+    <dimen name="item_me_height">80.0dip</dimen>
     <dimen name="bar_height">80.0dip</dimen>
     <dimen name="item_img_height">45.0dip</dimen>
     <dimen name="item_img_width">45.0dip</dimen>

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

@@ -151,6 +151,14 @@
         <item name="android:paddingRight">5dp</item>
     </style>
 
+    <style name="IMTbleLine_UP_">
+        <item name="android:background">@color/item_color1</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/item_me_height</item>
+        <item name="android:minHeight">60dp</item>
+        <item name="android:paddingLeft">9dp</item>
+        <item name="android:paddingRight">5dp</item>
+    </style>
     <style name="IMTbleLine_UP_Me">
         <item name="android:background">@color/item_color1</item>
         <item name="android:layout_width">match_parent</item>
@@ -179,7 +187,6 @@
     </style>
 
     <style name="IMTbleLine_TextValue">
-        <item name="android:textSize">@dimen/NormalTextSize</item>
         <item name="android:textColorHint">@color/grey</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:gravity">right</item>

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0'
+        classpath 'com.android.tools.build:gradle:2.0.0'
     }
 }
 allprojects {