hjx-app / PresonalCenter

Download as
Browse Code »

Commit 7b3114a64f8b15b12d0966dab19e03844237ce6e

Authored by xiongwei
1 parent 9d08c5be52
Exists in master

版本信息的修改和完善

Showing 9 changed files with 275 additions and 215 deletions   Show diff stats
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java
Diff comments   View file @7b3114a
... ... @@ -22,7 +22,7 @@ import java.util.List;
22 22 * Created by h on 2017/8/12.
23 23 */
24 24  
25   -public class ChangePresonalInfoActivity extends AppCompatActivity implements View.OnClickListener {
  25 +public class ChangePresonalInfoActivity extends AppCompatActivity {
26 26 private ViewPager viewPager;
27 27 private SlidingTabLayout tableLayout;
28 28 private TextView subsave;
... ... @@ -37,14 +37,11 @@ public class ChangePresonalInfoActivity extends AppCompatActivity implements Vie
37 37 SysApplication.getInstance().addActivity(this);
38 38 initView();
39 39 initData();
40   - setLister();
41 40  
42 41 }
43 42 private void initView() {
44 43 viewPager = (ViewPager) findViewById(R.id.viewpager_login);
45 44 tableLayout = (SlidingTabLayout) findViewById(R.id.TabLayout_id);
46   - cancel = (ImageView) findViewById(R.id.cancel);
47   - subsave = (TextView) findViewById(R.id.presonal_sub);
48 45 }
49 46  
50 47 private void initData() {
... ... @@ -69,20 +66,5 @@ public class ChangePresonalInfoActivity extends AppCompatActivity implements Vie
69 66 viewPager.setOffscreenPageLimit(1);
70 67 //将TabLayout和ViewPager关联起来。
71 68 }
72   - private void setLister() {
73   - cancel.setOnClickListener(this);
74   - subsave.setOnClickListener(this);
75   - }
76 69  
77   - @Override
78   - public void onClick(View v) {
79   - switch (v.getId()){
80   - case R.id.presonal_sub:
81   - break;
82   - case R.id.cancel:
83   - finish();
84   - break;
85   - }
86   -
87   - }
88 70 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java
Diff comments   View file @7b3114a
... ... @@ -5,6 +5,7 @@ import android.os.Bundle;
5 5 import android.os.Handler;
6 6 import android.os.Message;
7 7 import android.support.v7.app.AppCompatActivity;
  8 +import android.util.Log;
8 9 import android.view.View;
9 10 import android.widget.AdapterView;
10 11 import android.widget.Button;
... ... @@ -45,6 +46,7 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
45 46 private GridAdapter sim_adapter;
46 47 private SimpleDraweeView simpleDraweeView;
47 48 private TextView publish;
  49 + private String chinese, math,english,physics,chemistry,history,geography,political,biology,science;
48 50  
49 51  
50 52 Handler handler = new Handler() {
... ... @@ -77,6 +79,30 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
77 79 defautPublishInfos.clear();
78 80 defautPublishInfos.addAll((List<DefautPublishInfo.DataBean>) msg.obj);
79 81 sim_adapter.notifyDataSetChanged();
  82 + for (int i = 0; i < defautPublishInfos.size(); i++) {
  83 + String subject = defautPublishInfos.get(i).getSubject();
  84 + if (subject.equals("语文")) {
  85 + chinese = defautPublishInfos.get(i).getPress();
  86 + } else if (subject.equals("数学")) {
  87 + math = defautPublishInfos.get(i).getPress();
  88 + } else if (subject.equals("英语")) {
  89 + english = defautPublishInfos.get(i).getPress();
  90 + } else if (subject.equals("物理")) {
  91 + physics = defautPublishInfos.get(i).getPress();
  92 + } else if (subject.equals("化学")) {
  93 + chemistry = defautPublishInfos.get(i).getPress();
  94 + } else if (subject.equals("历史")) {
  95 + history = defautPublishInfos.get(i).getPress();
  96 + } else if (subject.equals("地理")) {
  97 + geography = defautPublishInfos.get(i).getPress();
  98 + } else if (subject.equals("政治")) {
  99 + political = defautPublishInfos.get(i).getPress();
  100 + }else if (subject.equals("生物")) {
  101 + biology = defautPublishInfos.get(i).getPress();
  102 + }else if (subject.equals("科学")) {
  103 + science = defautPublishInfos.get(i).getPress();
  104 + }
  105 + }
80 106 break;
81 107 case HttpCode.REGISTERINFO_SUCESS:
82 108 try {
... ... @@ -169,7 +195,6 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
169 195 String schoolid = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.SCHOOOlID);
170 196 String name = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.USERNAME);
171 197 String regeionname = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.ADRESS);
172   - String togoth = "人民教育出版社";
173 198  
174 199 try {
175 200 if (userID == null) {
... ... @@ -188,8 +213,7 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
188 213  
189 214 //提交注册信息
190 215 HttpManager.getInstance().subregisterinfo(ChoiseTextBookActivity.this, auserID,
191   - name, gradeID, regionID, regeionname, schoolID, togoth, togoth, togoth, togoth
192   - , togoth, togoth, togoth, togoth, togoth, togoth, handler);
  216 + name, gradeID, regionID, regeionname, schoolID, math,english, chinese,physics,chemistry,history,geography,political,biology,science, handler);
193 217 }
194 218  
195 219 } catch (NumberFormatException e) {
... ... @@ -219,6 +243,29 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
219 243 String publishs = data.get(position).getPressName();
220 244 simpleDraweeView.setImageURI(imageurl);
221 245 publish.setText(publishs);
  246 + String subject = SaveParam.getInstance().getLoginParam(this, SaveParam.SUBJECT);
  247 + Log.e("test", "选择的科目" + subject);
  248 + if ("语文".equals(subject)) {
  249 + chinese = publishs;
  250 + } else if ("数学".equals(subject)) {
  251 + math = publishs;
  252 + }else if ("英语".equals(subject)) {
  253 + english = publishs;
  254 + }else if ("物理".equals(subject)) {
  255 + physics = publishs;
  256 + }else if ("化学".equals(subject)) {
  257 + chemistry = publishs;
  258 + }else if ("历史".equals(subject)) {
  259 + history = publishs;
  260 + }else if ("地理".equals(subject)) {
  261 + geography = publishs;
  262 + }else if ("政治".equals(subject)) {
  263 + political = publishs;
  264 + }else if ("生物".equals(subject)) {
  265 + biology = publishs;
  266 + }else if ("科学".equals(subject)) {
  267 + science = publishs;
  268 + }
222 269  
223 270 }
224 271 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
Diff comments   View file @7b3114a
... ... @@ -230,13 +230,13 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
230 230 }
231 231  
232 232 //初始化图片
233   - file = new File(FileUtil.getCachePath(this), "user-avatar.jpg");
234   - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
235   - uri = Uri.fromFile(file);
236   - } else {
237   - //通过FileProvider创建一个content类型的Uri(android 7.0需要这样的方法跨应用访问)
238   - uri = FileProvider.getUriForFile(MyApplication.getContext(), "com.hjx.personalcenter", file);
239   - }
  233 +// file = new File(FileUtil.getCachePath(this), "user-avatar.jpg");
  234 +// if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
  235 +// uri = Uri.fromFile(file);
  236 +// } else {
  237 +// //通过FileProvider创建一个content类型的Uri(android 7.0需要这样的方法跨应用访问)
  238 +// uri = FileProvider.getUriForFile(MyApplication.getContext(), "com.hjx.personalcenter", file);
  239 +// }
