【新功能红点文字第一次启动提示】【功能完成】

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

@@ -55,6 +55,7 @@ import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.OAModel;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
@@ -111,6 +112,12 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
     private TextView uok_task_num;
     @ViewInject(R.id.week_tv)
     private TextView week_tv;
+    
+    @ViewInject(R.id.tv_signin_num)
+    private TextView tv_signin_num;
+    @ViewInject(R.id.tv_signout_num)
+    private TextView  tv_signout_num;
+    
     @ViewInject(R.id.oa_listview)
     private MyListView oa_listview;
 
@@ -524,6 +531,27 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
             meeting.setVisibility(View.INVISIBLE);
             special_attendance.setVisibility(View.INVISIBLE);
         }
+
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_signin)){
+            tv_signin_num.setVisibility(View.GONE);
+        }
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_signout)){
+            tv_signout_num.setVisibility(View.GONE);
+        }
+
+        tv_signin_num.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+               
+            }
+        });
+
+        tv_signout_num.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+               
+            }
+        });
     }
 
     @Override
@@ -814,6 +842,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 boolean isAdmin = PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false);
                 intent.putExtra(AppConfig.IS_ADMIN, isAdmin);//上传管理员状态
                 startActivity(intent);
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_signin, true);
+                tv_signin_num.setVisibility(View.GONE);
                 break;
             case R.id.outoffice:  //外勤签到
                 boolean is = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
@@ -826,6 +856,8 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
                 boolean isAdmain = PreferenceUtils.getBoolean(AppConfig.IS_ADMIN, false);
                 intent.putExtra(AppConfig.IS_ADMIN, isAdmain);//上传管理员状态
                 startActivityForResult(intent, 0x21);
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_signout, true);
+                tv_signout_num.setVisibility(View.GONE);
                 break;
             case R.id.meeting://会议管理
                 startActivity(new Intent(activity, MeetingActivity.class));

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

@@ -3,8 +3,8 @@ package com.xzjmyk.pm.activity.ui.erp.fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -20,6 +20,7 @@ import com.xzjmyk.pm.activity.ui.erp.activity.oa.OAActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.oa.StatisticsActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.util.PreferenceUtils;
 import com.xzjmyk.pm.activity.util.ToastUtil;
@@ -35,6 +36,22 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
     private static final String TIME_MILL = "TIMEMILL";
     private String TAG = "WorksFragment";
     private Context ct;
+
+    @ViewInject(R.id.tv_business_num)
+    private TextView tv_business_num;
+    @ViewInject(R.id.tv_menu_oa)
+    private TextView  tv_menu_oa;
+
+    @ViewInject(R.id.tv_oa_desc)
+    private TextView tv_oa_desc;
+    @ViewInject(R.id.tv_desc_business)
+    private TextView  tv_desc_business;
+
+    @ViewInject(R.id.iv_business_desc)
+    private ImageView iv_business_desc;
+    @ViewInject(R.id.iv_desc_oa)
+    private ImageView iv_desc_oa;
+    
     @ViewInject(R.id.setting_rl)
     private RelativeLayout setting_rl;
     @ViewInject(R.id.rl_uas_sys)
@@ -74,6 +91,26 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         my_data_rl.setOnClickListener(this);
         my_client_rl.setOnClickListener(this);
         goods_find.setOnClickListener(this);
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)){
+            tv_menu_oa.setVisibility(View.GONE);
+        }
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_business)){
+            tv_business_num.setVisibility(View.GONE);
+        }
+        
+        tv_menu_oa.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+             
+            }
+        });
+        
+        tv_business_num.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+             
+            }
+        });
         show_new_function_ll.setOnClickListener(this);
         int new_function_notice = PreferenceUtils.getInt(MyApplication.getInstance(), MainActivity.NEW_FUNCTION_NOTICE);
         if (new_function_notice == 1) {
@@ -114,12 +151,20 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
                 } else {
                     url = "http://uas.ubtob.com/authen?b_username=" + phone + "&b_password=" + password + "&b_enuu=" + b_enuu;
                 }
