修复退出账号后重新登录闪退

WeiChat/src/main/java/com/sk/weichat/AppConfig.java

@@ -5,13 +5,11 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.text.TextUtils;
 import android.util.Log;
-
 import com.sk.weichat.bean.ConfigBean;
 
 public class AppConfig {
 	public static final String TAG = "roamer";
 	public static final boolean DEBUG = true;
-
 	/* 应用程序包名 */
 	public static final String sPackageName = "com.sk.weichat";
 

WeiChat/src/main/java/com/sk/weichat/ui/SplashActivity.java

@@ -18,7 +18,6 @@ import com.sk.weichat.R;
 import com.sk.weichat.bean.ConfigBean;
 import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.ui.account.LoginActivity;
-import com.sk.weichat.ui.account.LoginHistoryActivity;
 import com.sk.weichat.ui.account.RegisterActivity;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.volley.ObjectResult;
@@ -130,7 +129,7 @@ public class SplashActivity extends BaseActivity {
 			intent.setClass(mContext, MainActivity.class);
 			break;
 		case LoginHelper.STATUS_USER_SIMPLE_TELPHONE:
-			intent.setClass(mContext, LoginHistoryActivity.class);
+			intent.setClass(mContext, LoginActivity.class);
 			break;
 		case LoginHelper.STATUS_NO_USER:
 		default:

WeiChat/src/main/java/com/sk/weichat/ui/UserCheckedActivity.java

@@ -13,7 +13,6 @@ import com.sk.weichat.R;
 import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.sp.UserSp;
 import com.sk.weichat.ui.account.LoginActivity;
-import com.sk.weichat.ui.account.LoginHistoryActivity;
 import com.sk.weichat.ui.base.ActionBackActivity;
 import com.sk.weichat.ui.base.ActivityStack;
 
@@ -85,7 +84,7 @@ public class UserCheckedActivity extends ActionBackActivity {
 		boolean idIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getUserId(""));
 		boolean telephoneIsEmpty = TextUtils.isEmpty(UserSp.getInstance(this).getTelephone(null));
 		if (!idIsEmpty && !telephoneIsEmpty) {//
-			startActivity(new Intent(this, LoginHistoryActivity.class));
+			startActivity(new Intent(this, LoginActivity.class));
 		} else {
 			startActivity(new Intent(this, LoginActivity.class));
 		}

WeiChat/src/main/java/com/sk/weichat/ui/circle/BasicInfoActivity.java

@@ -121,9 +121,7 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 		}
 		setContentView(R.layout.activity_basic_info);
 		mProgressDialog = ProgressDialogUtil.init(this, null, getString(R.string.please_wait));
-
 		initView();
-
 		if (mLoginUserId.equals(mUserId) || TextUtils.isEmpty(mUserId)) {// 显示我的资料
 			mUserId = mLoginUserId;// 让mUserId变为和登陆者一样，当做是查看登陆者自己的个人资料
 			isMyInfo = true;
@@ -132,7 +130,6 @@ public class BasicInfoActivity extends BaseActivity implements NewFriendListener
 			isMyInfo = false;
 			loadOthersInfoFromNet();
 		}
-
 		ListenerManager.getInstance().addNewFriendListener(this);
 		mBind = bindService(CoreService.getIntent(), mServiceConnection, BIND_AUTO_CREATE);
 	}

WeiChat/src/main/java/com/sk/weichat/ui/circle/BusinessCircleActivity.java

@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -36,7 +35,6 @@ import com.sk.weichat.db.dao.FriendDao;
 import com.sk.weichat.db.dao.MyPhotoDao;
 import com.sk.weichat.helper.AvatarHelper;
 import com.sk.weichat.helper.FileDataHelper;
-import com.sk.weichat.ui.MainActivity;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.tool.MultiImagePreviewActivity;
 import com.sk.weichat.util.PreferenceUtils;
