提交代码

WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

WeiChat/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.xzjmyk.pm.activity"
     android:versionCode="69"
-    android:versionName="5.5.5.1">
+    android:versionName="5.5.5">
 
     <uses-sdk
         android:minSdkVersion="11"

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

@@ -84,7 +84,7 @@ public class AllSubscriptionAdapter extends BaseAdapter{
             viewHolder = (ViewHolder) convertView.getTag();
         }
 
-        viewHolder.subImageView.setImageResource(mImageIds.get(position % 5));
+//        viewHolder.subImageView.setImageResource(mImageIds.get(position % 5));
         viewHolder.subNameTextView.setText(mSubscriptionNumbers.get(position).getTitle());
         if (mSubscriptionNumbers.get(position).getStatus()== 1){
             viewHolder.applyTextView.setText("已订阅");

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

@@ -84,7 +84,7 @@ public class MySubscriptionAdapter extends BaseAdapter {
         }else {
             viewHolder = (ViewHolder) view.getTag();
         }
-        viewHolder.subscribeIv.setImageResource(mImageIds.get(i % 5));
+//        viewHolder.subscribeIv.setImageResource(mImageIds.get(i % 5));
         viewHolder.titleTv.setText(mPersonalSubscriptionBeans.get(i).getTITLE());
         if (mPersonalSubscriptionBeans.get(i).getISAPPLED() == -1){
             viewHolder.applyTv.setText("－退订");

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/MainActivity.java

@@ -41,13 +41,8 @@ import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.account.LoginActivity;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.circle.BusinessCircleFragment;
-import com.xzjmyk.pm.activity.ui.erp.db.DBManager;
-import com.xzjmyk.pm.activity.ui.erp.entity.EmployeesEntity;
 import com.xzjmyk.pm.activity.ui.erp.fragment.ContactFragment;
 import com.xzjmyk.pm.activity.ui.erp.fragment.WorksFragment;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
-import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.find.MyFriendFragment;
 import com.xzjmyk.pm.activity.ui.groupchat.GroupChatFragment;
 import com.xzjmyk.pm.activity.ui.me.MeFragment;
@@ -471,17 +466,17 @@ public class MainActivity extends BaseActivity implements NetWorkObservable.NetW
         
         
         //查询数据库，取出中文名:
-        DBManager  dbManager = new DBManager(ct);
-        List<EmployeesEntity> db = dbManager.select_getEmployee(
-                new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
-                        CommonUtil.getSharedPreferences(ct, "erp_username")}
-                , "whichsys=? and em_code=? ");
-        if (!ListUtils.isEmpty(db)){
-            if (!StringUtils.isEmpty(db.get(0).getEM_NAME())){
-                CommonUtil.setSharedPreferences(ct,"erp_emname",db.get(0).getEM_NAME());
-            }
-        }
-        dbManager.closeDB();
+//        DBManager  dbManager = new DBManager(ct);
+//        List<EmployeesEntity> db = dbManager.select_getEmployee(
+//                new String[]{CommonUtil.getSharedPreferences(ct, "erp_master"),
+//                        CommonUtil.getSharedPreferences(ct, "erp_username")}
+//                , "whichsys=? and em_code=? ");
+//        if (!ListUtils.isEmpty(db)){
+//            if (!StringUtils.isEmpty(db.get(0).getEM_NAME())){
+//                CommonUtil.setSharedPreferences(ct,"erp_emname",db.get(0).getEM_NAME());
+//            }
+//        }
+//        dbManager.closeDB();
     }
 
     public void updateVersion() {

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

@@ -1,17 +1,13 @@
 package com.xzjmyk.pm.activity.ui.erp.fragment;
 
 import android.content.Intent;
-import android.graphics.drawable.BitmapDrawable;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.View;
 import android.widget.AdapterView;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.PopupWindow;
-import android.widget.TextView;
 
 import com.handmark.pulltorefresh.library.PullToRefreshBase;
 import com.handmark.pulltorefresh.library.PullToRefreshListView;
@@ -139,7 +135,7 @@ public class SubscriptionAllFragment extends BaseFragment {
             }
         });
 
-        mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+        /*mPullToRefreshListView.getRefreshableView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
                 View popView = View.inflate(getActivity(), R.layout.pop_subs_delete, null);
@@ -196,7 +192,7 @@ public class SubscriptionAllFragment extends BaseFragment {
 
                 return true;
             }
-        });
+        });*/
 
         mTypeListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
@@ -213,7 +209,7 @@ public class SubscriptionAllFragment extends BaseFragment {
                 }
             }
         });
-
+/*
         mTypeListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             @Override
             public boolean onItemLongClick(AdapterView<?> parent, View view, final int position, long id) {
@@ -267,7 +263,7 @@ public class SubscriptionAllFragment extends BaseFragment {
 
                 return true;
             }
-        });
+        });*/
     }
 
     private void initKeyStrings() {

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/net/ViewUtil.java

@@ -395,6 +395,7 @@ public class ViewUtil {
             CommonUtil.setSharedPreferences(ct, "erp_uu", String.valueOf(dataMap.get("uu")));
             CommonUtil.setSharedPreferences(ct, "erp_masterId", erp_masterId);
             CommonUtil.setSharedPreferences(ct, "erp_login", true);
+            CommonUtil.setSharedPreferences(ct,"erp_emname",String.valueOf(dataMap.get("emname")));
         }
         if (erp_phone != null) {
             Log.i("login_status", "ChangeStatusERP:" + erp_phone);

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

@@ -367,7 +367,7 @@
                 android:drawablePadding="@dimen/drawable_padding"
                 android:drawableTop="@drawable/oa_8"
                 android:gravity="center"
-                android:text="考勤统计"
+                android:text="查询统计"
                 android:textColor="@color/white" />
 
             <TextView

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

@@ -10,6 +10,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:scaleType="fitXY"
+        android:src="@drawable/ic_subscription_number"
         />
     <LinearLayout
         android:layout_width="match_parent"

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

@@ -10,6 +10,7 @@
         android:layout_width="40dp"
         android:layout_height="40dp"
         android:scaleType="fitXY"
+        android:src="@drawable/ic_subscription_number"
         />
 
     <TextView