家长控制手机端功能

liujiaqi
1 parent bfaa7264b3
Showing 11 changed files with 88 additions and 10 deletions Show diff stats
.DS_Store
PersonalCenter/.idea/misc.xml
PersonalCenter/app/PresonalCenter.apk
PersonalCenter/app/build.gradle
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpClient.java
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpCode.java
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java
PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/VersionCodeUtils.java
PersonalCenter/app/src/main/res/layout/activity_electronic_look_cardinfo.xml
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
@@ -24,7 +27,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -7,8 +7,8 @@ android {
         applicationId "com.hjx.personalcenter"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 5
-        versionName "1.0.5"
+        versionCode 6
+        versionName "1.1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -44,7 +44,7 @@ dependencies {
     compile files('libs/android-async-http-1.4.8.jar')
     compile 'com.google.code.gson:gson:2.7'
     compile 'com.zaaach:toprightmenu:1.0'
-    compile 'com.android.support:recyclerview-v7:25.+'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
     debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
     releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
     compile 'com.google.zxing:core:3.3.0'
@@ -246,6 +246,16 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
  
                     }
                     break;
+                case HttpCode.RELOGIN:
+                    //清除数据
+                    SaveParam.getInstance().saveCustomizeParam(MainActivity.this, SaveParam.ACCOUNT, "1");
+                    SaveParam.getInstance().clearData(MainActivity.this);
+                    Intent settingintent = new Intent();
+                    settingintent.setClass(MainActivity.this, LoginAndRegisterActivity.class);
+                    startActivity(settingintent);
+                    overridePendingTransition(R.anim.rightin, R.anim.rightout);
+                    finish();
+                    break;
  
  
             }
 package com.hjx.personalcenter.http;
  
  
+import android.os.Build;
+
+import com.hjx.personalcenter.R;
+import com.hjx.personalcenter.activity.MyApplication;
+import com.hjx.personalcenter.util.VersionCodeUtils;
 import com.loopj.android.http.AsyncHttpClient;
  
 public class HttpClient extends AsyncHttpClient {
@@ -9,6 +14,14 @@ public class HttpClient extends AsyncHttpClient {
 	public static HttpClient getInstance() {
 		if(client == null) {
 			client = new HttpClient();
+			client.addHeader("app-name", MyApplication.getInstance().getString(R.string.app_name));
+			client.addHeader("device-model",  Build.MODEL);
+			client.addHeader("device-number",  Build.SERIAL);
+			client.addHeader("os-type",  "Android");
+			client.addHeader("os-version",  Build.VERSION.RELEASE);
+			client.addHeader("pid",  MyApplication.getInstance().getPackageName());
+			client.addHeader("version-code", VersionCodeUtils.getVersionCode()+"");
+			client.addHeader("version-name",  VersionCodeUtils.getVerName());
 		}
 		return client;
 	}
@@ -61,6 +61,8 @@ public class HttpCode {
     public static final int TOUXIANG = 29;
     //学校
     public static final int SCOOL = 29;
+    //每天POST设备号，需要重新登录
+    public static final int RELOGIN = 30;
  
  
 }
@@ -4,6 +4,7 @@ import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Message;
 import android.support.v4.app.FragmentActivity;
@@ -36,6 +37,7 @@ import com.hjx.personalcenter.model.VersionInfo;
 import com.hjx.personalcenter.model.VideoInfo;
 import com.hjx.personalcenter.util.AlertUtils;
 import com.hjx.personalcenter.util.DialogPermission;
+import com.hjx.personalcenter.util.GetDevicesUtil;
 import com.loopj.android.http.AsyncHttpResponseHandler;
 import com.loopj.android.http.JsonHttpResponseHandler;
 import com.loopj.android.http.RequestParams;
@@ -71,6 +73,7 @@ public class HttpManager {
         mProgress = DialogPermission.showProgress(mContext, null, "正在登录...",
                 true, true, null);
         HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
+        HttpClient.getInstance().addHeader("device-number",  Build.SERIAL);
         HttpClient.getInstance().get(HttpUrl.loginUrl + "?username=" + username + "&password=" + password, new AsyncHttpResponseHandler() {
             @Override
             public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
@@ -647,20 +650,21 @@ public class HttpManager {
             @Override
             public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
                 closeProgress();
-               // Log.e("test", "个人信息" + new String(arg2));
+                Log.e("test", "个人信息" + new String(arg2));
                 try {
                     JSONObject jsonObject = new JSONObject(new String(arg2));
                     int status = jsonObject.optInt("status");
+                    Message message = Message.obtain();
                     if (status == 1) {
                         PesonalInfo pesonalInfo = GsonTool.getPerson(new String(arg2), PesonalInfo.class);//解析json数据
                         PesonalInfo.DataBean pesonalInfoBeanList = pesonalInfo.getData();
-                        Message message = Message.obtain();
                         message.what = HttpCode.GETINFO;
                         message.obj = pesonalInfoBeanList;
                         handler.sendMessage(message);
-
-
-                    } else {
+                    } else if (status == 1011){
+                        message.what = HttpCode.RELOGIN;
+                        handler.sendMessage(message);
+                    }else {
                         AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!");
  
                     }
@@ -118,7 +118,7 @@ public class CenterService extends BaseService {
             userInfoModer.setBirthday(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTCONSTELLATION));
             userInfoModer.setGender(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTSEX));
             userInfoModer.setQq(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTQQ));
-            userInfoModer.setAddress(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTXINGZUO));
+            userInfoModer.setAddress(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTADRESS));
             userInfoModer.setPortrait(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.PORTAIT));
             userInfoModer.setGradeid(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.GRADENS));
             userInfoModer.setIsprototype(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.YANGJI));