240 240  
241 241 }
242 242  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
Diff comments   View file @7b3114a
... ... @@ -43,16 +43,6 @@ public class SaveParam {
43 43 //科目信息
44 44 public static String SUBJECT = "subject";
45 45 //科目出版社
46   - public static String CHINESE = "chinese";
47   - public static String MATH = "math";
48   - public static String ENGLISH = "english";
49   - public static String PHYSICS = "physics";
50   - public static String CHEMISTRY = "chemistry";
51   - public static String HISTORY = "history";
52   - public static String GEOGRAPHY = "geography";
53   - public static String POLITICAL = "political";
54   - public static String BIOLOGY = "biology";
55   - public static String SCIENCE = "science";
56 46 //图片URL
57 47 public static String IMGURL = "imgurl";
58 48 //版本名称
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
Diff comments   View file @7b3114a
... ... @@ -53,10 +53,12 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
53 53 private View mView;
54 54 private int type;
55 55 private TimePickerView pvTime;
  56 +
56 57 private EditText tv_username1, tv_useinfo_adress1, tv_useinfo_qq;
57   - private TextView tv_sex, tv_useinfo_adress, tv_useinfo_birthday, tv_useinfo_school, tv_useinfo_gender;
  58 + private TextView tv_sex, tv_useinfo_adress, tv_useinfo_birthday, tv_useinfo_school, tv_useinfo_gender, sub;
58 59 public static String TABLAYOUT_FRAGMENT = "presonfragment";
59   - private ImageView my_adress,my_sex,my_bthday,my_grade,my_school;
  60 + private ImageView my_adress, my_sex, my_bthday, my_grade, my_school, ccancel;
  61 +
60 62  
61 63 public static PresonInfoFragment newInstance(int type) {
62 64 PresonInfoFragment fragment = new PresonInfoFragment();
... ... @@ -96,11 +98,14 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
96 98 my_bthday = (ImageView) mView.findViewById(R.id.my_bthday);
97 99 my_grade = (ImageView) mView.findViewById(R.id.my_grade);
98 100 my_school = (ImageView) mView.findViewById(R.id.my_school);
  101 + sub = (TextView) mView.findViewById(R.id.presonal_sub);
  102 + ccancel = (ImageView) mView.findViewById(R.id.cancel);
99 103  
100 104  
101 105 }
102 106  
103 107 private void initData() {
  108 +
104 109 }
105 110  
106 111 private void setLister() {
... ... @@ -114,6 +119,7 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
114 119 my_bthday.setOnClickListener(this);
115 120 my_grade.setOnClickListener(this);
116 121 my_school.setOnClickListener(this);
  122 + sub.setOnClickListener(this);
117 123 }
118 124  
119 125 @Override
... ... @@ -183,60 +189,64 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
183 189 tv_useinfo_school.setText("");
184 190 GradeListDialog.getInstance((DialogCallBack.GradeCallBack) PresonInfoFragment.this).show(getChildFragmentManager(), "GradeListDialog");
185 191 break;
  192 + case R.id.cancel:
  193 + getActivity().finish();
  194 + break;
186 195 case R.id.presonal_sub:
187   - Log.e("test","你提交个人信息");
188   - if (TextUtils.isEmpty(presonal1) ||
189   - TextUtils.isEmpty(presonal2) || TextUtils.isEmpty(presonal3) || TextUtils.isEmpty(presonal4) ||
190   - TextUtils.isEmpty(presonal5) || TextUtils.isEmpty(presonal7) ||
191   - TextUtils.isEmpty(presonal8)) {
192   - AlertUtils.showToast(getActivity(), "请将信息填写完整！");
193   - return;
194   - } else {
  196 + Log.e("test", "你提交个人信息");
  197 + if (TextUtils.isEmpty(presonal1) ||
  198 + TextUtils.isEmpty(presonal2) || TextUtils.isEmpty(presonal3) || TextUtils.isEmpty(presonal4) ||
  199 + TextUtils.isEmpty(presonal5) || TextUtils.isEmpty(presonal7) ||
  200 + TextUtils.isEmpty(presonal8)) {
  201 + AlertUtils.showToast(getActivity(), "请将信息填写完整！");
  202 + return;
  203 + } else {
195 204  
196   - int a = 0, b = 0;
197   - int d = 1;
198   - Object schoolids;
199   - Long f = null;
200   - //保存星座
201   - BrithdayStar brithdayStar = new BrithdayStar();
202   - String s = brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString());
203   - SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.CONSTELLATION, s);
204   -
205   - String regionId = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.COUNTRY);
206   - String regionId1 = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS);
207   - if (regionId == null) {
208   - regionId = regionId1;
209   - }
210   - String grade = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.GRADENS);
211   - String schoolid = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.SCHOOOlID);
212   - String type = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.ACCOUNT);
213   - String userID = SaveParam.getInstance().getLoginParam(getActivity(), "userId");
214   - String devicenumber = GetDevicesUtil.getDevicesInfo(getActivity()).getDeviceNumber();
215   - String changeinfo = null;
216   - if ("男".equals(presonal3)) {
217   - changeinfo = "male";
  205 + int a = 0, b = 0;
  206 + int d = 1;
  207 + Object schoolids;
  208 + Long f = null;
  209 + //保存星座
  210 + BrithdayStar brithdayStar = new BrithdayStar();
  211 + String s = brithdayStar.getConstellations(tv_useinfo_birthday.getText().toString());
  212 + SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.CONSTELLATION, s);
  213 +
  214 + String regionId = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.COUNTRY);
  215 + String regionId1 = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.CITYS);
  216 + if (regionId == null) {
  217 + regionId = regionId1;
  218 + }
  219 + String grade = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.GRADENS);
  220 + String schoolid = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.SCHOOOlID);
  221 + String type = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.ACCOUNT);
  222 + String userID = SaveParam.getInstance().getLoginParam(getActivity(), "userId");
  223 + String devicenumber = GetDevicesUtil.getDevicesInfo(getActivity()).getDeviceNumber();
  224 + String changeinfo = null;
  225 + if ("男".equals(presonal3)) {
  226 + changeinfo = "male";
  227 + } else {
  228 + changeinfo = "female";
  229 + }
  230 + try {
  231 + a = Integer.parseInt(regionId);
  232 + b = Integer.parseInt(grade);
  233 + if (TextUtils.isEmpty(presonal6)) {
  234 + schoolids = null;
218 235 } else {
219   - changeinfo = "female";
220   - }
221   - try {
222   - a = Integer.parseInt(regionId);
223   - b = Integer.parseInt(grade);
224   - if (TextUtils.isEmpty(presonal6)) {
225   - schoolids = null;
226   - } else {
227   - schoolids = Long.parseLong(schoolid);
228   - }
229   - d = Integer.parseInt(type);
230   - f = Long.parseLong(userID);
231   - //提交个人信息
232   - HttpManager.getInstance().changepresonalinfo(getActivity(),
233   - f, d, presonal1, presonal5, b, a, schoolids, presonal8, changeinfo, presonal4 + presonal2, devicenumber);
234   -
235   - } catch (Exception e) {
236   - e.printStackTrace();
  236 + schoolids = Long.parseLong(schoolid);
237 237 }
  238 + d = Integer.parseInt(type);
  239 + f = Long.parseLong(userID);
  240 + //提交个人信息
  241 + HttpManager.getInstance().changepresonalinfo(getActivity(),
  242 + f, d, presonal1, presonal5, b, a, schoolids, presonal8, changeinfo, presonal4 + presonal2, devicenumber);
  243 +
  244 + } catch (Exception e) {
  245 + e.printStackTrace();
  246 + }
