diff --git a/PersonalCenter/app/src/main/AndroidManifest.xml b/PersonalCenter/app/src/main/AndroidManifest.xml
index cfbfbd1..ad999a7 100644
--- a/PersonalCenter/app/src/main/AndroidManifest.xml
+++ b/PersonalCenter/app/src/main/AndroidManifest.xml
@@ -132,7 +132,14 @@
+
+
+
+
+
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java
index dad70c8..5e07933 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java
@@ -23,6 +23,7 @@ import com.hjx.personalcenter.model.CityInfo;
import com.hjx.personalcenter.model.CountyInfo;
import com.hjx.personalcenter.model.ProvinceInfo;
import com.hjx.personalcenter.util.AlertUtils;
+import com.hjx.personalcenter.util.GetDevicesUtil;
import com.hjx.personalcenter.util.Judgment;
import com.hjx.personalcenter.util.PhoneNumCheckUtils;
@@ -132,7 +133,7 @@ public class ChangeElectronicCardAdressInfoActivity extends AppCompatActivity im
} else {
//修改地址接口
- String userID = SaveParam.getInstance().getLoginParam(this,"userId");
+ String userID = GetDevicesUtil.getDevicesInfo(this).getDeviceNumber();
long auserID = 0;
try {
auserID = Long.parseLong(userID);
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java
index f6f999a..349b250 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java
@@ -18,6 +18,7 @@ import com.hjx.personalcenter.db.SaveParam;
import com.hjx.personalcenter.http.HttpCode;
import com.hjx.personalcenter.http.HttpManager;
import com.hjx.personalcenter.util.AlertUtils;
+import com.hjx.personalcenter.util.GetDevicesUtil;
import com.hjx.personalcenter.util.PhoneNumCheckUtils;
import org.json.JSONObject;
@@ -149,8 +150,9 @@ public class ElectronicCardValidationActivity extends AppCompatActivity implemen
}else if (Content.authcodeflag==2){
//修改保卡手机号
+ String userID22 = GetDevicesUtil.getDevicesInfo(this).getDeviceNumber();
HttpManager.getInstance().changecardinfophone(this,
- auserID,usernameStr,authcodeStr);
+ userID22,usernameStr,authcodeStr);
}else {
String phone =phonenumber.getText().toString().trim();
SaveParam.getInstance().saveCustomizeParam(this,SaveParam.CARDPHONE, phone );
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
index 6a413df..b9ae064 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
@@ -17,6 +17,7 @@ import android.support.v7.widget.RecyclerView;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
+import android.widget.GridView;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
@@ -28,8 +29,9 @@ import com.facebook.drawee.generic.GenericDraweeHierarchyBuilder;
import com.facebook.drawee.generic.RoundingParams;
import com.facebook.drawee.interfaces.DraweeController;
import com.facebook.drawee.view.SimpleDraweeView;
+import com.google.gson.Gson;
import com.hjx.personalcenter.R;
-import com.hjx.personalcenter.adapter.GalleryAdapter;
+import com.hjx.personalcenter.adapter.MianGridAdapter;
import com.hjx.personalcenter.adapter.VideoAdapter;
import com.hjx.personalcenter.customdialog.HeadDialog;
import com.hjx.personalcenter.customdialog.RecyclerViewSpaceItem;
@@ -66,17 +68,18 @@ import java.util.ArrayList;
import java.util.List;
public class MainActivity extends AppCompatActivity implements View.OnClickListener, DialogCallBack.CallBackView {
- private ImageView iv_imformatioan, iv_look_card, iv_setting, iv_sign, iv_sex;
- private TextView tv_edit_presoninfo, tv_sign,
+ private ImageView iv_imformatioan, iv_setting, iv_sign, iv_sex,tv_edit_presoninfo;
+ private TextView tv_sign,
tv_username, tv_username1, tv_mygad, tv_sex, tv_useinfo_adress, tv_useinfo_birthday,
tv_useinfo_qq, tv_useinfo_school, tv_useinfo_gender, tv_yangji;
- private LinearLayout linel_mycuoti, linel_mynote, linel_mycollege, linel_myclass;
+ private TextView linel_mycuoti, linel_mynote, linel_mycollege, linel_myclass,iv_look_card;
private TopRightMenu mTopRightMenu;
+ private LinearLayout view_novedeo;
//水平滑动
private RecyclerView mRecyclerView;
- private RecyclerView mRecyclerViewpublish;
+ private GridView mRecyclerViewpublish;
private VideoAdapter RecyclerViewadapter;
- private GalleryAdapter RecyclerViewadapterpublish;
+ private MianGridAdapter RecyclerViewadapterpublish;
private ArrayList defautPublishInfos = new ArrayList<>();
private ArrayList videoinfo = new ArrayList<>();
@@ -129,8 +132,27 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTQQ,cardinfoBean.getQq());
SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTADRESS,cardinfoBean.getRegion().getRegionName());
SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ACCOUNTXINGZUO,cardinfoBean.getAddress());
+ SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.ADRESSID,cardinfoBean.getRegion().getRegionId());
+ SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.PORTAIT,cardinfoBean.getPortrait());
String graderID = cardinfoBean.getGrade().getGradeId();
Log.e("test","nianji"+graderID);
+ try {
+ long auserID = Long.parseLong(graderID);
+ String ss =SaveParam.getInstance().getLoginParam(MainActivity.this, SaveParam.GRADENS);
+ if ((auserID<8)&&(ss ==null)){
+ Intent intentbroad = new Intent();
+ intentbroad.putExtra("info","小学");
+ //4、定义广播发送的action
+ intentbroad.setAction("com.ozing.launcher.SWITCH_GRADE");
+ //5、发送广播
+ sendBroadcast(intentbroad);
+ Log.i("---", "发送完了");
+ }
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ }
+
+
SaveParam.getInstance().saveLoginParam(MainActivity.this, SaveParam.GRADENS, graderID);
String userID = SaveParam.getInstance().getLoginParam(MainActivity.this, "userId");
//账户类型
@@ -170,10 +192,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
defautPublishInfos.clear();
defautPublishInfos.addAll((List) msg.obj);
RecyclerViewadapterpublish.notifyDataSetChanged();
+ Gson gson = new Gson();
+ Log.e("test","(List) msg.obj"+ gson.toJson( msg.obj));
+ SaveParam.getInstance().saveLoginParam(MainActivity.this,SaveParam.VERSIONINTEFACE, gson.toJson( msg.obj));
break;
case HttpCode.GETVIDIO_SUCESS:
videoinfo.clear();
- videoinfo.addAll((List) msg.obj);
+ if (((List) msg.obj).size()==0) {
+ view_novedeo.setVisibility(View.VISIBLE);
+ } else {
+ view_novedeo.setVisibility(View.GONE);
+ videoinfo.addAll((List) msg.obj);
+ }
+
RecyclerViewadapter.notifyDataSetChanged();
break;
case HttpCode.SUCHCARDINFOONE:
@@ -233,8 +264,8 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
private void initView() {
iv_imformatioan = (ImageView) findViewById(R.id.iv_imformatioan);
- iv_look_card = (ImageView) findViewById(R.id.iv_look_card);
- tv_edit_presoninfo = (TextView) findViewById(R.id.tv_edit_presoninfo);
+ iv_look_card = (TextView) findViewById(R.id.iv_look_card);
+ tv_edit_presoninfo = (ImageView) findViewById(R.id.tv_edit_presoninfo);
iv_setting = (ImageView) findViewById(R.id.iv_setting);
iv_sign = (ImageView) findViewById(R.id.iv_sign);
tv_sign = (TextView) findViewById(R.id.tv_sign);
@@ -253,14 +284,14 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
tv_useinfo_gender = (TextView) findViewById(R.id.tv_useinfo_gender);
tv_yangji = (TextView) findViewById(R.id.tv_yangji);
//跳转其他应用
- linel_mycuoti = (LinearLayout) findViewById(R.id.linel_mycuoti);
- linel_mynote = (LinearLayout) findViewById(R.id.linel_mynote);
- linel_mycollege = (LinearLayout) findViewById(R.id.linel_mycollege);
- linel_myclass = (LinearLayout) findViewById(R.id.linel_myclass);
+ linel_mycuoti = (TextView) findViewById(R.id.linel_mycuoti);
+ linel_mynote = (TextView) findViewById(R.id.linel_mynote);
+ linel_mycollege = (TextView) findViewById(R.id.linel_mycollege);
+ linel_myclass = (TextView) findViewById(R.id.linel_myclass);
//
mRecyclerView = (RecyclerView) findViewById(R.id.id_recyclerview_horizontal);
- mRecyclerViewpublish = (RecyclerView) findViewById(R.id.id_recyclerview_pubish);
-
+ mRecyclerViewpublish = (GridView) findViewById(R.id.id_recyclerview_pubish);
+ view_novedeo = (LinearLayout) findViewById(R.id.view_novedeo);
}
@@ -276,18 +307,18 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(this);
linearLayoutManager.setOrientation(LinearLayoutManager.HORIZONTAL);
- LinearLayoutManager linearLayoutManagerpublish = new LinearLayoutManager(this);
- linearLayoutManagerpublish.setOrientation(LinearLayoutManager.HORIZONTAL);
+// LinearLayoutManager linearLayoutManagerpublish = new LinearLayoutManager(this);
+// linearLayoutManagerpublish.setOrientation(LinearLayoutManager.HORIZONTAL);
mRecyclerView.setLayoutManager(linearLayoutManager);
mRecyclerView.addItemDecoration(new RecyclerViewSpaceItem(10));
- mRecyclerViewpublish.setLayoutManager(linearLayoutManagerpublish);
- mRecyclerViewpublish.addItemDecoration(new RecyclerViewSpaceItem(10));
+// mRecyclerViewpublish.setLayoutManager(linearLayoutManagerpublish);
+// mRecyclerViewpublish.addItemDecoration(new RecyclerViewSpaceItem(10));
//设置视频适配器
RecyclerViewadapter = new VideoAdapter(this, videoinfo);
- RecyclerViewadapterpublish = new GalleryAdapter(this, defautPublishInfos);
+ RecyclerViewadapterpublish = new MianGridAdapter(defautPublishInfos,this);
//版本信息适配器
mRecyclerView.setAdapter(RecyclerViewadapter);
@@ -306,10 +337,21 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
String userID = SaveParam.getInstance().getLoginParam(this, "userId");
//获取个性签名
String typeaccount = SaveParam.getInstance().getCustomizeParam(this, SaveParam.ACCOUNT);
+ String childsID = SaveParam.getInstance().getCustomizeParam(this, SaveParam.CHILDSID);
+
try {
- long auserID = Long.parseLong(userID);
+ long auserID = 1;
+ long id = Long.parseLong(userID);
+ long childssID = Long.parseLong(childsID);
+
int typeaccount1 = Integer.parseInt(typeaccount);
- HttpManager.getInstance().getsignatures(MainActivity.this, auserID, typeaccount1, handler);
+ if (typeaccount1==2){
+ auserID =childssID;
+ }else {
+ auserID =id;
+ }
+
+ HttpManager.getInstance().getsignatures(MainActivity.this, auserID, typeaccount1, handler);
} catch (NumberFormatException e) {
e.printStackTrace();
@@ -382,6 +424,17 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
.setPositive("确定", new View.OnClickListener() {
@Override
public void onClick(View v) {
+ String graderID = SaveParam.getInstance().getLoginParam(MainActivity.this, SaveParam.GRADENS);
+ int graderIDs = Integer.parseInt(graderID);
+ if (graderIDs<8){
+ Intent intentbroad = new Intent();
+ intentbroad.putExtra("info","小学");
+ //4、定义广播发送的action
+ intentbroad.setAction("com.ozing.launcher.SWITCH_GRADE");
+ //5、发送广播
+ sendBroadcast(intentbroad);
+ Log.i("---", "发送完了");
+ }
//清除数据
SaveParam.getInstance().clearData(MainActivity.this);
Intent settingintent = new Intent();
@@ -418,7 +471,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
// params.inputBackgroundResourceId = R.drawable.bg_input;
}
})
- .setNegative("取消", null)
+ .setNegative("取消", new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ RecyclerViewadapterpublish.notifyDataSetChanged();
+ }
+ })
.setPositiveInput("确定", new OnInputClickListener() {
@Override
public void onClick(String text, View v) {
@@ -444,10 +502,22 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
.show();
break;
case R.id.linel_mycuoti:
- AlertUtils.showToast(this, "我的错题 ");
+// Intent intentbroad = new Intent();
+// //intentbroad.putExtra("info","小学");
+// //4、定义广播发送的action
+// intentbroad.setAction("com.ozing.launcher.SWITCH_GRADE");
+// //5、发送广播
+// sendBroadcast(intentbroad);
+// Log.i("---", "发送完了");
break;
case R.id.linel_mynote:
- AlertUtils.showToast(this, "我的笔记 ");
+// Intent intentbroad1 = new Intent();
+// //intentbroad1.putExtra("info","中学");
+// //4、定义广播发送的action
+// intentbroad1.setAction("com.ozing.launcher.SWITCH_GRADE");
+// //5、发送广播
+// sendBroadcast(intentbroad1);
+// Log.i("---", "发送完了");
break;
case R.id.linel_mycollege:
AlertUtils.showToast(this, "我的收藏 ");
@@ -475,7 +545,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
long auserID = Long.parseLong(userID);
int typeaccount1 = Integer.parseInt(accounts);
//获取最近播放视频
- HttpManager.getInstance().getstuyvidioinfo(this, auserID, handler);
+ HttpManager.getInstance().getstuyvidioinfo(this, auserID, handler);
//获取个人信息
HttpManager.getInstance().getpresonalinfo(MainActivity.this, auserID, typeaccount1, handler);
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java
index 9d748b5..46e0bca 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MyApplication.java
@@ -35,8 +35,8 @@ public class MyApplication extends Application {
instance = this;
CrashReport.initCrashReport(getApplicationContext(), "c2170557a0", false);
CrashHandler crashHandler = CrashHandler.getInstance();
- //生成错误日志，测试的时候得放开
- crashHandler.init(getApplicationContext());
+ //生成错误日志，上线的时候得放开
+ //crashHandler.init(getApplicationContext());
crashHandler.registerHandler(new CrashHandler.ExceptionHandler() {
@Override
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/MianGridAdapter.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/MianGridAdapter.java
new file mode 100644
index 0000000..90bfa1d
--- /dev/null
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/MianGridAdapter.java
@@ -0,0 +1,66 @@
+package com.hjx.personalcenter.adapter;
+
+import android.content.Context;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+import com.facebook.drawee.view.SimpleDraweeView;
+import com.hjx.personalcenter.R;
+import com.hjx.personalcenter.model.DefautPublishInfo;
+
+import java.util.ArrayList;
+
+/**
+ * Created by h on 2017/9/12.
+ */
+
+public class MianGridAdapter extends BaseAdapter {
+ private ArrayList defautPublishInfo;
+ private Context context;
+
+ public MianGridAdapter(ArrayList defautPublishInfo, Context context) {
+ this.defautPublishInfo = defautPublishInfo;
+ this.context = context;
+ }
+
+ @Override
+ public int getCount() {
+ return defautPublishInfo.size();
+ }
+
+ @Override
+ public Object getItem(int position) {
+ return position;
+ }
+
+ @Override
+ public long getItemId(int position) {
+ return position;
+ }
+
+ @Override
+ public View getView(int position, View convertView, ViewGroup parent) {
+ ViewHolder viewHolder = new ViewHolder();
+ if (convertView == null) {
+ convertView = View.inflate(context, R.layout.fragment_changge_version_info_itmes4, null);
+ viewHolder.simpleDraweeView = (SimpleDraweeView) convertView.findViewById(R.id.image_publish);
+ //viewHolder.subject = (TextView) convertView.findViewById(R.id.subject);
+ viewHolder.publish = (TextView) convertView.findViewById(R.id.tv_publish);
+ convertView.setTag(viewHolder);
+ } else {
+ viewHolder = (ViewHolder) convertView.getTag();
+ }
+ viewHolder.simpleDraweeView.setImageURI(defautPublishInfo.get(position).getCover());
+ //viewHolder.subject.setText(defautPublishInfo.get(position).getSubject());
+ viewHolder.publish.setText(defautPublishInfo.get(position).getPress());
+ return convertView;
+ }
+
+ static class ViewHolder {
+ SimpleDraweeView simpleDraweeView;
+ // TextView subject;
+ TextView publish;
+ }
+}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java
index 901bf90..fda0f40 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/SchoolListDialog.java
@@ -96,7 +96,7 @@ public class SchoolListDialog extends BaseCircleDialog implements AdapterView.On
school_sech = (EditText) getView().findViewById(R.id.et_school_sech);
cance = (ImageView) getView().findViewById(R.id.cancel);
String citys = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.CITYS);
- String country = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.COUNTRY);
+ String country = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.ADRESSID);
if (country==null){
country =citys;
}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
index b305846..41b4467 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
@@ -35,6 +35,8 @@ public class SaveParam {
public static String ACCOUNTSEX = "accountsex";//性别
public static String ACCOUNTQQ= "accountqq";//qq
public static String ACCOUNTXINGZUO = "accountxingzuo";//详细地址
+ public static String PORTAIT = "portrait";//头像
+ public static String ADRESSID = "adressid";//地址id
//电子保卡信息
public static String CARDPHONE = "cardphone";//保卡手机号
@@ -59,6 +61,8 @@ public class SaveParam {
public static String IMGURL = "imgurl";
//版本名称
public static String VERSION = "version";
+ //版本信息接口返回值
+ public static String VERSIONINTEFACE = "versioninterface";
public void saveLoginParam(Context context,String spname, String spstr) {
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
index d8c0e64..5792545 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
@@ -1,5 +1,6 @@
package com.hjx.personalcenter.fragment;
+import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.annotation.Nullable;
@@ -240,18 +241,27 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
return;
} else {
int a = 0, b = 0;
- int d = 1;
+ int d = 1,gradeold =0;
Object schoolids;
Long f = null;
- String regionId = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.COUNTRY);
+ String regionId2 = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.COUNTRY);
String regionId1 = SaveParam.getInstance().getsaveCityParam(getActivity(), SaveParam.CITYS);
- if (regionId == null) {
- regionId = regionId1;
+ String regionId = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.ADRESSID);
+ if (regionId == null ) {
+ if (regionId1!=null){
+ regionId = regionId1;
+ }else {
+ regionId = regionId2;
+ }
+
}
- String grade = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CHILDSGRADENS);
+ String gradeolds = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.GRADENS);
+ String grade = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.GRADENS);
String schoolid = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.SCHOOOlID);
String type = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.ACCOUNT);
String userID = SaveParam.getInstance().getLoginParam(getActivity(), "userId");
+ String childsID = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.CHILDSID);
+
String devicenumber = GetDevicesUtil.getDevicesInfo(getActivity()).getDeviceNumber();
String changeinfo = null;
if ("男".equals(presonal3)) {
@@ -262,13 +272,30 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
try {
a = Integer.parseInt(regionId);
b = Integer.parseInt(grade);
+ gradeold = Integer.parseInt(gradeolds);
+ if ((gradeold<8&&b>=8)||((gradeold>8&&b<=8))){
+ Intent intentbroad = new Intent();
+ intentbroad.putExtra("info","小学");
+ //4、定义广播发送的action
+ intentbroad.setAction("com.ozing.launcher.SWITCH_GRADE");
+ //5、发送广播
+ getActivity().sendBroadcast(intentbroad);
+ Log.i("---", "发送完了");
+ }
if (TextUtils.isEmpty(presonal6)) {
schoolids = null;
} else {
schoolids = Long.parseLong(schoolid);
}
d = Integer.parseInt(type);
- f = Long.parseLong(userID);
+ if (d==2){
+ f = Long.parseLong(childsID);
+
+ }else{
+ f = Long.parseLong(userID);
+ }
+
+
//提交个人信息
HttpManager.getInstance().changepresonalinfo(getActivity(),
f, d, presonal1, presonal5, b, a, schoolids, presonal8, changeinfo, presonal4 ,presonal2,devicenumber);
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
index 6fdbf65..1b8eb92 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
@@ -445,7 +445,7 @@ public class HttpManager {
}
//修改保卡信息电话
- public void changecardinfophone(final Context mContext, long userId, final String customerPhone, String authCode) {
+ public void changecardinfophone(final Context mContext, String userId, final String customerPhone, String authCode) {
RequestParams params = new RequestParams();
params.put("userId", userId);
params.put("customerPhone", customerPhone);
@@ -775,7 +775,7 @@ public class HttpManager {
public void changepublishinfo(final Context mContext, String userId, String chinese,
String math, String english, String physics, String chemistry,
String history, String geography, String political, String biology, String science) {
- mProgress = DialogPermission.showProgress(mContext, null, "正在保存个人信息...",
+ mProgress = DialogPermission.showProgress(mContext, null, "正在保存版本信息...",
false, true, null);
RequestParams params = new RequestParams();
params.put(HttpKey.USEID, userId);
@@ -1227,6 +1227,7 @@ public class HttpManager {
SaveParam.getInstance().saveLoginParam(mContext, SaveParam.HEADURL, imagUrl);
if (status.equals("1")) {
Toast.makeText(mContext, "头像上传成功。", Toast.LENGTH_LONG).show();
+ SaveParam.getInstance().saveLoginParam(mContext,SaveParam.PORTAIT,imagUrl);
} else {
AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试");
}
@@ -1275,6 +1276,7 @@ public class HttpManager {
SaveParam.getInstance().saveLoginParam(mContext, SaveParam.HEADURL, imagUrl);
if (status.equals("1")) {
Toast.makeText(mContext, "头像上传成功。", Toast.LENGTH_LONG).show();
+ SaveParam.getInstance().saveLoginParam(mContext,SaveParam.PORTAIT,imagUrl);
} else {
AlertUtils.showToast(mContext, "你好，服务器异常，请稍后重试");
}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/UserInfoModer.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/UserInfoModer.java
new file mode 100644
index 0000000..a7b183b
--- /dev/null
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/model/UserInfoModer.java
@@ -0,0 +1,92 @@
+package com.hjx.personalcenter.model;
+
+import java.io.Serializable;
+
+/**
+ * Created by h on 2017/11/23.
+ */
+
+public class UserInfoModer implements Serializable {
+ private String nickName;
+ private String gender;
+ private String address;
+ private String portrait;
+ private String school;
+ private String grade;
+ private String gradeid;
+
+ public String getGradeid() {
+ return gradeid;
+ }
+
+ public void setGradeid(String gradeid) {
+ this.gradeid = gradeid;
+ }
+
+ private String birthday;
+ private String qq;
+
+ public String getNickName() {
+ return nickName;
+ }
+
+ public void setNickName(String nickName) {
+ this.nickName = nickName;
+ }
+
+ public String getGender() {
+ return gender;
+ }
+
+ public void setGender(String gender) {
+ this.gender = gender;
+ }
+
+ public String getAddress() {
+ return address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public String getPortrait() {
+ return portrait;
+ }
+
+ public void setPortrait(String portrait) {
+ this.portrait = portrait;
+ }
+
+ public String getSchool() {
+ return school;
+ }
+
+ public void setSchool(String school) {
+ this.school = school;
+ }
+
+ public String getGrade() {
+ return grade;
+ }
+
+ public void setGrade(String grade) {
+ this.grade = grade;
+ }
+
+ public String getBirthday() {
+ return birthday;
+ }
+
+ public void setBirthday(String birthday) {
+ this.birthday = birthday;
+ }
+
+ public String getQq() {
+ return qq;
+ }
+
+ public void setQq(String qq) {
+ this.qq = qq;
+ }
+}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java
index 39ba2b0..930b043 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java
@@ -3,13 +3,13 @@ package com.hjx.personalcenter.service;
import android.content.Intent;
import android.os.IBinder;
import android.os.RemoteException;
-import android.util.Log;
import com.google.gson.Gson;
import com.hjx.personalcenter.activity.LoginAndRegisterActivity;
import com.hjx.personalcenter.db.SaveParam;
import com.hjx.personalcenter.model.CardInfo;
import com.hjx.personalcenter.model.LoginInfo;
+import com.hjx.personalcenter.model.UserInfoModer;
import com.hjx.personalcenter.util.GetDevicesUtil;
/**
@@ -68,7 +68,7 @@ public class CenterService extends BaseService {
logininfo =gson.toJson(loginInfo);
- Log.e("test","登录信息"+logininfo);
+ //Log.e("test","登录信息"+logininfo);
}
@@ -95,19 +95,33 @@ public class CenterService extends BaseService {
dataBean.setMobilePhone(SaveParam.getInstance().getCustomizeParam(getApplication(),SaveParam.CARDPHONE));
// cardInfo.setData(dataBean);
results =gson.toJson(dataBean);
- Log.e("test","保卡信息"+results);
+ //Log.e("test","保卡信息"+results);
return results;
}
@Override
public String getUserInfo() throws RemoteException {
- return null;
+ String userinfo = null;
+ Gson gson = new Gson();
+ UserInfoModer userInfoModer = new UserInfoModer();
+ userInfoModer.setNickName(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTUSERNAME));
+ userInfoModer.setGrade(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTGRADES));
+ userInfoModer.setSchool(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.ACCOUNTSCHOOL));
+ 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.setPortrait(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.PORTAIT));
+ userInfoModer.setGradeid(SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.GRADENS));
+ userinfo = gson.toJson(userInfoModer);
+ return userinfo;
}
@Override
public String logout() throws RemoteException {
- return null;
+ String visoninfo = SaveParam.getInstance().getLoginParam(getApplication(),SaveParam.VERSIONINTEFACE);
+ return visoninfo;
}
@Override
@@ -130,4 +144,9 @@ public class CenterService extends BaseService {
public IBinder onBind(Intent intent) {
return binder;
}
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ }
}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/StaticReceiver.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/StaticReceiver.java
new file mode 100644
index 0000000..dd6efe9
--- /dev/null
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/StaticReceiver.java
@@ -0,0 +1,20 @@
+package com.hjx.personalcenter.service;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+/**
+ * Created by h on 2017/11/20.
+ */
+
+public class StaticReceiver extends BroadcastReceiver {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ String info = intent.getStringExtra("info");
+ Log.i("---","onReceive");
+ // 处理消息
+ // Toast.makeText(context, info, Toast.LENGTH_LONG).show();
+ }
+}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java
index 966c370..87a0c12 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/GetDevicesUtil.java
@@ -3,8 +3,7 @@ package com.hjx.personalcenter.util;
import android.content.Context;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.provider.Settings;
-import android.telephony.TelephonyManager;
+import android.os.Build;
import android.util.Log;
import com.hjx.personalcenter.model.DeviceInfo;
@@ -21,6 +20,7 @@ public class GetDevicesUtil {
}
public static void initDevicesInfo(DeviceInfo mDeviceInfo,Context context){
+ //if (PermissionUtil.hasReadExternalStoragePermission((Activity) context))
mDeviceInfo.setDeviceModel(android.os.Build.MODEL);
Log.e(LOG_TAG,"" + mDeviceInfo.getDeviceModel());
mDeviceInfo.setMac(getMacAddress(context));
@@ -31,14 +31,17 @@ public class GetDevicesUtil {
}
private static String getCPUSerial(Context context) {
- String cpuAddress = null;
- TelephonyManager mTelephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
- if (mTelephony.getDeviceId() != null) {
- cpuAddress = mTelephony.getDeviceId();
- } else {
- //android.provider.Settings;
- cpuAddress = Settings.Secure.getString(context.getApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
- }
+ //String androidID = Settings.Secure.getString(context.getContentResolver(), Settings.Secure.ANDROID_ID);
+ String cpuAddress = Build.SERIAL;
+// String cpuAddress = null;
+// TelephonyManager mTelephony = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+// //if (PermissionUtil.hasReadExternalStoragePermission((Activity) context))
+// if (mTelephony.getDeviceId() != null) {
+// cpuAddress = mTelephony.getDeviceId();
+// } else {
+// //android.provider.Settings;
+// cpuAddress = Settings.Secure.getString(context.getApplicationContext().getContentResolver(), Settings.Secure.ANDROID_ID);
+// }
return cpuAddress;
}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/ISGradeChange.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/ISGradeChange.java
new file mode 100644
index 0000000..905eaff
--- /dev/null
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/ISGradeChange.java
@@ -0,0 +1,15 @@
+package com.hjx.personalcenter.util;
+
+/**
+ * Created by h on 2017/11/20.
+ */
+
+public class ISGradeChange {
+
+ public boolean isgradechange(int grade) {
+ if (grade>7){
+ return true;
+ }
+ return false;
+ }
+}
diff --git a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/PermissionUtil.java b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/PermissionUtil.java
index 2e464bf..c51393c 100644
--- a/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/PermissionUtil.java
+++ b/PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/PermissionUtil.java
@@ -14,7 +14,7 @@ import android.util.Log;
*/
public class PermissionUtil {
public static final int REQUEST_SHOWCAMERA = 0;
- public static final int REQUEST_READ_EXTERNAL_STORAGE = 1;
+ public static final int READ_PHONE_STATE = 1;
public static final int REQUEST_RECORD_AUDIO = 2;
public static final int REQUEST_CONTACTS = 3;
public static final int REQUEST_LOCATION = 4;
@@ -31,12 +31,14 @@ public class PermissionUtil {
MIN_SDK_PERMISSIONS.put("android.permission.WRITE_CALL_LOG", 16);
MIN_SDK_PERMISSIONS.put("android.permission.SYSTEM_ALERT_WINDOW", 23);
MIN_SDK_PERMISSIONS.put("android.permission.WRITE_SETTINGS", 23);
+ MIN_SDK_PERMISSIONS.put("android.permission.READ_PHONE_STATE", 23);
}
private static boolean permissionExists(String permission) {
Integer minVersion = MIN_SDK_PERMISSIONS.get(permission);
return minVersion == null || Build.VERSION.SDK_INT >= minVersion;
}
+
public static boolean hasCameraPermission(Activity activity){
int hasPermission = ContextCompat.checkSelfPermission(activity,
Manifest.permission.CAMERA);
@@ -55,15 +57,15 @@ public class PermissionUtil {
public static boolean hasReadExternalStoragePermission(Activity activity){
int hasPermission = ContextCompat.checkSelfPermission(activity,
- Manifest.permission.READ_EXTERNAL_STORAGE);
- if(!permissionExists(Manifest.permission.READ_EXTERNAL_STORAGE)){
- Log.e("permission","your system does not suppport "+ Manifest.permission.READ_EXTERNAL_STORAGE+" permission");
+ Manifest.permission.READ_PHONE_STATE);
+ if(!permissionExists(Manifest.permission.READ_PHONE_STATE)){
+ Log.e("permission","your system does not suppport "+ Manifest.permission.READ_PHONE_STATE+" permission");
return false;
}
if (hasPermission != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(activity,
- new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
- PermissionUtil.REQUEST_READ_EXTERNAL_STORAGE);
+ new String[]{Manifest.permission.READ_PHONE_STATE},
+ PermissionUtil.READ_PHONE_STATE);
return false;
}
return true;
diff --git a/PersonalCenter/app/src/main/res/drawable/corcle_blue_bg.xml b/PersonalCenter/app/src/main/res/drawable/corcle_blue_bg.xml
index aecd97d..afb5240 100644
--- a/PersonalCenter/app/src/main/res/drawable/corcle_blue_bg.xml
+++ b/PersonalCenter/app/src/main/res/drawable/corcle_blue_bg.xml
@@ -4,10 +4,10 @@
+ android:bottomLeftRadius="10dp"
+ android:topLeftRadius="10dp"
+ android:bottomRightRadius="10dp"
+ android:topRightRadius="10dp"/>
\ No newline at end of file
diff --git a/PersonalCenter/app/src/main/res/drawable/radio_button.xml b/PersonalCenter/app/src/main/res/drawable/radio_button.xml
index 12bd16b..ee01e56 100644
--- a/PersonalCenter/app/src/main/res/drawable/radio_button.xml
+++ b/PersonalCenter/app/src/main/res/drawable/radio_button.xml
@@ -4,7 +4,8 @@