@@ -0,0 +1,45 @@
+package com.hjx.personalcenter.util;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+import com.hjx.personalcenter.activity.MyApplication;
+
+/**
+ * Created by liujiaqi on 2018/4/11.
+ */
+
+public class VersionCodeUtils {
+    /**
+     * 获取当前本地apk的版本
+     *
+     * @return
+     */
+    public static int getVersionCode() {
+        int versionCode = 0;
+        try {
+            //获取软件版本号，对应AndroidManifest.xml下android:versionCode
+            versionCode = MyApplication.getInstance().getPackageManager().
+                    getPackageInfo(MyApplication.getInstance().getPackageName(), 0).versionCode;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return versionCode;
+    }
+
+    /**
+     * 获取版本号名称
+     *
+     * @return
+     */
+    public static String getVerName() {
+        String verName = "";
+        try {
+            verName = MyApplication.getInstance().getPackageManager().
+                    getPackageInfo(MyApplication.getInstance().getPackageName(), 0).versionName;
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+        return verName;
+    }
+}
@@ -300,6 +300,7 @@
                     android:layout_marginLeft="18dp"
                     android:background="@drawable/corcle_blue_bg"
                     android:text="修改"
+                    android:visibility="gone"
                     android:paddingLeft="5dp"
                     android:paddingRight="5dp"
                     android:textColor="@color/login_text_blue"
1	1	<?xml version="1.0" encoding="UTF-8"?>
2	2	<project version="4">
	3	+ <component name="EntryPointsManager">
	4	+ <entry_points version="2.0" />
	5	+ </component>
3	6	<component name="NullableNotNullManager">
4	7	<option name="myDefaultNullable" value="android.support.annotation.Nullable" />
5	8	<option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
...	...	@@ -24,7 +27,7 @@
24	27	</value>
25	28	</option>
26	29	</component>
27		- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
	30	+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
28	31	<output url="file://$PROJECT_DIR$/build/classes" />
29	32	</component>
30	33	<component name="ProjectType">
...	...
...	...	@@ -7,8 +7,8 @@ android {
7	7	applicationId "com.hjx.personalcenter"
8	8	minSdkVersion 15
9	9	targetSdkVersion 25
10		- versionCode 5
11		- versionName "1.0.5"
	10	+ versionCode 6
	11	+ versionName "1.1.0"
12	12	testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13	13	}
14	14	buildTypes {
...	...	@@ -44,7 +44,7 @@ dependencies {
44	44	compile files('libs/android-async-http-1.4.8.jar')
45	45	compile 'com.google.code.gson:gson:2.7'
46	46	compile 'com.zaaach:toprightmenu:1.0'
47		- compile 'com.android.support:recyclerview-v7:25.+'
	47	+ compile 'com.android.support:recyclerview-v7:25.3.1'
48	48	debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3'
49	49	releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3'
50	50	compile 'com.google.zxing:core:3.3.0'
...	...
...	...	@@ -246,6 +246,16 @@ public class MainActivity extends FragmentActivity implements View.OnClickListen
246	246
247	247	}
248	248	break;
	249	+ case HttpCode.RELOGIN:
	250	+ //清除数据
	251	+ SaveParam.getInstance().saveCustomizeParam(MainActivity.this, SaveParam.ACCOUNT, "1");
	252	+ SaveParam.getInstance().clearData(MainActivity.this);
	253	+ Intent settingintent = new Intent();
	254	+ settingintent.setClass(MainActivity.this, LoginAndRegisterActivity.class);
	255	+ startActivity(settingintent);
	256	+ overridePendingTransition(R.anim.rightin, R.anim.rightout);
	257	+ finish();
	258	+ break;
249	259
250	260
251	261	}
...	...
1	1	package com.hjx.personalcenter.http;
2	2
3	3
	4	+import android.os.Build;
	5	+
	6	+import com.hjx.personalcenter.R;
	7	+import com.hjx.personalcenter.activity.MyApplication;
	8	+import com.hjx.personalcenter.util.VersionCodeUtils;
4	9	import com.loopj.android.http.AsyncHttpClient;
5	10
6	11	public class HttpClient extends AsyncHttpClient {
...	...	@@ -9,6 +14,14 @@ public class HttpClient extends AsyncHttpClient {
9	14	public static HttpClient getInstance() {
10	15	if(client == null) {
11	16	client = new HttpClient();
	17	+ client.addHeader("app-name", MyApplication.getInstance().getString(R.string.app_name));
	18	+ client.addHeader("device-model", Build.MODEL);
	19	+ client.addHeader("device-number", Build.SERIAL);
	20	+ client.addHeader("os-type", "Android");
	21	+ client.addHeader("os-version", Build.VERSION.RELEASE);
	22	+ client.addHeader("pid", MyApplication.getInstance().getPackageName());
	23	+ client.addHeader("version-code", VersionCodeUtils.getVersionCode()+"");
	24	+ client.addHeader("version-name", VersionCodeUtils.getVerName());
12	25	}
13	26	return client;
14	27	}
...	...
...	...	@@ -61,6 +61,8 @@ public class HttpCode {
61	61	public static final int TOUXIANG = 29;
62	62	//学校
63	63	public static final int SCOOL = 29;
	64	+ //每天POST设备号，需要重新登录
	65	+ public static final int RELOGIN = 30;
64	66
65	67
66	68	}
...	...
...	...	@@ -4,6 +4,7 @@ import android.app.Activity;
4	4	import android.app.ProgressDialog;
5	5	import android.content.Context;
6	6	import android.content.Intent;
	7	+import android.os.Build;
7	8	import android.os.Handler;
8	9	import android.os.Message;
9	10	import android.support.v4.app.FragmentActivity;
...	...	@@ -36,6 +37,7 @@ import com.hjx.personalcenter.model.VersionInfo;
36	37	import com.hjx.personalcenter.model.VideoInfo;
37	38	import com.hjx.personalcenter.util.AlertUtils;
38	39	import com.hjx.personalcenter.util.DialogPermission;
	40	+import com.hjx.personalcenter.util.GetDevicesUtil;
39	41	import com.loopj.android.http.AsyncHttpResponseHandler;
40	42	import com.loopj.android.http.JsonHttpResponseHandler;
41	43	import com.loopj.android.http.RequestParams;
...	...	@@ -71,6 +73,7 @@ public class HttpManager {
71	73	mProgress = DialogPermission.showProgress(mContext, null, "正在登录...",
72	74	true, true, null);
73	75	HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,/;q=0.8");
	76	+ HttpClient.getInstance().addHeader("device-number", Build.SERIAL);
74	77	HttpClient.getInstance().get(HttpUrl.loginUrl + "?username=" + username + "&password=" + password, new AsyncHttpResponseHandler() {
75	78	@Override
76	79	public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
...	...	@@ -647,20 +650,21 @@ public class HttpManager {
647	650	@Override
648	651	public void onSuccess(int arg0, Header[] arg1, byte[] arg2) {
649	652	closeProgress();
650		- // Log.e("test", "个人信息" + new String(arg2));
	653	+ Log.e("test", "个人信息" + new String(arg2));
651	654	try {
652	655	JSONObject jsonObject = new JSONObject(new String(arg2));
653	656	int status = jsonObject.optInt("status");
	657	+ Message message = Message.obtain();
654	658	if (status == 1) {
655	659	PesonalInfo pesonalInfo = GsonTool.getPerson(new String(arg2), PesonalInfo.class);//解析json数据
656	660	PesonalInfo.DataBean pesonalInfoBeanList = pesonalInfo.getData();
657		- Message message = Message.obtain();
658	661	message.what = HttpCode.GETINFO;
659	662	message.obj = pesonalInfoBeanList;
660	663	handler.sendMessage(message);
661		-
662		-
663		- } else {
	664	+ } else if (status == 1011){
	665	+ message.what = HttpCode.RELOGIN;
	666	+ handler.sendMessage(message);
	667	+ }else {
664	668	AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试!");
665	669
666	670	}
...	...
...	...	@@ -118,7 +118,7 @@ public class CenterService extends BaseService {
118	118	userInfoModer.setBirthday(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTCONSTELLATION));
119	119	userInfoModer.setGender(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTSEX));
120	120	userInfoModer.setQq(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTQQ));
121		- userInfoModer.setAddress(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTXINGZUO));
	121	+ userInfoModer.setAddress(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTADRESS));
122	122	userInfoModer.setPortrait(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.PORTAIT));
123	123	userInfoModer.setGradeid(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.GRADENS));
124	124	userInfoModer.setIsprototype(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.YANGJI));
...	...
...	...	@@ -0,0 +1,45 @@
	1	+package com.hjx.personalcenter.util;
	2	+
	3	+import android.content.Context;
	4	+import android.content.pm.PackageManager;
	5	+
	6	+import com.hjx.personalcenter.activity.MyApplication;
	7	+
	8	+/**
	9	+ * Created by liujiaqi on 2018/4/11.
	10	+ */
	11	+
	12	+public class VersionCodeUtils {
	13	+ /**
	14	+ * 获取当前本地apk的版本
	15	+ *
	16	+ * @return
	17	+ */
	18	+ public static int getVersionCode() {
	19	+ int versionCode = 0;
	20	+ try {
	21	+ //获取软件版本号，对应AndroidManifest.xml下android:versionCode
	22	+ versionCode = MyApplication.getInstance().getPackageManager().
	23	+ getPackageInfo(MyApplication.getInstance().getPackageName(), 0).versionCode;
	24	+ } catch (PackageManager.NameNotFoundException e) {
	25	+ e.printStackTrace();
	26	+ }
	27	+ return versionCode;
	28	+ }
	29	+
	30	+ /**
	31	+ * 获取版本号名称
	32	+ *
	33	+ * @return
	34	+ */
	35	+ public static String getVerName() {
	36	+ String verName = "";
	37	+ try {
	38	+ verName = MyApplication.getInstance().getPackageManager().
	39	+ getPackageInfo(MyApplication.getInstance().getPackageName(), 0).versionName;
	40	+ } catch (PackageManager.NameNotFoundException e) {
	41	+ e.printStackTrace();
	42	+ }
	43	+ return verName;
	44	+ }
	45	+}
...	...
...	...	@@ -300,6 +300,7 @@
300	300	android:layout_marginLeft="18dp"
301	301	android:background="@drawable/corcle_blue_bg"
302	302	android:text="修改"
	303	+ android:visibility="gone"
303	304	android:paddingLeft="5dp"
304	305	android:paddingRight="5dp"
305	306	android:textColor="@color/login_text_blue"
...	...