订阅号

WeiChat/src/main/AndroidManifest.xml

@@ -401,22 +401,22 @@
         <activity android:name=".ui.circle.PhoneSelectActivity" />
         <activity android:name=".ui.erp.activity.ClientActivity" />
         <activity
-            android:name=".ui.erp.activity.SigninActivity"
+            android:name=".ui.erp.activity.oa.SigninActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.erp.activity.OA_AlarmaActivity"
+            android:name=".ui.erp.activity.oa.OA_AlarmaActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.erp.activity.MeetingActivity"
+            android:name=".ui.erp.activity.oa.MeetingActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.erp.activity.AddMeetingActivity"
+            android:name=".ui.erp.activity.oa.AddMeetingActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.erp.activity.OAActivity"
+            android:name=".ui.erp.activity.oa.OAActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity
-            android:name=".ui.erp.activity.StatisticsActivity"
+            android:name=".ui.erp.activity.oa.StatisticsActivity"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
         <activity android:name=".ui.erp.activity.TextErpActivity" />
         <activity android:name=".ui.erp.activity.crm.BusinessActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -2,7 +2,6 @@ package com.xzjmyk.pm.activity.ui.account;
 
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -14,17 +13,17 @@ import android.widget.EditText;
 import com.alibaba.fastjson.JSON;
 import com.android.volley.Response.ErrorListener;
 import com.android.volley.VolleyError;
-import com.xzjmyk.pm.activity.helper.LoginHelper;
-import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
-import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
+import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
+import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.Md5Util;
+import com.xzjmyk.pm.activity.util.PreferenceUtils;
+import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
 import com.xzjmyk.pm.activity.util.ToastUtil;
 import com.xzjmyk.pm.activity.volley.ObjectResult;
 import com.xzjmyk.pm.activity.volley.Result;
@@ -83,10 +82,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
             mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
         }
-        //忘记密码按钮点击事件
-        findViewById(R.id.forget_password_btn).setOnClickListener(this);
-        //注册账号
-        findViewById(R.id.register_account_btn).setOnClickListener(this);
+
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);
     }
@@ -94,14 +90,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     @Override
     public void onClick(View v) {
         switch (v.getId()) {
-            case R.id.register_account_btn:// 注册
-                startActivity(new Intent(mContext, RegisterActivity.class));
-                break;
-            case R.id.forget_password_btn:// 忘记密码
-//			 Intent intent = new Intent(mContext, FindPwdActivity.class);
-//			 intent.putExtra(FindPwdActivity.EXTRA_FROM_LOGIN, this.getClass().getName());
-//			 startActivity(intent);
-                break;
             case R.id.login_btn:// 登陆
                 login();
                 break;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.content.Intent;
 import android.os.Bundle;

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

@@ -1,16 +1,24 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
+import android.annotation.TargetApi;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.BaseAdapter;
+import android.widget.PopupMenu;
 import android.widget.Spinner;
 
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.calendar.cons.DPMode;
 import com.xzjmyk.pm.activity.ui.calendar.views.DatePicker;
+import com.xzjmyk.pm.activity.ui.erp.activity.SaleSelectActivity;
 import com.xzjmyk.pm.activity.util.CalendarUtils;
 import com.xzjmyk.pm.activity.view.MyListView;
 
@@ -18,10 +26,11 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     private OAActivity activity = this;
     private MyListView listview;
     private Spinner state, show_type, type;
-    private String[] stateItems = {"状态1", "状态2", "状态3", "状态4", "状态5"};
-    private String[] typeItems = {"类型1", "类型2", "类型3", "类型4", "类型5"};
-    private String[] show_typeItems = {"展示方式1", "展示方式2", "展示方式3", "展示方式4", "展示方式5"};
+    private String[] stateItems = {"状态", "确认中", "进行中", "已完成"};
+    private String[] typeItems = {"类型", "任务", "日程", "拜访"};
+    private String[] show_typeItems = {"展示方式", "日程", "列表"};
     private DatePicker picker;
+    private PopupMenu poAddMenu;
 
 
     @Override
@@ -33,11 +42,13 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
     }
 
     private void init() {
-        ;
+
     }
 
     private void initView() {
+
         findViewById(R.id.ll_signin).setOnClickListener(this);
+        findViewById(R.id.oa_img_add).setOnClickListener(this);
         findViewById(R.id.ll_outside).setOnClickListener(this);
         findViewById(R.id.ll_meeting).setOnClickListener(this);
         findViewById(R.id.ll_worklog).setOnClickListener(this);
@@ -107,6 +118,9 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
                 break;
             case R.id.ll_outside:  //外勤签到
                 break;
+            case R.id.oa_img_add:  //添加按钮
+                popAdd(view);
+                break;
             case R.id.ll_meeting://会议管理
                 startActivity(new Intent(activity, MeetingActivity.class));
                 break;
@@ -154,4 +168,64 @@ public class OAActivity extends BaseActivity implements View.OnClickListener {
         }
     }
 
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    private void popAdd(View view) {
+        //点击添加按钮
+        if (poAddMenu == null) {
+            poAddMenu = new PopupMenu(this, view);
+            poAddMenu.getMenuInflater().inflate(R.menu.oa_pop_add, poAddMenu.getMenu());
+            poAddMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                @Override
+                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;
+                    }
+
+                    poAddMenu.dismiss();
+                    return false;
+                }
+            });
+        }
+        poAddMenu.show();
+    }
+
+
+
+
+
+
+
+    class MyListViewAdapter extends BaseAdapter{
+
+        @Override
+        public int getCount() {
+            return 1;
+        }
+
+        @Override
+        public Object getItem(int i) {
+            return null;
+        }
+
+        @Override
+        public long getItemId(int i) {
+            return i;
+        }
+
+        @Override
+        public View getView(int i, View view, ViewGroup viewGroup) {
+            return null;
+        }
+    }
 }

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
 import android.view.View;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.app.AlertDialog;
 import android.content.Intent;

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