238 247  
239 248 break;
  249 +
240 250 }
241 251 }
242 252 }
... ... @@ -283,14 +293,6 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
283 293 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
284 294 return format.format(date);
285 295 }
286   -//
287   - @Override
288   - public void onAttach(Context context) {
289   - super.onAttach(context);
290   - View rootView = ((Activity)context).getWindow().getDecorView();
291   - TextView sub = (TextView) rootView.findViewById(R.id.presonal_sub);
292   - sub.setOnClickListener(this);
293   - }
294 296  
295 297 @Override
296 298 public void province1OnItemClick(ArrayList<CityInfo.CitiesBean> data, int position, int type) {
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
Diff comments   View file @7b3114a
1 1 package com.hjx.personalcenter.fragment;
2 2  
3   -import android.app.Activity;
4   -import android.content.Context;
5 3 import android.os.Bundle;
6 4 import android.os.Handler;
7 5 import android.os.Message;
... ... @@ -13,6 +11,7 @@ import android.view.View;
13 11 import android.view.ViewGroup;
14 12 import android.widget.AdapterView;
15 13 import android.widget.GridView;
  14 +import android.widget.ImageView;
16 15 import android.widget.TextView;
17 16  
18 17 import com.facebook.drawee.view.SimpleDraweeView;
... ... @@ -39,10 +38,12 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
39 38 private GridAdapter sim_adapter;
40 39 private View mView;
41 40 private int type;
42   - private TextView publish;
  41 + private ImageView cances;
  42 + private TextView publish, sub;
43 43 private SimpleDraweeView simpleDraweeView;
44 44 public static String TABLAYOUT_FRAGMENT = "versionfragment";
45 45  
  46 + private String chinese, math,english,physics,chemistry,history,geography,political,biology,science;
46 47 public static VersionsInfoFragment newInstance(int type) {
47 48 VersionsInfoFragment fragment = new VersionsInfoFragment();
48 49 Bundle bundle = new Bundle();
... ... @@ -51,40 +52,66 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
51 52 return fragment;
52 53  
53 54 }
54   - Handler handler = new Handler(){
  55 +
  56 + Handler handler = new Handler() {
55 57 @Override
56 58 public void handleMessage(Message msg) {
57 59 super.handleMessage(msg);
58   - switch (msg.what){
  60 + switch (msg.what) {
59 61 case HttpCode.PUBLISH_SUCESS:
60 62 defautPublishInfos.clear();
61   - defautPublishInfos.addAll( (List<DefautPublishInfo.DataBean>)msg.obj);
  63 + defautPublishInfos.addAll((List<DefautPublishInfo.DataBean>) msg.obj);
62 64 sim_adapter.notifyDataSetChanged();
  65 + for (int i = 0; i < defautPublishInfos.size(); i++) {
  66 + String subject = defautPublishInfos.get(i).getSubject();
  67 + if (subject.equals("语文")) {
  68 + chinese = defautPublishInfos.get(i).getPress();
  69 + } else if (subject.equals("数学")) {
  70 + math = defautPublishInfos.get(i).getPress();
  71 + } else if (subject.equals("英语")) {
  72 + english = defautPublishInfos.get(i).getPress();
  73 + } else if (subject.equals("物理")) {
  74 + physics = defautPublishInfos.get(i).getPress();
  75 + } else if (subject.equals("化学")) {
  76 + chemistry = defautPublishInfos.get(i).getPress();
  77 + } else if (subject.equals("历史")) {
  78 + history = defautPublishInfos.get(i).getPress();
  79 + } else if (subject.equals("地理")) {
  80 + geography = defautPublishInfos.get(i).getPress();
  81 + } else if (subject.equals("政治")) {
  82 + political = defautPublishInfos.get(i).getPress();
  83 + }else if (subject.equals("生物")) {
  84 + biology = defautPublishInfos.get(i).getPress();
  85 + }else if (subject.equals("科学")) {
  86 + science = defautPublishInfos.get(i).getPress();
  87 + }
  88 + }
63 89 break;
64 90 }
65 91 }
66 92 };
  93 +
67 94 @Override
68 95 public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
69 96 if (mView == null) {
70 97 mView = inflater.inflate(R.layout.fragment_changge_version_info, container, false);
71   - String userID = SaveParam.getInstance().getLoginParam(getActivity(),"userId");
72   - String graderid = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.GRADENS);
  98 + String userID = SaveParam.getInstance().getLoginParam(getActivity(), "userId");
  99 + String graderid = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.GRADENS);
73 100 //子账户年级id
74   - String graderidchilds = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.CHILDSGRADENS);
  101 + String graderidchilds = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.CHILDSGRADENS);
