xiugai

WeiChat/src/main/AndroidManifest.xml

@@ -836,8 +836,10 @@
         <activity
             android:name=".ui.erp.activity.oa.HolidaysActivity"
             android:label="法定节假日" />
-        <activity android:name=".ui.erp.activity.oa.StatisticsActivity"
-            android:label="考勤统计"/>
+        <activity
+            android:name=".ui.erp.activity.oa.StatisticsActivity"
+            android:label="考勤统计" />
+        <activity android:name=".ui.erp.activity.oa.DepartmentActivity"></activity>
     </application>
 
 </manifest>

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

@@ -0,0 +1,26 @@
+package com.xzjmyk.pm.activity.ui.erp.activity.oa;
+
+import android.os.Bundle;
+import android.widget.FrameLayout;
+
+import com.lidroid.xutils.view.annotation.ViewInject;
+import com.xzjmyk.pm.activity.R;
+import com.xzjmyk.pm.activity.ui.base.BaseActivity;
+
+
+public class DepartmentActivity extends BaseActivity {
+
+    @ViewInject(R.id.context_fl)
+    private FrameLayout context_fl;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_department);
+        initView();
+    }
+
+    private void initView() {
+
+    }
+}

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java

@@ -37,7 +37,7 @@ import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.BaseInfoActivity;
-import com.xzjmyk.pm.activity.ui.erp.activity.oa.TestActivity;
+import com.xzjmyk.pm.activity.ui.erp.activity.oa.DepartmentActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Master;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
@@ -273,7 +273,7 @@ public class MeFragment extends EasyFragment implements View.OnClickListener {
         findViewById(R.id.test_rl).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
-                startActivity(new Intent(ct, TestActivity.class));
+                startActivity(new Intent(ct, DepartmentActivity.class));
             }
         });
 

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

@@ -0,0 +1,14 @@
+<?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:id="@+id/activity_department"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="com.xzjmyk.pm.activity.ui.erp.activity.oa.DepartmentActivity">
+<FrameLayout
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/context_fl"
+    />
+</LinearLayout>

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

@@ -516,7 +516,7 @@
             style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="7dp"
             android:background="@drawable/selector_me_menu_item_bg"
-            android:visibility="gone">
+       >
 
             <TextView
                 android:layout_width="wrap_content"