Bitliker:合并发布版本代码

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

@@ -28,7 +28,6 @@ import com.xzjmyk.pm.activity.bean.Friend;
 import com.xzjmyk.pm.activity.sortlist.BaseSortModel;
 import com.xzjmyk.pm.activity.ui.MainActivity;
 import com.xzjmyk.pm.activity.ui.base.EasyFragment;
-import com.xzjmyk.pm.activity.ui.erp.activity.NoticeMenuActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.TaskActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessB2BActivity;
 import com.xzjmyk.pm.activity.ui.erp.activity.message.ProcessMsgActivity;
@@ -75,7 +74,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
     private PopupWindow setWindow;
     private int clickPosition = 0;
     private Boolean platform;
-    private RelativeLayout news_notice_rl;
+    //    private RelativeLayout news_notice_rl;
     private RelativeLayout subscribe_rl;
     public static final int REQUESTCODE = 0xa1;
     private Comparator<BaseSortModel<Friend>> comparator;
@@ -153,7 +152,6 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
                 return true;
             }
         });
-
     }
 
     private void initView() {
@@ -170,7 +168,7 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
 
     private View initHeaderView() {
         View view = LayoutInflater.from(mContext).inflate(R.layout.new_message_header, null);
-        news_notice_rl = (RelativeLayout) view.findViewById(R.id.notice_rl);
+//        news_notice_rl = (RelativeLayout) view.findViewById(R.id.notice_rl);
         subscribe_rl = (RelativeLayout) view.findViewById(R.id.subscribe_rl);
         schedule_num_tv = (TextView) view.findViewById(R.id.schedule_num_tv);//审批流
         waitting_work_num_tv = (TextView) view.findViewById(R.id.waitting_work_num_tv);//待办工作
@@ -186,13 +184,13 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
         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.notice_rl).setOnClickListener(this); //新闻通知
+//        view.findViewById(R.id.notice_rl).setOnClickListener(this); //新闻通知
         if (platform) {
             subscribe_rl.setVisibility(View.GONE);
-            news_notice_rl.setVisibility(View.GONE);
+//            news_notice_rl.setVisibility(View.GONE);
         } else {
             subscribe_rl.setVisibility(View.VISIBLE);
-            news_notice_rl.setVisibility(View.GONE);
+//            news_notice_rl.setVisibility(View.GONE);
         }
         return view;
     }
@@ -285,13 +283,13 @@ public class MessageFragment extends EasyFragment implements IMessageView, Recog
                 break;
             case R.id.msg_markread_tv://标为已读
                 break;
-            case R.id.notice_rl: //新闻通知
-                Intent intent = new Intent(mContext, NoticeMenuActivity.class);
-//                intent.putExtra(NoticeMenuActivity.GONGGAO, GONGGAO_count);
-//                intent.putExtra(NoticeMenuActivity.NOTICE, NOTICE_count);
-//                intent.putExtra(NoticeMenuActivity.NES, NES_count);
-                startActivityForResult(intent, REQUESTCODE);
-                break;
+//            case R.id.notice_rl: //新闻通知
+//                Intent intent = new Intent(mContext, NoticeMenuActivity.class);
+////                intent.putExtra(NoticeMenuActivity.GONGGAO, GONGGAO_count);
+////                intent.putExtra(NoticeMenuActivity.NOTICE, NOTICE_count);
+////                intent.putExtra(NoticeMenuActivity.NES, NES_count);
+//                startActivityForResult(intent, REQUESTCODE);
+//                break;
         }
 
     }

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

@@ -1,22 +1,23 @@
 <!--登录界面-->
-<ScrollView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#EBE9E9"
     android:fillViewport="true">
-    
+
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
+
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_head"
             android:layout_width="80dp"
-            android:layout_height="80dp" 
-            android:layout_centerHorizontal="true"
+            android:layout_height="80dp"
             android:layout_above="@+id/ll_content"
+            android:layout_centerHorizontal="true"
             android:layout_marginBottom="20dp"
-            android:src="@drawable/login_header"/>
+            android:src="@drawable/login_header" />
+
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
@@ -28,12 +29,12 @@
             <com.xzjmyk.pm.activity.view.ClearEditText
                 android:id="@+id/phone_numer_edit"
                 style="@style/IMLineEditText"
-                android:paddingTop="0dp"
-                android:paddingBottom="0dp"
                 android:background="@color/white"
                 android:drawableLeft="@drawable/login_user_name"
                 android:hint="@string/please_input_phone_number"
-                android:inputType="phone" />
+                android:inputType="phone"
+                android:paddingBottom="0dp"
+                android:paddingTop="0dp" />
 
             <View
                 android:layout_width="match_parent"
@@ -55,27 +56,28 @@
                 android:layout_marginTop="10dp"
                 android:background="@drawable/bg_bule_btn"
                 android:text="登  录"
-                android:textSize="@dimen/text_main"
-                android:textColor="@color/white" />
-            
-          
+                android:textColor="@color/white"
+                android:textSize="@dimen/text_main" />
+
+
         </LinearLayout>
+
         <TextView
-            android:layout_below="@+id/ll_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@+id/ll_content"
             android:layout_marginLeft="20dp"
-            android:textColor="@color/titleBlue"
-            android:text="忘记密码"/>
+            android:text="忘记密码"
+            android:textColor="@color/titleBlue" />
 
         <TextView
-            android:layout_below="@+id/ll_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="@color/titleBlue"
             android:layout_alignParentRight="true"
-            android:onClick="onRegister"
+            android:layout_below="@+id/ll_content"
             android:layout_marginRight="20dp"
