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

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/account/LoginActivity.java

@@ -94,12 +94,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         tv_register= (TextView) findViewById(R.id.tv_register);
         if (CommonUtil.getSharedPreferences(this,"user_phone") != null &&CommonUtil.getSharedPreferences(this, "user_phone").length() > 0) {
             mPhoneNumberEdit.setText(CommonUtil.getSharedPreferences(this, "user_phone"));
-            mPhoneNumberEdit.setFocusable(false);
+      
         
         }
         if (PreferenceUtils.getString(this, PASS_WORDS) != null && PreferenceUtils.getString(this, PASS_WORDS).length() > 0) {
             mPasswordEdit.setText(PreferenceUtils.getString(this, PASS_WORDS));
-            mPasswordEdit.setFocusable(false);
+           
         }
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);

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

@@ -93,9 +93,17 @@ public class WorksFragment extends XutilsFragment implements View.OnClickListene
         goods_find.setOnClickListener(this);
         if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_oa)){
             tv_menu_oa.setVisibility(View.GONE);
+            tv_desc_business.setVisibility(View.GONE);
+            iv_business_desc.setVisibility(View.GONE);
+            tv_oa_desc.setVisibility(View.GONE);
+            iv_desc_oa.setVisibility(View.GONE);
         }
         if(CommonUtil.getSharedPreferencesBoolean(MyApplication.getInstance(), Constants.new_business)){
             tv_business_num.setVisibility(View.GONE);
+            tv_desc_business.setVisibility(View.GONE);
+            iv_business_desc.setVisibility(View.GONE);
+            tv_oa_desc.setVisibility(View.GONE);
+            iv_desc_oa.setVisibility(View.GONE);
         }
         
         tv_menu_oa.setOnClickListener(new View.OnClickListener() {

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

@@ -1,23 +1,25 @@
 <!--登录界面-->
-<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"
-        >
+        android:focusable="true"
+        android:focusableInTouchMode="true">
+
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_head"
             android:layout_width="80dp"
-            android:layout_height="80dp" 
+            android:layout_height="80dp"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="50dp"
             android:layout_marginBottom="20dp"
-            android:src="@drawable/login_header"/>
+            android:layout_marginTop="50dp"
+            android:src="@drawable/login_header" />
+
         <LinearLayout
             android:id="@+id/ll_content"
             android:layout_width="match_parent"
@@ -25,53 +27,59 @@
             android:layout_below="@+id/iv_head"
             android:layout_marginBottom="10dp"
             android:orientation="vertical">
-          <LinearLayout
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:background="@color/white"
-              android:orientation="horizontal">
-              <TextView
-                  android:layout_width="wrap_content"
-                  android:layout_height="match_parent"
-                  android:gravity="center"
-                  android:paddingLeft="10dp"
-                  android:text="账号    |"/>
-              <!--   android:drawableLeft="@drawable/login_user_name"-->
-              <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:hint="@string/please_input_phone_number"
-                  android:inputType="phone" />
-          </LinearLayout>
-         
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/white"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:paddingLeft="10dp"
+                    android:text="账号    |" />
+                <!--   android:drawableLeft="@drawable/login_user_name"-->
+                <com.xzjmyk.pm.activity.view.ClearEditText
+                    android:id="@+id/phone_numer_edit"
+                    style="@style/IMLineEditText"
+                    android:background="@color/white"
+                    android:hint="@string/please_input_phone_number"
+                    android:inputType="phone"
+
+                    android:paddingBottom="0dp"
+                    android:paddingTop="0dp" />
+            </LinearLayout>
+
 
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp" />
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/white"
-            android:orientation="horizontal">
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:paddingLeft="10dp"
-                android:text="密码    |"/>
-            <!--    android:drawableLeft="@drawable/loginpw"-->
-            <com.xzjmyk.pm.activity.view.ClearEditText
-                android:id="@+id/password_edit"
-                style="@style/IMLineEditPass"
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
                 android:background="@color/white"
-            
-                android:hint="@string/please_input_password" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:background="@color/white"
+                    android:gravity="center"
+                    android:paddingLeft="10dp"
+                    android:text="密码    |" />
+                <!--    android:drawableLeft="@drawable/loginpw"-->
+                <com.xzjmyk.pm.activity.view.ClearEditText
+                    android:id="@+id/password_edit"
+                    style="@style/IMLineEditPass"
+                    android:background="@color/white"
+
+                    android:hint="@string/please_input_password" />
             </LinearLayout>
-            
+
 
             <Button
                 android:id="@+id/login_btn"
@@ -82,30 +90,31 @@
                 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:id="@+id/tv_findPwd"
-            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:id="@+id/tv_register"
-            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:layout_below="@+id/ll_content"
             android:layout_marginRight="20dp"
-            android:text="新用户注册"/>
+
+            android:text="新用户注册"
+            android:textColor="@color/titleBlue" />
     </RelativeLayout>
 </ScrollView>