dev-login 完成

WeiChat/build.gradle

@@ -112,14 +112,12 @@ dependencies {
     compile('com.facebook.stetho:stetho:1.4.1') {
         force = true
     }
-    //JSON解析
 
-    //https://mvnrepository.com/artifact/com.alibaba/fastjson
+    compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.alibaba:fastjson:1.2.24'
     compile project(':library-refreshlayout')
     compile files('src/main/jniLibs/pushservice-5.3.0.99.jar')
     compile files('libs/lite-orm-1.7.0.jar')
-    //    compile fileTree(include: ['*.jar'], dir: 'libs')
     compile files('libs/Msc.jar')
     compile files('libs/zhy_treeview.jar')
     compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'

WeiChat/src/main/AndroidManifest.xml

@@ -147,6 +147,7 @@
         <!-- 登录模块 -->
         <activity
             android:name=".ui.account.LoginActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:windowSoftInputMode="adjustPan" />
         <activity android:name=".ui.account.LoginHistoryActivity" />
         <activity android:name=".ui.account.DataDownloadActivity" />

WeiChat/src/main/java/com/xzjmyk/pm/activity/helper/AvatarHelper.java

@@ -10,6 +10,7 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.MemoryCacheUtil;
 import com.nostra13.universalimageloader.core.imageaware.ImageAware;
 import com.xzjmyk.pm.activity.MyApplication;
+import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
 
 import java.io.File;
 import java.io.IOException;
@@ -257,6 +258,7 @@ public class AvatarHelper {
 
     public void display(String userId, final ImageView imageView, final boolean isThumb, boolean isDeleteCache) {
         final String url = getAvatarUrl(userId, isThumb);
+        LogUtil.d(url);
         if (isDeleteCache) {
             deleteCache(url);
         }

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

@@ -14,10 +14,12 @@ import com.android.volley.VolleyError;
 import com.xzjmyk.pm.activity.MyApplication;
 import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.LoginRegisterResult;
+import com.xzjmyk.pm.activity.helper.AvatarHelper;
 import com.xzjmyk.pm.activity.helper.LoginHelper;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.me.TimeStatisticsActivity;
 import com.xzjmyk.pm.activity.util.DeviceInfoUtil;
 import com.xzjmyk.pm.activity.util.Md5Util;
@@ -31,6 +33,8 @@ import com.xzjmyk.pm.activity.volley.StringJsonObjectRequest;
 
 import java.util.HashMap;
 
+import de.hdodenhof.circleimageview.CircleImageView;
+
 /**
  * 登陆界面
  *
@@ -38,7 +42,9 @@ import java.util.HashMap;
  * @version 1.0
  */
 public class LoginActivity extends BaseActivity implements View.OnClickListener {
-    private static final String PASS_WORDS = "PASS_WORDS";
+
+    private CircleImageView mHeader;
+    private String PASS_WORDS = "PASS_WORDS";
     private EditText mPhoneNumberEdit;
     private EditText mPasswordEdit;
 
@@ -46,14 +52,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
-        getSupportActionBar().setTitle(R.string.user_telphone_login);
         initView();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        //如果没有保存用户定位信息，那么去地位用户当前位置
         if (!MyApplication.getInstance().getBdLocationHelper().isLocationUpdate()) {
             MyApplication.getInstance().getBdLocationHelper().requestLocation();
         }
@@ -62,6 +66,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
     private void initView() {
         mPhoneNumberEdit = (EditText) findViewById(R.id.phone_numer_edit);
         mPasswordEdit = (EditText) findViewById(R.id.password_edit);
+        mHeader= (CircleImageView) findViewById(R.id.iv_head);
         if (MyApplication.getInstance().mLoginUser.getTelephone() != null && MyApplication.getInstance().mLoginUser.getTelephone().length() > 0) {
             mPhoneNumberEdit.setText(MyApplication.getInstance().mLoginUser.getTelephone());
         }
@@ -70,6 +75,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         }
         //登陆账号
         findViewById(R.id.login_btn).setOnClickListener(this);
+        if(!StringUtils.isEmpty(MyApplication.getInstance().mLoginUser.getUserId())) {
+            AvatarHelper.getInstance().display(MyApplication.getInstance().mLoginUser.getUserId(), mHeader, true, true);
+        }
     }
 
     @Override
@@ -81,12 +89,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
         }
     }
 
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-    }
-
     private void login() {
         MyApplication.cookie = null;
         final String phoneNumber = mPhoneNumberEdit.getText().toString().trim();

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

@@ -3,26 +3,34 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/login_bg"
+    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_above="@+id/ll_content"
+            android:layout_marginBottom="20dp"
+            android:src="@drawable/login_header"/>
         <LinearLayout
+            android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_marginBottom="80dp"
+            android:layout_centerInParent="true"
+            android:layout_marginBottom="10dp"
             android:orientation="vertical">
 
             <com.xzjmyk.pm.activity.view.ClearEditText
                 android:id="@+id/phone_numer_edit"
                 style="@style/IMLineEditText"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
                 android:paddingTop="0dp"
                 android:paddingBottom="0dp"
-                android:background="@color/wirtehine"
+                android:background="@color/white"
                 android:drawableLeft="@drawable/login_user_name"
                 android:hint="@string/please_input_phone_number"
                 android:inputType="phone" />
@@ -34,22 +42,39 @@
             <com.xzjmyk.pm.activity.view.ClearEditText
                 android:id="@+id/password_edit"
                 style="@style/IMLineEditPass"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:background="@color/wirtehine"
+                android:background="@color/white"
                 android:drawableLeft="@drawable/loginpw"
                 android:hint="@string/please_input_password" />
 
             <Button
                 android:id="@+id/login_btn"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginLeft="40dp"
-                android:layout_marginRight="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
                 android:layout_marginTop="10dp"
-                android:background="@drawable/bg_btn"
+                android:background="@drawable/bg_bule_btn"
                 android:text="登  录"
+                android:textSize="@dimen/text_main"
                 android:textColor="@color/white" />
+            
+          
         </LinearLayout>
+        <TextView
+            android:layout_below="@+id/ll_content"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="20dp"
+            android:textColor="@color/titleBlue"
+            android:text="忘记密码"/>
+
+        <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:layout_marginRight="20dp"
+            android:text="新用户注册"/>
     </RelativeLayout>
 </ScrollView>