hjx-app / PresonalCenter

Download as
Browse Code »

Commit 9d08c5be52ae93dd699a5515d966a7587889615a

Authored by xiongwei
1 parent 73ba0df5f6
Exists in master

修改个人中心BUG

Showing 34 changed files with 315 additions and 107 deletions   Show diff stats
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/AccountManagementActivity.java
Diff comments   View file @9d08c5b
... ... @@ -103,6 +103,7 @@ public class AccountManagementActivity extends AppCompatActivity implements View
103 103 protected void onCreate(Bundle savedInstanceState) {
104 104 super.onCreate(savedInstanceState);
105 105 setContentView(R.layout.activity_account_management);
  106 + SysApplication.getInstance().addActivity(this);
106 107  
107 108 initView();
108 109 initData();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/BangDingCode.java
Diff comments   View file @9d08c5b
1 1 package com.hjx.personalcenter.activity;
2 2  
  3 +import android.content.Intent;
3 4 import android.graphics.Bitmap;
4 5 import android.os.Bundle;
5 6 import android.support.v7.app.AppCompatActivity;
6 7 import android.util.DisplayMetrics;
  8 +import android.view.View;
  9 +import android.widget.Button;
7 10 import android.widget.ImageView;
8 11 import android.widget.LinearLayout;
9 12  
... ... @@ -19,12 +22,24 @@ import java.io.File;
19 22  
20 23 public class BangDingCode extends AppCompatActivity {
21 24 private ImageView EQpicture;
  25 + private Button btn_next_tep;
22 26 File file;
23 27 @Override
24 28 protected void onCreate(Bundle savedInstanceState) {
25 29 super.onCreate(savedInstanceState);
26 30 setContentView(R.layout.activity_binding_code);
  31 + SysApplication.getInstance().addActivity(this);
27 32 EQpicture = (ImageView) findViewById(R.id.EQpicture);
  33 + btn_next_tep = (Button) findViewById(R.id.btn_next_tep);
  34 + btn_next_tep.setOnClickListener(new View.OnClickListener() {
  35 + @Override
  36 + public void onClick(View v) {
  37 + Intent intent = new Intent();
  38 + intent.setClass(BangDingCode.this, TheStartPageActivity.class);
  39 + startActivity(intent);
  40 + overridePendingTransition(R.anim.rightin, R.anim.rightout);
  41 + }
  42 + });
28 43 EQPicture();
29 44  
30 45  
... ... @@ -35,8 +50,8 @@ public class BangDingCode extends AppCompatActivity {
35 50 int screenHeight = dm.heightPixels;//屏幕高度
36 51 //设置二维码外布局占屏幕高宽
37 52 LinearLayout.LayoutParams layoutParams = (LinearLayout.LayoutParams) EQpicture.getLayoutParams();
38   - layoutParams.width = screenHeight * 17 / 30;
39   - layoutParams.height = screenHeight * 19 / 30;
  53 + layoutParams.width = screenHeight * 15 / 30;
  54 + layoutParams.height = screenHeight * 17 / 30;
40 55 EQpicture.setLayoutParams(layoutParams);
41 56 //生成占屏幕一定比例 的二维码存储在本地并显示
42 57 file = new File(FileUtil.getCachePath(this), "user-code.jpg");
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeBangDingActivity.java
Diff comments   View file @9d08c5b
... ... @@ -14,5 +14,6 @@ public class ChangeBangDingActivity extends Activity {
14 14 protected void onCreate(Bundle savedInstanceState) {
15 15 super.onCreate(savedInstanceState);
16 16 setContentView(R.layout.activity_chage_binding);
  17 + SysApplication.getInstance().addActivity(this);
17 18 }
18 19 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeElectronicCardAdressInfoActivity.java
Diff comments   View file @9d08c5b
... ... @@ -86,6 +86,7 @@ public class ChangeElectronicCardAdressInfoActivity extends AppCompatActivity im
86 86 protected void onCreate(Bundle savedInstanceState) {
87 87 super.onCreate(savedInstanceState);
88 88 setContentView(R.layout.activity_change_card_validation);
  89 + SysApplication.getInstance().addActivity(this);
89 90 initView();
90 91 setLister();
91 92 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangeEletronicCardPhoneActivity.java
Diff comments   View file @9d08c5b
... ... @@ -16,5 +16,6 @@ public class ChangeEletronicCardPhoneActivity extends AppCompatActivity {
16 16 protected void onCreate(Bundle savedInstanceState) {
17 17 super.onCreate(savedInstanceState);
18 18 setContentView(R.layout.activity_electronicard_phone);
  19 + SysApplication.getInstance().addActivity(this);
19 20 }
20 21 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePasswordActivity.java
Diff comments   View file @9d08c5b
... ... @@ -29,6 +29,7 @@ public class ChangePasswordActivity extends AppCompatActivity implements View.On
29 29 protected void onCreate(Bundle savedInstanceState) {
30 30 super.onCreate(savedInstanceState);
31 31 setContentView(R.layout.activity_changepsword);
  32 + SysApplication.getInstance().addActivity(this);
32 33 initView();
33 34 setLister();
34 35 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChangePresonalInfoActivity.java
Diff comments   View file @9d08c5b
... ... @@ -34,6 +34,7 @@ public class ChangePresonalInfoActivity extends AppCompatActivity implements Vie
34 34 protected void onCreate(Bundle savedInstanceState) {
35 35 super.onCreate(savedInstanceState);
36 36 setContentView(R.layout.activity_change_preson_info);
  37 + SysApplication.getInstance().addActivity(this);
37 38 initView();
38 39 initData();
39 40 setLister();
... ... @@ -68,14 +69,16 @@ public class ChangePresonalInfoActivity extends AppCompatActivity implements Vie
68 69 viewPager.setOffscreenPageLimit(1);
69 70 //将TabLayout和ViewPager关联起来。
70 71 }
71   -
72 72 private void setLister() {
73 73 cancel.setOnClickListener(this);
  74 + subsave.setOnClickListener(this);
74 75 }
75 76  
76 77 @Override
77 78 public void onClick(View v) {
78 79 switch (v.getId()){
  80 + case R.id.presonal_sub:
  81 + break;
79 82 case R.id.cancel:
80 83 finish();
81 84 break;
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ChoiseTextBookActivity.java
Diff comments   View file @9d08c5b
... ... @@ -21,7 +21,9 @@ import com.hjx.personalcenter.customdialog.VerSionDialog;
21 21 import com.hjx.personalcenter.db.SaveParam;
22 22 import com.hjx.personalcenter.http.HttpCode;
23 23 import com.hjx.personalcenter.http.HttpManager;
  24 +import com.hjx.personalcenter.interfaces.DialogCallBack;
24 25 import com.hjx.personalcenter.model.DefautPublishInfo;
  26 +import com.hjx.personalcenter.model.VersionInfo;
25 27 import com.hjx.personalcenter.util.AlertUtils;
26 28  
27 29 import org.json.JSONException;
... ... @@ -35,13 +37,14 @@ import java.util.List;
35 37 * Created by h on 2017/8/10.
36 38 */
37 39  
38   -public class ChoiseTextBookActivity extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemClickListener{
  40 +public class ChoiseTextBookActivity extends AppCompatActivity implements View.OnClickListener, AdapterView.OnItemClickListener, DialogCallBack.VersionCallBack {
39 41 private GridView gridView;
40 42 private Button btn_ok;
41 43 private ImageView cancel;
42 44 private ArrayList<DefautPublishInfo.DataBean> defautPublishInfos = new ArrayList<>();
43 45 private GridAdapter sim_adapter;
44   -
  46 + private SimpleDraweeView simpleDraweeView;
  47 + private TextView publish;
45 48  
46 49  
47 50 Handler handler = new Handler() {
... ... @@ -72,7 +75,7 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
72 75 break;
73 76 case HttpCode.PUBLISH_SUCESS:
74 77 defautPublishInfos.clear();
75   - defautPublishInfos.addAll( (List<DefautPublishInfo.DataBean>)msg.obj);
  78 + defautPublishInfos.addAll((List<DefautPublishInfo.DataBean>) msg.obj);
76 79 sim_adapter.notifyDataSetChanged();
77 80 break;
78 81 case HttpCode.REGISTERINFO_SUCESS:
... ... @@ -114,18 +117,19 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
114 117 @Override
115 118 protected void onCreate(Bundle savedInstanceState) {
116 119 super.onCreate(savedInstanceState);
117   - String userID = SaveParam.getInstance().getLoginParam(this,"userId");
118   - String graderid = SaveParam.getInstance().getCustomizeParam(this,SaveParam.GRADENS);
  120 + String userID = SaveParam.getInstance().getLoginParam(this, "userId");
  121 + String graderid = SaveParam.getInstance().getCustomizeParam(this, SaveParam.GRADENS);
119 122 try {
120 123 long auserID = Long.parseLong(userID);
121 124 int graderID = Integer.parseInt(graderid);
122 125 //获取版本信息
123   - HttpManager.getInstance().getpublishinfo(this,auserID,graderID,handler);
  126 + HttpManager.getInstance().getpublishinfo(this, auserID, graderID, handler);
124 127  
125 128 } catch (NumberFormatException e) {
126 129 e.printStackTrace();
127 130 }
128 131 setContentView(R.layout.activity_choisetextbook);
  132 + SysApplication.getInstance().addActivity(this);
129 133 initView();
130 134 initData();
131 135 initLister();
... ... @@ -138,7 +142,7 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
138 142 }
139 143  
140 144 private void initData() {
141   - sim_adapter = new GridAdapter(defautPublishInfos,this);
  145 + sim_adapter = new GridAdapter(defautPublishInfos, this);
142 146 //配置适配器
143 147 gridView.setAdapter(sim_adapter);
144 148  
... ... @@ -165,7 +169,7 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
165 169 String schoolid = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.SCHOOOlID);
166 170 String name = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.USERNAME);
167 171 String regeionname = SaveParam.getInstance().getLoginParam(ChoiseTextBookActivity.this, SaveParam.ADRESS);
168   - String togoth ="人民教育出版社";
  172 + String togoth = "人民教育出版社";
169 173  
170 174 try {
171 175 if (userID == null) {
... ... @@ -176,16 +180,16 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
176 180 long auserID = Long.parseLong(userID);
177 181 int gradeID = Integer.parseInt(grade);
178 182 long regionID = Long.parseLong(regionId);
179   - if (schoolid==null){
180   - schoolID =null;
181   - }else {
  183 + if (schoolid == null) {
  184 + schoolID = null;
  185 + } else {
182 186 schoolID = Long.parseLong(schoolid);
183 187 }
184 188  
185 189 //提交注册信息
186 190 HttpManager.getInstance().subregisterinfo(ChoiseTextBookActivity.this, auserID,
187   - name ,gradeID,regionID,regeionname,schoolID,togoth,togoth,togoth,togoth
188   - ,togoth,togoth,togoth,togoth,togoth,togoth,handler);
  191 + name, gradeID, regionID, regeionname, schoolID, togoth, togoth, togoth, togoth
  192 + , togoth, togoth, togoth, togoth, togoth, togoth, handler);
189 193 }
190 194  
191 195 } catch (NumberFormatException e) {
... ... @@ -202,15 +206,19 @@ public class ChoiseTextBookActivity extends AppCompatActivity implements View.On
202 206  
203 207 @Override
204 208 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
205   - SaveParam.getInstance().saveLoginParam(this,SaveParam.SUBJECT,defautPublishInfos.get(position).getSubject());
206   - VerSionDialog.getInstance().show(getSupportFragmentManager(), "VerSionDialog");
207   -
208   - String imgurl = SaveParam.getInstance().getLoginParam(this, SaveParam.IMGURL);
209   - String version = SaveParam.getInstance().getLoginParam(this, SaveParam.VERSION);
210   - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) parent.findViewById(R.id.image_publish);
211   - TextView publish = (TextView) parent.findViewById(R.id.tv_publish);
212   - simpleDraweeView.setImageURI(imgurl);
213   - publish.setText(version);
  209 + SaveParam.getInstance().saveLoginParam(this, SaveParam.SUBJECT, defautPublishInfos.get(position).getSubject());
  210 + VerSionDialog.getInstance(this).show(getSupportFragmentManager(), "VerSionDialog");
  211 + simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
  212 + publish = (TextView) view.findViewById(R.id.tv_publish);
  213 +
214 214 }
215 215  
  216 + @Override
  217 + public void versionOnItemClick(ArrayList<VersionInfo.DataBean> data, int position, int type) {
  218 + String imageurl = data.get(position).getPressCover();
  219 + String publishs = data.get(position).getPressName();
  220 + simpleDraweeView.setImageURI(imageurl);
  221 + publish.setText(publishs);
  222 +
  223 + }
216 224 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardEditInfoActivity.java
Diff comments   View file @9d08c5b
... ... @@ -45,6 +45,7 @@ public class ElectronicCardEditInfoActivity extends AppCompatActivity implements
45 45 protected void onCreate(Bundle savedInstanceState) {
46 46 super.onCreate(savedInstanceState);
47 47 setContentView(R.layout.activity_electroniccard_info);
  48 + SysApplication.getInstance().addActivity(this);
48 49 initView();
49 50 initData();
50 51 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardInfoOKActivity.java
Diff comments   View file @9d08c5b
... ... @@ -25,6 +25,7 @@ public class ElectronicCardInfoOKActivity extends AppCompatActivity implements V
25 25 protected void onCreate(Bundle savedInstanceState) {
26 26 super.onCreate(savedInstanceState);
27 27 setContentView(R.layout.activity_ok_cardinfo);
  28 + SysApplication.getInstance().addActivity(this);
28 29 initView();
29 30 initData();
30 31 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardLookInfoActivity.java
Diff comments   View file @9d08c5b
... ... @@ -64,6 +64,7 @@ public class ElectronicCardLookInfoActivity extends AppCompatActivity implements
64 64 protected void onCreate(Bundle savedInstanceState) {
65 65 super.onCreate(savedInstanceState);
66 66 setContentView(R.layout.activity_electronic_look_cardinfo);
  67 + SysApplication.getInstance().addActivity(this);
67 68 initView();
68 69 initData();
69 70 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ElectronicCardValidationActivity.java
Diff comments   View file @9d08c5b
... ... @@ -79,6 +79,7 @@ public class ElectronicCardValidationActivity extends AppCompatActivity implemen
79 79 protected void onCreate(Bundle savedInstanceState) {
80 80 super.onCreate(savedInstanceState);
81 81 setContentView(R.layout.activity_electroniccard_validation);
  82 + SysApplication.getInstance().addActivity(this);
82 83 initView();
83 84 initData();
84 85 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/FeedBackActivity.java
Diff comments   View file @9d08c5b
... ... @@ -63,6 +63,7 @@ public class FeedBackActivity extends AppCompatActivity implements View.OnClickL
63 63 super.onCreate(savedInstanceState);
64 64 Fresco.initialize(this);
65 65 setContentView(R.layout.activity_feedback);
  66 + SysApplication.getInstance().addActivity(this);
66 67 initView();
67 68 initData();
68 69 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/ForgotPasswordActivity.java
Diff comments   View file @9d08c5b
... ... @@ -113,6 +113,7 @@ public class ForgotPasswordActivity extends AppCompatActivity implements View.On
113 113 protected void onCreate(Bundle savedInstanceState) {
114 114 super.onCreate(savedInstanceState);
115 115 setContentView(R.layout.activity_forgetpsword);
  116 + SysApplication.getInstance().addActivity(this);
116 117 initView();
117 118 setLister();
118 119 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/LoginAndRegisterActivity.java
Diff comments   View file @9d08c5b
... ... @@ -79,6 +79,7 @@ public class LoginAndRegisterActivity extends AppCompatActivity {
79 79  
80 80 }
81 81 setContentView(R.layout.activity_loginandregister);
  82 + SysApplication.getInstance().addActivity(this);
82 83 initView();
83 84 initData();
84 85 setLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/MainActivity.java
Diff comments   View file @9d08c5b
... ... @@ -106,6 +106,19 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
106 106 iv_sex.setImageResource(R.mipmap.women);
107 107 }
108 108 mSimpleDraweeView.setImageURI(cardinfoBean.getPortrait());
  109 + String graderID =cardinfoBean.getGrade().getGradeId();
  110 + String userID = SaveParam.getInstance().getLoginParam(MainActivity.this,"userId");
  111 + SaveParam.getInstance().saveCustomizeParam(MainActivity.this, SaveParam.GRADENS, ""+graderID);
  112 + try {
  113 + long auserID = Long.parseLong(userID);
  114 + int graderIDs =Integer.parseInt(graderID);
  115 + //获取版本信息
  116 + HttpManager.getInstance().getpublishinfo(MainActivity.this,auserID,graderIDs,handler);
  117 +
  118 + } catch (NumberFormatException e) {
  119 + e.printStackTrace();
  120 + }
  121 +
109 122 break;
110 123 case HttpCode.SIGN:
111 124 SignInfo.DataBean dataBean = (SignInfo.DataBean)msg.obj;
... ... @@ -135,6 +148,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
135 148 super.onCreate(savedInstanceState);
136 149 Fresco.initialize(this);
137 150 setContentView(R.layout.activity_main);
  151 + SysApplication.getInstance().addActivity(this);
138 152 initView();
139 153 initData();
140 154 initLister();
... ... @@ -203,16 +217,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
203 217 //版本信息适配器
204 218 mRecyclerView.setAdapter(RecyclerViewadapter);
205 219 mRecyclerViewpublish.setAdapter(RecyclerViewadapterpublish);
206   -
207   - //加载个人信息
208   - String xiongzuo = SaveParam.getInstance().getLoginParam(this,SaveParam.CONSTELLATION);
209   - if (xiongzuo==null){
210   - tv_mygad.setText("");
211   - }else {
212   - tv_mygad.setText(xiongzuo);
213   - }
214 220 String userID = SaveParam.getInstance().getLoginParam(this,"userId");
215   -
216 221 //获取个性签名
217 222 String typeaccount = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT);
218 223 try {
... ... @@ -224,8 +229,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
224 229 e.printStackTrace();
225 230 }
226 231  
227   -
228   -
229 232 //初始化图片
230 233 file = new File(FileUtil.getCachePath(this), "user-avatar.jpg");
231 234 if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
... ... @@ -369,26 +372,25 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
369 372 protected void onResume() {
370 373 super.onResume();
371 374 String userID = SaveParam.getInstance().getLoginParam(this,"userId");
372   - String graderid = SaveParam.getInstance().getCustomizeParam(this,SaveParam.GRADENS);
373   - //子账户年级id
374   - String graderidchilds = SaveParam.getInstance().getCustomizeParam(this,SaveParam.CHILDSGRADENS);
375 375 //账户类型
376 376 String accounts = SaveParam.getInstance().getCustomizeParam(this,SaveParam.ACCOUNT);
  377 + //加载个人信息
  378 + String xiongzuo = SaveParam.getInstance().getLoginParam(this,SaveParam.CONSTELLATION);
  379 + if (xiongzuo==null){
  380 + tv_mygad.setText("");
  381 + }else {
  382 + tv_mygad.setText(xiongzuo);
  383 + }
377 384 try {
378 385 int graderID;
379 386 long auserID = Long.parseLong(userID);
380 387 int typeaccount1=Integer.parseInt(accounts);
381   - if ("2".equals(accounts)){
382   - graderID = Integer.parseInt(graderidchilds);
383   - }else {
384   - graderID = Integer.parseInt(graderid);
385   - }
386   - //获取个人信息
387   - HttpManager.getInstance().getpresonalinfo(MainActivity.this,auserID,typeaccount1,handler);
388   - //获取版本信息
389   - HttpManager.getInstance().getpublishinfo(this,auserID,graderID,handler);
390 388 //获取最近播放视频
391 389 HttpManager.getInstance().getstuyvidioinfo(this,auserID,handler);
  390 + //获取个人信息
  391 + HttpManager.getInstance().getpresonalinfo(MainActivity.this,auserID,typeaccount1,handler);
  392 +
  393 +
392 394  
393 395 } catch (NumberFormatException e) {
394 396 e.printStackTrace();
... ... @@ -598,7 +600,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
598 600 Toast.LENGTH_SHORT).show();
599 601 exitTime = System.currentTimeMillis();
600 602 } else {
601   - MainActivity.this.finish();
  603 + SysApplication.getInstance().exit();
602 604 }
603 605 return false;
604 606 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/RegisterInfoActivity.java
Diff comments   View file @9d08c5b
... ... @@ -45,6 +45,8 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl
45 45 protected void onCreate(Bundle savedInstanceState) {
46 46 super.onCreate(savedInstanceState);
47 47 setContentView(R.layout.activity_registerinfo);
  48 + SysApplication.getInstance().addActivity(this);
  49 +
48 50 initView();
49 51 initData();
50 52 initLister();
... ... @@ -85,9 +87,11 @@ public class RegisterInfoActivity extends AppCompatActivity implements View.OnCl
85 87 String register4 = et_school.getText().toString().trim();
86 88 switch (v.getId()) {
87 89 case R.id.et_region:
  90 + et_school.setText("");
88 91 choiseregion();
89 92 break;
90 93 case R.id.et_grade:
  94 + et_school.setText("");
91 95 choisegrade();
92 96 break;
93 97 case R.id.et_school:
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/SysApplication.java
Diff comments   View file @9d08c5b
... ... @@ -0,0 +1,39 @@
  1 +package com.hjx.personalcenter.activity;
  2 +
  3 +import android.app.Activity;
  4 +import android.app.Application;
  5 +
  6 +import java.util.LinkedList;
  7 +import java.util.List;
  8 +public class SysApplication extends Application {
  9 + private List<Activity> mList = new LinkedList<Activity>();
  10 + private static SysApplication instance;
  11 + private SysApplication() {
  12 + }
  13 + public synchronized static SysApplication getInstance() {
  14 + if (null == instance) {
  15 + instance = new SysApplication();
  16 + }
  17 + return instance;
  18 + }
  19 + // add Activity
  20 + public void addActivity(Activity activity) {
  21 + mList.add(activity);
  22 + }
  23 + public void exit() {
  24 + try {
  25 + for (Activity activity : mList) {
  26 + if (activity != null)
  27 + activity.finish();
  28 + }
  29 + } catch (Exception e) {
  30 + e.printStackTrace();
  31 + } finally {
  32 + System.exit(0);
  33 + }
  34 + }
  35 + public void onLowMemory() {
  36 + super.onLowMemory();
  37 + System.gc();
  38 + }
  39 +}
0 40 \ No newline at end of file
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/activity/TheStartPageActivity.java
Diff comments   View file @9d08c5b
... ... @@ -19,6 +19,7 @@ public class TheStartPageActivity extends AppCompatActivity implements View.OnCl
19 19 protected void onCreate(Bundle savedInstanceState) {
20 20 super.onCreate(savedInstanceState);
21 21 setContentView(R.layout.activity_start_page);
  22 + SysApplication.getInstance().addActivity(this);
22 23 initView();
23 24 initData();
24 25 initLister();
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/adapter/GridAdapter.java
Diff comments   View file @9d08c5b
... ... @@ -16,7 +16,7 @@ import java.util.ArrayList;
16 16 * Created by h on 2017/9/12.
17 17 */
18 18  
19   -public class GridAdapter extends BaseAdapter {
  19 +public class GridAdapter extends BaseAdapter {
20 20 private ArrayList<DefautPublishInfo.DataBean> defautPublishInfo;
21 21 private Context context;
22 22  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/GradeListDialog.java
Diff comments   View file @9d08c5b
... ... @@ -16,6 +16,7 @@ import android.widget.ListView;
16 16  
17 17 import com.hjx.personalcenter.R;
18 18 import com.hjx.personalcenter.adapter.GrandeAdapter;
  19 +import com.hjx.personalcenter.db.Content;
19 20 import com.hjx.personalcenter.db.SaveParam;
20 21 import com.hjx.personalcenter.http.HttpCode;
21 22 import com.hjx.personalcenter.http.HttpManager;
... ... @@ -88,8 +89,12 @@ public class GradeListDialog extends BaseCircleDialog implements AdapterView.OnI
88 89  
89 90 @Override
90 91 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
  92 + if (Content.accountflag ==2){
  93 + SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.CHILDSGRADENS, ""+data.get(position).getId());
  94 + }else {
  95 + SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.GRADENS, ""+data.get(position).getId());
  96 + }
91 97  
92   - SaveParam.getInstance().saveCustomizeParam(getActivity(), SaveParam.GRADENS, ""+data.get(position).getId());
93 98 mCallBack.province3OnItemClick(data,position,5);
94 99 dismiss();
95 100  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/customdialog/VerSionDialog.java
Diff comments   View file @9d08c5b
... ... @@ -14,12 +14,15 @@ import android.view.ViewGroup;
14 14 import android.widget.AdapterView;
15 15 import android.widget.ImageView;
16 16 import android.widget.ListView;
  17 +import android.widget.TextView;
17 18  
  19 +import com.facebook.drawee.view.SimpleDraweeView;
18 20 import com.hjx.personalcenter.R;
19 21 import com.hjx.personalcenter.adapter.VersionAdapter;
20 22 import com.hjx.personalcenter.db.SaveParam;
21 23 import com.hjx.personalcenter.http.HttpCode;
22 24 import com.hjx.personalcenter.http.HttpManager;
  25 +import com.hjx.personalcenter.interfaces.DialogCallBack;
23 26 import com.hjx.personalcenter.model.VersionInfo;
24 27 import com.mylhyl.circledialog.BaseCircleDialog;
25 28 import com.mylhyl.circledialog.res.values.CircleDimen;
... ... @@ -32,12 +35,17 @@ import java.util.List;
32 35 * Created by h on 2017/8/10.
33 36 */
34 37 @SuppressLint("ValidFragment")
35   -public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener {
  38 +public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnItemClickListener{
36 39 private VersionAdapter listadapter;
37 40 private ImageView cance;
38 41 private ListView listView;
  42 + private TextView publish;
  43 + private SimpleDraweeView simpleDraweeView;
39 44 private ArrayList<VersionInfo.DataBean> data = new ArrayList<>();
40   -
  45 + private DialogCallBack.VersionCallBack mcallback;
  46 + public VerSionDialog(DialogCallBack.VersionCallBack callBack) {
  47 + this.mcallback = callBack;
  48 + }
41 49 Handler handler = new Handler(){
42 50 @Override
43 51 public void handleMessage(Message msg) {
... ... @@ -53,8 +61,8 @@ public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnIte
53 61 }
54 62 };
55 63  
56   - public static VerSionDialog getInstance() {
57   - VerSionDialog dialogFragment = new VerSionDialog();
  64 + public static VerSionDialog getInstance(DialogCallBack.VersionCallBack callBack) {
  65 + VerSionDialog dialogFragment = new VerSionDialog(callBack);
58 66 dialogFragment.setCanceledBack(true);
59 67 dialogFragment.setCanceledOnTouchOutside(true);
60 68 dialogFragment.setRadius(CircleDimen.RADIUS);
... ... @@ -91,12 +99,12 @@ public class VerSionDialog extends BaseCircleDialog implements AdapterView.OnIte
91 99  
92 100 @Override
93 101 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
94   - String imageurl = data.get(position).getPressCover();
95   - String publish = data.get(position).getPressName();
96   - Log.e("test","拿到的数据为"+imageurl+publish);
97   -
98   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.IMGURL,imageurl);
99   - SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.VERSION,publish);
  102 + mcallback.versionOnItemClick(data,position,5);
  103 +// String imageurl = data.get(position).getPressCover();
  104 +// String publishs = data.get(position).getPressName();
  105 +// Log.e("test","拿到的数据为"+imageurl+publish);
  106 +// simpleDraweeView.setImageURI(imageurl);
  107 +// publish.setText(publishs);
100 108  
101 109 dismiss();
102 110  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/db/SaveParam.java
Diff comments   View file @9d08c5b
... ... @@ -42,6 +42,17 @@ public class SaveParam {
42 42 public static String ACCOUNT = "account";//账户类型
43 43 //科目信息
44 44 public static String SUBJECT = "subject";
  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";
45 56 //图片URL
46 57 public static String IMGURL = "imgurl";
47 58 //版本名称
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/PresonInfoFragment.java
Diff comments   View file @9d08c5b
1 1 package com.hjx.personalcenter.fragment;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Context;
4 5 import android.graphics.Color;
5 6 import android.os.Bundle;
6 7 import android.support.annotation.Nullable;
... ... @@ -22,7 +23,6 @@ import com.hjx.personalcenter.customdialog.CountryDialog;
22 23 import com.hjx.personalcenter.customdialog.GradeListDialog;
23 24 import com.hjx.personalcenter.customdialog.ProvinceListDialog;
24 25 import com.hjx.personalcenter.customdialog.SchoolListDialog;
25   -import com.hjx.personalcenter.db.Content;
26 26 import com.hjx.personalcenter.db.SaveParam;
27 27 import com.hjx.personalcenter.http.HttpManager;
28 28 import com.hjx.personalcenter.interfaces.DialogCallBack;
... ... @@ -159,6 +159,7 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
159 159 break;
160 160 case R.id.tv_useinfo_adress:
161 161 case R.id.my_adress:
  162 + tv_useinfo_school.setText("");
162 163 ProvinceListDialog.getInstance((DialogCallBack.ProvincesCallBack) PresonInfoFragment.this).show(getChildFragmentManager(), "ProvinceListDialog");
163 164 break;
164 165 case R.id.tv_useinfo_birthday:
... ... @@ -179,10 +180,10 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
179 180 break;
180 181 case R.id.tv_useinfo_gender:
181 182 case R.id.my_grade:
  183 + tv_useinfo_school.setText("");
182 184 GradeListDialog.getInstance((DialogCallBack.GradeCallBack) PresonInfoFragment.this).show(getChildFragmentManager(), "GradeListDialog");
183 185 break;
184 186 case R.id.presonal_sub:
185   - if (Content.changeinfoflag == 1) {
186 187 Log.e("test","你提交个人信息");
187 188 if (TextUtils.isEmpty(presonal1) ||
188 189 TextUtils.isEmpty(presonal2) || TextUtils.isEmpty(presonal3) || TextUtils.isEmpty(presonal4) ||
... ... @@ -234,7 +235,6 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
234 235 } catch (Exception e) {
235 236 e.printStackTrace();
236 237 }
237   - }
238 238  
239 239 break;
240 240 }
... ... @@ -283,11 +283,11 @@ public class PresonInfoFragment extends Fragment implements View.OnClickListener
283 283 SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
284 284 return format.format(date);
285 285 }
286   -
  286 +//
287 287 @Override
288   - public void onAttach(Activity activity) {
289   - super.onAttach(activity);
290   - View rootView = activity.getWindow().getDecorView();
  288 + public void onAttach(Context context) {
  289 + super.onAttach(context);
  290 + View rootView = ((Activity)context).getWindow().getDecorView();
291 291 TextView sub = (TextView) rootView.findViewById(R.id.presonal_sub);
292 292 sub.setOnClickListener(this);
293 293 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/fragment/VersionsInfoFragment.java
Diff comments   View file @9d08c5b
1 1 package com.hjx.personalcenter.fragment;
2 2  
3 3 import android.app.Activity;
  4 +import android.content.Context;
4 5 import android.os.Bundle;
5 6 import android.os.Handler;
6 7 import android.os.Message;
... ... @@ -18,11 +19,12 @@ import com.facebook.drawee.view.SimpleDraweeView;
18 19 import com.hjx.personalcenter.R;
19 20 import com.hjx.personalcenter.adapter.GridAdapter;
20 21 import com.hjx.personalcenter.customdialog.VerSionDialog;
21   -import com.hjx.personalcenter.db.Content;
22 22 import com.hjx.personalcenter.db.SaveParam;
23 23 import com.hjx.personalcenter.http.HttpCode;
24 24 import com.hjx.personalcenter.http.HttpManager;
  25 +import com.hjx.personalcenter.interfaces.DialogCallBack;
25 26 import com.hjx.personalcenter.model.DefautPublishInfo;
  27 +import com.hjx.personalcenter.model.VersionInfo;
26 28  
27 29 import java.util.ArrayList;
28 30 import java.util.List;
... ... @@ -31,12 +33,14 @@ import java.util.List;
31 33 * Created by h on 2017/8/12.
32 34 */
33 35  
34   -public class VersionsInfoFragment extends Fragment implements AdapterView.OnItemClickListener, View.OnClickListener {
  36 +public class VersionsInfoFragment extends Fragment implements AdapterView.OnItemClickListener, View.OnClickListener, DialogCallBack.VersionCallBack {
35 37 private GridView gridView;
36 38 private ArrayList<DefautPublishInfo.DataBean> defautPublishInfos = new ArrayList<>();
37 39 private GridAdapter sim_adapter;
38 40 private View mView;
39 41 private int type;
  42 + private TextView publish;
  43 + private SimpleDraweeView simpleDraweeView;
40 44 public static String TABLAYOUT_FRAGMENT = "versionfragment";
41 45  
42 46 public static VersionsInfoFragment newInstance(int type) {
... ... @@ -67,7 +71,7 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
67 71 String userID = SaveParam.getInstance().getLoginParam(getActivity(),"userId");
68 72 String graderid = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.GRADENS);
69 73 //子账户年级id
70   - String graderidchilds = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.CHILDSGRADENS);
  74 + String graderidchilds = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.CHILDSGRADENS);
71 75 //账户类型
72 76 String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.ACCOUNT);
73 77 try {
... ... @@ -112,22 +116,16 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
112 116 @Override
113 117 public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
114 118 SaveParam.getInstance().saveLoginParam(getActivity(),SaveParam.SUBJECT,defautPublishInfos.get(position).getSubject());
115   - VerSionDialog.getInstance().show(getChildFragmentManager(), "VerSionDialog");
116   -
117   -
118   - String imgurl = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.IMGURL);
119   - String version = SaveParam.getInstance().getLoginParam(getActivity(), SaveParam.VERSION);
120   - SimpleDraweeView simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
121   - TextView publish = (TextView) view.findViewById(R.id.tv_publish);
122   - simpleDraweeView.setImageURI(imgurl);
123   - publish.setText(version);
  119 + VerSionDialog.getInstance(this).show(getChildFragmentManager(), "VerSionDialog");
  120 + simpleDraweeView = (SimpleDraweeView) view.findViewById(R.id.image_publish);
  121 + publish = (TextView) view.findViewById(R.id.tv_publish);
124 122  
125 123 }
126 124  
127 125 @Override
128   - public void onAttach(Activity activity) {
129   - super.onAttach(activity);
130   - View rootView = activity.getWindow().getDecorView();
  126 + public void onAttach(Context context) {
  127 + super.onAttach(context);
  128 + View rootView = ((Activity)context).getWindow().getDecorView();
131 129 TextView sub = (TextView) rootView.findViewById(R.id.presonal_sub);
132 130 sub.setOnClickListener(this);
133 131 }
... ... @@ -144,18 +142,25 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
144 142 public void onClick(View v) {
145 143 switch (v.getId()){
146 144 case R.id.presonal_sub:
147   - if (Content.changeinfoflag ==2){
148   - Log.e("test","你提交版本信息");
149   - }
150   -
  145 + Log.e("test","你提交版本信息");
151 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);
152 157 //子账户id
153 158 String childsidid = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.CHILDSID);
154 159 //账户类型
155 160 String accounts = SaveParam.getInstance().getCustomizeParam(getActivity(),SaveParam.ACCOUNT);
156 161 try {
157 162 String id = null;
158   - String piblish = "清华大学出版社";
  163 + //String piblish = "清华大学出版社";
159 164 if ("2".equals(accounts)){
160 165 id =childsidid;
161 166 }else {
... ... @@ -163,8 +168,9 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
163 168 }
164 169  
165 170 //修改版本信息
166   - HttpManager.getInstance().changepublishinfo(getActivity(),id,piblish
167   - ,piblish,piblish,piblish,piblish,piblish,piblish,piblish,piblish,piblish);
  171 + HttpManager.getInstance().changepublishinfo(getActivity(),id,"人民教育出版社"
  172 + ,"人民教育出版社","人民教育出版社","人民教育出版社","人民教育出版社","人民教育出版社",
  173 + "人民教育出版社","人民教育出版社","人民教育出版社","人民教育出版社");
168 174  
169 175 } catch (NumberFormatException e) {
170 176 e.printStackTrace();
... ... @@ -176,4 +182,47 @@ public class VersionsInfoFragment extends Fragment implements AdapterView.OnItem
176 182 }
177 183  
178 184 }
  185 +
  186 + @Override
  187 + public void versionOnItemClick(ArrayList<VersionInfo.DataBean> data, int position, int type) {
  188 + String imageurl = data.get(position).getPressCover();
  189 + String publishs = data.get(position).getPressName();
  190 + simpleDraweeView.setImageURI(imageurl);
  191 + publish.setText(publishs);
  192 + String subject = SaveParam.getInstance().getLoginParam(getActivity(),SaveParam.SUBJECT);
  193 + Log.e("test","选择的科目"+subject);
  194 + 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);
  225 + }
  226 +
  227 + }
179 228 }
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/http/HttpManager.java
Diff comments   View file @9d08c5b
... ... @@ -65,7 +65,7 @@ public class HttpManager {
65 65  
66 66 public void login(final String username, final String password, final Context mContext, final Handler handler) {
67 67 mProgress = DialogPermission.showProgress(mContext, null, "正在登录...",
68   - false, true, null);
  68 + true, true, null);
69 69 HttpClient.getInstance().addHeader("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8");
70 70 HttpClient.getInstance().get(HttpUrl.loginUrl + "?username=" + username + "&password=" + password, new AsyncHttpResponseHandler() {
71 71 @Override
... ... @@ -886,7 +886,7 @@ public class HttpManager {
886 886 * @param handler
887 887 */
888 888 public void getchildAccountinfo(final Context mContext, long userId, String deviceNumber, final Handler handler) {
889   - mProgress = DialogPermission.showProgress(mContext, null, "正在获取信息...",
  889 + mProgress = DialogPermission.showProgress(mContext, null, "正在获取子账户信息...",
890 890 false, true, null);
891 891  
892 892 Log.e("test", "ID" + userId + "deviceNumber" + deviceNumber);
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/service/CenterService.java
Diff comments   View file @9d08c5b
... ... @@ -50,12 +50,21 @@ public class CenterService extends BaseService {
50 50 Gson gson = new Gson();
51 51 LoginInfo loginInfo = new LoginInfo();
52 52 String islogin = SaveParam.getInstance().getLoginParam(getApplication(),"login");
  53 + //子账户id
  54 + String childsidid = SaveParam.getInstance().getCustomizeParam(getApplication(),SaveParam.CHILDSID);
  55 + //账户类型
  56 + String accounts = SaveParam.getInstance().getCustomizeParam(getApplication(),SaveParam.ACCOUNT);
53 57 if ("true".equals(islogin)){
54 58 loginInfo.setUsername(SaveParam.getInstance().getLoginParam(getApplication(), "username"));
55 59 loginInfo.setPassword(SaveParam.getInstance().getLoginParam(getApplication(), "password"));
56 60 loginInfo.setAccess_token(SaveParam.getInstance().getLoginParam(getApplication(), "access_token"));
57 61 loginInfo.setLoginStatus(SaveParam.getInstance().getLoginParam(getApplication(), "login"));
58   - loginInfo.setUserId(SaveParam.getInstance().getLoginParam(getApplication(), "userId"));
  62 +
  63 + if ("2".equals(accounts)){
  64 + loginInfo.setUserId(childsidid);
  65 + }else {
  66 + loginInfo.setUserId(SaveParam.getInstance().getLoginParam(getApplication(), "userId"));
  67 + }
59 68  
60 69 logininfo =gson.toJson(loginInfo);
61 70  
... ...
PersonalCenter/app/src/main/java/com/hjx/personalcenter/util/DialogPermission.java
Diff comments   View file @9d08c5b
... ... @@ -63,7 +63,8 @@ public class DialogPermission {
63 63 dialog.setTitle(title);
64 64 dialog.setMessage(message);
65 65 dialog.setIndeterminate(indeterminate);
66   - dialog.setCancelable(false);
  66 + dialog.setCancelable(true);
  67 + dialog.setCanceledOnTouchOutside(false);
67 68 // dialog.setDefaultButton(false);
68 69 if (cancelable && listener != null)
69 70 dialog.setOnDismissListener(listener);
... ...
PersonalCenter/app/src/main/res/layout/activity_account_management.xml
Diff comments   View file @9d08c5b
... ... @@ -309,7 +309,9 @@
309 309 android:layout_height="wrap_content"
310 310 android:layout_centerVertical="true"
311 311 android:layout_toLeftOf="@+id/add_account"
312   - android:scrollbars="none"></android.support.v7.widget.RecyclerView>
  312 + android:scrollbars="none">
  313 +
  314 + </android.support.v7.widget.RecyclerView>
313 315  
314 316 <LinearLayout
315 317 android:id="@+id/add_account"
... ...
PersonalCenter/app/src/main/res/layout/activity_binding_code.xml
Diff comments   View file @9d08c5b
... ... @@ -4,9 +4,47 @@
4 4 android:layout_width="match_parent"
5 5 android:gravity="center"
6 6 android:layout_height="match_parent">
7   - <ImageView
8   - android:id="@+id/EQpicture"
  7 + <LinearLayout
9 8 android:layout_width="wrap_content"
10   - android:layout_height="wrap_content" />
  9 + android:layout_height="wrap_content"
  10 + android:orientation="vertical"
  11 + android:gravity="center">
  12 + <ImageView
  13 + android:id="@+id/EQpicture"
  14 + android:layout_width="wrap_content"
  15 + android:layout_height="wrap_content" />
  16 + <TextView
  17 + android:layout_width="wrap_content"
  18 + android:layout_height="wrap_content"
  19 + android:paddingLeft="250dp"
  20 + android:paddingRight="250dp"
  21 + android:textSize="18sp"
  22 + android:text="方式一：扫描上图中的二维码，下载“好记星家教老师”app，打开app，再次扫描二维码完成绑定，若您已下载最新版app，则可直接扫描二维码绑定即可开始管理您的机器；
  23 +"/>
  24 + <TextView
  25 + android:layout_marginTop="5dp"
  26 + android:layout_width="wrap_content"
  27 + android:layout_height="wrap_content"
  28 + android:paddingLeft="250dp"
  29 + android:paddingRight="250dp"
  30 + android:textSize="18sp"
  31 + android:text="方式二：打开本机找到“家长控制”应用，输入初始密码“123456”，进入后，即可开始管理您的机器。"/>
  32 +
  33 + <RelativeLayout
  34 + android:layout_width="wrap_content"
  35 + android:layout_height="wrap_content"
  36 + android:layout_alignParentBottom="true"
  37 + android:layout_marginTop="20dp"
  38 + android:paddingLeft="250dp"
  39 + android:paddingRight="250dp">
  40 + <Button
  41 + android:id="@+id/btn_next_tep"
  42 + style="@style/button_login_register_style"
  43 + android:layout_marginBottom="50dp"
  44 + android:text="下一步" />
  45 + </RelativeLayout>
  46 +
  47 + </LinearLayout>
  48 +
11 49  
12 50 </LinearLayout>
13 51 \ No newline at end of file
... ...
PersonalCenter/app/src/main/res/layout/fragment_loginandregister_login.xml
Diff comments   View file @9d08c5b
... ... @@ -4,8 +4,8 @@
4 4 android:layout_height="match_parent"
5 5 android:background="#ffffffff"
6 6 android:orientation="vertical"
7   - android:paddingLeft="250dp"
8   - android:paddingRight="250dp" >
  7 + android:paddingLeft="300dp"
  8 + android:paddingRight="300dp" >
9 9  
10 10  
11 11 <EditText
... ...
PersonalCenter/app/src/main/res/layout/fragment_loginandregister_register.xml
Diff comments   View file @9d08c5b
... ... @@ -4,8 +4,8 @@
4 4 android:layout_height="match_parent"
5 5 android:background="#ffffffff"
6 6 android:orientation="vertical"
7   - android:paddingLeft="250dp"
8   - android:paddingRight="250dp">
  7 + android:paddingLeft="300dp"
  8 + android:paddingRight="300dp">
9 9  
10 10 <EditText
11 11 android:id="@+id/et_phonenumber"
... ... @@ -38,8 +38,6 @@
38 38 <Button
39 39 android:id="@+id/btn_authcode"
40 40 style="@style/login_register_btn_authcode_rect_style"
41   - android:layout_marginLeft="0px"
42   - android:layout_marginTop="0px"
43 41 android:layout_weight="2"
44 42 android:text="获取验证码"
45 43 android:textColor="@color/btn_text_color" />
... ...
PersonalCenter/app/src/main/res/values/strings.xml
Diff comments   View file @9d08c5b
1 1 <resources>
2   - <string name="app_name">PersonalCenter</string>
  2 + <string name="app_name">个人中心</string>
3 3  
4 4  
5 5  
... ... @@ -27,7 +27,7 @@
27 27 <string name="change_electroniccard_info_fill">修改保卡信息</string>
28 28 <string name="string_electroniccard_info_change">修改保卡信息</string>
29 29 <string name="string_electroniccard_info_ok">确认保卡信息</string>
30   - <string name="string_electroniccard_info_look">好记星-电子报卡</string>
  30 + <string name="string_electroniccard_info_look">好记星-电子保卡</string>
31 31 <string name="string_electroniccard_change_bangding">更换绑定</string>
32 32 <string name="electronic_card">温馨提示：若您想修改的相关信息请拨打客服电话</string>
33 33 <string name="electronic_card1">请先填写《好记星-电子保卡》信息</string>
... ...
PersonalCenter/app/src/main/res/values/styles.xml
Diff comments   View file @9d08c5b
... ... @@ -25,7 +25,10 @@
25 25 <item name="android:layout_width">match_parent</item>
26 26 <item name="android:layout_height">wrap_content</item>
27 27 <item name="android:textColorHint">@color/login_edittext_hint</item>
28   - <item name="android:padding">10dp</item>
  28 + <item name="android:paddingRight">10dp</item>
  29 + <item name="android:paddingTop">10dp</item>
  30 + <item name="android:paddingLeft">10dp</item>
  31 + <item name="android:paddingBottom">12dp</item>
29 32 </style>
30 33  
31 34 <style name="login_register_btn_authcode_rect_style">
... ...