@@ -527,7 +525,6 @@ public class BusinessCircleActivity extends BaseActivity implements showCEView{
 		if (!isPullDwonToRefersh && mMessages.size() > 0) {
 			messageId = mMessages.get(mMessages.size() - 1).getMessageId();
 		}
-
 		HashMap<String, String> params = new HashMap<String, String>();
 		params.put("access_token", MyApplication.getInstance().mAccessToken);
 		params.put("userId", mUserId);

WeiChat/src/main/java/com/sk/weichat/ui/circle/SendAudioActivity.java

@@ -25,7 +25,7 @@ import com.sk.weichat.bean.Area;
 import com.sk.weichat.bean.UploadFileResult;
 import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.helper.UploadService;
-import com.sk.weichat.ui.account.LoginHistoryActivity;
+import com.sk.weichat.ui.account.LoginActivity;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.util.DeviceInfoUtil;
 import com.sk.weichat.util.ProgressDialogUtil;
@@ -208,7 +208,7 @@ public class SendAudioActivity extends BaseActivity {
 			super.onPostExecute(result);
 			if (result == 1) {
 				ProgressDialogUtil.dismiss(mProgressDialog);
-				startActivity(new Intent(SendAudioActivity.this, LoginHistoryActivity.class));
+				startActivity(new Intent(SendAudioActivity.this, LoginActivity.class));
 			} else if (result == 2) {
 				ProgressDialogUtil.dismiss(mProgressDialog);
 				ToastUtil.showToast(SendAudioActivity.this, R.string.audio_file_not_exist);

WeiChat/src/main/java/com/sk/weichat/ui/circle/SendShuoshuoActivity.java

@@ -32,7 +32,7 @@ import com.sk.weichat.bean.Area;
 import com.sk.weichat.bean.UploadFileResult;
 import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.helper.UploadService;
-import com.sk.weichat.ui.account.LoginHistoryActivity;
+import com.sk.weichat.ui.account.LoginActivity;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.tool.MultiImagePreviewActivity;
 import com.sk.weichat.util.CameraUtil;
@@ -340,7 +340,7 @@ public class SendShuoshuoActivity extends BaseActivity {
 			super.onPostExecute(result);
 			if (result == 1) {
 				ProgressDialogUtil.dismiss(mProgressDialog);
-				startActivity(new Intent(SendShuoshuoActivity.this, LoginHistoryActivity.class));
+				startActivity(new Intent(SendShuoshuoActivity.this, LoginActivity.class));
 			} else if (result == 2) {
 				ProgressDialogUtil.dismiss(mProgressDialog);
 				ToastUtil.showToast(SendShuoshuoActivity.this, getString(R.string.upload_failed));

WeiChat/src/main/java/com/sk/weichat/ui/circle/SendVideoActivity.java

@@ -26,7 +26,7 @@ import com.sk.weichat.bean.Area;
 import com.sk.weichat.bean.UploadFileResult;
 import com.sk.weichat.helper.LoginHelper;
 import com.sk.weichat.helper.UploadService;
-import com.sk.weichat.ui.account.LoginHistoryActivity;
+import com.sk.weichat.ui.account.LoginActivity;
 import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.me.LocalVideoActivity;
 import com.sk.weichat.util.BitmapUtil;
@@ -238,7 +238,7 @@ public class SendVideoActivity extends BaseActivity {
 			super.onPostExecute(result);
 			if (result == 1) {
 				ProgressDialogUtil.dismiss(mProgressDialog);
-				startActivity(new Intent(SendVideoActivity.this, LoginHistoryActivity.class));
+				startActivity(new Intent(SendVideoActivity.this, LoginActivity.class));
 			} else if (result == 2) {
 				ProgressDialogUtil.dismiss(mProgressDialog);
 				ToastUtil.showToast(SendVideoActivity.this, R.string.video_file_not_exist);

WeiChat/src/main/java/com/sk/weichat/ui/erp/net/ViewUtil.java

@@ -25,6 +25,7 @@ import com.alibaba.fastjson.JSON;
 import com.sk.weichat.MyApplication;
 import com.sk.weichat.ui.MainActivity;
 import com.sk.weichat.ui.account.DataDownloadActivity;
+import com.sk.weichat.ui.base.BaseActivity;
 import com.sk.weichat.ui.erp.activity.WebViewCommActivity;
 import com.sk.weichat.ui.erp.model.LoginEntity;
 import com.sk.weichat.ui.erp.util.CommonUtil;
@@ -303,7 +304,9 @@ public class ViewUtil {
         mdProcessDialog = new MaterialDialog.Builder(ct).title("登录")
                 .content("登录验证中，请稍等...").progress(true, 0)
                 .progressIndeterminateStyle(false).build();
-        mdProcessDialog.show();
+        if (((BaseActivity)ViewUtil.ct).isFinishing()){
+            mdProcessDialog.show();
+        }
         String url = Constants.BASE_URL_LOGIN;
         Map<String, String> params = new HashMap<String, String>();
         params.put("user", user_phone);

WeiChat/src/main/java/com/sk/weichat/view/DataLoadView.java

@@ -39,11 +39,9 @@ public class DataLoadView extends LinearLayout {
 		LayoutInflater.from(getContext()).inflate(R.layout.layout_data_load, this);
 		mLoadProgressBar = (ProgressBar) findViewById(R.id.load_progress_bar);
 		mLoadFailedTv = (TextView) findViewById(R.id.load_failed_tv);
-
 		status = STATUS_NONE;
 		mLoadProgressBar.setVisibility(View.GONE);
 		mLoadFailedTv.setVisibility(View.GONE);
-
 		mLoadFailedTv.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {

WeiChat/src/main/res/color/main_tab_btn_text.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item android:state_checked="true" android:color="@color/orange"/>
+    <item android:state_checked="true" android:color="@color/white"/>
     <item android:color="@color/main_tab_text_normal_grey"/>
 
 </selector>

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

@@ -153,7 +153,7 @@
 
                 <Button
                     android:id="@+id/next_step_btn"
-                    style="@style/IMButton.Orange"
+                    style="@style/IMButton"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="9dp"

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

@@ -34,9 +34,7 @@
         android:id="@+id/login_btn"
         style="@style/IMButton.Orange"
         android:layout_width="match_parent"
-        android:layout_marginLeft="9dp"
-        android:layout_marginRight="9dp"
-        android:layout_marginTop="9dp" />
+        android:layout_margin="15dp" />
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -44,6 +42,7 @@
         android:layout_marginTop="10dp">
 
         <Button
+            android:visibility="gone"
             android:id="@+id/register_account_btn"
             style="@style/IMHyperText"
             android:layout_alignParentLeft="true"
@@ -53,6 +52,7 @@
             android:text="@string/register_account" />
 
         <Button
+            android:visibility="gone"
             android:id="@+id/forget_password_btn"
             style="@style/IMHyperText"
             android:layout_alignParentRight="true"

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

@@ -6,7 +6,6 @@
 
     <FrameLayout
         android:id="@+id/main_content"
-
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_above="@+id/main_tab_radio_group" >

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

@@ -69,7 +69,7 @@
         <!--公司-->
         <RelativeLayout
             android:id="@+id/rl_company_change"
-            style="@style/IMTbleLine_UP"
+            style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="9dp">
 
             <TextView
@@ -144,7 +144,7 @@
 
         <RelativeLayout
             android:id="@+id/my_data_rl"
-            style="@style/IMTbleLine_UP">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -169,7 +169,7 @@
 
         <RelativeLayout
             android:id="@+id/my_erp_rl"
-            style="@style/IMTbleLine_UP"
+            style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="9dp">
 
             <TextView
@@ -245,7 +245,7 @@
 
         <RelativeLayout
             android:id="@+id/my_friend_rl"
-            style="@style/IMTbleLine_UP"
+            style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="9dp">
 
             <TextView
@@ -302,7 +302,7 @@
 
         <RelativeLayout
             android:id="@+id/local_video_rl"
-            style="@style/IMTbleLine_UP">
+            style="@style/IMTbleLine_UP_Me">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -326,7 +326,7 @@
 
         <RelativeLayout
             android:id="@+id/setting_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP_Me"
             android:layout_marginTop="9dp">
 
             <TextView

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

@@ -20,7 +20,7 @@
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="我的关注"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <ImageView
@@ -46,7 +46,7 @@
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="我的朋友圈"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <ImageView
@@ -80,7 +80,7 @@
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="我的UAS"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <ImageView
@@ -94,7 +94,7 @@
 
         <RelativeLayout
             android:id="@+id/setting_rl"
-            style="@style/IMTbleLine"
+            style="@style/IMTbleLine_UP"
             android:layout_marginTop="2dp">
 
             <TextView
@@ -105,7 +105,7 @@
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="优软商务"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <ImageView
@@ -130,7 +130,7 @@
                 android:drawablePadding="10dp"
                 android:gravity="center"
                 android:text="商品查询"
-                android:textColor="@color/black"
+                android:textColor="@color/white"
                 android:textSize="14sp" />
 
             <ImageView

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

@@ -18,7 +18,7 @@
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="企业通讯录"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="14sp" />
 
         <ImageView
@@ -36,7 +36,7 @@
         android:layout_height="2dp" />
     <RelativeLayout
         android:id="@+id/my_friends_rl"
-        style="@style/IMTbleLine">
+        style="@style/IMTbleLine_UP">
 
         <TextView
             android:layout_width="wrap_content"
@@ -46,7 +46,7 @@
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="我的好友"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="14sp" />
 
         <ImageView
@@ -75,7 +75,7 @@
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="我的群组"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="14sp" />
 
         <ImageView
@@ -94,7 +94,7 @@
 
     <RelativeLayout
         android:id="@+id/local_video_rl"
-        style="@style/IMTbleLine">
+        style="@style/IMTbleLine_UP">
 
         <TextView
             android:layout_width="wrap_content"
@@ -104,7 +104,7 @@
             android:drawablePadding="10dp"
             android:gravity="center"
             android:text="商务伙伴"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="14sp" />
 
         <ImageView

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

@@ -61,7 +61,7 @@
             android:layout_alignParentRight="true"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="@color/ghostwhite"
+            android:textColor="@color/wirtehine"
             android:textSize="14sp" />
 
         <TextView
@@ -72,7 +72,7 @@
             android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="@color/ghostwhite"
+            android:textColor="@color/wirtehine"
             android:textSize="14sp" />
     </RelativeLayout>
 

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

@@ -60,7 +60,7 @@
             android:layout_alignParentRight="true"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="@color/ghostwhite"
+            android:textColor="@color/wirtehine"
             android:textSize="14sp" />
 
         <TextView
@@ -71,7 +71,7 @@
             android:layout_marginTop="8dp"
             android:ellipsize="end"
             android:singleLine="true"
-            android:textColor="@color/ghostwhite"
+            android:textColor="@color/wirtehine"
             android:textSize="14sp" />
     </RelativeLayout>
 

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

@@ -10,9 +10,9 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:background="@color/wirtehine"
-        android:paddingBottom="5dip"
+        android:gravity="center_vertical"
         android:paddingLeft="15dip"
-        android:paddingTop="3dip"
+        android:textSize="10sp"
         android:textColor="@color/white" />
 
     <RelativeLayout

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

@@ -152,7 +152,7 @@
     </style>
 
     <style name="IMTbleLine_UP_Me">
-        <item name="android:background">@color/message_item2</item>
+        <item name="android:background">@color/message_item1</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">60dp</item>
@@ -160,7 +160,7 @@
         <item name="android:paddingRight">5dp</item>
     </style>
     <style name="IMTbleLine_UP">
-        <item name="android:background">@color/message_item1</item>
+        <item name="android:background">@color/message_item2</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:minHeight">55dp</item>