75 102 //账户类型
76   - String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.ACCOUNT);
  103 + String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.ACCOUNT);
77 104 try {
78 105 int graderID;
79 106 long auserID = Long.parseLong(userID);
80   - if ("2".equals(accounts)){
  107 + if ("2".equals(accounts)) {
81 108 graderID = Integer.parseInt(graderidchilds);
82   - }else {
  109 + } else {
83 110 graderID = Integer.parseInt(graderid);
84 111 }
85 112  
86 113 //获取版本信息
87   - HttpManager.getInstance().getpublishinfo(getActivity(),auserID,graderID,handler);
  114 + HttpManager.getInstance().getpublishinfo(getActivity(), auserID, graderID, handler);
88 115  
89 116 } catch (NumberFormatException e) {
90 117 e.printStackTrace();
... ... @@ -98,39 +125,35 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
98 125 }
99 126 return mView;
100 127 }
  128 +
101 129 //初始化
102 130 private void initView(View mView) {
103   - gridView =(GridView) mView.findViewById(R.id.grideview);
  131 + gridView = (GridView) mView.findViewById(R.id.grideview);
  132 + cances = (ImageView) mView.findViewById(R.id.cancel);
  133 + sub = (TextView) mView.findViewById(R.id.version_sub);
104 134  
105 135 }
  136 +