@@ -1,4 +1,4 @@
-package com.xzjmyk.pm.activity.ui.erp.activity;
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
 
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;

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

@@ -17,8 +17,7 @@ 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.ClientActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.ErpMenActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.OAActivity;
+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;
@@ -95,8 +94,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/java/com/xzjmyk/pm/activity/ui/message/SubscriptionActivity.java

@@ -110,6 +110,8 @@ public class SubscriptionActivity extends BaseActivity {
         listView = (PullToRefreshListView) findViewById(R.id.listview);
         listView.setMode(PullToRefreshBase.Mode.BOTH);
         View aa=LayoutInflater.from(this).inflate(R.layout.subscrip_emptyview,null);
+        getSupportActionBar().setCustomView(aa);
+
         listView.setEmptyView(aa);
         listView.setOnRefreshListener(new PullToRefreshBase.OnRefreshListener2<ListView>() {
             @Override
@@ -123,7 +125,6 @@ public class SubscriptionActivity extends BaseActivity {
                 newlong = calendar.getTimeInMillis();
                 loadNetData(newlong);//获取当天的网络数据
             }
-
             @Override
             public void onPullUpToRefresh(PullToRefreshBase<ListView> refreshView) {
                 isRef = false;
@@ -191,7 +192,6 @@ public class SubscriptionActivity extends BaseActivity {
                     }
                 }
                 handler.sendEmptyMessage(RESULT_OK);
-
             }
         });
 

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

@@ -1,74 +1,50 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/login_bg"
-    android:orientation="vertical">
+    android:background="@drawable/login_bg">
 
-    <ImageView
-        android:id="@+id/img_h"
-        android:layout_width="match_parent"
-        android:layout_height="180dp"
-        android:src="@drawable/loginh" />
-
-    <com.xzjmyk.pm.activity.view.ClearEditText
-        android:id="@+id/phone_numer_edit"
-        style="@style/IMLineEditText"
-        android:layout_marginLeft="9dp"
-        android:layout_marginRight="9dp"
-        android:layout_marginTop="9dp"
-        android:background="@color/wirtehine"
-        android:drawableLeft="@drawable/login_user_name"
-        android:hint="@string/please_input_phone_number"
-        android:inputType="phone" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp" />
-
-    <com.xzjmyk.pm.activity.view.ClearEditText
-        android:id="@+id/password_edit"
-        style="@style/IMLineEditPass"
-        android:layout_marginLeft="9dp"
-        android:layout_marginRight="9dp"
-        android:background="@color/wirtehine"
-        android:drawableLeft="@drawable/loginpw"
-        android:hint="@string/please_input_password" />
-
-    <Button
-        android:id="@+id/login_btn"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
-        android:layout_marginTop="10dp"
-        android:background="@drawable/bg_btn"
-        android:text="登  录"
-        android:textColor="@color/white" />
-
-    <RelativeLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp">
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="70dp"
+        android:orientation="vertical">
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/phone_numer_edit"
+            style="@style/IMLineEditText"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="9dp"
+            android:layout_marginTop="9dp"
+            android:background="@color/wirtehine"
+            android:drawableLeft="@drawable/login_user_name"
+            android:hint="@string/please_input_phone_number"
+            android:inputType="phone" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp" />
+
+        <com.xzjmyk.pm.activity.view.ClearEditText
+            android:id="@+id/password_edit"
+            style="@style/IMLineEditPass"
+            android:layout_marginLeft="9dp"
+            android:layout_marginRight="9dp"
+            android:background="@color/wirtehine"
+            android:drawableLeft="@drawable/loginpw"
+            android:hint="@string/please_input_password" />
 
         <Button
