Merge branch 'developer_master' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer_master

WeiChat/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.xzjmyk.pm.activity"
-    android:versionCode="36"
-    android:versionName="3.6" >
+    android:versionCode="37"
+    android:versionName="3.7" >
 
     <uses-sdk
         android:minSdkVersion="14"

WeiChat/src/main/java/com/xzjmyk/pm/activity/db/SQLiteHelper.java

@@ -26,7 +26,7 @@ import java.sql.SQLException;
 
 public class SQLiteHelper extends OrmLiteSqliteOpenHelper {
 	public static final String DATABASE_NAME = "shiku.db";
-	private static final int DATABASE_VERSION = 2;
+	private static final int DATABASE_VERSION = 39;
 
 	// public static final String DATABASE_PATH = Config.SDCARD_PATH +
 	// File.separator + "shiku" + File.separator + "shiku.db";

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

@@ -317,7 +317,8 @@ public class LoginHelper {
 									}
 								}
 							} else {// 设备号不一致，那么就是切换过手机
-//								MyApplication.getInstance().mUserStatus = STATUS_USER_TOKEN_CHANGE;
+								MyApplication.getInstance().mUserStatus = STATUS_USER_TOKEN_CHANGE;
+
 								//TODO 可能存在异常提示账号在另一设备登陆情况
 
 							}
@@ -338,7 +339,7 @@ public class LoginHelper {
 		request.setTag("checkStatus");
 		activity.addDefaultRequest(request);
 	}
-
+   //方法结束
 	public interface OnCheckedFailedListener {// 检查Token失败才回调，然后外部在继续下一次检测
 
 		void onCheckFailed();

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/SplashActivity.java

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
 import android.view.View;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
@@ -121,18 +122,19 @@ public class SplashActivity extends BaseActivity {
 			return;
 		}
 		int userStatus = LoginHelper.prepareUser(mContext);
+		Log.i("Arison", "jump() called with: " + "userStatus:"+userStatus);
 		Intent intent = new Intent();
 		switch (userStatus) {
-		case LoginHelper.STATUS_USER_FULL:
-		case LoginHelper.STATUS_USER_NO_UPDATE:
-		case LoginHelper.STATUS_USER_TOKEN_OVERDUE:
+		case LoginHelper.STATUS_USER_FULL://5
+		case LoginHelper.STATUS_USER_NO_UPDATE://3
+		case LoginHelper.STATUS_USER_TOKEN_OVERDUE://2
 			//状态，进入主mainactivity
 			intent.setClass(mContext, MainActivity.class);
 			break;
 		case LoginHelper.STATUS_USER_SIMPLE_TELPHONE:
 			intent.setClass(mContext, LoginActivity.class);
 			break;
-		case LoginHelper.STATUS_NO_USER:
+		case LoginHelper.STATUS_NO_USER://0
 		default:
 			stay();
 			return;// must return

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

@@ -238,7 +238,6 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 		mRequest.setTag(requestTag);
 		addDefaultRequest(mRequest);*/
         ViewUtil.LoginTask(phone, password, mContext);
-
     }
 
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/base/BaseActivity.java

@@ -44,7 +44,7 @@ public abstract class BaseActivity extends ActionBackActivity {
 	@Override
 	protected void onStop() {
 		super.onStop();
-		Log.i("Arison","BaseActivity onStop()");
+//		Log.i("Arison","BaseActivity onStop()");
 		//PreferenceUtils.putBoolean(this, Constants.IS_NOTIFICATION, true);//进行通知
 	}
 

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

@@ -602,6 +602,7 @@ public class CompanyContactsActivity extends BaseActivity {
         mHandler.sendMessage(message);
     }
 
+
     /**
      * @注释：关键字查询
      */

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/db/DBOpenHelper.java

@@ -13,7 +13,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.Constants;
  */
 public class DBOpenHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VERSION = 38;//数据库版本号
+    private static final int DATABASE_VERSION = 39;//数据库版本号
     public static String dataBaseName = "erp.db";//数据库名称
     public Context context;
 

WeiChat/src/main/java/com/xzjmyk/pm/activity/volley/Result.java

@@ -2,6 +2,7 @@ package com.xzjmyk.pm.activity.volley;
 
 import android.content.Context;
 import android.text.TextUtils;
+import android.util.Log;
 import android.widget.Toast;
 
 import com.alibaba.fastjson.JSON;
@@ -47,14 +48,16 @@ public class Result {
 		} else if (result.resultCode == CODE_NO_TOKEN) {// 缺少参数Token
 			//TODO 发出异常登录的广播
 			//LoginHelper.broadcastToken(context);
-			LoginHelper.broadcastConflict(context);
+			//LoginHelper.broadcastConflict(context);
+			Log.i("Arison", "defaultParser() returned: " + "Token 过期");
 			if (showToast)
 				showResultToast(context, result);
 			return false;
 		} else if (result.resultCode == CODE_TOKEN_ERROR) {// Token过期或错误
 			//TODO 发出异常登录的广播
 			//LoginHelper.broadcastToken(context);
-			LoginHelper.broadcastConflict(context);
+			//LoginHelper.broadcastConflict(context);
+			Log.i("Arison", "defaultParser() returned: " + "Token 过期");
 			if (showToast)
 				showResultToast(context, result);
 			return false;