dathlin/ClientServerProject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android端的登录机制优化，代码比较乱。。。v1.7.6

Browse Source
This commit is contained in:
dathlin
2017-11-06 21:57:07 +08:00
parent f661ad6997
commit 2a912fea7b
6 changed files with 189 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidTemplate/app/src/main/java/com/example/HslCommunication/Enthernet/NetComplexClient.java
View File

@@ -193,7 +193,7 @@ public class NetComplexClient extends NetShareBase {
// 连接成功，发送数据信息
if(!SendStringAndCheckReceive(
socket,
1,
2,
ClientAlias,
result,
null,

25
AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/LoginSupport/LoginActivity.java
View File

@@ -6,6 +6,7 @@ import android.animation.ObjectAnimator;
import android.animation.PropertyValuesHolder;
import android.animation.ValueAnimator;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
@@ -48,6 +49,24 @@ public class LoginActivity extends AppCompatActivity {
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.activity_login);
initView();
EditText editText1 = (EditText) findViewById(R.id.login_intput_username);
SharedPreferences pref = getSharedPreferences(UserClient.SettingsFileName,MODE_PRIVATE);
String name = pref.getString("name","");
if("".equals(name))
{
}
else {
editText1.setText(name);
EditText editText2 = (EditText) findViewById(R.id.login_intput_password);
editText2.setFocusable(true);
}
}
@@ -152,7 +171,6 @@ public class LoginActivity extends AppCompatActivity {
else if(msg.arg1 == 2)
{
// 登录成功
InterfaceRestore();
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
startActivity(intent);
finish();
@@ -222,6 +240,11 @@ public class LoginActivity extends AppCompatActivity {
}
UserClient.UserAccount = account;
// 保存用户名和密码
SharedPreferences.Editor editor = getSharedPreferences(UserClient.SettingsFileName,MODE_PRIVATE).edit();
editor.putString("name",UserName);
editor.putString("password",UserPassword);
editor.putLong("time",System.currentTimeMillis());
editor.apply();
LogUtil.LogD("loginSystem","开始请求版本检查");

139
AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/LoginSupport/SplashActivity.java
View File

@@ -1,6 +1,7 @@
package com.example.UserSoftwareAndroidTemplate.LoginSupport;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.AsyncTask;
import android.os.Bundle;
import android.os.Handler;
@@ -11,10 +12,16 @@ import android.widget.Toast;
import com.example.HslCommunication.BasicFramework.SystemVersion;
import com.example.HslCommunication.Core.Types.OperateResultString;
import com.example.HslCommunication.Log.LogUtil;
import com.example.UserSoftwareAndroidTemplate.CommonLibrary.SimplifyHeadCode;
import com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount;
import com.example.UserSoftwareAndroidTemplate.MainActivity;
import com.example.UserSoftwareAndroidTemplate.R;
import com.example.UserSoftwareAndroidTemplate.UserClient;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import static com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount.FrameworkVersion;
public class SplashActivity extends AppCompatActivity {
@@ -49,12 +56,19 @@ public class SplashActivity extends AppCompatActivity {
@Override
protected void onPostExecute(Integer result) {
if (result > 0) {
if (result == SUCCESSTWO) {
Intent intent = new Intent(SplashActivity.this, LoginActivity.class);
//intent.setClassName(SplashActivity.this, getString(R.string.));
startActivity(intent);
finish();
//两个参数分别表示进入的动画,退出的动画
overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
} else {
Intent intent = new Intent(SplashActivity.this, MainActivity.class);
startActivity(intent);
finish();
//两个参数分别表示进入的动画,退出的动画
overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
}
}
}
@@ -63,10 +77,10 @@ public class SplashActivity extends AppCompatActivity {
}
private static final int SHOW_TIME_MIN = 3000;
private static final int SHOW_TIME_MIN = 1200;
private static final int FAILURE = 0; // 失败
private static final int SUCCESS = 1; // 成功
private static final int OFFLINE = 2; // 如果支持离线阅读，进入离线模式
private static final int SUCCESSONE = 1; // 直接登录
private static final int SUCCESSTWO = 2; // 显示登录窗口
private Handler handler=new Handler(){
@@ -91,44 +105,133 @@ public class SplashActivity extends AppCompatActivity {
private int loadingCache() {
// 检查登录状态
SharedPreferences pref = getSharedPreferences(UserClient.SettingsFileName,MODE_PRIVATE);
if(pref == null) {
return SUCCESSTWO;
}
String name = pref.getString("name","");
String password = pref.getString("password","");
long time = pref.getLong("time",0);
if("".equals(name))
{
return SUCCESSTWO;
}
if("".equals(password))
{
return SUCCESSTWO;
}
if((System.currentTimeMillis()-time)/1000/60/60/24>6)
{
// 七天未登录就放弃
return SUCCESSTWO;
}
// 直接登录
LogUtil.LogD("loginSystem","开始请求维护检查");
// 第一步请求维护状态
OperateResultString result=UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.维护检查,"",null,null);
if(!result.IsSuccess){
OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.维护检查, "", null, null);
if (!result.IsSuccess) {
MessageShow(result.ToMessageShowString());
return FAILURE;
}
if (!result.Content.equals("1")) {
MessageShow(result.Content.substring(1));
return FAILURE;
}
if(!result.Content.equals("1")) {
MessageShow(result.Content.substring(1));
return FAILURE;
}
LogUtil.LogD("loginSystem","开始请求账户检查");
// 第二步检查账户
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty(UserAccount.UserNameText, name);
jsonObject.addProperty(UserAccount.PasswordText, password);
jsonObject.addProperty(UserAccount.LoginWayText, "Andriod");
jsonObject.addProperty(UserAccount.DeviceUniqueID, "Missing");
jsonObject.addProperty(FrameworkVersion, UserClient.FrameworkVersion.toString());
// 第三步检查版本
result=UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.更新检查,"",null,null);
if(!result.IsSuccess){
LogUtil.LogD("loginSystem",jsonObject.toString());
result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.账户检查, jsonObject.toString(), null, null);
if (!result.IsSuccess) {
MessageShow(result.ToMessageShowString());
return FAILURE;
}
SystemVersion sv=new SystemVersion(result.Content);
if(!UserClient.CurrentVersion.IsSameVersion(sv)) {
UserAccount account = new Gson().fromJson(result.Content, UserAccount.class);
if (!account.LoginEnable) {
// 不允许登录
MessageShow(account.ForbidMessage);
return SUCCESSTWO;
}
UserClient.UserAccount = account;
LogUtil.LogD("loginSystem","开始请求版本检查");
// 第三步检查版本
result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.更新检查, "", null, null);
if (!result.IsSuccess) {
MessageShow(result.ToMessageShowString());
return FAILURE;
}
SystemVersion sv = new SystemVersion(result.Content);
if (account.UserName != "admin") {
if (!UserClient.CurrentVersion.IsSameVersion(sv)) {
MessageShow("版本号校验失败！服务器版本为：" + sv.toString());
// 此处应该启动下载更新，这部分的服务以后再完成
return FAILURE;
}
} else {
if(UserClient.CurrentVersion.IsSmallerThan(sv))
{
// 管理员也不允许以低版本登录
MessageShow("版本号校验失败！服务器版本为：" + sv.toString());
return FAILURE;
}
}
LogUtil.LogD("loginSystem","开始请求数据下载");
// 下载服务器数据
result = UserClient.Net_simplify_client.ReadFromServer(SimplifyHeadCode.参数下载,"",null,null);
if (result.IsSuccess) {
// 服务器返回初始化的数据，此处进行数据的提取，有可能包含了多个数据
JsonBeanPara para = new Gson().fromJson(result.Content, JsonBeanPara.class);
// 例如公告数据和分厂数据
UserClient.Announcement = para.Announcement;
UserClient.SystemFactories = para.SystemFactories;
}
else
{
// 访问失败
MessageShow(result.ToMessageShowString());
return FAILURE;
}
// 下载服务器数据
LogUtil.LogD("loginSystem","登录成功");
return SUCCESS;
return SUCCESSONE;
}
}

28
AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/MainActivity.java
View File

@@ -1,5 +1,7 @@
package com.example.UserSoftwareAndroidTemplate;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Handler;
import android.os.Message;
import android.support.v7.app.AppCompatActivity;
@@ -15,6 +17,8 @@ import com.example.HslCommunication.Core.Types.NetHandle;
import com.example.HslCommunication.Core.Types.OperateResultString;
import com.example.HslCommunication.Enthernet.NetSimplifyClient;
import com.example.UserSoftwareAndroidTemplate.CommonLibrary.UserAccount;
import com.example.UserSoftwareAndroidTemplate.LoginSupport.LoginActivity;
import com.example.UserSoftwareAndroidTemplate.LoginSupport.SplashActivity;
import com.google.gson.Gson;
import java.util.UUID;
@@ -28,8 +32,6 @@ public class MainActivity extends AppCompatActivity {
private Handler handler=new Handler(){
/**重写handleMessage方法*/
@Override
@@ -83,9 +85,27 @@ public class MainActivity extends AppCompatActivity {
button2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
UserAccount account = new UserAccount();
TextView textView = (TextView) findViewById(R.id.textViewMain);
textView.setText(new Gson().toJson(account));
textView.setText(new Gson().toJson(UserClient.UserAccount));
}
});
Button button3 = (Button) findViewById(R.id.button3);
button3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
// 清除
SharedPreferences.Editor editor = getSharedPreferences(UserClient.SettingsFileName,MODE_PRIVATE).edit();
editor.putString("password","");
editor.putLong("time",0);
editor.apply();
Intent intent = new Intent(MainActivity.this, LoginActivity.class);
startActivity(intent);
finish();
//两个参数分别表示进入的动画,退出的动画
overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
}
});

19
AndroidTemplate/app/src/main/java/com/example/UserSoftwareAndroidTemplate/UserClient.java
View File

@@ -14,22 +14,17 @@ import java.util.UUID;
public class UserClient {
public static SystemVersion FrameworkVersion = new SystemVersion("1.7.5");
public static SystemVersion CurrentVersion= new SystemVersion("1.0.0.171026");
public static String ServerIp="117.48.203.204";
public static int PortSecondary=14568;
public static UUID Token=UUID.fromString("1275BB9A-14B2-4A96-9673-B0AF0463D474");
public static SystemVersion CurrentVersion = new SystemVersion("1.0.0.171026");
public static String SettingsFileName = "Settings";
public static String ServerIp = "117.48.203.204";
public static int PortSecondary = 14568;
public static UUID Token = UUID.fromString("1275BB9A-14B2-4A96-9673-B0AF0463D474");
public static List<String> SystemFactories = null; // 分厂
public static String Announcement=""; // 公告
public static NetSimplifyClient Net_simplify_client=new NetSimplifyClient(ServerIp,PortSecondary,Token);
public static String Announcement = ""; // 公告
public static NetSimplifyClient Net_simplify_client = new NetSimplifyClient(ServerIp, PortSecondary, Token);
public static UserAccount UserAccount = null;
}

6
AndroidTemplate/app/src/main/res/layout/activity_main.xml
View File

@@ -22,7 +22,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Button" />
<Button
android:id="@+id/button3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="退出登录" />
<TextView
android:id="@+id/textViewMain"