Main4个Fragement字体调整

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

@@ -645,7 +645,7 @@ public class OfficeAddressSettingsActivity extends BaseActivity {
         popupWindow.setTouchable(true);
         popupWindow.setOutsideTouchable(false);
         // 如果不设置PopupWindow的背景，无论是点击外部区域还是Back键都无法dismiss弹框
-        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.bg_main));
+        popupWindow.setBackgroundDrawable(getResources().getDrawable(R.drawable.pop_round_bg));
         // 设置好参数之后再show
         popupWindow.showAtLocation(contentView, Gravity.CENTER, 0, 0);
         setbg(0.4f);

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

@@ -39,7 +39,7 @@
                     android:layout_centerVertical="true"
                     android:layout_toLeftOf="@+id/phone_number_tv"
                     android:textColor="@color/text_main"
-                    android:textSize="@dimen/text_main" />
+                    android:textSize="16dp" />
 
                 <ImageView
                     android:id="@id/tag"
@@ -205,7 +205,7 @@
                 android:gravity="center"
                 android:text="@string/user_firend_cirle"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/iv_remain"
@@ -256,7 +256,7 @@
                 android:gravity="center"
                 android:text="@string/user_company"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/company_tv"
@@ -299,7 +299,7 @@
                 android:gravity="center"
                 android:text="@string/user_account"
                 android:textColor="@color/text_main"
-                android:textSize="@dimen/text_main" />
+                android:textSize="16sp" />
 
             <TextView
                 android:id="@+id/master_tv"

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

@@ -26,7 +26,7 @@
             android:hint="@string/common_search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
-            android:textSize="15sp" />
+            android:textSize="@dimen/text_main" />
 
         <ImageView
             android:id="@+id/voice_search_iv"

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

@@ -57,7 +57,7 @@
                 android:gravity="center"
                 android:text="@string/work_customer"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"
@@ -118,7 +118,7 @@
                 android:gravity="center"
                 android:text="@string/work_oa"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/oa_next"
@@ -226,7 +226,7 @@
                 android:gravity="center"
                 android:text="@string/work_business_manage"
                 android:textColor="@color/text_main"
-                android:textSize="14sp"
+                android:textSize="16sp"
                 android:id="@+id/textView2" />
 
             <ImageView
@@ -259,7 +259,7 @@
                 android:gravity="center"
                 android:text="@string/work_business_mall"
                 android:textColor="@color/text_main"
-                android:textSize="14sp" />
+                android:textSize="16sp" />
 
             <ImageView
                 android:layout_width="@dimen/next_width"

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

@@ -26,7 +26,7 @@
             android:hint="@string/search"
             android:textColor="@color/dark_grey"
             android:textColorHint="@color/grey"
-            android:textSize="15sp" />
+            android:textSize="16sp" />
 
         <ImageView
             android:id="@+id/voice_search_iv"
@@ -55,7 +55,8 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/qiyetongxunlu"
             android:gravity="center"
-            android:text="@string/contact_company" />
+            android:text="@string/contact_company"
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/group"
@@ -64,6 +65,7 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/qunliao"
             android:gravity="center"
+            android:textSize="16sp"
             android:text="@string/contact_business" />
 
         <TextView
@@ -73,7 +75,8 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/uuhaoyou"
             android:gravity="center"
-            android:text="@string/contact_friend" />
+            android:text="@string/contact_friend"
+            android:textSize="16sp"/>
 
         <TextView
             android:id="@+id/peculiar_tv"
@@ -82,7 +85,8 @@
             android:layout_weight="1"
             android:drawableTop="@drawable/guanzhu"
             android:gravity="center"
-            android:text="@string/contact_often" />
+            android:text="@string/contact_often"
+            android:textSize="16sp"/>
     </LinearLayout>
 
     <View

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

@@ -183,7 +183,7 @@
     <string name="add_office_address">添加办公地址</string>
     <string name="select_range">选择范围</string>
     <string name="edit_office_address_name">完善办公地址名称</string>
-    <string name="detail_address">详细地址：</string>
+    <string name="detail_address">详细地址</string>
     <string name="delete_address_notice1">确认删除该条办公地址？</string>
     <!-- end 办公地址设置 -->
 

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

@@ -26,7 +26,7 @@
     <dimen name="line_big">7.0dip</dimen>
     <dimen name="line_min">2.0dip</dimen>
     <dimen name="next_height">15.0dip</dimen>
-    <dimen name="text_main">17.0sp</dimen>
+    <dimen name="text_main">16.0sp</dimen>
     <dimen name="text_hine">14.0sp</dimen>
     <dimen name="text_min">12.0sp</dimen>
     <dimen name="item_height_edit">100.0dip</dimen>