提交类型 修复bug

提交内容  客户首页添加下拉刷新功能

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

@@ -315,10 +315,8 @@ public class MeFragment extends EasyFragment implements View.OnClickListener, On
         });
         findViewById(R.id.my_data_rl).setOnClickListener(this);
         View workCardRl = findViewById(R.id.workCardRl);
-        if (BaseConfig.isDebug()) {
-            workCardRl.setVisibility(View.VISIBLE);
-            workCardRl.setOnClickListener(this);
-        }
+        workCardRl.setVisibility(View.VISIBLE);
+        workCardRl.setOnClickListener(this);
         findViewById(R.id.my_friend_rl).setOnClickListener(this);
         findViewById(R.id.my_space_rl).setOnClickListener(this);
         findViewById(R.id.local_video_rl).setOnClickListener(this);

app_core/common/src/main/res/layout/fragment_me.xml

@@ -470,7 +470,44 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
+        <RelativeLayout
+            android:id="@+id/workCardRl"
+            android:layout_width="match_parent"
+            android:layout_height="50dp"
+            android:background="@drawable/selector_item_white_pass"
+            android:paddingLeft="@dimen/padding"
+            android:visibility="visible"
+            android:paddingTop="@dimen/padding">
+
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line"
+                android:layout_alignParentBottom="true"
+                android:background="@color/item_line" />
+
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:drawableLeft="@drawable/ic_work_card"
+                android:drawablePadding="10dp"
+                android:gravity="center"
+                android:text="电子工牌"
+                android:textColor="#333333"
+                android:textSize="15sp" />
+
+            <ImageView
+                android:layout_width="@dimen/next_width"
+                android:layout_height="@dimen/next_height"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="8dp"
+                android:background="@drawable/oa_next"
+                android:contentDescription="@string/app_name" />
 
+
+        </RelativeLayout>
         <RelativeLayout
             android:id="@+id/setting_rl"
             android:layout_width="match_parent"
@@ -626,44 +663,7 @@
                 android:background="@drawable/oa_next"
                 android:contentDescription="@string/app_name" />
         </RelativeLayout>
-        <RelativeLayout
-            android:id="@+id/workCardRl"
-            android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:background="@drawable/selector_item_white_pass"
-            android:paddingLeft="@dimen/padding"
-            android:visibility="gone"
-            android:paddingTop="@dimen/padding">
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/line"
-                android:layout_alignParentBottom="true"
-                android:background="@color/item_line" />
-
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:drawableLeft="@drawable/ic_work_card"
-                android:drawablePadding="10dp"
-                android:gravity="center"
-                android:text="电子工牌"
-                android:textColor="#333333"
-                android:textSize="15sp" />
-
-            <ImageView
-                android:layout_width="@dimen/next_width"
-                android:layout_height="@dimen/next_height"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="8dp"
-                android:background="@drawable/oa_next"
-                android:contentDescription="@string/app_name" />
 
-
-        </RelativeLayout>
     </LinearLayout>
 
 </ScrollView>

app_modular/appcontact/src/main/java/com/uas/appcontact/ui/fragment/ContactsFragment.java

@@ -465,7 +465,7 @@ public class ContactsFragment extends SupportToolBarFragment
         if (ListUtils.isEmpty(allDatas)) return;
         showDatas = new ArrayList<>();
         for (BaseSortModel<Friend> e : allDatas) {
-            String text = e.getBean().getShowName() + e.getBean().getDepart() + e.getBean().getPosition() + e.getBean().getPhone();
+            String text = e.getBean().getShowName() + e.getBean().getPhone();
             if (StringUtil.isInclude(text, str)) {
                 showDatas.add(e);
             }