-            android:text="新用户注册"/>
+            android:onClick="onRegister"
+            android:text="新用户注册"
+            android:textColor="@color/titleBlue" />
     </RelativeLayout>
 </ScrollView>

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

@@ -260,85 +260,85 @@
 
     </RelativeLayout>
 
-    <RelativeLayout
-        android:id="@+id/notice_rl"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/item_height"
-        android:background="@drawable/selector_me_menu_item_bg"
-        android:descendantFocusability="blocksDescendants"
-        android:minHeight="@dimen/item_height"
-        android:paddingLeft="15dp"
-        android:paddingRight="15dp">
-        <!--android:background="@color/item_color1"-->
-        <FrameLayout
-            android:id="@+id/notice_head_area"
-            android:layout_width="57dp"
-            android:layout_height="64dp"
-            android:layout_centerVertical="true">
-
-            <ImageView
-                android:id="@+id/notice_avatar_img"
-                android:layout_width="@dimen/item_img_height"
-                android:layout_height="@dimen/item_img_width"
-                android:layout_gravity="center_vertical"
-                android:background="@color/transparent"
-                android:contentDescription="@string/app_name"
-                android:padding="1dp"
-                android:src="@drawable/home_image_03_u" />
-
-            <TextView
-                android:id="@+id/notice_num_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="top|right"
-                android:background="@drawable/tab_unread_bg"
-                android:gravity="center"
-                android:textColor="@android:color/white"
-                android:textSize="10.0dip"
-                android:visibility="gone" />
-        </FrameLayout>
-
-        <RelativeLayout
-            android:id="@+id/notice_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="3dp"
-            android:layout_toRightOf="@id/notice_head_area"
-            android:gravity="center_vertical">
-
-            <TextView
-                android:id="@+id/notice_name_tv"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_toLeftOf="@+id/notice_time_tv"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="新闻通知"
-                android:textColor="@color/text_main"
-                android:textSize="16sp" />
-
-            <TextView
-                android:id="@+id/notice_time_tv"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="@color/text_hine"
-                android:textSize="14sp" />
-
-            <TextView
-                android:id="@+id/notice_content_tv"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/notice_name_tv"
-                android:layout_marginTop="8dp"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="@color/text_hine"
-                android:textSize="14sp" />
-        </RelativeLayout>
-
-    </RelativeLayout>
+    <!--<RelativeLayout-->
+        <!--android:id="@+id/notice_rl"-->
+        <!--android:layout_width="match_parent"-->
+        <!--android:layout_height="@dimen/item_height"-->
+        <!--android:background="@drawable/selector_me_menu_item_bg"-->
+        <!--android:descendantFocusability="blocksDescendants"-->
+        <!--android:minHeight="@dimen/item_height"-->
+        <!--android:paddingLeft="15dp"-->
+        <!--android:paddingRight="15dp">-->
+        <!--&lt;!&ndash;android:background="@color/item_color1"&ndash;&gt;-->
+        <!--<FrameLayout-->
+            <!--android:id="@+id/notice_head_area"-->
+            <!--android:layout_width="57dp"-->
+            <!--android:layout_height="64dp"-->
+            <!--android:layout_centerVertical="true">-->
+
+            <!--<ImageView-->
+                <!--android:id="@+id/notice_avatar_img"-->
+                <!--android:layout_width="@dimen/item_img_height"-->
+                <!--android:layout_height="@dimen/item_img_width"-->
+                <!--android:layout_gravity="center_vertical"-->
+                <!--android:background="@color/transparent"-->
+                <!--android:contentDescription="@string/app_name"-->
+                <!--android:padding="1dp"-->
+                <!--android:src="@drawable/home_image_03_u" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/notice_num_tv"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_gravity="top|right"-->
+                <!--android:background="@drawable/tab_unread_bg"-->
+                <!--android:gravity="center"-->
+                <!--android:textColor="@android:color/white"-->
+                <!--android:textSize="10.0dip"-->
+                <!--android:visibility="gone" />-->
+        <!--</FrameLayout>-->
+
+        <!--<RelativeLayout-->
+            <!--android:id="@+id/notice_content"-->
+            <!--android:layout_width="match_parent"-->
+            <!--android:layout_height="match_parent"-->
+            <!--android:layout_centerVertical="true"-->
+            <!--android:layout_marginLeft="3dp"-->
+            <!--android:layout_toRightOf="@id/notice_head_area"-->
+            <!--android:gravity="center_vertical">-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/notice_name_tv"-->
+                <!--android:layout_width="fill_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_toLeftOf="@+id/notice_time_tv"-->
+                <!--android:ellipsize="end"-->
+                <!--android:singleLine="true"-->
+                <!--android:text="新闻通知"-->
+                <!--android:textColor="@color/text_main"-->
+                <!--android:textSize="16sp" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/notice_time_tv"-->
+                <!--android:layout_width="wrap_content"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_alignParentRight="true"-->
+                <!--android:ellipsize="end"-->
+                <!--android:singleLine="true"-->
+                <!--android:textColor="@color/text_hine"-->
+                <!--android:textSize="14sp" />-->
+
+            <!--<TextView-->
+                <!--android:id="@+id/notice_content_tv"-->
+                <!--android:layout_width="fill_parent"-->
+                <!--android:layout_height="wrap_content"-->
+                <!--android:layout_below="@id/notice_name_tv"-->
+                <!--android:layout_marginTop="8dp"-->
+                <!--android:ellipsize="end"-->
+                <!--android:singleLine="true"-->
+                <!--android:textColor="@color/text_hine"-->
+                <!--android:textSize="14sp" />-->
+        <!--</RelativeLayout>-->
+
+    <!--</RelativeLayout>-->
 </LinearLayout>