备份2

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
     android:versionCode="45"
-    android:versionName="4.5" >
+    android:versionName="4.5">
 
     <uses-sdk
         android:minSdkVersion="11"
@@ -69,7 +70,7 @@
         android:allowBackup="true"
         android:icon="@drawable/uuu"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme">
         <meta-data
             android:name="UMENG_APPKEY"
             android:value="574504a167e58eec520017df" />
@@ -80,7 +81,7 @@
         <!-- 启动页面 -->
         <activity
             android:name=".ui.SplashActivity"
-            android:theme="@style/SplashTheme" >
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -240,7 +241,7 @@
             android:exported="true"
             android:icon="@drawable/ic_chooser"
             android:label="@string/choose_file"
-            android:theme="@style/ChooserTheme" >
+            android:theme="@style/ChooserTheme">
             <intent-filter>
                 <action android:name="android.intent.action.GET_CONTENT" />
 
@@ -257,13 +258,13 @@
             android:enabled="@bool/use_provider"
             android:exported="true"
             android:grantUriPermissions="true"
-            android:permission="android.permission.MANAGE_DOCUMENTS" >
+            android:permission="android.permission.MANAGE_DOCUMENTS">
             <intent-filter>
                 <action android:name="android.content.action.DOCUMENTS_PROVIDER" />
             </intent-filter>
         </provider>
 
-        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver" >
+        <receiver android:name=".broadcast.ScrenLockedBroadCastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.SCREEN_OFF" />
                 <action android:name="android.intent.action.SCREEN_ON" />
@@ -290,7 +291,7 @@
         <!-- 用于接收系统消息以保证PushService正常运行 -->
         <receiver
             android:name="com.baidu.android.pushservice.PushServiceReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
@@ -306,7 +307,7 @@
         <!-- Push服务接收客户端发送的各种请求 -->
         <receiver
             android:name="com.baidu.android.pushservice.RegistrationReceiver"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.METHOD" />
                 <action android:name="com.baidu.android.pushservice.action.BIND_SYNC" />
@@ -325,7 +326,7 @@
             android:name="com.baidu.android.pushservice.PushService"
             android:exported="true"
             android:persistent="true"
-            android:process=":bdservice_v1" >
+            android:process=":bdservice_v1">
             <intent-filter>
                 <action android:name="com.baidu.android.pushservice.action.PUSH_SERVICE" />
             </intent-filter>
@@ -339,7 +340,7 @@
 
 
         <!-- 此处Receiver名字修改为当前包名路径 -->
-        <receiver android:name=".ui.PushNetMessageReceiver" >
+        <receiver android:name=".ui.PushNetMessageReceiver">
             <intent-filter>
 
                 <!-- 接收push消息 -->
@@ -360,7 +361,7 @@
             </intent-filter>
         </activity>
         -->
-        <activity android:name=".ui.message.SelectCardActivity" >
+        <activity android:name=".ui.message.SelectCardActivity">
             <intent-filter>
                 <action android:name="com.xzjmyk.pm.activity.ui.message.SelectCardActivity" />
             </intent-filter>
@@ -384,7 +385,7 @@
 
         <receiver
             android:name="com.baidu.autoupdatesdk.receiver.BDBroadcastReceiver"
-            android:exported="false" >
+            android:exported="false">
             <intent-filter>
                 <action android:name="com.baidu.autoupdatesdk.ACTION_NEW_UPDATE" />
                 <action android:name="com.baidu.autoupdatesdk.ACTION_DOWNLOAD_COMPLETE" />
@@ -443,9 +444,17 @@
         <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>
-        <activity android:name=".ui.erp.activity.oa.SigninTimeSetActivity"></activity>
-        <activity android:name=".ui.erp.activity.oa.SuperSetActivity"></activity>
+        <activity android:name=".ui.circle.view.SelectLocationActivity" />
+        <activity
+            android:name=".ui.erp.activity.oa.SigninTimeSetActivity"
+            tools:ignore="DuplicateActivity" />
+        <activity
+            android:name=".ui.erp.activity.oa.SuperSetActivity"
+            tools:ignore="DuplicateActivity" />
+        <activity
+            android:name=".ui.erp.activity.oa.VisitActivity"
+            android:label="拜访报告" />
+        <activity android:name=".ui.erp.activity.oa.SelectLocationActivity"></activity>
     </application>
 
 </manifest>

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

@@ -33,7 +33,6 @@ 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;
@@ -281,10 +280,12 @@ public class SendShuoshuoActivity extends BaseActivity implements View.OnClickLi
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.location_rl:
-                startActivityForResult(new Intent(SendShuoshuoActivity.this, SelectLocationActivity.class), LOCATION);
+//                startActivityForResult(new Intent(SendShuoshuoActivity.this, SelectLocationActivity.class), LOCATION);
+                ToastMessage("该功能还未完善");
                 break;
             case R.id.display_rl:
