最后回滚回来的数据

WeiChat/src/main/java/com/xzjmyk/pm/activity/adapter/PublicMessageAdapter.java

@@ -410,17 +410,17 @@ public class PublicMessageAdapter extends BaseAdapter implements BusinessCircleA
             viewHolder.body_tv.setVisibility(View.VISIBLE);
             if(body.getText().contains("我也去分享")){
                 viewHolder.daily_share_tv.setVisibility(View.VISIBLE);
-                viewHolder.daily_share_tv.setTextColor(mContext.getResources().getColor(R.color.approval));
+//                viewHolder.daily_share_tv.setTextColor(mContext.getResources().getColor(R.color.approval));
                 viewHolder.daily_share_tv.setText("工作心得");
-                viewHolder.daily_share_tv.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        if (finalHolder.body_tv.getText().toString().contains("(我也去分享)")) {
-                            Intent intent = new Intent(mContext, WorkDailyAddActivity.class);
-                            mContext.startActivity(intent);
-                        }
-                    }
-                });
+//                viewHolder.daily_share_tv.setOnClickListener(new View.OnClickListener() {
+//                    @Override
+//                    public void onClick(View v) {
+//                        if (finalHolder.body_tv.getText().toString().contains("(我也去分享)")) {
+//                            Intent intent = new Intent(mContext, WorkDailyAddActivity.class);
+//                            mContext.startActivity(intent);
+//                        }
+//                    }
+//                });
             }else{
                 viewHolder.daily_share_tv.setVisibility(View.GONE);
                 viewHolder.daily_share_tv.setText("外部分享");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/BusinessCircleActivity.java

@@ -170,8 +170,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
 
 
 
-
-
     /**
      * 是否是商务圈类型
      *
@@ -295,7 +293,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
             }
         });
 
-       /* mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        mPullToRefreshListView.getRefreshableView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 mClickPosition = (int) parent.getItemIdAtPosition(position);
@@ -304,7 +302,7 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView {
                 intent.putExtra("public_message", message);
                 startActivityForResult(intent,REQUEST_CODE_GET_SHUOSHUODETAIL_BACK);
             }
-        });*/
+        });
 
         mPullToRefreshListView.getRefreshableView().setOnScrollListener(
                 new PauseOnScrollListener(ImageLoader.getInstance(), true, true, new AbsListView.OnScrollListener() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendShuoshuoActivity.java

@@ -69,7 +69,6 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
     private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
 
     private EditText mTextEdit;
-    private TextView mSelectImagePromptTv;
     private View mSelectImgLayout;
     private MyGridView mGridView;
     private ArrayList<String> mPhotoList;
@@ -122,7 +121,6 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
 //        }
 
         mTextEdit = (EditText) findViewById(R.id.text_edit);
-        mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
         mSelectImgLayout = findViewById(R.id.select_img_layout);
         mGridView = (MyGridView) findViewById(R.id.grid_view);
 
@@ -137,7 +135,6 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
             mTextEdit.setText(dailyexperience);
         }
         if (mType == 0) {
-            mSelectImagePromptTv.setVisibility(View.GONE);
             mSelectImgLayout.setVisibility(View.GONE);
         }
 
@@ -400,12 +397,12 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.location_rl:
-//                ToastMessage("该功能还未完善");
                 String name = MyApplication.getInstance().getBdLocationHelper().getName();
                 String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
                 baseAddr = StringUtils.isEmail(name) ? address : name;
                 Intent i = new Intent(activity, LocationMapActivity.class);
                 i.putExtra("qzoneaddr", baseAddr == null ? "" : baseAddr);
+                i.putExtra("qzone_select_add","qzone_select_add");
 //                Log.i("baseAddr",baseAddr) ;
                 startActivityForResult(i, 0x21);
                 break;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/circle/SendVideoActivity.java

@@ -98,7 +98,7 @@ public class SendVideoActivity extends BaseActivity {
 //        }
 
         // init status
-        mIconImageView.setBackgroundResource(R.drawable.add_video);
+        mIconImageView.setBackgroundResource(R.drawable.icon_shipin_nor);
         mVideoTextTv.setText(R.string.circle_add_video);
 
         // set event
@@ -135,6 +135,7 @@ public class SendVideoActivity extends BaseActivity {
                 baseAddr = StringUtils.isEmail(name) ? address : name;
                 Intent i = new Intent(activity, LocationMapActivity.class);
                 i.putExtra("qzoneaddr", baseAddr == null ? "" : baseAddr);
+                i.putExtra("qzone_select_add","qzone_select_add");
 //                Log.i("baseAddr",baseAddr) ;
                 startActivityForResult(i, 0x21);
             }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/LocationMapActivity.java

@@ -36,7 +36,7 @@ import java.util.List;
 /**
  * 选择地址
  * 1.外勤签到、打卡签到、会议详情、工作圈发动态定位
- * 2、参数：1、title(标题String) 2、style(主题 int) 3、Single(是否单选 boolean)
+ * 2、参数：1、title(标题String) 2、style(主题 int) 3、Single(是否单选 boolean) 7、qzone_select_add (工作圈定位设置自定义标题String)
  * 4、search(是否有搜索框 boolean) 5、resultcode(返回码 int) 6、type(搜索方式int 1.搜索附近 2.搜索地名)
  */
 public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchResultListener {
@@ -62,6 +62,11 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_map_location);
         location = getIntent().getIntExtra("data", 500);
+
+        String qzone_select_add = getIntent().getStringExtra("qzone_select_add");
+        if (!TextUtils.isEmpty(qzone_select_add) && qzone_select_add.equals("qzone_select_add")){
+            getSupportActionBar().setTitle("选择位置");
+        }
         init();
         initView();
         BaiduMapUtil.getInstence().getNearInfo(location, 0, point, "公司", new BaiduMapUtil.OnSearchPoiListener() {
@@ -76,6 +81,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     //设置主题
     private void setThisTheme() {
         String action = getIntent().getStringExtra("action");
+
         int theme = 0;
         if (!StringUtils.isEmpty(action)) {
             if (action.equals("SigninFragment")) {
@@ -93,6 +99,7 @@ public class LocationMapActivity extends BaseActivity implements OnGetPoiSearchR
     }
 
     private void initView() {
+
         mapView = (MapView) findViewById(R.id.bmapView);
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setEmptyView(R.layout.view_empty);

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

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <stroke
+        android:width="2dp"
+        android:color="@color/white"></stroke>
+</shape>

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

@@ -1,7 +1,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white">
+    android:background="#ebe9e9">
 
     <ScrollView
         android:id="@+id/scroll_view"
@@ -13,40 +13,28 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="#ebe9e9"/>
             <EditText
                 android:id="@+id/text_edit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/full_edit_bg"
+                android:background="@color/white"
                 android:gravity="top"
                 android:hint="@string/circle_now_think"
                 android:inputType="textMultiLine"
                 android:minHeight="250dp"
                 android:padding="10dp"
                 android:textColor="@color/black"
-                android:textColorHint="@color/grey"
+                android:textColorHint="#969695"
                 android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/select_img_prompt_tv"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="3dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginTop="10dp"
-                android:shadowColor="@color/white"
-                android:shadowRadius="1"
-                android:text="@string/circle_select_image"
-                android:textColor="@color/gray"
-                android:textSize="14sp" />
-
             <LinearLayout
                 android:id="@+id/select_img_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/light_gray"
+                android:background="@color/white"
                 android:padding="10dp">
 
                 <com.xzjmyk.pm.activity.view.MyGridView
@@ -61,20 +49,28 @@
                     android:verticalSpacing="3dp" />
             </LinearLayout>
 
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="10dp"
+                android:background="#ebe9e9"
+                android:textColor="@color/gray"/>
             <RelativeLayout
                 android:id="@+id/location_rl"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:clickable="true"
-                android:padding="10dp">
+                android:padding="10dp"
+                android:background="@color/white">
                 <ImageView
                     android:id="@+id/location_iv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/icon_location"
+                    android:src="@drawable/icon_dingwei1_nor"
                     android:layout_marginTop="5dp"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="10dp"
+                    android:layout_centerVertical="true"
                     />
                 <TextView
                     android:id="@+id/location_tv"
@@ -82,7 +78,7 @@
                     android:layout_height="match_parent"
                     android:gravity="center"
                     android:text="所在位置"
-                    android:textColor="@color/text_hine"
+                    android:textColor="#575757"
                     android:textSize="@dimen/text_main"
                     android:paddingRight="20dp"
                     android:layout_toRightOf="@+id/location_iv"/>
@@ -93,11 +89,6 @@
                     android:src="@drawable/oa_next" />
             </RelativeLayout>
 
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="20px"
-                android:background="@color/item_line"
-                android:visibility="gone"/>
 
             <RelativeLayout
                 android:id="@+id/display_rl"

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

@@ -36,7 +36,7 @@
 
                 <include
                     android:id="@+id/add_video_item"
-                    layout="@layout/layout_circle_add_more_item" />
+                    layout="@layout/layout_circle_add_video_item" />
             </LinearLayout>
             <EditText
                 android:id="@+id/text_edit"
@@ -53,6 +53,10 @@
                 android:textColorHint="@color/white"
                 android:hint="说点什么吧.."/>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/white"/>
             <RelativeLayout
                 android:id="@+id/location_rl"
                 android:layout_width="match_parent"
@@ -65,11 +69,12 @@
                     android:id="@+id/location_iv"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/icon_location"
+                    android:src="@drawable/icon_dingwei1_nor"
                     android:layout_marginTop="5dp"
                     android:layout_marginLeft="5dp"
                     android:layout_marginRight="10dp"
                     android:background="@color/white"
+                    android:layout_centerVertical="true"
                     />
                 <TextView
                     android:id="@+id/location_tv"
@@ -85,7 +90,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:src="@drawable/oa_next"
+                    android:src="@drawable/icon_zhankai_nor"
                     android:background="@color/white"/>
             </RelativeLayout>
         </LinearLayout>

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

@@ -183,7 +183,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:paddingLeft="6dp"
-                android:paddingRight="6dp">
+                android:paddingRight="6dp"
+                android:visibility="gone">
 
                 <TextView
                     android:id="@+id/praise_count_tv"

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

@@ -2,7 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="5dp">
+    android:padding="5dp"
+    android:background="@drawable/selector_me_menu_item_bg"
+    >
 
     <TextView
         android:id="@+id/name_tv"

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

@@ -1,30 +1,32 @@
 <com.xzjmyk.pm.activity.view.SquareCenterFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    >
 
     <ImageView
         android:id="@+id/image_view"
-        android:layout_width="match_parent"
-        android:layout_height="300dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:contentDescription="@string/app_name"
         android:scaleType="centerCrop"
-        android:src="@drawable/circle_add_item_default_bg" />
+        android:src="@drawable/add_picture" />
 
     <FrameLayout
         android:id="@+id/float_layout"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
         android:src="@drawable/circle_add_float_view_bg"
         android:layout_gravity="center">
 
         <ImageView
             android:id="@+id/icon_image_view"
-            android:layout_width="35dp"
-            android:layout_height="35dp"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_gravity="top|center_horizontal"
             android:paddingTop="20dp"
-            android:contentDescription="@string/app_name" />
+            android:contentDescription="@string/app_name"
+            android:visibility="gone"/>
 
         <TextView
             android:id="@+id/text_tv"
@@ -35,7 +37,8 @@
             android:layout_marginBottom="5dp"
             android:textColor="@color/gray"
             android:textSize="12sp"
-            android:layout_marginTop="5dp"/>
+            android:layout_marginTop="5dp"
+            android:visibility="gone"/>
     </FrameLayout>
 
 </com.xzjmyk.pm.activity.view.SquareCenterFrameLayout>

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

@@ -0,0 +1,36 @@
+<com.xzjmyk.pm.activity.view.SquareCenterFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+    <ImageView
+        android:id="@+id/image_view"
+        android:layout_width="match_parent"
+        android:layout_height="300dp"
+        android:contentDescription="@string/app_name"
+        android:scaleType="centerCrop"
+        android:src="@drawable/circle_add_item_default_bg" />
+    <FrameLayout
+        android:id="@+id/float_layout"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:src="@drawable/circle_add_float_view_bg"
+        android:layout_gravity="center">
+        <ImageView
+            android:id="@+id/icon_image_view"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:layout_gravity="top|center_horizontal"
+            android:paddingTop="20dp"
+            android:contentDescription="@string/app_name" />
+        <TextView
+            android:id="@+id/text_tv"
+            android:singleLine="true"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_marginBottom="5dp"
+            android:textColor="@color/gray"
+            android:textSize="12sp"
+            android:layout_marginTop="5dp"/>
+    </FrameLayout>
+</com.xzjmyk.pm.activity.view.SquareCenterFrameLayout>

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

@@ -47,8 +47,8 @@
         android:layout_width="match_parent"
         android:layout_height="45dp"
         android:gravity="center"
+        android:textColor="@color/black"
         android:text="取消"
-        android:textColor="@color/done_approval"
         android:textSize="15sp"/>
 
 </LinearLayout>

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

@@ -35,7 +35,6 @@
             android:id="@+id/body_tv"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
             android:layout_marginTop="8dp"
             android:background="@drawable/text_click_bg"
             android:text="ss"
@@ -142,10 +141,12 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:drawableLeft="@drawable/ic_zan_friend"
+                    android:paddingLeft="5dp"
+                    android:drawablePadding="5dp"
                     android:paddingBottom="2dp"
                     android:paddingTop="10dp"
                     android:textSize="@dimen/text_min"
-                    android:text=""
+                    android:text="ss"
                     />
 
                 <View

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

@@ -45,7 +45,10 @@
             android:layout_alignParentRight="true"
             android:layout_marginRight="10dp"
             android:contentDescription="@string/app_name"
-            android:src="@drawable/avatar_normal" />
+            android:src="@drawable/avatar_normal"
+            android:background="@drawable/shape_qzone_head_bg"
+            android:padding="2dp"
+            />
         <TextView
             android:id="@+id/qzone_name"
             android:layout_width="wrap_content"

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

@@ -277,7 +277,7 @@
 
     <!-- 商务圈 -->
     <string name="send_myspace">发表到朋友圈</string>
-    <string name="send_text">发文字</string>
+    <string name="send_text">发表文字</string>
     <string name="send_image">发图片</string>
     <string name="send_audio">发语音</string>
     <string name="send_video">发视频</string>