备份

WeiChat/src/main/AndroidManifest.xml

@@ -441,9 +441,10 @@
         <activity android:name=".ui.erp.activity.oa.WorkLogsActivity" />
         <activity android:name=".ui.erp.activity.oa.AddSigninActivity" />
         <activity android:name=".ui.erp.activity.oa.AddNextSigninActivity" />
-        <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity"></activity>
-        <activity android:name=".ui.erp.activity.oa.SuperSetActivity"></activity>
-        <activity android:name=".ui.erp.activity.oa.AddLogActivity"></activity>
+        <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity" />
+        <activity android:name=".ui.erp.activity.oa.SuperSetActivity" />
+        <activity android:name=".ui.erp.activity.oa.AddLogActivity" />
+        <activity android:name=".ui.circle.view.SelectLocationActivity"></activity>
     </application>
 
 </manifest>

WeiChat/src/main/java/com/xzjmyk/pm/activity/BdLocationHelper.java

@@ -43,9 +43,12 @@ public class BdLocationHelper {
 		option.setScanSpan(5000);// 设置发起定位请求的间隔时间为10s
 		option.setIsNeedAddress(true);
 		option.setNeedDeviceDirect(false);
-		mLocationClient.setLocOption(option);
+		option.setOpenGps(true);//可选，默认false,设置是否使用gps
 
+		mLocationClient.setLocOption(option);
 		requestLocation();
+
+
 	}
 
 	public void release() {
@@ -160,4 +163,5 @@ public class BdLocationHelper {
 		return mLatitude != 0 && mLongitude != 0;
 	}
 
+
 }

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

@@ -15,7 +15,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.BaseAdapter;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ImageView.ScaleType;
@@ -34,6 +33,7 @@ import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.helper.UploadService;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.circle.view.SelectLocationActivity;
 import com.xzjmyk.pm.activity.ui.tool.MultiImagePreviewActivity;
 import com.xzjmyk.pm.activity.util.CameraUtil;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
@@ -53,7 +53,7 @@ import java.util.Map;
 /**
  * 发布一条说说的Activity
  */