106 137 private void initData() {
107   - sim_adapter = new GridAdapter(defautPublishInfos,getActivity());
  138 + sim_adapter = new GridAdapter(defautPublishInfos, getActivity());
108 139 //配置适配器
109 140 gridView.setAdapter(sim_adapter);
110 141 }
111 142  
112 143 private void setLister() {
113 144 gridView.setOnItemClickListener(this);
  145 + sub.setOnClickListener(this);
114 146 }
115 147  
116 148 @Override
117 149 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
118   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.SUBJECT,defautPublishInfos.get(position).getSubject());
  150 + SaveParam.getInstance().saveLoginParam(getActivity(), SaveParam.SUBJECT, defautPublishInfos.get(position).getSubject());
119 151 VerSionDialog.getInstance(this).show(getChildFragmentManager(), "VerSionDialog");
120 152 simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
121 153 publish = (TextView) view.findViewById(R.id.tv_publish);
122 154  
123 155 }
124 156  
125   - @Override
126   - public void onAttach(Context context) {
127   - super.onAttach(context);
128   - View rootView = ((Activity)context).getWindow().getDecorView();
129   - TextView sub = (TextView) rootView.findViewById(R.id.presonal_sub);
130   - sub.setOnClickListener(this);
131   - }
132   -
133   -
134 157  
135 158 @Override
136 159 public void onResume() {
... ... @@ -140,44 +163,33 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
140 163  
141 164 @Override
142 165 public void onClick(View v) {
143   - switch (v.getId()){
144   - case R.id.presonal_sub:
145   - Log.e("test","你提交版本信息");
146   - String userID = SaveParam.getInstance().getLoginParam(getActivity(),"userId");
147   - String chinese = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.CHINESE);
148   - String math = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.MATH);
149   - String english = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.ENGLISH);
150   - String physics = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.PHYSICS);
151   - String chemistry = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.CHEMISTRY);
152   - String history = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.HISTORY);
153   - String geography = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.GEOGRAPHY);
154   - String political = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.POLITICAL);
155   - String biology = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.BIOLOGY);
156   - String science = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.SCIENCE);
  166 + switch (v.getId()) {
  167 + case R.id.version_sub:
  168 + Log.e("test", "你提交版本信息");
  169 + String userID = SaveParam.getInstance().getLoginParam(getActivity(), "userId");
157 170 //子账户id
158   - String childsidid = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.CHILDSID);
  171 + String childsidid = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.CHILDSID);