-                startActivityForResult(new Intent(), LOCATION);
+//                startActivityForResult(new Intent(), LOCATION);
+                ToastMessage("该功能还未完善");
                 break;
             case R.id.release_btn:
                 if (mPhotoList.size() <= 0 && TextUtils.isEmpty(mTextEdit.getText().toString())) {// 没有照片，也没有说说，直接返回

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

@@ -4,7 +4,6 @@ import android.annotation.TargetApi;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -86,7 +85,7 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         state.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                ToastMessage(stateItems[i]);
+                //TODO 选择菜单
             }
 
             @Override
@@ -97,12 +96,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
-                ToastMessage(typeItems[i]);
+                //TODO 选择菜单
             }
 
             @Override
             public void onNothingSelected(AdapterView<?> adapterView) {
-
+                //TODO 选择菜单
             }
         });
         show_type.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@@ -188,16 +187,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 public boolean onMenuItemClick(MenuItem menuItem) {
                     switch (menuItem.getItemId()) {
                         case R.id.add_task:
-                            Log.i("gongpengming", "点击了add_task");
                             break;
                         case R.id.add_date:
-                            Log.i("gongpengming", "add_date");
                             break;
                         case R.id.add_visit:
-                            Log.i("gongpengming", "add_visit");
                             break;
                         case R.id.add_visit_item:
-                            Log.i("gongpengming", "add_visit_item");
                             break;
                     }
 
@@ -244,6 +239,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
             }
 
             bindItemData(viewholder);
+            viewholder.item_doit_tv.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    startActivityForResult(new Intent(activity, VisitActivity.class), 1);
+                }
+            });
             return view;
         }
 

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

@@ -0,0 +1,16 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+//选择地址
+public class SelectLocationActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_select_location2);
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+public class VisitActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_visit);
+        initView();
+    }
+
+    private void initView() {
+        findViewById(R.id.location_tv).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                
+            }
+        });
+    }
+
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.menu_visit_save, menu);
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.save:
+
+                break;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+}

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

@@ -31,7 +31,6 @@ public class WorkLogsActivity extends BaseActivity {
         init();
         initView();
     }
-
     private void initView() {
         listView = (PullToRefreshListView) findViewById(R.id.listView);
         listView.setAdapter(adapter);
@@ -79,13 +78,13 @@ public class WorkLogsActivity extends BaseActivity {
 
         @Override
         public View getView(int i, View view, ViewGroup viewGroup) {
-
             if (view == null) {
                 view = LayoutInflater.from(ct).inflate(R.layout.item_activity_worklogs, null);
+
             } else {
 
-            }
 
+            }
             return view;
         }
     }

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:orientation="vertical"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SelectLocationActivity">
+
+    <com.baidu.mapapi.map.MapView
+        android:id="@+id/bmapView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:clickable="true" />
+
+    <com.handmark.pulltorefresh.library.PullToRefreshListView
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+</LinearLayout>

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