-public class SendShuoshuoActivity extends BaseActivity {
+public class SendShuoshuoActivity extends BaseActivity implements View.OnClickListener {
     private static final int REQUEST_CODE_CAPTURE_PHOTO = 1;// 拍照
     private static final int REQUEST_CODE_PICK_PHOTO = 2;// 图库
     private Uri mNewPhotoUri;// 拍照和图库 获得图片的URI
@@ -62,12 +62,14 @@ public class SendShuoshuoActivity extends BaseActivity {
     private TextView mSelectImagePromptTv;
     private View mSelectImgLayout;
     private MyGridView mGridView;
-    private Button mReleaseBtn;
-
     private ArrayList<String> mPhotoList;
     private GridViewAdapter mAdapter;
     private String mImageData;
 
+    //添加位置和查阅人员选择
+    private TextView location_tv, display_tv;
+    public static final int LOCATION = 0x00a, DISPLAY = 0x00b;
+
     private int mType;
 
     @Override
@@ -84,6 +86,12 @@ public class SendShuoshuoActivity extends BaseActivity {
     }
 
     private void initView() {
+        location_tv = (TextView) findViewById(R.id.location_tv);
+        display_tv = (TextView) findViewById(R.id.display_tv);
+        findViewById(R.id.release_btn).setOnClickListener(this);
+        findViewById(R.id.location_rl).setOnClickListener(this);
+        findViewById(R.id.display_rl).setOnClickListener(this);
+
         if (mType == 0) {
             getSupportActionBar().setTitle(R.string.send_text);
         } else {
@@ -93,7 +101,7 @@ public class SendShuoshuoActivity extends BaseActivity {
         mSelectImagePromptTv = (TextView) findViewById(R.id.select_img_prompt_tv);
         mSelectImgLayout = findViewById(R.id.select_img_layout);
         mGridView = (MyGridView) findViewById(R.id.grid_view);
-        mReleaseBtn = (Button) findViewById(R.id.release_btn);
+
 //       ToastUtil.addEditTextNumChanged(SendShuoshuoActivity.this, mTextEdit, 200);//这里复制粘贴过多字数会在有些机型上出现bug
         mGridView.setAdapter(mAdapter);
 
@@ -118,19 +126,7 @@ public class SendShuoshuoActivity extends BaseActivity {
             }
         });
 
-        mReleaseBtn.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
-                    return;
-                }
-                if (mPhotoList.size() <= 0) {// 发文字
-                    sendShuoshuo();
-                } else {//  图片+文字
-                    new UploadPhpto().execute();
-                }
-            }
-        });
+
     }
 
     private void showPictureActionDialog(final int position) {
@@ -281,6 +277,30 @@ public class SendShuoshuoActivity extends BaseActivity {
 
     private ProgressDialog mProgressDialog;
 
+    @Override
+    public void onClick(View view) {
+        switch (view.getId()) {
+            case R.id.location_rl:
+                startActivityForResult(new Intent(SendShuoshuoActivity.this, SelectLocationActivity.class), LOCATION);
+                break;
+            case R.id.display_rl:
+                startActivityForResult(new Intent(), LOCATION);
+                break;
+            case R.id.release_btn:
+                if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回
+                    return;
+                }
+                if (mPhotoList.size() <= 0) {// 发文字
+                    sendShuoshuo();
+                } else {//  图片+文字
+                    new UploadPhpto().execute();
+                }
+                break;
+        }
+
+
+    }
+
     private class UploadPhpto extends AsyncTask<Void, Integer, Integer> {
         @Override
         protected void onPreExecute() {

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

@@ -0,0 +1,35 @@
+package com.xzjmyk.pm.activity.ui.circle.view;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+import java.util.ArrayList;
+
+public class SelectLocationActivity extends BaseActivity {
+    ArrayList<Bean> beens = new ArrayList<>();
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_location);
+        init();
+    }
+
+    private void init() {
+        beens.add(new Bean("不显示", ""));
+
+    }
+
+
+    class Bean {
+        Bean(String name, String subName) {
+            this.name = name;
+            this.subName = subName;
+        }
+
+        String name;
+        String subName;
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/fragment/WorksFragment.java

@@ -16,7 +16,7 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.XutilsFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
@@ -93,8 +93,8 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 ViewUtil.WebLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
-                ct.startActivity(new Intent(ct, ErpMenActivity.class));
-//                        ct.startActivity(new Intent(ct, OAActivity.class));
+//                ct.startActivity(new Intent(ct, ErpMenActivity.class));
+                 ct.startActivity(new Intent(ct, OAActivity.class));
                 break;
             case R.id.my_client_rl:
                 // ct.startActivity(new Intent(ct, ClientActivity.class));

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.handmark.pulltorefresh.library.PullToRefreshListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:ptr="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/pull_refresh_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    ptr:ptrAnimationStyle="flip"
+    ptr:ptrDrawableEnd="@drawable/default_ptr_rotate"
+    ptr:ptrDrawableStart="@drawable/default_ptr_flip"
+    ptr:ptrHeaderTextColor="@color/black"
+    ptr:ptrMode="both"
+    ptr:ptrOverScroll="false"
+    ptr:ptrScrollingWhileRefreshingEnabled="true"
+    ptr:ptrShowIndicator="false" />

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

@@ -2,18 +2,18 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white" >
+    android:background="@color/white">
 
     <ScrollView
         android:id="@+id/scroll_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_above="@+id/bottom_layout" >
+        android:layout_above="@+id/bottom_layout">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
+            android:orientation="vertical">
 
             <EditText
                 android:id="@+id/text_edit"
@@ -48,7 +48,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@color/light_gray"
-                android:padding="10dp" >
+                android:padding="10dp">
 
                 <com.xzjmyk.pm.activity.view.MyGridView
                     android:id="@+id/grid_view"
@@ -61,6 +61,61 @@
                     android:stretchMode="columnWidth"
                     android:verticalSpacing="3dp" />
             </LinearLayout>
+
+            <RelativeLayout
+                android:id="@+id/location_rl"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:clickable="true"
+                android:padding="10dp">
+
+                <TextView
+                    android:id="@+id/location_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="位置"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_main" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:src="@drawable/set_list_next" />
+            </RelativeLayout>
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="20px"
+                android:background="@color/item_line" />
+
+            <RelativeLayout
+                android:id="@+id/display_rl"
+                android:layout_width="match_parent"
+                android:layout_height="50dp"
+                android:clickable="true"
+                android:padding="10dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:text="谁能看见"
+                    android:textColor="@color/text_hine"
+                    android:textSize="@dimen/text_main" />
+
+                <TextView
+                    android:id="@+id/display_tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:drawableRight="@drawable/set_list_next"
+                    android:gravity="center"
+                    android:text="所有人可见" />
+            </RelativeLayout>
+
+
         </LinearLayout>
     </ScrollView>
 
@@ -73,7 +128,7 @@
         android:baselineAligned="false"
         android:gravity="bottom"
         android:orientation="vertical"
-        android:padding="10dp" >
+        android:padding="10dp">
 
         <Button
             android:id="@+id/release_btn"