159 172 //账户类型
160   - String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.ACCOUNT);
  173 + String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(), SaveParam.ACCOUNT);
161 174 try {
162 175 String id = null;
163 176 //String piblish = "清华大学出版社";
164   - if ("2".equals(accounts)){
165   - id =childsidid;
166   - }else {
  177 + if ("2".equals(accounts)) {
  178 + id = childsidid;
  179 + } else {
167 180 id = userID;
168 181 }
169   -
170 182 //修改版本信息
171   - HttpManager.getInstance().changepublishinfo(getActivity(),id,"人民教育出版社"
172   - ,"人民教育出版社","人民教育出版社","人民教育出版社","人民教育出版社","人民教育出版社",
173   - "人民教育出版社","人民教育出版社","人民教育出版社","人民教育出版社");
  183 + HttpManager.getInstance().changepublishinfo(getActivity(), id,math,english, chinese,physics,chemistry,history,geography,political,biology,science);
174 184  
175 185 } catch (NumberFormatException e) {
176 186 e.printStackTrace();
177 187 }
178 188  
179 189  
180   -
  190 + break;
  191 + case R.id.cancel:
  192 + getActivity().finish();
181 193 break;
182 194 }
183 195  
... ... @@ -187,41 +199,31 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
187 199 public void versionOnItemClick(ArrayList<VersionInfo.DataBean> data, int position, int type) {
188 200 String imageurl = data.get(position).getPressCover();
189 201 String publishs = data.get(position).getPressName();
  202 +
190 203 simpleDraweeView.setImageURI(imageurl);
191 204 publish.setText(publishs);
192   - String subject = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.SUBJECT);
193   - Log.e("test","选择的科目"+subject);
  205 + String subject = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.SUBJECT);
  206 + Log.e("test", "选择的科目" + subject);