-                Log.i(TAG, "onClick:" + url);
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(),Constants.new_business,true);
+                
+                tv_business_num.setVisibility(View.GONE);
+                tv_desc_business.setVisibility(View.GONE);
+                iv_business_desc.setVisibility(View.GONE);
                 ViewUtil.webLinks(ct, url, "我的商务");
                 break;
             case R.id.rl_uas_sys:
                 if (falg.equals("1")) {
                     getActivity().startActivityForResult(new Intent(ct, OAActivity.class), 0x11);
+                    CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_oa, true);
+                    tv_menu_oa.setVisibility(View.GONE);
+                    tv_oa_desc.setVisibility(View.GONE);
+                    iv_desc_oa.setVisibility(View.GONE);
                 } else {
                     startActivity(new Intent(ct, ErpMenActivity.class));
                 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/Constants.java

@@ -293,5 +293,6 @@ public class Constants {
     public final static String  new_dingyue="dingyue";
     public final static String  new_signin="signin";
     public final static String  new_signout="signout";
+    public final static String  new_oa="oa_menu";
     public final static String  new_business="business";
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/message/MessageFragment.java

@@ -81,6 +81,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
     public static final int REQUESTCODE = 0xa1;
     private Comparator<BaseSortModel<Friend>> comparator;
     private TextView dingyue_num;
+    private TextView tv_dingyue_desc;
 
     @Override
     public void onAttach(Context context) {
@@ -186,18 +187,14 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
         subscribe_time_tv = (TextView) view.findViewById(R.id.subscribe_time_tv);//我的订阅
 
         dingyue_num=  (TextView) view.findViewById(R.id.tv_dingYue_num);//订阅红点
-        if(!CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_dingyue)){
+        tv_dingyue_desc=  (TextView) view.findViewById(R.id.tv_dingyue_desc);//订阅红点
+        if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_dingyue)){
             dingyue_num.setVisibility(View.GONE);
         }
         view.findViewById(R.id.schedule_rl).setOnClickListener(this);//审批流
         view.findViewById(R.id.waitting_work_rl).setOnClickListener(this);//待办工作
         view.findViewById(R.id.subscribe_rl).setOnClickListener(this);//我的订阅
-        view.findViewById(R.id.tv_dingYue_num).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                CommonUtil.setSharedPreferences(MyApplication.getInstance(),Constants.new_dingyue,false);
-            }
-        });
+     
         
 //        view.findViewById(R.id.notice_rl).setOnClickListener(this); //新闻通知
         if (platform) {
@@ -293,6 +290,9 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
             case R.id.subscribe_rl://我的订阅
                 presenter.setSubReadTime(TimeUtils.s_long_2_str(System.currentTimeMillis()));
                 startActivity(new Intent(mContext, Subscription2Activity.class));
+                CommonUtil.setSharedPreferences(MyApplication.getInstance(), Constants.new_dingyue, true);
+                dingyue_num.setVisibility(View.GONE);
+                tv_dingyue_desc.setVisibility(View.GONE);
                 break;
             case R.id.msg_delete_tv://删除
                 break;

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--com.handmark.pulltorefresh.library.PullToRefreshScrollView -->
-<ScrollView
+<com.handmark.pulltorefresh.library.PullToRefreshScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/oamain_ptrsv"
     android:layout_width="match_parent"
@@ -35,31 +35,64 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:paddingBottom="10dp">
-
+                    <RelativeLayout
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent">
+                        <TextView
+                            android:id="@+id/tv_signin_num"
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_marginRight="10dp"
+                            android:background="@drawable/hongdian"
+                            android:layout_gravity="top|right"
+                            android:gravity="center"
+                            android:text=""
+                            android:textColor="@android:color/white"
+                            android:textSize="10.0dip"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_alignTop="@+id/signin" />
                     <TextView
                         android:id="@+id/signin"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_weight="1"
                         android:drawablePadding="@dimen/drawable_padding"
                         android:drawableTop="@drawable/oa_1"
-                        android:gravity="center"
+                        android:layout_centerInParent="true"
                         android:text="打卡签到"
                         android:textColor="@color/white"
                         android:layout_marginTop="2dp"/>
-                  
+                    </RelativeLayout>
+                    <RelativeLayout
+                        android:layout_weight="1"
+                        android:layout_width="0dp"
+                        android:layout_height="match_parent">
+                        <TextView
+                            android:id="@+id/tv_signout_num"
+                            android:layout_width="10dp"
+                            android:layout_height="10dp"
+                            android:layout_marginRight="10dp"
+                            android:background="@drawable/hongdian"
+                            android:layout_gravity="top|right"
+                            android:layout_alignParentRight="true"
+                            android:gravity="center"
+                            android:text=""
+                            android:textColor="@android:color/white"
+                            android:textSize="10.0dip"
+                            />
                     <TextView
                         android:id="@+id/outoffice"
-                        android:layout_width="0dp"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="2dp"
-                        android:layout_weight="1"
+                        android:gravity="center"
                         android:drawablePadding="@dimen/drawable_padding"
                         android:drawableTop="@drawable/oa_2"
-                        android:gravity="center"
+                        android:layout_centerInParent="true"
                         android:text="外勤签到"
                         android:textColor="@color/white" />
-
+                        </RelativeLayout>
                     <TextView
                         android:id="@+id/worklog"
                         android:layout_width="0dp"
@@ -471,5 +504,5 @@
     </LinearLayout>
 
 
-</ScrollView>
+</com.handmark.pulltorefresh.library.PullToRefreshScrollView>
 <!---->

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

@@ -80,17 +80,34 @@
             style="@style/IMTbleLine"
             android:background="@drawable/selector_me_menu_item_bg">
             <TextView
-                android:id="@+id/tv_menu_oa"
+                android:id="@+id/tv_oa_desc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="自动考勤"
+                android:layout_below="@+id/tv_menu_oa"
+                android:layout_toLeftOf="@+id/iv_desc_oa"
+                android:layout_toStartOf="@+id/iv_desc_oa" />
+            <ImageView
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/kaoqintongji"
+                android:layout_alignBottom="@+id/oa_next"
+                android:layout_toLeftOf="@+id/tv_menu_oa"
+                android:layout_toStartOf="@+id/tv_menu_oa"
+                android:id="@+id/iv_desc_oa" />
+            <TextView
+                android:id="@+id/tv_menu_oa"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
                 android:layout_gravity="top|right"
-                android:layout_alignParentRight="true"
-                android:background="@drawable/tab_unread_bg"
+                android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
                 android:textColor="@android:color/white"
                 android:textSize="10.0dip"
-                />
+                android:layout_toLeftOf="@+id/oa_next"
+                android:layout_toStartOf="@+id/oa_next"
+                android:layout_alignTop="@+id/tv_oa" />
             <TextView
                 android:id="@+id/tv_oa"
                 android:layout_width="wrap_content"
@@ -171,17 +188,35 @@
             style="@style/IMTbleLine"
             android:background="@drawable/selector_me_menu_item_bg">
             <TextView
-                android:id="@+id/tv_dingYue_num"
+                android:id="@+id/tv_desc_business"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="查看订单询价单"
+                android:layout_below="@+id/tv_business_num"
+                android:layout_toLeftOf="@+id/iv_business_desc"
+                android:layout_toStartOf="@+id/iv_business_desc" />
+            <ImageView
+                android:id="@+id/iv_business_desc"
+                android:layout_width="20dp"
+                android:layout_height="20dp"
+                android:src="@drawable/kaoqintongji"
+                android:layout_below="@+id/tv_business_num"
+                android:layout_toLeftOf="@+id/tv_business_num"
+                android:layout_toStartOf="@+id/tv_business_num"
+                />
+            <TextView
+                android:id="@+id/tv_business_num"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
                 android:layout_gravity="top|right"
-                android:layout_alignParentRight="true"
-                android:background="@drawable/tab_unread_bg"
+                android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
                 android:textColor="@android:color/white"
-                android:textSize="10.0dip"
-                />
+
+                android:layout_toLeftOf="@+id/imageView2"
+                android:layout_toStartOf="@+id/imageView2"
+                android:layout_alignTop="@+id/textView2" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -191,7 +226,8 @@
                 android:gravity="center"
                 android:text="商务管理"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="14sp"
+                android:id="@+id/textView2" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -200,7 +236,8 @@
                 android:layout_centerVertical="true"
 
                 android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
+                android:contentDescription="@string/app_name"
+                android:id="@+id/imageView2" />
         </RelativeLayout>
 
         <View

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

@@ -238,12 +238,20 @@
                 android:textColor="@color/text_main"
                 android:textSize="16sp" />
             <TextView
-                android:id="@+id/tv_dingYue_num"
+                android:id="@+id/tv_dingyue_desc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:text="查看企业数据"
+                android:layout_below="@+id/subscribe_time_tv"
+                android:layout_toLeftOf="@+id/tv_dingYue_num"
+                android:layout_toStartOf="@+id/tv_dingYue_num" />
+            <TextView
+                android:id="@+id/tv_dingYue_num"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
                 android:layout_gravity="top|right"
                 android:layout_alignParentRight="true"
-                android:background="@drawable/tab_unread_bg"
+                android:background="@drawable/hongdian"
                 android:gravity="center"
                 android:text=""
                 android:textColor="@android:color/white"
@@ -255,6 +263,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
                 android:ellipsize="end"
+                android:visibility="gone"
                 android:textColor="@color/text_hine"
                 android:textSize="14sp" />