@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView 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"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.VisitActivity">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            style="@style/IMTbleLine_UP"
+            android:layout_marginTop="10dp">
+
+            <TextView
+                style="@style/add_signin_tv_main"
+                android:drawableLeft="@drawable/calendar_back"
+                android:gravity="center"
+                android:text="拜访日期" />
+
+            <TextView
+                style="@style/add_signin_tv_hine"
+                android:layout_alignParentRight="true"
+                android:text="默认系统时间" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/IMTbleLine_UP"
+            android:layout_marginTop="10dp">
+
+            <TextView
+                style="@style/add_signin_tv_main"
+                android:drawableLeft="@drawable/oa_signin"
+                android:gravity="center"
+                android:text="地址" />
+
+            <TextView
+                android:id="@+id/location_tv"
+                style="@style/add_signin_tv_hine"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@drawable/set_list_next"
+                android:text="广东深圳市南山XXXX" />
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:text="定位不准？点我重置"
+            android:textColor="@color/blue" />
+
+
+        <RelativeLayout
+            style="@style/IMTbleLine_UP"
+            android:layout_marginTop="10dp">
+
+            <TextView
+                style="@style/add_signin_tv_main"
+                android:drawableLeft="@drawable/oa_client"
+                android:gravity="center"
+                android:text="地址" />
+
+            <TextView
+                style="@style/add_signin_tv_hine"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@drawable/set_list_next"
+                android:text="广东深圳市南山XXXX" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            style="@style/IMTbleLine_UP"
+            android:layout_marginTop="1dp">
+
+            <TextView
+                style="@style/add_signin_tv_main"
+                android:drawableLeft="@drawable/oa_client"
+                android:gravity="center"
+                android:text="地址" />
+
+            <TextView
+                style="@style/add_signin_tv_hine"
+                android:layout_alignParentRight="true"
+                android:drawableRight="@drawable/set_list_next"
+                android:text="广东深圳市南山XXXX" />
+        </RelativeLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="vertical"
+            android:padding="2dp">
+
+            <RelativeLayout
+                style="@style/IMTbleLine_UP"
+                android:layout_marginTop="1dp"
+                android:background="@drawable/oa_signin_tv_bg">
+
+                <TextView
+                    style="@style/add_signin_tv_main"
+                    android:drawableLeft="@drawable/oa_client"
+                    android:gravity="center"
+                    android:text="业务员" />
+
+                <EditText
+                    style="@style/add_signin_tv_hine"
+                    android:layout_alignParentRight="true"
+                    android:text="广东深圳市南山XXXX"
+                    android:textColorLink="@null" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                style="@style/IMTbleLine_UP"
+                android:layout_marginTop="1dp"
+                android:background="@drawable/oa_signin_tv_bg">
+
+                <TextView
+                    style="@style/add_signin_tv_main"
+                    android:drawableLeft="@drawable/oa_client"
+                    android:gravity="center"
+                    android:text="业务员" />
+
+                <EditText
+                    style="@style/add_signin_tv_hine"
+                    android:layout_alignParentRight="true"
+                    android:text="广东深圳市南山XXXX"
+                    android:textColorLink="@null" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                style="@style/IMTbleLine_UP"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/oa_signin_tv_bg">
+
+                <TextView
+                    style="@style/add_signin_tv_main"
+                    android:drawableLeft="@drawable/oa_client"
+                    android:gravity="center"
+                    android:text="业务员" />
+
+                <EditText
+                    style="@style/add_signin_tv_hine"
+                    android:layout_alignParentRight="true"
+                    android:text="广东深圳市南山XXXX"
+                    android:textColorLink="@null" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                style="@style/IMTbleLine_UP"
+                android:layout_marginTop="1dp"
+                android:background="@drawable/oa_signin_tv_bg">
+
+                <TextView
+                    style="@style/add_signin_tv_main"
+                    android:drawableLeft="@drawable/oa_client"
+                    android:gravity="center"
+                    android:text="业务员" />
+
+                <EditText
+                    style="@style/add_signin_tv_hine"
+                    android:layout_alignParentRight="true"
+                    android:text="广东深圳市南山XXXX"
+                    android:textColorLink="@null" />
+            </RelativeLayout>
+
+            <RelativeLayout
+                style="@style/IMTbleLine_UP"
+                android:layout_marginTop="1dp"
+                android:background="@drawable/oa_signin_tv_bg">
+
+                <EditText
+                    style="@style/add_signin_tv_main"
+                    android:gravity="center"
+                    android:minLines="3"
+                    android:text="备注： 请输入" />
+            </RelativeLayout>
+        </LinearLayout>
+    </LinearLayout>
+</ScrollView>

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

@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.handmark.pulltorefresh.library.PullToRefreshListView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/listView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkLogsActivity">
-
-<com.handmark.pulltorefresh.library.PullToRefreshListView
-        android:id="@+id/listView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@+id/top"
-        android:layout_marginTop="10dp"
-        android:background="@color/item_color2" />
-
-</RelativeLayout>
+    android:layout_below="@+id/top"
+    android:layout_marginTop="10dp"
+    android:background="@color/item_color2"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.WorkLogsActivity"/>

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

@@ -41,10 +41,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_gravity="center_horizontal"
-        android:focusable="true"
         android:isIndicator="true"
         android:numStars="5"
-        android:rating="0"
+        android:rating="1"
         android:stepSize="1" />
 
     <TextView

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

@@ -46,6 +46,7 @@
         android:textSize="@dimen/text_hine" />
 
     <TextView
+        android:clickable="true"
         android:id="@+id/item_doit_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

WeiChat/src/main/res/menu/menu_visit_save.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/save"
+        android:title="保存"
+        app:showAsAction="always" />
+</menu>

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

@@ -18,7 +18,6 @@
     <style name="StyleProgressBarMini" parent="@android:style/Widget.ProgressBar.Horizontal">
         <item name="android:maxHeight">50dip</item>
         <item name="android:minHeight">14dip</item>
-
         <item name="android:indeterminateOnly">false</item>
         <item name="android:indeterminateDrawable">
             @android:drawable/progress_indeterminate_horizontal