194 207 if ("语文".equals(subject)) {
195   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.CHINESE,publishs);
196   - }else {
197   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.CHINESE,publish.getText().toString());
198   - }
199   - if ("数学".equals(subject)) {
200   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.MATH,publishs);
201   - }
202   - if ("英语".equals(subject)) {
203   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.ENGLISH,publishs);
204   - }
205   - if ("物理".equals(subject)) {
206   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.PHYSICS,publishs);
207   - }
208   - if ("化学".equals(subject)) {
209   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.CHEMISTRY,publishs);
210   - }
211   - if ("历史".equals(subject)) {
212   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.HISTORY,publishs);
213   - }
214   - if ("地理".equals(subject)) {
215   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.GEOGRAPHY,publishs);
216   - }
217   - if ("政治".equals(subject)) {
218   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.POLITICAL,publishs);
219   - }
220   - if ("生物".equals(subject)) {
221   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.BIOLOGY,publishs);
222   - }
223   - if ("科学".equals(subject)) {
224   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.SCIENCE,publishs);
  208 + chinese = publishs;
  209 + } else if ("数学".equals(subject)) {
  210 + math = publishs;
  211 + }else if ("英语".equals(subject)) {
  212 + english = publishs;
  213 + }else if ("物理".equals(subject)) {
  214 + physics = publishs;
  215 + }else if ("化学".equals(subject)) {
  216 + chemistry = publishs;
  217 + }else if ("历史".equals(subject)) {
  218 + history = publishs;
  219 + }else if ("地理".equals(subject)) {
  220 + geography = publishs;
  221 + }else if ("政治".equals(subject)) {
  222 + political = publishs;
  223 + }else if ("生物".equals(subject)) {
  224 + biology = publishs;
  225 + }else if ("科学".equals(subject)) {
  226 + science = publishs;
225 227 }
226 228  
227 229 }
... ...
PersonalCenter/app/src/main/res/layout/activity_change_preson_info.xml
Diff comments   View file @7b3114a
... ... @@ -6,43 +6,6 @@
6 6 android:layout_height="fill_parent"
7 7 android:background="@color/white"
8 8 tools:context="com.hjx.personalcenter.activity.LoginAndRegisterActivity">
9   - <RelativeLayout
10   - android:id="@+id/title"
11   - android:layout_width="match_parent"
12   - android:layout_height="50dp"
13   - android:background="@color/login_text_blue">
14   -
15   - <ImageView
16   - android:id="@+id/cancel"
17   - android:layout_width="wrap_content"
18   - android:layout_height="match_parent"
19   - android:paddingLeft="20dp"
20   - android:paddingRight="20dp"
21   - android:src="@mipmap/title_back" />
22   -
23   - <TextView
24   - android:id="@+id/menu_title"
25   - android:layout_width="wrap_content"
26   - android:layout_height="match_parent"
27   - android:layout_centerInParent="true"
28   - android:gravity="center_vertical"
29   - android:text="@string/changge_preson"
30   - android:textColor="@android:color/white"
31   - android:textSize="22sp" />
32   - <TextView
33   - android:id="@+id/presonal_sub"
34   - android:layout_width="wrap_content"
35   - android:layout_height="match_parent"
36   - android:paddingLeft="20dp"
37   - android:paddingRight="20dp"
38   - android:gravity="center_vertical"
39   - android:layout_alignParentRight="true"
40   - android:text="保存"
41   - android:textColor="@android:color/white"
42   - android:textSize="22sp" />
43   -
44   -
45   - </RelativeLayout>
46 9  
47 10 <LinearLayout
48 11 android:layout_width="wrap_content"
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_presonal_info.xml
Diff comments   View file @7b3114a
... ... @@ -4,6 +4,43 @@
4 4 android:layout_width="match_parent"
5 5 android:layout_height="match_parent"
6 6 android:orientation="vertical">
  7 + <RelativeLayout
  8 + android:id="@+id/title"
  9 + android:layout_width="match_parent"
  10 + android:layout_height="50dp"
  11 + android:background="@color/login_text_blue">
  12 +
  13 + <ImageView
  14 + android:id="@+id/cancel"
  15 + android:layout_width="wrap_content"
  16 + android:layout_height="match_parent"
  17 + android:paddingLeft="20dp"
  18 + android:paddingRight="20dp"
  19 + android:src="@mipmap/title_back" />
  20 +
  21 + <TextView
  22 + android:id="@+id/menu_title"
  23 + android:layout_width="wrap_content"
  24 + android:layout_height="match_parent"
  25 + android:layout_centerInParent="true"
  26 + android:gravity="center_vertical"
  27 + android:text="@string/changge_preson"
  28 + android:textColor="@android:color/white"
  29 + android:textSize="22sp" />
  30 + <TextView
  31 + android:id="@+id/presonal_sub"
  32 + android:layout_width="wrap_content"
  33 + android:layout_height="match_parent"
  34 + android:paddingLeft="20dp"
  35 + android:paddingRight="20dp"
  36 + android:gravity="center_vertical"
  37 + android:layout_alignParentRight="true"
  38 + android:text="保存"
  39 + android:textColor="@android:color/white"
  40 + android:textSize="22sp" />
  41 +
  42 +
  43 + </RelativeLayout>
