合并考勤统计红点问题

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="90"
-    android:versionName="5.7.6" >
+    android:versionCode="91"
+    android:versionName="5.7.7" >
 
     <uses-sdk
         android:minSdkVersion="11"

WeiChat/src/main/java/com/xzjmyk/pm/activity/MyApplication.java

@@ -142,6 +142,7 @@ public class MyApplication extends Application {
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
+
     }
 
 

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

@@ -274,7 +274,7 @@ public class Constants {
      * @author：Administrator on 2016/2/18 15:12
      */
     public static String getAppBaseUrl(Context ct) {
-        if (ct == null) return "";
+        if (ct==null)return "";
         String baseUrl = CommonUtil.getSharedPreferences(ct, "erp_baseurl");
         return baseUrl;
     }
@@ -308,14 +308,15 @@ public class Constants {
     public final static String new_signout = "signout";
     public final static String new_oa = "oa_menu";
     public final static String new_business = "business";
-
+    
     public final static String NEW_SETING = "seting_2";
-
+ 
     public final static String NEW_UURUN = "NEW_UURUN";
     public final static String NEW_ME_TAG = "ME_TAG";
 
-    public final static String SET_SIGN_AUTO = "set_sign_auto";
-    public final static String SET_SIGN_IN = "set_sign_in";
+    public final static String SET_SIGN_AUTO="set_sign_auto";
+    public final static String SET_SIGN_IN="set_sign_in";
+
     public final static String NEW_FUNCTION_NOTICE = "NEWFUNCTIONNOTICE";
 
 
@@ -337,5 +338,4 @@ public class Constants {
         LogUtil.i("packageInfo.versionCode=" + packageInfo.versionCode);
         return packageInfo.versionCode;
     }
-
 }

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

@@ -238,7 +238,7 @@ public class SettingActivity extends ActionBackActivity implements View.OnClickL
         language_us_rl.setOnClickListener(this);
         
         if (CommonUtil.isReleaseVersion()){
-            language_us_rl.setVisibility(View.GONE);
+            language_us_rl.setVisibility(View.VISIBLE);
         }else{
             language_us_rl.setVisibility(View.VISIBLE);
         }

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

@@ -123,10 +123,25 @@
                     android:layout_height="40dp">
 
                     <ImageView
-                        android:layout_width="240dp"
+                        android:layout_toLeftOf="@+id/iv_icon1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_left"/>
+
+                    <TextView
+                        android:id="@+id/iv_icon1"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:src="@drawable/ic_my_rank" />
+                        android:text="@string/crm_icon1"  />
+                    <ImageView
+                        android:layout_toRightOf="@+id/iv_icon1"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_right"/>
 
                     <TextView
                         android:id="@+id/ib_ranking_condition"
@@ -241,21 +256,26 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
-                  <!--  <ImageView
-                        android:layout_toLeftOf="@id/iv_sale"
+                    <ImageView
+                        android:layout_toLeftOf="@+id/iv_sale"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />-->
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_left"/>
                   
-                    <ImageView
+                    <TextView
                         android:id="@+id/iv_sale"
-                        android:layout_width="240dp"
-                       android:layout_height="wrap_content"
-                       android:layout_centerInParent="true"
-                       android:src="@drawable/ic_sale_brief" />
-                 <!--   <ImageView
-                        android:layout_toRightOf="@id/iv_sale"
                         android:layout_width="wrap_content"
-                        android:layout_height="wrap_content" />-->
+                        android:layout_height="wrap_content"
+                        android:textColor="#62B7F2"
+                        android:layout_centerInParent="true"
+                        android:text="@string/crm_icon2"  />
+                    <ImageView
+                        android:layout_toRightOf="@+id/iv_sale"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_right"/>
 
                     <!--   <ImageButton style="@style/crm_ib_card_topRight"
                            android:id="@+id/ib_sale_condition" />-->
@@ -465,12 +485,26 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
-
                     <ImageView
-                        android:layout_width="240dp"
+                        android:layout_toLeftOf="@+id/iv_icon3"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_left"/>
+
+                    <TextView
+                        android:id="@+id/iv_icon3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:src="@drawable/ic_my_branch" />
+                        android:text="@string/crm_icon3"  />
+                    <ImageView
+                        android:layout_toRightOf="@+id/iv_icon3"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_right"/>
 
                     <!-- <ImageButton style="@style/crm_ib_card_topRight"
                          android:id="@+id/ib_em_condition" />-->
@@ -805,10 +839,25 @@
                     android:layout_height="40dp">
 
                     <ImageView
-                        android:layout_width="240dp"
+                        android:layout_toLeftOf="@+id/iv_icon4"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_left"/>
+
+                    <TextView
+                        android:id="@+id/iv_icon4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:src="@drawable/ic_my_target" />
+                        android:text="@string/crm_icon4"  />
+                    <ImageView
+                        android:layout_toRightOf="@+id/iv_icon4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_right"/>
 
                     <TextView
                         android:id="@+id/ib_index_condition"
@@ -888,12 +937,26 @@
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="40dp">
-
                     <ImageView
-                        android:layout_width="240dp"
+                        android:layout_toLeftOf="@+id/iv_icon5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_left"/>
+
+                    <TextView
+                        android:id="@+id/iv_icon5"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textColor="#62B7F2"
                         android:layout_centerInParent="true"
-                        android:src="@drawable/ic_forget_customer" />
+                        android:text="@string/crm_icon5" />
+                    <ImageView
+                        android:layout_toRightOf="@+id/iv_icon5"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_centerVertical="true"
+                        android:src="@drawable/crm_right"/>
 
                     <TextView
                         android:id="@+id/tv_cu_count"

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

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--com.handmark.pulltorefresh.library.PullToRefreshScrollView -->
 <com.handmark.pulltorefresh.library.PullToRefreshScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/oamain_ptrsv"
     android:layout_width="match_parent"
@@ -402,15 +402,16 @@
                 android:id="@+id/oa_more_menu_ll"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:visibility="gone"
+               >
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="#6A6A6A"
                     android:orientation="horizontal"
-                    android:paddingBottom="10dp"
-                    android:visibility="gone">
+                    android:paddingBottom="10dp">
 
                     <TextView
                         android:id="@+id/oamain_special_attendance_tv"
@@ -438,19 +439,9 @@
                         <FrameLayout
                             android:id="@+id/notice_head_area"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent"
+                            android:layout_height="wrap_content"
                             android:layout_marginLeft="20dp">
 
-                            <TextView
-                                android:id="@+id/oamain_sign_statistical_notice_tv"
-                                android:layout_width="10dp"
-                                android:layout_height="10dp"
-                                android:layout_gravity="top|right"
-                                android:layout_marginRight="10dp"
-                                android:background="@drawable/hongdian"
-                                android:textColor="@android:color/white"
-                                android:textSize="10.0dip" />
-
                             <ImageView
                                 android:id="@+id/notice_avatar_img"
                                 android:layout_width="wrap_content"
@@ -459,6 +450,17 @@
                                 android:contentDescription="@string/app_name"
                                 android:padding="0dp"
                                 android:src="@drawable/kaoqintongji" />
+
+                            <TextView
+                                android:id="@+id/oamain_sign_statistical_notice_tv"
+                                android:layout_width="10dp"
+                                android:layout_height="10dp"
+                                android:layout_gravity="top|right"
+                                android:layout_marginRight="15dp"
+                                android:background="@drawable/hongdian"
+                                android:textColor="@android:color/white"
+                                android:textSize="10.0dip"
+                               />
                         </FrameLayout>
 
                         <TextView

WeiChat/src/main/res/raw/versionconfiguration.properties

@@ -1,4 +1,4 @@
 
 #发布版本状态改为true,测试版本状态为false
 #release_version = true
-release_version = false
+release_version = true

WeiChat/src/main/res/values-en/strings.xml

@@ -1100,10 +1100,12 @@
     <string name="describe">Description</string>
 
     <!--翻译补漏-->
-    <string name="language_sys">Follow the system</string>
-    <string name="language_rCN">Simplified Chinese</string>
-    <string name="language_rTW">Traditional Chinese</string>
-    <string name="language_en">English(UK)</string>
+    <!--翻译补漏-->
+    <string name="language_sys">跟随系统</string>
+    <string name="language_rCN">简体中文</string>
+    <string name="language_rTW">繁體中文</string>
+    <string name="language_en">English</string>
+    
     <string name="Rated_UU">Rated UU</string>
     <string name="Rated_notice1">Please give you a score for UU, you only need to spend your little time, thank you for your support!</string>
     <string name="Rated_now">Now to score</string>
@@ -1253,6 +1255,13 @@
     <string name="input_meeting_resolution">会议决议未按要求填写</string>
     <string name="input_meeting_left">遗留问题未按要求填写</string>
     <string name="input_meeting_next">后续工作未按要求填写</string>
+
+
+    <string name="crm_icon1">My rankings</string>
+    <string name="crm_icon2">Sales briefing</string>
+    <string name="crm_icon3">My subordinates</string>
+    <string name="crm_icon4">My indicators</string>
+    <string name="crm_icon5">Forgotten customers</string>
     <string name="leave">请假</string>
     <string name="overtime">加班</string>
     <string name="ychuqin">应该出勤</string>

WeiChat/src/main/res/values-zh-rCN/strings.xml

@@ -1261,8 +1261,8 @@
     <!--翻译补漏-->
     <string name="language_sys">跟随系统</string>
     <string name="language_rCN">简体中文</string>
-    <string name="language_rTW">繁体中文</string>
-    <string name="language_en">英文</string>
+    <string name="language_rTW">繁體中文</string>
+    <string name="language_en">English</string>
 
     <string name="Rated_UU">为UU评分</string>
     <string name="Rated_notice1">请您为UU评一个分数吧，只需要花费您很少的时间，感谢您的支持!</string>
@@ -1358,4 +1358,11 @@
     <string name="add_blacklist_succ">加入黑名单成功</string>
     <string name="unsubmit">反提交</string>
     <string name="Operation_succeeded">反提交成功</string>
+
+
+    <string name="crm_icon1">我的排名</string>
+    <string name="crm_icon2">本月销售简报</string>
+    <string name="crm_icon3">我的下属</string>
+    <string name="crm_icon4">我的指标</string>
+    <string name="crm_icon5">遗忘的客户</string>
 </resources>

WeiChat/src/main/res/values-zh-rTW/strings.xml

@@ -1247,10 +1247,12 @@
     <string name="work_off_time">下班時間</string>
 
     <!--翻译补漏-->
-    <string name="language_sys">跟隨系統</string>
-    <string name="language_rCN">簡體中文</string>
+    <!--翻译补漏-->
+    <string name="language_sys">跟随系统</string>
+    <string name="language_rCN">简体中文</string>
     <string name="language_rTW">繁體中文</string>
-    <string name="language_en">英文</string>
+    <string name="language_en">English</string>
+    
     <string name="update_business">修改商機</string>
     <string name="search_select_hint">蒐索項目、品牌、物料、型號等</string>
     <string name="not_search_message">沒有符合條件的結果</string>
@@ -1346,4 +1348,10 @@
     <string name="add_blacklist_succ">加入黑名單成功</string>
     <string name="unsubmit">反提交</string>
     <string name="Operation_succeeded">Operation succeeded</string>
+
+    <string name="crm_icon1">我的排名</string>
+    <string name="crm_icon2">本月銷售簡報</string>
+    <string name="crm_icon3">我的下屬</string>
+    <string name="crm_icon4">我的名額</string>
+    <string name="crm_icon5">遺忘的客戶</string>
 </resources>

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

@@ -1664,6 +1664,12 @@
     <string name="input_meeting_resolution">会议决议未按要求填写</string>
     <string name="input_meeting_left">遗留问题未按要求填写</string>
     <string name="input_meeting_next">后续工作未按要求填写</string>
+
+    <string name="crm_icon1">我的排名</string>
+    <string name="crm_icon2">本月销售简报</string>
+    <string name="crm_icon3">我的下属</string>
+    <string name="crm_icon4">我的指标</string>
+    <string name="crm_icon5">遗忘的客户</string>
     <string name="leave">请假</string>
     <string name="overtime">加班</string>
     <string name="ychuqin">应该出勤</string>