Browse Source

聊天界面更改备份

gongpm 9 years ago
parent
commit
a2912d15ef

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

@@ -3,7 +3,6 @@ package com.sk.weichat.ui.erp.fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
@@ -20,7 +19,6 @@ import com.sk.weichat.ui.circle.BusinessCircleActivity;
 import com.sk.weichat.ui.erp.activity.ErpMenActivity;
 import com.sk.weichat.ui.erp.net.ViewUtil;
 import com.sk.weichat.util.PreferenceUtils;
-import com.sk.weichat.util.ViewAlphaUtil;
 import com.sk.weichat.volley.FastVolley;
 
 /**

+ 3 - 5
WeiChat/src/main/java/com/sk/weichat/ui/erp/view/MasterDialog.java

@@ -1,9 +1,5 @@
 package com.sk.weichat.ui.erp.view;
 
-import java.util.ArrayList;
-import java.util.List;
-
-
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -23,6 +19,9 @@ import com.sk.weichat.R;
 import com.sk.weichat.ui.erp.model.Master;
 import com.sk.weichat.ui.erp.util.CommonUtil;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author LiuJie
  * @功能:自定义的对话框
@@ -97,7 +96,6 @@ public class MasterDialog extends Dialog {
 		}
 		mListView.setChoiceMode(ListView.CHOICE_MODE_SINGLE);// 
 		mListView.setOnItemClickListener(new ListView.OnItemClickListener(){
-
 			@Override
 			public void onItemClick(AdapterView<?> parent, View view,
 					int position, long id) {

+ 0 - 1
WeiChat/src/main/java/com/sk/weichat/ui/me/MeFragment.java

@@ -94,7 +94,6 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
                             });
                     mDialog.show();
                     mDialog.initViewData(mList);
-
                     break;
                 case 3://切换账套登录
                     Map<String, Object> results = FlexJsonUtil.fromJson(msg

+ 4 - 2
WeiChat/src/main/java/com/sk/weichat/ui/message/ChatActivity.java

@@ -371,11 +371,13 @@ public class ChatActivity extends ActionBackActivity
     }
 
     @Override
-    public void onMessageClick(ChatMessage chatMessage) {
+    public void onMessageClick(ChatMessage chatMessage) {//点击消息
+
     }
 
     @Override
-    public void onMessageLongClick(ChatMessage chatMessage) {
+    public void onMessageLongClick(ChatMessage chatMessage) {//张点击
+
     }
 
     @Override

+ 0 - 1
WeiChat/src/main/java/com/sk/weichat/view/ChatContentView.java

@@ -1046,7 +1046,6 @@ public class ChatContentView extends PullDownListView implements OnMediaStateCha
 
         private void setLongClickInterface(final ChatMessage message, View view, final int position) {
             view.setOnLongClickListener(new OnLongClickListener() {
-
                 @Override
                 public boolean onLongClick(View v) {
                     Vibrator vib = (Vibrator) mContext.getSystemService(Service.VIBRATOR_SERVICE);

+ 5 - 5
WeiChat/src/main/res/layout/activity_setting.xml

@@ -52,7 +52,7 @@
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
+                android:layout_height="@dimen/line"
                 android:background="@color/item_line"/>
             <!--设置关闭推送-->
             <RelativeLayout
@@ -81,7 +81,7 @@
             <!--清除缓存-->
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
+                android:layout_height="@dimen/line"
                 android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/clear_cache_rl"
@@ -116,7 +116,7 @@
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
+                android:layout_height="@dimen/line"
                 android:background="@color/item_line"/>
             <RelativeLayout
                 android:id="@+id/use_help_rl"
@@ -142,7 +142,7 @@
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
+                android:layout_height="@dimen/line"
                 android:layout_marginTop="@dimen/line_big"
                 android:background="@color/item_line"/>
             <RelativeLayout
@@ -170,7 +170,7 @@
             </RelativeLayout>
             <View
                 android:layout_width="match_parent"
-                android:layout_height="1dp"
+                android:layout_height="@dimen/line"
                 android:background="@color/item_line"/>
             <RelativeLayout
                 android:clickable="true"

+ 10 - 10
WeiChat/src/main/res/layout/fragment_me.xml

@@ -65,7 +65,7 @@
         </RelativeLayout>
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
         <RelativeLayout
             android:id="@+id/my_data_rl"
@@ -95,7 +95,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -125,7 +125,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -155,7 +155,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -185,7 +185,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
         <!--公司-->
         <RelativeLayout
@@ -226,7 +226,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <!--账套-->
@@ -267,7 +267,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -308,7 +308,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -356,7 +356,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -387,7 +387,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
     </LinearLayout>
 

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

@@ -35,12 +35,12 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:layout_marginTop="7dp"
             android:background="@color/item_line" />
 
@@ -81,12 +81,12 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:layout_marginTop="7dp"
             android:background="@color/item_line" />
 
@@ -117,12 +117,12 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:layout_marginTop="7dp"
             android:background="@color/item_line" />
 
@@ -153,7 +153,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
 
         <RelativeLayout
@@ -183,7 +183,7 @@
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="1dp"
+            android:layout_height="@dimen/line"
             android:background="@color/item_line" />
     </LinearLayout>
 

+ 4 - 4
WeiChat/src/main/res/layout/headview_cantacts_menus.xml

@@ -32,7 +32,7 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/line"
         android:background="@color/item_line"/>
     <RelativeLayout
         android:id="@+id/my_friends_rl"
@@ -60,7 +60,7 @@
     </RelativeLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/line"
         android:background="@color/item_line"/>
 
     <RelativeLayout
@@ -90,7 +90,7 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/line"
         android:background="@color/item_line"/>
 
     <RelativeLayout
@@ -146,7 +146,7 @@
     </RelativeLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/line"
         android:background="@color/item_line"/>
 </LinearLayout>
 

+ 1 - 2
WeiChat/src/main/res/layout/item_weixin_listview.xml

@@ -20,7 +20,6 @@
          />
 <View
     android:layout_width="match_parent"
-    android:layout_height="1dp"
+    android:layout_height="@dimen/line"
     android:background="@color/item_line"/>
-
 </LinearLayout>

+ 19 - 5
WeiChat/src/main/res/layout/message_dialog.xml

@@ -3,18 +3,18 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
-    android:orientation="vertical" >
+    android:orientation="vertical">
 
     <LinearLayout
         android:id="@+id/pop_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:background="@android:color/white"
         android:layout_marginLeft="10dp"
         android:layout_marginRight="10dp"
+        android:background="@android:color/white"
         android:gravity="center_horizontal"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <Button
             android:id="@+id/btn_copy"
@@ -39,7 +39,8 @@
             android:text="转   发"
             android:textColor="@color/btn_textcolor_selector"
             android:textStyle="bold" />
- <Button
+
+        <Button
             android:id="@+id/btn_delete"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -50,14 +51,27 @@
             android:text="删   除"
             android:textColor="@color/btn_textcolor_selector"
             android:textStyle="bold" />
+
         <Button
-            android:id="@+id/btn_cancle"
+            android:id="@+id/btn_more"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="20dip"
             android:layout_marginRight="20dip"
             android:layout_marginTop="15dip"
+            android:background="@drawable/btn_dialog_selector"
+            android:text="更   多"
+            android:textColor="@color/btn_textcolor_selector"
+            android:textStyle="bold" />
+
+        <Button
+            android:id="@+id/btn_cancle"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_marginBottom="20dp"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            android:layout_marginTop="15dip"
             android:background="@drawable/btn_dialog_selector"
             android:text="取   消"
             android:textColor="@color/btn_textcolor_selector"

+ 1 - 1
WeiChat/src/main/res/layout/p_msg_item_main_body.xml

@@ -129,7 +129,7 @@
                 <View
                     android:id="@+id/img_praise_line"
                     android:layout_width="match_parent"
-                    android:layout_height="1dp"
+                    android:layout_height="@dimen/line"
                     android:layout_below="@+id/multi_praise_tv"
                     android:background="@color/item_line" />
 

+ 1 - 0
WeiChat/src/main/res/values/dimens.xml

@@ -1,5 +1,6 @@
 <resources>
     <dimen name="next_width">10.0dip</dimen>
+    <dimen name="line">1px</dimen>
     <dimen name="line_big">7.0dip</dimen>
     <dimen name="line_min">2.0dip</dimen>
     <dimen name="next_height">20.0dip</dimen>

+ 1 - 1
build.gradle

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