7 44  
8 45  
9 46 <LinearLayout
... ...
PersonalCenter/app/src/main/res/layout/fragment_changge_version_info.xml
Diff comments   View file @7b3114a
... ... @@ -3,6 +3,43 @@
3 3 android:orientation="vertical" android:layout_width="match_parent"
4 4 android:layout_height="match_parent"
5 5 android:background="@color/white">
  6 + <RelativeLayout
  7 + android:id="@+id/title"
  8 + android:layout_width="match_parent"
  9 + android:layout_height="50dp"
  10 + android:background="@color/login_text_blue">
  11 +
  12 + <ImageView
  13 + android:id="@+id/cancel"
  14 + android:layout_width="wrap_content"
  15 + android:layout_height="match_parent"
  16 + android:paddingLeft="20dp"
  17 + android:paddingRight="20dp"
  18 + android:src="@mipmap/title_back" />
  19 +
  20 + <TextView
  21 + android:id="@+id/menu_title"
  22 + android:layout_width="wrap_content"
  23 + android:layout_height="match_parent"
  24 + android:layout_centerInParent="true"
  25 + android:gravity="center_vertical"
  26 + android:text="修改版本信息"
  27 + android:textColor="@android:color/white"
  28 + android:textSize="22sp" />
  29 + <TextView
  30 + android:id="@+id/version_sub"
  31 + android:layout_width="wrap_content"
  32 + android:layout_height="match_parent"
  33 + android:paddingLeft="20dp"
  34 + android:paddingRight="20dp"
  35 + android:gravity="center_vertical"
  36 + android:layout_alignParentRight="true"
  37 + android:text="保存"
  38 + android:textColor="@android:color/white"
  39 + android:textSize="22sp" />
  40 +
  41 +
  42 + </RelativeLayout>
6 43 <GridView
7 44 android:id="@+id/grideview"
8 45 android:layout_margin="30dp"
... ...