-            android:id="@+id/register_account_btn"
-            style="@style/IMHyperText"
-            android:layout_alignParentLeft="true"
-            android:paddingBottom="9dp"
-            android:paddingLeft="9dp"
-            android:paddingRight="9dp"
-            android:text="@string/register_account"
-            android:visibility="gone" />
-
-        <Button
-            android:id="@+id/forget_password_btn"
-            style="@style/IMHyperText"
-            android:layout_alignParentRight="true"
-            android:paddingBottom="9dp"
-            android:paddingLeft="9dp"
-            android:paddingRight="9dp"
-            android:text="@string/forget_password"
-            android:visibility="gone" />
-    </RelativeLayout>
-
-</LinearLayout>
+            android:id="@+id/login_btn"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:layout_marginLeft="40dp"
+            android:layout_marginRight="40dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/bg_btn"
+            android:text="登  录"
+            android:textColor="@color/white" />
+    </LinearLayout>
+
+
+</RelativeLayout>

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

@@ -3,7 +3,7 @@
     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.MeetingActivity">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.MeetingActivity">
 
     <RelativeLayout
         android:id="@+id/top"

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

@@ -16,9 +16,9 @@
             android:layout_height="wrap_content"
             android:background="@color/text_black"
             android:gravity="center_horizontal"
-            android:text="OA"
+            android:text="O A"
             android:textColor="@color/white"
-            android:textSize="30dp" />
+            android:textSize="35dp" />
 
 
         <LinearLayout
@@ -410,8 +410,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="2"
                 android:gravity="center"
-                android:text="aaa"
-                android:textSize="16sp" />
+                android:text="我的任务日程：20"
+                android:textSize="12sp" />
 
             <View
                 android:layout_width="1px"
@@ -423,8 +423,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="aaa"
-                android:textSize="16sp" />
+                android:text="已完成：2"
+                android:textSize="12sp"/>
 
             <View
                 android:layout_width="1px"
@@ -436,8 +436,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="aaa"
-                android:textSize="16sp" />
+                android:text="未完成：2"
+                android:textSize="12sp" />
 
             <View
                 android:layout_width="1px"
@@ -449,9 +449,8 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:gravity="center"
-                android:text="aaa"
-
-                android:textSize="16sp" />
+                android:text="达成率：10%"
+                android:textSize="12sp"/>
         </LinearLayout>
 
         <View

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

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.OA_AlarmaActivity">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.OA_AlarmaActivity">
 
     <RelativeLayout
         android:id="@+id/top"

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

@@ -3,7 +3,7 @@
     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.SigninActivity">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.SigninActivity">
 
     <RelativeLayout
         android:id="@+id/top"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
+
     android:layout_height="match_parent">
 
-    <FrameLayout
-        android:id="@+id/welcome_ly"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+
 
         <ImageView
             android:id="@+id/welcome_iv"
@@ -14,8 +12,7 @@
             android:layout_height="match_parent"
             android:contentDescription="@string/app_name"
             android:scaleType="centerCrop"
-            android:src="@drawable/index_u" />
-    </FrameLayout>
+            android:src="@drawable/index" />
 
     <RelativeLayout
         android:id="@+id/select_lv"

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

@@ -3,7 +3,7 @@
     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.StatisticsActivity">
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity">
 
     <RelativeLayout
         android:id="@+id/top"

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

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+
+
+
+</RelativeLayout>

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <item
+        android:id="@+id/add_task"
+        android:showAsAction="always"
+        android:title="创建任务"
+        tools:ignore="AppCompatResource" />
+    <item
+        android:id="@+id/add_date"
+        android:showAsAction="always"
+        android:title="新增日程"
+        tools:ignore="AppCompatResource" />
+    <item
+        android:id="@+id/add_visit"
+        android:showAsAction="always"
+        android:title="新增拜访计划"
+        tools:ignore="AppCompatResource" />
+    <item
+        android:id="@+id/add_visit_item"
+        android:showAsAction="always"
+        android:title="新增拜访报告"
+        tools:ignore="AppCompatResource" />
+</menu>